diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 6a1cf6e4ee86..297b91976a88 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -8,45 +8,75 @@
# Mentioned users will get code review requests.
# This file
-.github/CODEOWNERS @edolstra
+/.github/CODEOWNERS @edolstra
# Boostraping and core infra
-pkgs/stdenv/ @edolstra
-pkgs/build-support/cc-wrapper/ @edolstra
+/pkgs/stdenv @edolstra
+/pkgs/build-support/cc-wrapper @edolstra
# Libraries
-lib/ @edolstra
+/lib @edolstra @nbp
+
+# Nixpkgs Internals
+/default.nix @nbp
+/pkgs/top-level/default.nix @nbp
+/pkgs/top-level/impure.nix @nbp
+/pkgs/top-level/stage.nix @nbp
+
+# NixOS Internals
+/nixos/default.nix @nbp
+/nixos/lib/from-env.nix @nbp
+/nixos/lib/eval-config.nix @nbp
+/nixos/doc/manual/configuration/abstractions.xml @nbp
+/nixos/doc/manual/configuration/config-file.xml @nbp
+/nixos/doc/manual/configuration/config-syntax.xml @nbp
+/nixos/doc/manual/configuration/modularity.xml @nbp
+/nixos/doc/manual/development/assertions.xml @nbp
+/nixos/doc/manual/development/meta-attributes.xml @nbp
+/nixos/doc/manual/development/option-declarations.xml @nbp
+/nixos/doc/manual/development/option-def.xml @nbp
+/nixos/doc/manual/development/option-types.xml @nbp
+/nixos/doc/manual/development/replace-modules.xml @nbp
+/nixos/doc/manual/development/writing-modules.xml @nbp
+/nixos/doc/manual/man-nixos-option.xml @nbp
+/nixos/modules/installer/tools/nixos-option.sh @nbp
# Python-related code and docs
-pkgs/top-level/python-packages.nix @FRidh
-pkgs/development/interpreters/python/* @FRidh
-pkgs/development/python-modules/* @FRidh
-doc/languages-frameworks/python.md @FRidh
+/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
+/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
+/pkgs/applications/science/math/R @peti
+/pkgs/development/r-modules @peti
+
+# Ruby
+/pkgs/development/interpreters/ruby @zimbatm
+/pkgs/development/ruby-modules @zimbatm
# Darwin-related
-pkgs/stdenv/darwin/* @copumpkin @LnL7
-pkgs/os-specific/darwin/* @LnL7
-pkgs/os-specific/darwin/apple-source-releases/* @copumpkin
+/pkgs/stdenv/darwin @NixOS/darwin-maintainers
+/pkgs/os-specific/darwin @NixOS/darwin-maintainers
# Beam-related (Erlang, Elixir, LFE, etc)
-pkgs/development/beam-modules/* @gleber
-pkgs/development/interpreters/erlang/* @gleber
-pkgs/development/interpreters/lfe/* @gleber
-pkgs/development/interpreters/elixir/* @gleber
-pkgs/development/tools/build-managers/rebar/* @gleber
-pkgs/development/tools/build-managers/rebar3/* @gleber
-pkgs/development/tools/erlang/* @gleber
+/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
+/pkgs/applications/editors/jetbrains @edwtjo
+
+# Eclipse
+/pkgs/applications/editors/eclipse @rycee
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index f7fac647f412..41e85bd5ac46 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -32,11 +32,14 @@ under the terms of [COPYING](../COPYING), which is an MIT-like license.
The old config generation system used impure shell scripts and could break in specific circumstances (see #1234).
* `meta.description` should:
- * Be capitalized
- * Not start with the package name
- * Not have a dot at the end
+ * Be capitalized.
+ * Not start with the package name.
+ * Not have a period at the end.
+* `meta.license` must be set and fit the upstream license.
+ * If there is no upstream license, `meta.license` should default to `stdenv.lib.licenses.unfree`.
+* `meta.maintainers` must be set.
-See the nixpkgs manual for more details on how to [Submit changes to nixpkgs](https://nixos.org/nixpkgs/manual/#chap-submitting-changes).
+See the nixpkgs manual for more details on [standard meta-attributes](https://nixos.org/nixpkgs/manual/#sec-standard-meta-attributes) and on how to [submit changes to nixpkgs](https://nixos.org/nixpkgs/manual/#chap-submitting-changes).
## Writing good commit messages
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 280c9807e589..75db8e1377c4 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -9,7 +9,7 @@
- Built on platform(s)
- [ ] NixOS
- [ ] macOS
- - [ ] Linux
+ - [ ] other Linux distributions
- [ ] Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests))
- [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nox --run "nox-review wip"`
- [ ] Tested execution of all binary files (usually in `./result/bin/`)
diff --git a/COPYING b/COPYING
index a632d6f58b12..afc460fff5cb 100644
--- a/COPYING
+++ b/COPYING
@@ -23,9 +23,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Note: the license above does not apply to the packages built by the
Nix Packages collection, merely to the package descriptions (i.e., Nix
-expressions, build scripts, etc.). Also, the license does not apply
-to some of the binaries used for bootstrapping Nixpkgs (e.g.,
-pkgs/stdenv/linux/tools/bash). It also might not apply to patches
+expressions, build scripts, etc.). It also might not apply to patches
included in Nixpkgs, which may be derivative works of the packages to
which they apply. The aforementioned artifacts are all covered by the
licenses of the respective packages.
diff --git a/README.md b/README.md
index 1a0fb5014ded..64cfb25eac34 100644
--- a/README.md
+++ b/README.md
@@ -13,12 +13,12 @@ build daemon as so-called channels. To get channel information via git, add
```
For stability and maximum binary package support, it is recommended to maintain
-custom changes on top of one of the channels, e.g. `nixos-17.03` for the latest
+custom changes on top of one of the channels, e.g. `nixos-17.09` for the latest
release and `nixos-unstable` for the latest successful build of master:
```
% git remote update channels
-% git rebase channels/nixos-17.03
+% git rebase channels/nixos-17.09
```
For pull-requests, please rebase onto nixpkgs `master`.
@@ -30,11 +30,11 @@ For pull-requests, please rebase onto nixpkgs `master`.
* [Documentation (Nix Expression Language chapter)](https://nixos.org/nix/manual/#ch-expression-language)
* [Manual (How to write packages for Nix)](https://nixos.org/nixpkgs/manual/)
* [Manual (NixOS)](https://nixos.org/nixos/manual/)
-* [Nix Wiki](https://nixos.org/wiki/) (deprecated, see milestone ["Move the Wiki!"](https://github.com/NixOS/nixpkgs/issues?q=is%3Aopen+is%3Aissue+milestone%3A%22Move+the+wiki%21%22))
+* [Community maintained wiki](https://nixos.wiki/)
* [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined)
-* [Continuous package builds for 17.03 release](https://hydra.nixos.org/jobset/nixos/release-17.03)
+* [Continuous package builds for 17.09 release](https://hydra.nixos.org/jobset/nixos/release-17.09)
* [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents)
-* [Tests for 17.03 release](https://hydra.nixos.org/job/nixos/release-17.03/tested#tabs-constituents)
+* [Tests for 17.09 release](https://hydra.nixos.org/job/nixos/release-17.09/tested#tabs-constituents)
Communication:
diff --git a/doc/configuration.xml b/doc/configuration.xml
index ac03b42714c6..55c5ea809d35 100644
--- a/doc/configuration.xml
+++ b/doc/configuration.xml
@@ -55,6 +55,10 @@ configuration file located at
+Note that we are not able to test or build unfree software on Hydra
+due to policy. Most unfree licenses prohibit us from either executing or
+distributing the software.
+
Installing broken packages
diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml
index 77d020afa2df..9e9dd41c2881 100644
--- a/doc/cross-compilation.xml
+++ b/doc/cross-compilation.xml
@@ -184,7 +184,7 @@
For now, feel free to use either method.
- There is also a "backlink" __targetPackages, yielding a package set whose buildPackages is the current package set.
+ There is also a "backlink" targetPackages, yielding a package set whose buildPackages is the current package set.
This is a hack, though, to accommodate compilers with lousy build systems.
Please do not use this unless you are absolutely sure you are packaging such a compiler and there is no other way.
diff --git a/doc/introduction.md b/doc/introduction.md
index 96a5571b4266..8b03221c64b1 100644
--- a/doc/introduction.md
+++ b/doc/introduction.md
@@ -48,6 +48,4 @@ The binaries are made available via a [binary cache](https://cache.nixos.org).
The current Nix expressions of the channels are available in the
[`nixpkgs-channels`](https://github.com/NixOS/nixpkgs-channels) repository,
-which has branches corresponding to the available channels. There is also the
-[Nixpkgs Monitor](http://monitor.nixos.org) which keeps track of updates
-and security vulnerabilities.
+which has branches corresponding to the available channels.
diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md
index 298da8f9f0d2..cf81b240ceac 100644
--- a/doc/languages-frameworks/python.md
+++ b/doc/languages-frameworks/python.md
@@ -165,7 +165,7 @@ run the script in the `python3` shell.
```py
#! /usr/bin/env nix-shell
-#! nix-shell -i 'python3.withPackages(ps: [ps.numpy])'
+#! nix-shell -i python3 -p "python3.withPackages(ps: [ps.numpy])"
import numpy
@@ -785,7 +785,20 @@ 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'`.
+- Non-working tests can often be deselected. By default `buildPythonPackage` runs `python setup.py test`.
+ Most python modules follows the standard test protocol where the pytest runner can be used instead.
+ `py.test` supports a `-k` parameter to ignore test methods or classes:
+
+ ```nix
+ buildPythonPackage {
+ # ...
+ # assumes the tests are located in tests
+ checkInputs = [ pytest ];
+ checkPhase = ''
+ py.test -k 'not function_name and not other_function' tests
+ '';
+ }
+ ```
- Unicode issues can typically be fixed by including `glibcLocales` in `buildInputs` and exporting `LC_ALL=en_US.utf-8`.
- Tests that attempt to access `$HOME` can be fixed by using the following work-around before running tests (e.g. `preCheck`): `export HOME=$(mktemp -d)`
diff --git a/doc/languages-frameworks/rust.md b/doc/languages-frameworks/rust.md
index 481b76fb78f2..276b5496fbb8 100644
--- a/doc/languages-frameworks/rust.md
+++ b/doc/languages-frameworks/rust.md
@@ -9,16 +9,15 @@ date: 2017-03-05
To install the rust compiler and cargo put
```
-rustStable.rustc
-rustStable.cargo
+rust
```
-into the `environment.systemPackages` or bring them into scope with
-`nix-shell -p rustStable.rustc -p rustStable.cargo`.
+into the `environment.systemPackages` or bring them into
+scope with `nix-shell -p rust`.
-There are also `rustBeta` and `rustNightly` package sets available.
-These are not updated very regularly. For daily builds use either rustup from
-nixpkgs or use the [Rust nightlies overlay](#using-the-rust-nightlies-overlay).
+For daily builds (beta and nightly) use either rustup from
+nixpkgs or use the [Rust nightlies
+overlay](#using-the-rust-nightlies-overlay).
## Packaging Rust applications
@@ -38,7 +37,7 @@ buildRustPackage rec {
sha256 = "0y5d1n6hkw85jb3rblcxqas2fp82h3nghssa4xqrhqnz25l799pj";
};
- depsSha256 = "0q68qyl2h6i0qsz82z840myxlnjay8p1w5z7hfyr8fqp7wgwa9cx";
+ cargoSha256 = "0q68qyl2h6i0qsz82z840myxlnjay8p1w5z7hfyr8fqp7wgwa9cx";
meta = with stdenv.lib; {
description = "A utility that combines the usability of The Silver Searcher with the raw speed of grep";
@@ -50,7 +49,7 @@ buildRustPackage rec {
}
```
-`buildRustPackage` requires a `depsSha256` attribute which is computed over
+`buildRustPackage` requires a `cargoSha256` attribute which is computed over
all crate sources of this package. Currently it is obtained by inserting a
fake checksum into the expression and building the package once. The correct
checksum can be then take from the failed build.
@@ -76,11 +75,11 @@ in the `~/.config/nixpkgs/overlays` directory.
The latest version can be installed with the following command:
- $ nix-env -Ai nixos.rustChannels.stable.rust
+ $ nix-env -Ai nixos.latest.rustChannels.stable.rust
Or using the attribute with nix-shell:
- $ nix-shell -p nixos.rustChannels.stable.rust
+ $ nix-shell -p nixos.latest.rustChannels.stable.rust
To install the beta or nightly channel, "stable" should be substituted by
"nightly" or "beta", or
diff --git a/doc/manual.xml b/doc/manual.xml
index 75bd21557fd1..eb0a24789d44 100644
--- a/doc/manual.xml
+++ b/doc/manual.xml
@@ -18,6 +18,7 @@
+
diff --git a/doc/meta.xml b/doc/meta.xml
index b1ffd0502b2b..0f9dccfb91b5 100644
--- a/doc/meta.xml
+++ b/doc/meta.xml
@@ -200,11 +200,9 @@ meta-attributes
meta.platforms = stdenv.lib.platforms.linux;
- Attribute Set stdenv.lib.platforms in
-
- nixpkgs/lib/platforms.nix defines various common
- lists of platforms types.
-
+ Attribute Set stdenv.lib.platforms defines
+
+ various common lists of platforms types.
diff --git a/doc/package-notes.xml b/doc/package-notes.xml
index e1aea62f7848..184bee089ae3 100644
--- a/doc/package-notes.xml
+++ b/doc/package-notes.xml
@@ -477,32 +477,18 @@ it. Place the resulting package.nix file into
Using the FOSS Radeon or nouveau (nvidia) drivers
-
- 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
- conflics with the one dynamically loaded by radeonsi_dri.so.
- If you get the error
- steam.sh: line 713: 7842 Segmentation fault (core dumped)
- have a look at this pull request.
-
+
+ The newStdcpp parameter
+ was removed since NixOS 17.09 and should not be needed anymore.
+
+
+
+ Steam ships statically linked with a version of libcrypto that
+ conflics with the one dynamically loaded by radeonsi_dri.so.
+ If you get the error
+ steam.sh: line 713: 7842 Segmentation fault (core dumped)
+ have a look at this pull request.
+
@@ -678,4 +664,34 @@ cp ${myEmacsConfig} $out/share/emacs/site-lisp/default.el
+
+Weechat
+
+Weechat can currently be configured to include your choice of plugins.
+To make use of this functionality, install an expression that overrides its configuration such as
+weechat.override {configure = {availablePlugins, ...}: {
+ plugins = with availablePlugins; [ python perl ];
+ }
+}
+
+
+The plugins currently available are python,
+perl, ruby, guile,
+tcl and lua.
+
+
+The python plugin allows the addition of extra libraries. For instance,
+the inotify.py script in weechat-scripts requires
+D-Bus or libnotify, and the fish.py script requires
+pycrypto. To use these scripts, use the python
+plugin's withPackages attribute:
+weechat.override {configure = {availablePlugins, ...}: {
+ plugins = with availablePlugins; [
+ (python.withPackages (ps: with ps; [ pycrypto python-dbus ]))
+ ];
+ }
+}
+
+
+
diff --git a/doc/platform-notes.xml b/doc/platform-notes.xml
new file mode 100644
index 000000000000..f4f6ec600294
--- /dev/null
+++ b/doc/platform-notes.xml
@@ -0,0 +1,83 @@
+
+
+Platform Notes
+
+
+
+Darwin (macOS)
+Some common issues when packaging software for darwin:
+
+
+
+
+
+ The darwin stdenv uses clang instead of gcc.
+ When referring to the compiler $CC or cc
+ will work in both cases. Some builds hardcode gcc/g++ in their
+ build scripts, that can usually be fixed with using something
+ like makeFlags = [ "CC=cc" ]; or by patching
+ the build scripts.
+
+
+
+ stdenv.mkDerivation {
+ name = "libfoo-1.2.3";
+ # ...
+ buildPhase = ''
+ $CC -o hello hello.c
+ '';
+ }
+
+
+
+
+
+ On darwin libraries are linked using absolute paths, libraries
+ are resolved by their install_name at link
+ time. Sometimes packages won't set this correctly causing the
+ library lookups to fail at runtime. This can be fixed by adding
+ extra linker flags or by running install_name_tool -id
+ during the fixupPhase.
+
+
+
+ stdenv.mkDerivation {
+ name = "libfoo-1.2.3";
+ # ...
+ makeFlags = stdenv.lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/libfoo.dylib";
+ }
+
+
+
+
+
+ Some packages assume xcode is available and use xcrun
+ to resolve build tools like clang, etc.
+ This causes errors like xcode-select: error: no developer tools were found at '/Applications/Xcode.app'
+ while the build doesn't actually depend on xcode.
+
+
+
+ stdenv.mkDerivation {
+ name = "libfoo-1.2.3";
+ # ...
+ prePatch = ''
+ substituteInPlace Makefile \
+ --replace '/usr/bin/xcrun clang' clang
+ '';
+ }
+
+
+
+ The package xcbuild can be used to build projects
+ that really depend on Xcode, however projects that build some kind of
+ graphical interface won't work without using Xcode in an impure way.
+
+
+
+
+
+
+
diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index dac53bc2b800..ee110b771049 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -1,4 +1,3 @@
-
@@ -188,11 +187,13 @@ genericBuild
NIX_DEBUG
- If set, stdenv will print some
- debug information during the build. In particular, the
- gcc and ld wrapper scripts
- will print out the complete command line passed to the wrapped
- tools.
+
+ A natural number indicating how much information to log.
+ If set to 1 or higher, stdenv will print moderate debug information during the build.
+ In particular, the gcc and ld wrapper scripts will print out the complete command line passed to the wrapped tools.
+ If set to 6 or higher, the stdenv setup script will be run with set -x tracing.
+ If set to 7 or higher, the gcc and ld wrapper scripts will also be run with set -x tracing.
+
@@ -697,8 +698,14 @@ nothing.
A list of strings passed as additional flags to
make. These flags are also used by the default
install and check phase. For setting make flags specific to the
- build phase, use buildFlags (see
- below).
+ build phase, use buildFlags (see below).
+
+
+makeFlags = [ "PREFIX=$(out)" ];
+
+
+ The flags are quoted in bash, but environment variables can
+ be specified by using the make syntax.
diff --git a/lib/licenses.nix b/lib/licenses.nix
index a790b576032d..cbd737dc57f1 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -219,6 +219,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
ffsl = {
fullName = "Floodgap Free Software License";
url = http://www.floodgap.com/software/ffsl/license.html;
+ free = false;
};
free = {
@@ -281,6 +282,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
url = https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception;
};
+ hpnd = spdx {
+ spdxId = "HPND";
+ fullName = "Historic Permission Notice and Disclaimer";
+ };
+
# Intel's license, seems free
iasl = {
fullName = "iASL";
diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 32ec8be0a688..a29d4d308e86 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -31,6 +31,7 @@
ak = "Alexander Kjeldaas ";
akaWolf = "Artjom Vejsel ";
akc = "Anders Claesson ";
+ alexvorobiev = "Alex Vorobiev = lowest && x <= highest) // {
+ name = "intBetween";
+ description = "integer between ${betweenDesc lowest highest}";
+ };
+ ign = lowest: highest: name: docStart:
+ between lowest highest // {
+ inherit name;
+ description = docStart + "; between ${betweenDesc lowest highest}";
+ };
+ unsign = bit: range: ign 0 (range - 1)
+ "unsignedInt${toString bit}" "${toString bit} bit unsigned integer";
+ sign = bit: range: ign (0 - (range / 2)) (range / 2 - 1)
+ "signedInt${toString bit}" "${toString bit} bit signed integer";
+
+ in rec {
+ /* An int with a fixed range.
+ *
+ * Example:
+ * (ints.between 0 100).check (-1)
+ * => false
+ * (ints.between 0 100).check (101)
+ * => false
+ * (ints.between 0 0).check 0
+ * => true
+ */
+ inherit between;
+
+ unsigned = addCheck types.int (x: x >= 0) // {
+ name = "unsignedInt";
+ description = "unsigned integer, meaning >=0";
+ };
+ positive = addCheck types.int (x: x > 0) // {
+ name = "positiveInt";
+ description = "positive integer, meaning >0";
+ };
+ u8 = unsign 8 256;
+ u16 = unsign 16 65536;
+ # the biggest int a 64-bit Nix accepts is 2^63 - 1 (9223372036854775808), for a 32-bit Nix it is 2^31 - 1 (2147483647)
+ # the smallest int a 64-bit Nix accepts is -2^63 (-9223372036854775807), for a 32-bit Nix it is -2^31 (-2147483648)
+ # u32 = unsign 32 4294967296;
+ # u64 = unsign 64 18446744073709551616;
+
+ s8 = sign 8 256;
+ s16 = sign 16 65536;
+ # s32 = sign 32 4294967296;
+ };
str = mkOptionType {
name = "str";
@@ -172,7 +225,7 @@ rec {
};
# drop this in the future:
- list = builtins.trace "`types.list' is deprecated; use `types.listOf' instead" types.listOf;
+ list = builtins.trace "`types.list` is deprecated; use `types.listOf` instead" types.listOf;
listOf = elemType: mkOptionType rec {
name = "listOf";
@@ -189,7 +242,7 @@ rec {
).optionalValue
) def.value
else
- throw "The option value `${showOption loc}' in `${def.file}' is not a list.") defs)));
+ throw "The option value `${showOption loc}` in `${def.file}` is not a list.") defs)));
getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["*"]);
getSubModules = elemType.getSubModules;
substSubModules = m: listOf (elemType.substSubModules m);
@@ -240,25 +293,6 @@ rec {
functor = (defaultFunctor name) // { wrapped = elemType; };
};
- # List or element of ...
- loeOf = elemType: mkOptionType rec {
- name = "loeOf";
- description = "element or list of ${elemType.description}s";
- check = x: isList x || elemType.check x;
- merge = loc: defs:
- let
- defs' = filterOverrides defs;
- res = (head defs').value;
- in
- if isList res then concatLists (getValues defs')
- else if lessThan 1 (length defs') then
- throw "The option `${showOption loc}' is defined multiple times, in ${showFiles (getFiles defs)}."
- else if !isString res then
- throw "The option `${showOption loc}' does not have a string value, in ${showFiles (getFiles defs)}."
- else res;
- functor = (defaultFunctor name) // { wrapped = elemType; };
- };
-
# Value of given type but with no merging (i.e. `uniq list`s are not concatenated).
uniq = elemType: mkOptionType rec {
name = "uniq";
@@ -279,7 +313,7 @@ rec {
let nrNulls = count (def: def.value == null) defs; in
if nrNulls == length defs then null
else if nrNulls != 0 then
- throw "The option `${showOption loc}' is defined both null and not null, in ${showFiles (getFiles defs)}."
+ throw "The option `${showOption loc}` is defined both null and not null, in ${showFiles (getFiles defs)}."
else elemType.merge loc defs;
getSubOptions = elemType.getSubOptions;
getSubModules = elemType.getSubModules;
@@ -307,8 +341,17 @@ rec {
}).config;
getSubOptions = prefix: (evalModules
{ modules = opts'; inherit prefix;
- # FIXME: hack to get shit to evaluate.
- args = { name = ""; }; }).options;
+ # This is a work-around due to the fact that some sub-modules,
+ # such as the one included in an attribute set, expects a "args"
+ # attribute to be given to the sub-module. As the option
+ # evaluation does not have any specific attribute name, we
+ # provide a default one for the documentation.
+ #
+ # This is mandatory as some option declaration might use the
+ # "name" attribute given as argument of the submodule and use it
+ # as the default of option declarations.
+ args.name = "<name>";
+ }).options;
getSubModules = opts';
substSubModules = m: submodule m;
functor = (defaultFunctor name) // {
diff --git a/maintainers/scripts/gnome.sh b/maintainers/scripts/gnome.sh
index f77dc5a9e64c..d44bda53f8d6 100755
--- a/maintainers/scripts/gnome.sh
+++ b/maintainers/scripts/gnome.sh
@@ -6,7 +6,7 @@ GNOME_FTP=ftp.gnome.org/pub/GNOME/sources
# projects that don't follow the GNOME major versioning, or that we don't want to
# programmatically update
-NO_GNOME_MAJOR="ghex gtkhtml gdm"
+NO_GNOME_MAJOR="ghex gtkhtml gdm gucharmap"
usage() {
echo "Usage: $0 || [major.minor]" >&2
diff --git a/maintainers/scripts/hydra-eval-failures.py b/maintainers/scripts/hydra-eval-failures.py
index 5233e0624450..ddc3c7c4a967 100755
--- a/maintainers/scripts/hydra-eval-failures.py
+++ b/maintainers/scripts/hydra-eval-failures.py
@@ -49,8 +49,8 @@ def get_maintainers(attr_name):
@click.command()
@click.option(
'--jobset',
- default="nixos/release-17.03",
- help='Hydra project like nixos/release-17.03')
+ default="nixos/release-17.09",
+ help='Hydra project like nixos/release-17.09')
def cli(jobset):
"""
Given a Hydra project, inspect latest evaluation
diff --git a/maintainers/scripts/update-python-libraries b/maintainers/scripts/update-python-libraries
index 7c73510c353a..3ddc8c23a79b 100755
--- a/maintainers/scripts/update-python-libraries
+++ b/maintainers/scripts/update-python-libraries
@@ -18,6 +18,7 @@ import os
import re
import requests
import toolz
+from concurrent.futures import ThreadPoolExecutor as pool
INDEX = "https://pypi.io/pypi"
"""url of PyPI"""
@@ -235,7 +236,8 @@ def main():
packages = map(os.path.abspath, args.package)
- count = list(map(_update, packages))
+ with pool() as p:
+ count = list(p.map(_update, packages))
logging.info("{} package(s) updated".format(sum(count)))
diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml
index 7b86e518aaf1..83dcf0232d9d 100644
--- a/nixos/doc/manual/development/option-types.xml
+++ b/nixos/doc/manual/development/option-types.xml
@@ -22,10 +22,6 @@
A boolean, its values can be true or
false.
-
- types.int
- An integer.
-
types.path
A filesystem path, defined as anything that when coerced to
@@ -39,7 +35,59 @@
-String related types:
+Integer-related types:
+
+
+
+ types.int
+ A signed integer.
+
+
+
+ types.ints.{s8, s16, s32}
+
+
+ Signed integers with a fixed length (8, 16 or 32 bits).
+ They go from
+ −2n/2
+ to
+ 2n/2−1
+
+ respectively (e.g. −128 to 127
+ for 8 bits).
+
+
+
+
+ types.ints.unsigned
+
+ An unsigned integer (that is >= 0).
+
+
+
+
+ types.ints.{u8, u16, u32}
+
+
+ Unsigned integers with a fixed length (8, 16 or 32 bits).
+ They go from
+ 0 to
+ 2n−1
+
+ respectively (e.g. 0 to 255
+ for 8 bits).
+
+
+
+
+ types.ints.positive
+
+ A positive integer (that is > 0).
+
+
+
+
+String-related types:
@@ -68,7 +116,7 @@
Value Types
- Value types are type that take a value parameter.
+ Value types are types that take a value parameter.
@@ -84,6 +132,17 @@
sep, e.g. types.separatedString
"|".
+
+
+ types.ints.between
+ lowest
+ highest
+
+ An integer between lowest
+ and highest (both inclusive).
+ Useful for creating types like types.port.
+
+
types.submodule o
A set of sub options o.
diff --git a/nixos/doc/manual/installation/installing-usb.xml b/nixos/doc/manual/installation/installing-usb.xml
index b97f989d902c..31d51816e39b 100644
--- a/nixos/doc/manual/installation/installing-usb.xml
+++ b/nixos/doc/manual/installation/installing-usb.xml
@@ -31,7 +31,7 @@ ISO, copy its contents verbatim to your drive, then either:
Edit loader/entries/nixos-livecd.conf on the drive
and change the root= field in the options
line to point to your drive (see the documentation on root=
- in
+ in
the kernel documentation for more details).
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml
index 8c37643c08f5..b0674307a563 100644
--- a/nixos/doc/manual/installation/installing.xml
+++ b/nixos/doc/manual/installation/installing.xml
@@ -16,7 +16,8 @@
hardware.
The NixOS manual is available on virtual console 8
- (press Alt+F8 to access).
+ (press Alt+F8 to access) or by running nixos-help.
+
You get logged in as root
(with empty password).
@@ -139,6 +140,11 @@
the GRUB boot loader is to be installed. Without it, NixOS cannot
boot.
+ If there are other operating systems running on the machine before
+ installing NixOS, the
+ option can be set to
+ true to automatically add them to the grub menu.
+
Another critical option is ,
specifying the file systems that need to be mounted by NixOS.
However, you typically don’t need to set it yourself, because
diff --git a/nixos/doc/manual/release-notes/release-notes.xml b/nixos/doc/manual/release-notes/release-notes.xml
index 6065a86f60d8..5ed56bde6659 100644
--- a/nixos/doc/manual/release-notes/release-notes.xml
+++ b/nixos/doc/manual/release-notes/release-notes.xml
@@ -9,6 +9,7 @@
This section lists the release notes for each stable version of NixOS
and current unstable revision.
+
diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml
index 55b39209f0d5..66f7b01db72a 100644
--- a/nixos/doc/manual/release-notes/rl-1709.xml
+++ b/nixos/doc/manual/release-notes/rl-1709.xml
@@ -6,13 +6,22 @@
Release 17.09 (“Hummingbird”, 2017/09/??)
+
+
+Highlights
+
In addition to numerous new and upgraded packages, this release
has the following highlights:
- The GNOME version is now 3.24.
+ The GNOME version is now 3.24. KDE Plasma was upgraded to 5.10,
+ KDE Applications to 17.08.1 and KDE Frameworks to 5.37.
@@ -45,16 +54,130 @@ has the following highlights:
even though HDMI-0 is the first head in the list.
+
+
+ The handling of SSL in the services.nginx module has
+ been cleaned up, renaming the misnamed enableSSL to
+ onlySSL which reflects its original intention. This
+ is not to be used with the already existing forceSSL
+ which creates a second non-SSL virtual host redirecting to the SSL
+ virtual host. This by chance had worked earlier due to specific
+ implementation details. In case you had specified both please remove
+ the enableSSL option to keep the previous behaviour.
+
+
+ Another addSSL option has been introduced to configure
+ both a non-SSL virtual host and an SSL virtual host with the same
+ configuration.
+
+
+ Options to configure resolver options and
+ upstream blocks have been introduced. See their information
+ for further details.
+
+
+ The port option has been replaced by a more generic
+ listen option which makes it possible to specify
+ multiple addresses, ports and SSL configs dependant on the new SSL
+ handling mentioned above.
+
+
+
+
+
+New Services
+
The following new services were added since the last release:
-
-
-
+ config/fonts/fontconfig-penultimate.nix
+ config/fonts/fontconfig-ultimate.nix
+ config/terminfo.nix
+ hardware/sensor/iio.nix
+ hardware/nitrokey.nix
+ hardware/raid/hpsa.nix
+ programs/browserpass.nix
+ programs/gnupg.nix
+ programs/qt5ct.nix
+ programs/slock.nix
+ programs/thefuck.nix
+ security/auditd.nix
+ security/lock-kernel-modules.nix
+ service-managers/docker.nix
+ service-managers/trivial.nix
+ services/admin/salt/master.nix
+ services/admin/salt/minion.nix
+ services/audio/slimserver.nix
+ services/cluster/kubernetes/default.nix
+ services/cluster/kubernetes/dns.nix
+ services/cluster/kubernetes/dashboard.nix
+ services/continuous-integration/hail.nix
+ services/databases/clickhouse.nix
+ services/databases/postage.nix
+ services/desktops/gnome3/gnome-disks.nix
+ services/desktops/gnome3/gpaste.nix
+ services/logging/SystemdJournal2Gelf.nix
+ services/logging/heartbeat.nix
+ services/logging/journalwatch.nix
+ services/logging/syslogd.nix
+ services/mail/mailhog.nix
+ services/mail/nullmailer.nix
+ services/misc/airsonic.nix
+ services/misc/autorandr.nix
+ services/misc/exhibitor.nix
+ services/misc/fstrim.nix
+ services/misc/gollum.nix
+ services/misc/irkerd.nix
+ services/misc/jackett.nix
+ services/misc/radarr.nix
+ services/misc/snapper.nix
+ services/monitoring/osquery.nix
+ services/monitoring/prometheus/collectd-exporter.nix
+ services/monitoring/prometheus/fritzbox-exporter.nix
+ services/network-filesystems/kbfs.nix
+ services/networking/dnscache.nix
+ services/networking/fireqos.nix
+ services/networking/iwd.nix
+ services/networking/keepalived/default.nix
+ services/networking/keybase.nix
+ services/networking/lldpd.nix
+ services/networking/matterbridge.nix
+ services/networking/squid.nix
+ services/networking/tinydns.nix
+ services/networking/xrdp.nix
+ services/security/shibboleth-sp.nix
+ services/security/sks.nix
+ services/security/sshguard.nix
+ services/security/torify.nix
+ services/security/usbguard.nix
+ services/security/vault.nix
+ services/system/earlyoom.nix
+ services/system/saslauthd.nix
+ services/web-apps/nexus.nix
+ services/web-apps/pgpkeyserver-lite.nix
+ services/web-apps/piwik.nix
+ services/web-servers/lighttpd/collectd.nix
+ services/web-servers/minio.nix
+ services/x11/display-managers/xpra.nix
+ services/x11/xautolock.nix
+ tasks/filesystems/bcachefs.nix
+ tasks/powertop.nix
+
+
+
+Backward Incompatibilities
When upgrading from a previous release, please be aware of the
following incompatible changes:
@@ -62,10 +185,97 @@ following incompatible changes:
- aiccu package was removed. This is due to SixXS
+
+ In an Qemu-based virtualization environment, the network interface
+ names changed from i.e. enp0s3 to
+ ens3.
+
+
+
+ This is due to a kernel configuration change. The new naming
+ is consistent with those of other Linux distributions with
+ systemd. See
+ #29197
+ for more information.
+
+
+ A machine is affected if the virt-what tool
+ either returns qemu or
+ kvm and has
+ interface names used in any part of its NixOS configuration,
+ in particular if a static network configuration with
+ networking.interfaces is used.
+
+
+ Before rebooting affected machines, please ensure:
+
+
+
+ Change the interface names in your NixOS configuration.
+ The first interface will be called ens3,
+ the second one ens8 and starting from there
+ incremented by 1.
+
+
+
+
+ After changing the interface names, rebuild your system with
+ nixos-rebuild boot to activate the new
+ configuration after a reboot. If you switch to the new
+ configuration right away you might lose network connectivity!
+ If using nixops, deploy with
+ nixops deploy --force-reboot.
+
+
+
+
+
+
+
+ The following changes apply if the stateVersion is changed to 17.09 or higher.
+ For stateVersion = "17.03" or lower the old behavior is preserved.
+
+
+
+
+ The postgres default version was changed from 9.5 to 9.6.
+
+
+
+
+ The postgres superuser name has changed from root to postgres to more closely follow what other Linux distributions are doing.
+
+
+
+
+ The postgres default dataDir has changed from /var/db/postgres to /var/lib/postgresql/$psqlSchema where $psqlSchema is 9.6 for example.
+
+
+
+
+ The mysql default dataDir has changed from /var/mysql to /var/lib/mysql.
+
+
+
+
+ Radicale's default package has changed from 1.x to 2.x. Instructions to migrate can be found here . It is also possible to use the newer version by setting the package to radicale2, which is done automatically when stateVersion is 17.09 or higher. The extraArgs option has been added to allow passing the data migration arguments specified in the instructions; see the radicale.nix NixOS test for an example migration.
+
+
+
+
+
+
+ The aiccu package was removed. This is due to SixXS
sunsetting its IPv6 tunnel.
+
+
+ The fanctl package and fan module
+ have been removed due to the developers not upstreaming their iproute2
+ patches and lagging with compatibility to recent iproute2 versions.
+
+
Top-level idea package collection was renamed.
@@ -81,7 +291,7 @@ following incompatible changes:
- The ipfs package now doesn't ignore the dataDir option anymore. If you've ever set this option to anything other than the default you'll have to either unset it (so the default gets used) or migrate the old data manually with
+ The ipfs service now doesn't ignore the dataDir option anymore. If you've ever set this option to anything other than the default you'll have to either unset it (so the default gets used) or migrate the old data manually with
dataDir=<valueOfDataDir>
mv /var/lib/ipfs/.ipfs/* $dataDir
@@ -89,32 +299,11 @@ rmdir /var/lib/ipfs/.ipfs
-
-
- The following changes apply if the stateVersion is changed to 17.09 or higher.
- For stateVersion = "17.03 or lower the old behavior is preserved.
-
-
- The postgres default version was changed from 9.5 to 9.6.
-
-
- The postgres superuser name has changed from root to postgres to more closely follow what other Linux distributions are doing.
-
-
- The postgres default dataDir has changed from /var/db/postgres to /var/lib/postgresql/$psqlSchema where $psqlSchema is 9.6 for example.
-
-
- The mysql default dataDir has changed from /var/mysql to /var/lib/mysql.
-
-
- Radicale's default package has changed from 1.x to 2.x. Instructions to migrate can be found here . It is also possible to use the newer version by setting the package to radicale2, which is done automatically when stateVersion is 17.09 or higher. The extraArgs option has been added to allow passing the data migration arguments specified in the instructions; see the radicale.nix NixOS test for an example migration.
-
-
The caddy service was previously using an extra
- .caddy in the data directory specified with the
- dataDir option. The contents of the
+ .caddy directory in the data directory specified
+ with the dataDir option. The contents of the
.caddy directory are now expected to be in the
dataDir.
@@ -193,18 +382,114 @@ rmdir /var/lib/ipfs/.ipfs
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.
+ services.mysql now has declarative
+ configuration of databases and users with the ensureDatabases and
+ ensureUsers options.
+
+
+
+ These options will never delete existing databases and users,
+ especially not when the value of the options are changed.
+
+
+
+ The MySQL users will be identified using
+
+ Unix socket authentication. This authenticates the
+ Unix user with the same name only, and that without the need
+ for a password.
+
+
+
+ If you have previously created a MySQL root
+ user with a password, you will need to add
+ root user for unix socket authentication
+ before using the new options. This can be done by running the
+ following SQL script:
+
+
+CREATE USER 'root'@'%' IDENTIFIED BY '';
+GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' WITH GRANT OPTION;
+FLUSH PRIVILEGES;
+
+-- Optionally, delete the password-authenticated user:
+-- DROP USER 'root'@'localhost';
+
+
+
+
+
+
+ services.mysqlBackup now works by default
+ without any user setup, including for users other than
+ mysql.
+
+
+
+ By default, the mysql user is no longer the
+ user which performs the backup. Instead a system account
+ mysqlbackup is used.
+
+
+
+ The mysqlBackup service is also now using
+ systemd timers instead of cron.
+
+
+
+ Therefore, the services.mysqlBackup.period
+ option no longer exists, and has been replaced with
+ services.mysqlBackup.calendar, which is in
+ the format of systemd.time(7).
+
+
+
+ If you expect to be sent an e-mail when the backup fails,
+ consider using a script which monitors the systemd journal for
+ errors. Regretfully, at present there is no built-in
+ functionality for this.
+
+
+
+ You can check that backups still work by running
+ systemctl start mysql-backup then
+ systemctl status mysql-backup.
+
+
+
+
+
+ Templated systemd services e.g container@name are
+ now handled currectly when switching to a new configuration, resulting
+ in them being reloaded.
+
+
+
+
+ Steam: the newStdcpp parameter
+ was removed and should not be needed anymore.
+
+
+
+
+ Redis has been updated to version 4 which mandates a cluster
+ mass-restart, due to changes in the network handling, in order
+ to ensure compatibility with networks NATing traffic.
-Other notable improvements:
+
+
+
+Other Notable Changes
@@ -249,7 +534,7 @@ rmdir /var/lib/ipfs/.ipfs
Nixpkgs overlays may now be specified with a file as well as a directory. The
value of <nixpkgs-overlays> may be a file, and
~/.config/nixpkgs/overlays.nix can be used instead of the
- ~/.config/nixpkgs/overalys directory.
+ ~/.config/nixpkgs/overlays directory.
See the overlays chapter of the Nixpkgs manual for more details.
@@ -257,14 +542,70 @@ rmdir /var/lib/ipfs/.ipfs
- 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.
+ Definitions for /etc/hosts can now be specified
+ declaratively with networking.hosts.
+
+
+
+
+ Two new options have been added to the installer loader, in addition
+ to the default having changed. The kernel log verbosity has been lowered
+ to the upstream default for the default options, in order to not spam
+ the console when e.g. joining a network.
+
+
+ This therefore leads to adding a new debug option
+ to set the log level to the previous verbose mode, to make debugging
+ easier, but still accessible easily.
+
+
+ Additionally a copytoram option has been added,
+ which makes it possible to remove the install medium after booting.
+ This allows tethering from your phone after booting from it.
+
+
+
+
+ services.gitlab-runner.configOptions has been added
+ to specify the configuration of gitlab-runners declaratively.
+
+
+
+
+ services.jenkins.plugins has been added
+ to install plugins easily, this can be generated with jenkinsPlugins2nix.
+
+
+
+
+ services.postfix.config has been added
+ to specify the main.cf with NixOS options. Additionally other options
+ have been added to the postfix module and has been improved further.
+
+
+
+
+ The GitLab package and module have been updated to the latest 10.0
+ release.
+
+
+
+
+ The systemd-boot boot loader now lists the NixOS
+ version, kernel version and build date of all bootable generations.
+
+
+
+
+ The dnscrypt-proxy service now defaults to using a random upstream resolver,
+ selected from the list of public non-logging resolvers with DNSSEC support.
+ Existing configurations can be migrated to this mode of operation by
+ omitting the option
+ or setting it to "random".
+
diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml
index ce05cde7b08b..17b385242f6f 100644
--- a/nixos/doc/manual/release-notes/rl-1803.xml
+++ b/nixos/doc/manual/release-notes/rl-1803.xml
@@ -6,6 +6,14 @@
Release 18.03 (“Impala”, 2018/03/??)
+
+
+Highlights
+
In addition to numerous new and upgraded packages, this release
has the following highlights:
@@ -16,6 +24,15 @@ has the following highlights:
+
+
+
+New Services
+
The following new services were added since the last release:
@@ -24,23 +41,56 @@ has the following highlights:
+
+
+
+Backward Incompatibilities
+
When upgrading from a previous release, please be aware of the
following incompatible changes:
+ Dollar signs in options under are
+ passed verbatim to Postfix, which will interpret them as the beginning of
+ a parameter expression. This was already true for string-valued options
+ in the previous release, but not for list-valued options. If you need to
+ pass literal dollar signs through Postfix, double them.
-
-
-Other notable improvements:
-
-
+ The postage package (for web-based PostgreSQL
+ administration) has been renamed to pgmanage. The
+ corresponding module has also been renamed. To migrate please rename all
+ options to
+ .
+
+
+Other Notable Changes
+
+
+
+
+ ZNC option now defaults to true.
+ That means that old configuration is not overwritten by default when update to the znc options are made.
+
+
+
+
+
+
diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix
index d4b2e338c3ef..865be297c066 100644
--- a/nixos/lib/make-disk-image.nix
+++ b/nixos/lib/make-disk-image.nix
@@ -64,7 +64,7 @@ let
${channelSources}
'';
- prepareImageInputs = with pkgs; [ rsync utillinux parted e2fsprogs lkl fakeroot config.system.build.nixos-prepare-root ] ++ stdenv.initialPath;
+ prepareImageInputs = with pkgs; [ rsync utillinux parted e2fsprogs lkl fakeroot libfaketime config.system.build.nixos-prepare-root ] ++ stdenv.initialPath;
# I'm preserving the line below because I'm going to search for it across nixpkgs to consolidate
# image building logic. The comment right below this now appears in 4 different places in nixpkgs :)
@@ -80,13 +80,13 @@ let
truncate -s ${toString diskSize}M $diskImage
${if partitioned then ''
- parted $diskImage -- mklabel msdos mkpart primary ext4 1M -1s
+ parted --script $diskImage -- mklabel msdos mkpart primary ext4 1M -1s
offset=$((2048*512))
'' else ''
offset=0
''}
- mkfs.${fsType} -F -L nixos -E offset=$offset $diskImage
+ faketime -f "1970-01-01 00:00:01" mkfs.${fsType} -F -L nixos -E offset=$offset $diskImage
root="$PWD/root"
mkdir -p $root
@@ -124,7 +124,15 @@ let
fakeroot nixos-prepare-root $root ${channelSources} ${config.system.build.toplevel} closure
echo "copying staging root to image..."
- cptofs ${pkgs.lib.optionalString partitioned "-P 1"} -t ${fsType} -i $diskImage $root/* /
+ # If we don't faketime, we can end up with timestamps other than 1 on the nix store, which
+ # will confuse Nix in some situations (e.g., breaking image builds in the target image)
+ # N.B: I use 0 here, which results in timestamp = 1 in the image. It's weird but see
+ # https://github.com/lkl/linux/issues/393. Also, running under faketime makes `cptofs` super
+ # noisy and it prints out that it can't find a bunch of files, and then works anyway. We'll
+ # shut it up someday but trying to do a stderr filter through grep is running into some nasty
+ # bug in some eval nonsense we have in runInLinuxVM and I'm sick of trying to fix it.
+ faketime -f "1970-01-01 00:00:00" \
+ cptofs ${pkgs.lib.optionalString partitioned "-P 1"} -t ${fsType} -i $diskImage $root/* /
'';
in pkgs.vmTools.runInLinuxVM (
pkgs.runCommand name
diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm
index cd375352c4ca..a7ed5d1faa38 100644
--- a/nixos/lib/test-driver/Machine.pm
+++ b/nixos/lib/test-driver/Machine.pm
@@ -372,6 +372,17 @@ sub getUnitInfo {
return $info;
}
+# Fail if the given systemd unit is not in the "active" state.
+sub requireActiveUnit {
+ my ($self, $unit) = @_;
+ $self->nest("checking if unit ‘$unit’ has reached state 'active'", sub {
+ my $info = $self->getUnitInfo($unit);
+ my $state = $info->{ActiveState};
+ if ($state ne "active") {
+ die "Expected unit ‘$unit’ to to be in state 'active' but it is in state ‘$state’\n";
+ };
+ });
+}
# Wait for a systemd unit to reach the "active" state.
sub waitForUnit {
diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix
index 58c447c76db6..9339ba78ff0c 100644
--- a/nixos/lib/testing.nix
+++ b/nixos/lib/testing.nix
@@ -149,6 +149,7 @@ rec {
{ key = "run-in-machine";
networking.hostName = "client";
nix.readOnlyStore = false;
+ virtualisation.writableStore = false;
}
];
diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix
index d76fb644d029..2e67edf8ee3d 100644
--- a/nixos/maintainers/scripts/ec2/amazon-image.nix
+++ b/nixos/maintainers/scripts/ec2/amazon-image.nix
@@ -9,6 +9,12 @@ in {
imports = [ ../../../modules/virtualisation/amazon-image.nix ];
options.amazonImage = {
+ name = mkOption {
+ type = types.str;
+ description = "The name of the generated derivation";
+ default = "nixos-disk-image";
+ };
+
contents = mkOption {
example = literalExample ''
[ { source = pkgs.memtest86 + "/memtest.bin";
@@ -38,7 +44,7 @@ in {
config.system.build.amazonImage = import ../../../lib/make-disk-image.nix {
inherit lib config;
- inherit (cfg) contents format;
+ inherit (cfg) contents format name;
pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package
partitioned = config.ec2.hvm;
diskSize = cfg.sizeMB;
diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh
index 24ced8da531a..dfc0f8d11465 100755
--- a/nixos/maintainers/scripts/ec2/create-amis.sh
+++ b/nixos/maintainers/scripts/ec2/create-amis.sh
@@ -17,7 +17,7 @@ mkdir -p $stateDir
rm -f ec2-amis.nix
types="hvm"
-stores="ebs s3"
+stores="ebs"
regions="eu-west-1 eu-west-2 eu-central-1 us-east-1 us-east-2 us-west-1 us-west-2 ca-central-1 ap-southeast-1 ap-southeast-2 ap-northeast-1 ap-northeast-2 sa-east-1 ap-south-1"
for type in $types; do
diff --git a/nixos/modules/config/debug-info.nix b/nixos/modules/config/debug-info.nix
index 49991d22a933..2942ae5905d1 100644
--- a/nixos/modules/config/debug-info.nix
+++ b/nixos/modules/config/debug-info.nix
@@ -30,14 +30,15 @@ with lib;
};
- config = {
+ config = mkIf config.environment.enableDebugInfo {
# FIXME: currently disabled because /lib is already in
# environment.pathsToLink, and we can't have both.
#environment.pathsToLink = [ "/lib/debug/.build-id" ];
- environment.extraOutputsToInstall =
- optional config.environment.enableDebugInfo "debug";
+ environment.extraOutputsToInstall = [ "debug" ];
+
+ environment.variables.NIX_DEBUG_INFO_DIRS = [ "/run/current-system/sw/lib/debug" ];
};
diff --git a/nixos/modules/config/krb5.nix b/nixos/modules/config/krb5.nix
deleted file mode 100644
index d318b7207429..000000000000
--- a/nixos/modules/config/krb5.nix
+++ /dev/null
@@ -1,206 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
- cfg = config.krb5;
-
-in
-
-{
- ###### interface
-
- options = {
-
- krb5 = {
-
- enable = mkOption {
- default = false;
- description = "Whether to enable Kerberos V.";
- };
-
- defaultRealm = mkOption {
- default = "ATENA.MIT.EDU";
- description = "Default realm.";
- };
-
- domainRealm = mkOption {
- default = "atena.mit.edu";
- description = "Default domain realm.";
- };
-
- kdc = mkOption {
- default = "kerberos.mit.edu";
- description = "Key Distribution Center";
- };
-
- kerberosAdminServer = mkOption {
- default = "kerberos.mit.edu";
- description = "Kerberos Admin Server.";
- };
-
- };
-
- };
-
- ###### implementation
-
- config = mkIf config.krb5.enable {
-
- environment.systemPackages = [ pkgs.krb5Full ];
-
- environment.etc."krb5.conf".text =
- ''
- [libdefaults]
- default_realm = ${cfg.defaultRealm}
- encrypt = true
-
- # The following krb5.conf variables are only for MIT Kerberos.
- krb4_config = /etc/krb.conf
- krb4_realms = /etc/krb.realms
- kdc_timesync = 1
- ccache_type = 4
- forwardable = true
- proxiable = true
-
- # The following encryption type specification will be used by MIT Kerberos
- # if uncommented. In general, the defaults in the MIT Kerberos code are
- # correct and overriding these specifications only serves to disable new
- # encryption types as they are added, creating interoperability problems.
-
- # default_tgs_enctypes = aes256-cts arcfour-hmac-md5 des3-hmac-sha1 des-cbc-crc des-cbc-md5
- # default_tkt_enctypes = aes256-cts arcfour-hmac-md5 des3-hmac-sha1 des-cbc-crc des-cbc-md5
- # permitted_enctypes = aes256-cts arcfour-hmac-md5 des3-hmac-sha1 des-cbc-crc des-cbc-md5
-
- # The following libdefaults parameters are only for Heimdal Kerberos.
- v4_instance_resolve = false
- v4_name_convert = {
- host = {
- rcmd = host
- ftp = ftp
- }
- plain = {
- something = something-else
- }
- }
- fcc-mit-ticketflags = true
-
- [realms]
- ${cfg.defaultRealm} = {
- kdc = ${cfg.kdc}
- admin_server = ${cfg.kerberosAdminServer}
- #kpasswd_server = ${cfg.kerberosAdminServer}
- }
- ATHENA.MIT.EDU = {
- kdc = kerberos.mit.edu:88
- kdc = kerberos-1.mit.edu:88
- kdc = kerberos-2.mit.edu:88
- admin_server = kerberos.mit.edu
- default_domain = mit.edu
- }
- MEDIA-LAB.MIT.EDU = {
- kdc = kerberos.media.mit.edu
- admin_server = kerberos.media.mit.edu
- }
- ZONE.MIT.EDU = {
- kdc = casio.mit.edu
- kdc = seiko.mit.edu
- admin_server = casio.mit.edu
- }
- MOOF.MIT.EDU = {
- kdc = three-headed-dogcow.mit.edu:88
- kdc = three-headed-dogcow-1.mit.edu:88
- admin_server = three-headed-dogcow.mit.edu
- }
- CSAIL.MIT.EDU = {
- kdc = kerberos-1.csail.mit.edu
- kdc = kerberos-2.csail.mit.edu
- admin_server = kerberos.csail.mit.edu
- default_domain = csail.mit.edu
- krb524_server = krb524.csail.mit.edu
- }
- IHTFP.ORG = {
- kdc = kerberos.ihtfp.org
- admin_server = kerberos.ihtfp.org
- }
- GNU.ORG = {
- kdc = kerberos.gnu.org
- kdc = kerberos-2.gnu.org
- kdc = kerberos-3.gnu.org
- admin_server = kerberos.gnu.org
- }
- 1TS.ORG = {
- kdc = kerberos.1ts.org
- admin_server = kerberos.1ts.org
- }
- GRATUITOUS.ORG = {
- kdc = kerberos.gratuitous.org
- admin_server = kerberos.gratuitous.org
- }
- DOOMCOM.ORG = {
- kdc = kerberos.doomcom.org
- admin_server = kerberos.doomcom.org
- }
- ANDREW.CMU.EDU = {
- kdc = vice28.fs.andrew.cmu.edu
- kdc = vice2.fs.andrew.cmu.edu
- kdc = vice11.fs.andrew.cmu.edu
- kdc = vice12.fs.andrew.cmu.edu
- admin_server = vice28.fs.andrew.cmu.edu
- default_domain = andrew.cmu.edu
- }
- CS.CMU.EDU = {
- kdc = kerberos.cs.cmu.edu
- kdc = kerberos-2.srv.cs.cmu.edu
- admin_server = kerberos.cs.cmu.edu
- }
- DEMENTIA.ORG = {
- kdc = kerberos.dementia.org
- kdc = kerberos2.dementia.org
- admin_server = kerberos.dementia.org
- }
- stanford.edu = {
- kdc = krb5auth1.stanford.edu
- kdc = krb5auth2.stanford.edu
- kdc = krb5auth3.stanford.edu
- admin_server = krb5-admin.stanford.edu
- default_domain = stanford.edu
- }
-
- [domain_realm]
- .${cfg.domainRealm} = ${cfg.defaultRealm}
- ${cfg.domainRealm} = ${cfg.defaultRealm}
- .mit.edu = ATHENA.MIT.EDU
- mit.edu = ATHENA.MIT.EDU
- .exchange.mit.edu = EXCHANGE.MIT.EDU
- exchange.mit.edu = EXCHANGE.MIT.EDU
- .media.mit.edu = MEDIA-LAB.MIT.EDU
- media.mit.edu = MEDIA-LAB.MIT.EDU
- .csail.mit.edu = CSAIL.MIT.EDU
- csail.mit.edu = CSAIL.MIT.EDU
- .whoi.edu = ATHENA.MIT.EDU
- whoi.edu = ATHENA.MIT.EDU
- .stanford.edu = stanford.edu
-
- [logging]
- kdc = SYSLOG:INFO:DAEMON
- admin_server = SYSLOG:INFO:DAEMON
- default = SYSLOG:INFO:DAEMON
- krb4_convert = true
- krb4_get_tickets = false
-
- [appdefaults]
- pam = {
- debug = false
- ticket_lifetime = 36000
- renew_lifetime = 36000
- max_timeout = 30
- timeout_shift = 2
- initial_timeout = 1
- }
- '';
-
- };
-
-}
diff --git a/nixos/modules/config/krb5/default.nix b/nixos/modules/config/krb5/default.nix
new file mode 100644
index 000000000000..c22e99a0a2f1
--- /dev/null
+++ b/nixos/modules/config/krb5/default.nix
@@ -0,0 +1,367 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+ cfg = config.krb5;
+
+ # This is to provide support for old configuration options (as much as is
+ # reasonable). This can be removed after 18.03 was released.
+ defaultConfig = {
+ libdefaults = optionalAttrs (cfg.defaultRealm != null)
+ { default_realm = cfg.defaultRealm; };
+
+ realms = optionalAttrs (lib.all (value: value != null) [
+ cfg.defaultRealm cfg.kdc cfg.kerberosAdminServer
+ ]) {
+ "${cfg.defaultRealm}" = {
+ kdc = cfg.kdc;
+ admin_server = cfg.kerberosAdminServer;
+ };
+ };
+
+ domain_realm = optionalAttrs (lib.all (value: value != null) [
+ cfg.domainRealm cfg.defaultRealm
+ ]) {
+ ".${cfg.domainRealm}" = cfg.defaultRealm;
+ "${cfg.domainRealm}" = cfg.defaultRealm;
+ };
+ };
+
+ mergedConfig = (recursiveUpdate defaultConfig {
+ inherit (config.krb5)
+ kerberos libdefaults realms domain_realm capaths appdefaults plugins
+ extraConfig config;
+ });
+
+ filterEmbeddedMetadata = value: if isAttrs value then
+ (filterAttrs
+ (attrName: attrValue: attrName != "_module" && attrValue != null)
+ value)
+ else value;
+
+ mkIndent = depth: concatStrings (builtins.genList (_: " ") (2 * depth));
+
+ mkRelation = name: value: "${name} = ${mkVal { inherit value; }}";
+
+ mkVal = { value, depth ? 0 }:
+ if (value == true) then "true"
+ else if (value == false) then "false"
+ else if (isInt value) then (toString value)
+ else if (isList value) then
+ concatMapStringsSep " " mkVal { inherit value depth; }
+ else if (isAttrs value) then
+ (concatStringsSep "\n${mkIndent (depth + 1)}"
+ ([ "{" ] ++ (mapAttrsToList
+ (attrName: attrValue: let
+ mappedAttrValue = mkVal {
+ value = attrValue;
+ depth = depth + 1;
+ };
+ in "${attrName} = ${mappedAttrValue}")
+ value))) + "\n${mkIndent depth}}"
+ else value;
+
+ mkMappedAttrsOrString = value: concatMapStringsSep "\n"
+ (line: if builtins.stringLength line > 0
+ then "${mkIndent 1}${line}"
+ else line)
+ (splitString "\n"
+ (if isAttrs value then
+ concatStringsSep "\n"
+ (mapAttrsToList mkRelation value)
+ else value));
+
+in {
+
+ ###### interface
+
+ options = {
+ krb5 = {
+ enable = mkEnableOption "Whether to enable Kerberos V.";
+
+ kerberos = mkOption {
+ type = types.package;
+ default = pkgs.krb5Full;
+ defaultText = "pkgs.krb5Full";
+ example = literalExample "pkgs.heimdalFull";
+ description = ''
+ The Kerberos implementation that will be present in
+ environment.systemPackages after enabling this
+ service.
+ '';
+ };
+
+ libdefaults = mkOption {
+ type = with types; either attrs lines;
+ default = {};
+ apply = attrs: filterEmbeddedMetadata attrs;
+ example = literalExample ''
+ {
+ default_realm = "ATHENA.MIT.EDU";
+ };
+ '';
+ description = ''
+ Settings used by the Kerberos V5 library.
+ '';
+ };
+
+ realms = mkOption {
+ type = with types; either attrs lines;
+ default = {};
+ example = literalExample ''
+ {
+ "ATHENA.MIT.EDU" = {
+ admin_server = "athena.mit.edu";
+ kdc = "athena.mit.edu";
+ };
+ };
+ '';
+ apply = attrs: filterEmbeddedMetadata attrs;
+ description = "Realm-specific contact information and settings.";
+ };
+
+ domain_realm = mkOption {
+ type = with types; either attrs lines;
+ default = {};
+ example = literalExample ''
+ {
+ "example.com" = "EXAMPLE.COM";
+ ".example.com" = "EXAMPLE.COM";
+ };
+ '';
+ apply = attrs: filterEmbeddedMetadata attrs;
+ description = ''
+ Map of server hostnames to Kerberos realms.
+ '';
+ };
+
+ capaths = mkOption {
+ type = with types; either attrs lines;
+ default = {};
+ example = literalExample ''
+ {
+ "ATHENA.MIT.EDU" = {
+ "EXAMPLE.COM" = ".";
+ };
+ "EXAMPLE.COM" = {
+ "ATHENA.MIT.EDU" = ".";
+ };
+ };
+ '';
+ apply = attrs: filterEmbeddedMetadata attrs;
+ description = ''
+ Authentication paths for non-hierarchical cross-realm authentication.
+ '';
+ };
+
+ appdefaults = mkOption {
+ type = with types; either attrs lines;
+ default = {};
+ example = literalExample ''
+ {
+ pam = {
+ debug = false;
+ ticket_lifetime = 36000;
+ renew_lifetime = 36000;
+ max_timeout = 30;
+ timeout_shift = 2;
+ initial_timeout = 1;
+ };
+ };
+ '';
+ apply = attrs: filterEmbeddedMetadata attrs;
+ description = ''
+ Settings used by some Kerberos V5 applications.
+ '';
+ };
+
+ plugins = mkOption {
+ type = with types; either attrs lines;
+ default = {};
+ example = literalExample ''
+ {
+ ccselect = {
+ disable = "k5identity";
+ };
+ };
+ '';
+ apply = attrs: filterEmbeddedMetadata attrs;
+ description = ''
+ Controls plugin module registration.
+ '';
+ };
+
+ extraConfig = mkOption {
+ type = with types; nullOr lines;
+ default = null;
+ example = ''
+ [logging]
+ kdc = SYSLOG:NOTICE
+ admin_server = SYSLOG:NOTICE
+ default = SYSLOG:NOTICE
+ '';
+ description = ''
+ These lines go to the end of krb5.conf verbatim.
+ krb5.conf may include any of the relations that are
+ valid for kdc.conf (see man
+ kdc.conf), but it is not a recommended practice.
+ '';
+ };
+
+ config = mkOption {
+ type = with types; nullOr lines;
+ default = null;
+ example = ''
+ [libdefaults]
+ default_realm = EXAMPLE.COM
+
+ [realms]
+ EXAMPLE.COM = {
+ admin_server = kerberos.example.com
+ kdc = kerberos.example.com
+ default_principal_flags = +preauth
+ }
+
+ [domain_realm]
+ example.com = EXAMPLE.COM
+ .example.com = EXAMPLE.COM
+
+ [logging]
+ kdc = SYSLOG:NOTICE
+ admin_server = SYSLOG:NOTICE
+ default = SYSLOG:NOTICE
+ '';
+ description = ''
+ Verbatim krb5.conf configuration. Note that this
+ is mutually exclusive with configuration via
+ libdefaults, realms,
+ domain_realm, capaths,
+ appdefaults, plugins and
+ extraConfig configuration options. Consult
+ man krb5.conf for documentation.
+ '';
+ };
+
+ defaultRealm = mkOption {
+ type = with types; nullOr str;
+ default = null;
+ example = "ATHENA.MIT.EDU";
+ description = ''
+ DEPRECATED, please use
+ krb5.libdefaults.default_realm.
+ '';
+ };
+
+ domainRealm = mkOption {
+ type = with types; nullOr str;
+ default = null;
+ example = "athena.mit.edu";
+ description = ''
+ DEPRECATED, please create a map of server hostnames to Kerberos realms
+ in krb5.domain_realm.
+ '';
+ };
+
+ kdc = mkOption {
+ type = with types; nullOr str;
+ default = null;
+ example = "kerberos.mit.edu";
+ description = ''
+ DEPRECATED, please pass a kdc attribute to a realm
+ in krb5.realms.
+ '';
+ };
+
+ kerberosAdminServer = mkOption {
+ type = with types; nullOr str;
+ default = null;
+ example = "kerberos.mit.edu";
+ description = ''
+ DEPRECATED, please pass an admin_server attribute
+ to a realm in krb5.realms.
+ '';
+ };
+ };
+ };
+
+ ###### implementation
+
+ config = mkIf cfg.enable {
+
+ environment.systemPackages = [ cfg.kerberos ];
+
+ environment.etc."krb5.conf".text = if isString cfg.config
+ then cfg.config
+ else (''
+ [libdefaults]
+ ${mkMappedAttrsOrString mergedConfig.libdefaults}
+
+ [realms]
+ ${mkMappedAttrsOrString mergedConfig.realms}
+
+ [domain_realm]
+ ${mkMappedAttrsOrString mergedConfig.domain_realm}
+
+ [capaths]
+ ${mkMappedAttrsOrString mergedConfig.capaths}
+
+ [appdefaults]
+ ${mkMappedAttrsOrString mergedConfig.appdefaults}
+
+ [plugins]
+ ${mkMappedAttrsOrString mergedConfig.plugins}
+ '' + optionalString (mergedConfig.extraConfig != null)
+ ("\n" + mergedConfig.extraConfig));
+
+ warnings = flatten [
+ (optional (cfg.defaultRealm != null) ''
+ The option krb5.defaultRealm is deprecated, please use
+ krb5.libdefaults.default_realm.
+ '')
+ (optional (cfg.domainRealm != null) ''
+ The option krb5.domainRealm is deprecated, please use krb5.domain_realm.
+ '')
+ (optional (cfg.kdc != null) ''
+ The option krb5.kdc is deprecated, please pass a kdc attribute to a
+ realm in krb5.realms.
+ '')
+ (optional (cfg.kerberosAdminServer != null) ''
+ The option krb5.kerberosAdminServer is deprecated, please pass an
+ admin_server attribute to a realm in krb5.realms.
+ '')
+ ];
+
+ assertions = [
+ { assertion = !((builtins.any (value: value != null) [
+ cfg.defaultRealm cfg.domainRealm cfg.kdc cfg.kerberosAdminServer
+ ]) && ((builtins.any (value: value != {}) [
+ cfg.libdefaults cfg.realms cfg.domain_realm cfg.capaths
+ cfg.appdefaults cfg.plugins
+ ]) || (builtins.any (value: value != null) [
+ cfg.config cfg.extraConfig
+ ])));
+ message = ''
+ Configuration of krb5.conf by deprecated options is mutually exclusive
+ with configuration by section. Please migrate your config using the
+ attributes suggested in the warnings.
+ '';
+ }
+ { assertion = !(cfg.config != null
+ && ((builtins.any (value: value != {}) [
+ cfg.libdefaults cfg.realms cfg.domain_realm cfg.capaths
+ cfg.appdefaults cfg.plugins
+ ]) || (builtins.any (value: value != null) [
+ cfg.extraConfig cfg.defaultRealm cfg.domainRealm cfg.kdc
+ cfg.kerberosAdminServer
+ ])));
+ message = ''
+ Configuration of krb5.conf using krb.config is mutually exclusive with
+ configuration by section. If you want to mix the two, you can pass
+ lines to any configuration section or lines to krb5.extraConfig.
+ '';
+ }
+ ];
+ };
+}
diff --git a/nixos/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix
index 97278238dcd5..7b36d4f1cbdf 100644
--- a/nixos/modules/config/nsswitch.nix
+++ b/nixos/modules/config/nsswitch.nix
@@ -18,7 +18,7 @@ let
hostArray = [ "files" ]
++ optionals mymachines [ "mymachines" ]
- ++ optionals nssmdns [ "mdns_minimal [!UNAVAIL=return]" ]
+ ++ optionals nssmdns [ "mdns_minimal [NOTFOUND=return]" ]
++ optionals nsswins [ "wins" ]
++ optionals resolved ["resolve [!UNAVAIL=return]"]
++ [ "dns" ]
diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix
index 5d339eaea485..d3212d931605 100644
--- a/nixos/modules/config/system-path.nix
+++ b/nixos/modules/config/system-path.nix
@@ -31,6 +31,7 @@ let
pkgs.nano
pkgs.ncurses
pkgs.netcat
+ pkgs.nix-info
config.programs.ssh.package
pkgs.perl
pkgs.procps
diff --git a/nixos/modules/config/timezone.nix b/nixos/modules/config/timezone.nix
index aa030a816d04..b15948f6e2e5 100644
--- a/nixos/modules/config/timezone.nix
+++ b/nixos/modules/config/timezone.nix
@@ -5,6 +5,9 @@ with lib;
let
tzdir = "${pkgs.tzdata}/share/zoneinfo";
+ nospace = str: filter (c: c == " ") (stringToCharacters str) == [];
+ timezone = types.nullOr (types.addCheck types.str nospace)
+ // { description = "null or string without spaces"; };
in
@@ -15,7 +18,7 @@ in
timeZone = mkOption {
default = null;
- type = types.nullOr types.str;
+ type = timezone;
example = "America/New_York";
description = ''
The time zone used when displaying times and dates. See 0) {
die "Btrfs subvol name for $mountPoint listed multiple times in mount\n"
} elsif ($#ids == 0) {
- my ($status, @path_info) = runCommand("btrfs subvol list $rootDir$mountPoint");
- if ($status != 0) {
- die "Failed to find $mountPoint subvolume id from btrfs\n";
- }
- my @paths = join("", @path_info) =~ m/ID $ids[0] [^\n]* path ([^\n]*)/;
+ my @paths = join("", @info) =~ m/^([^\n]*)/;
if ($#paths > 0) {
die "Btrfs returned multiple paths for a single subvolume id, mountpoint $mountPoint\n";
} elsif ($#paths != 0) {
diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh
index 79ed18c923c0..f994d5b4bde1 100644
--- a/nixos/modules/installer/tools/nixos-install.sh
+++ b/nixos/modules/installer/tools/nixos-install.sh
@@ -102,7 +102,7 @@ fi
extraBuildFlags+=(--option "build-users-group" "$buildUsersGroup")
# Inherit binary caches from the host
-# TODO: will this still work with Nix 1.12 now that it has no perl? Probably not...
+# TODO: will this still work with Nix 1.12 now that it has no perl? Probably not...
binary_caches="$(@perl@/bin/perl -I @nix@/lib/perl5/site_perl/*/* -e 'use Nix::Config; Nix::Config::readConfig; print $Nix::Config::config{"binary-caches"};')"
extraBuildFlags+=(--option "binary-caches" "$binary_caches")
@@ -113,8 +113,33 @@ if [[ -z "$closure" ]]; then
fi
unset NIXOS_CONFIG
-# TODO: do I need to set NIX_SUBSTITUTERS here or is the --option binary-caches above enough?
+# These get created in nixos-prepare-root as well, but we want to make sure they're here in case we're
+# running with --chroot. TODO: --chroot should just be split into a separate tool.
+mkdir -m 0755 -p "$mountPoint/dev" "$mountPoint/proc" "$mountPoint/sys"
+# Set up some bind mounts we'll want regardless of chroot or not
+mount --rbind /dev "$mountPoint/dev"
+mount --rbind /proc "$mountPoint/proc"
+mount --rbind /sys "$mountPoint/sys"
+
+# If we asked for a chroot, that means we're not actually installing anything (yeah I was confused too)
+# and we just want to run a command in the context of a $mountPoint that we're assuming has already been
+# set up by a previous nixos-install invocation. In that case we set up some remaining bind mounts and
+# exec the requested command, skipping the rest of the installation procedure.
+if [ -n "$runChroot" ]; then
+ mount -t tmpfs -o "mode=0755" none $mountPoint/run
+ rm -rf $mountPoint/var/run
+ ln -s /run $mountPoint/var/run
+ for f in /etc/resolv.conf /etc/hosts; do rm -f $mountPoint/$f; [ -f "$f" ] && cp -Lf $f $mountPoint/etc/; done
+ for f in /etc/passwd /etc/group; do touch $mountPoint/$f; [ -f "$f" ] && mount --rbind -o ro $f $mountPoint/$f; done
+
+ if ! [ -L $mountPoint/nix/var/nix/profiles/system ]; then
+ echo "$0: installation not finished; cannot chroot into installation directory"
+ exit 1
+ fi
+ ln -s /nix/var/nix/profiles/system $mountPoint/run/current-system
+ exec chroot $mountPoint "${chrootCommand[@]}"
+fi
# A place to drop temporary closures
trap "rm -rf $tmpdir" EXIT
@@ -153,9 +178,7 @@ nix-store --export $channel_root > $channel_closure
# nixos-prepare-root doesn't currently do anything with file ownership, so we set it up here instead
chown @root_uid@:@nixbld_gid@ $mountPoint/nix/store
-mount --rbind /dev $mountPoint/dev
-mount --rbind /proc $mountPoint/proc
-mount --rbind /sys $mountPoint/sys
+
# Grub needs an mtab.
ln -sfn /proc/mounts $mountPoint/etc/mtab
diff --git a/nixos/modules/installer/tools/nixos-prepare-root.sh b/nixos/modules/installer/tools/nixos-prepare-root.sh
index 0bd70d2d349c..ed5af234fec9 100644
--- a/nixos/modules/installer/tools/nixos-prepare-root.sh
+++ b/nixos/modules/installer/tools/nixos-prepare-root.sh
@@ -31,16 +31,16 @@ if ! test -e "$mountPoint"; then
fi
# Create a few of the standard directories in the target root directory.
-mkdir -m 0755 -p $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/etc $mountPoint/run $mountPoint/home
-mkdir -m 01777 -p $mountPoint/tmp
-mkdir -m 0755 -p $mountPoint/tmp/root
-mkdir -m 0755 -p $mountPoint/var
-mkdir -m 0700 -p $mountPoint/root
+install -m 0755 -d $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/etc $mountPoint/run $mountPoint/home
+install -m 01777 -d $mountPoint/tmp
+install -m 0755 -d $mountPoint/tmp/root
+install -m 0755 -d $mountPoint/var
+install -m 0700 -d $mountPoint/root
ln -sf /run $mountPoint/var/run
# Create the necessary Nix directories on the target device
-mkdir -m 0755 -p \
+install -m 0755 -d \
$mountPoint/nix/var/nix/gcroots \
$mountPoint/nix/var/nix/temproots \
$mountPoint/nix/var/nix/userpool \
@@ -48,7 +48,7 @@ mkdir -m 0755 -p \
$mountPoint/nix/var/nix/db \
$mountPoint/nix/var/log/nix/drvs
-mkdir -m 1775 -p $mountPoint/nix/store
+install -m 1775 -d $mountPoint/nix/store
# All Nix operations below should operate on our target store, not /nix/store.
# N.B: this relies on Nix 1.12 or higher
@@ -80,7 +80,7 @@ if [ ! -x $mountPoint/@shell@ ]; then
echo "Error: @shell@ wasn't included in the closure" >&2
exit 1
fi
-mkdir -m 0755 -p $mountPoint/bin
+install -m 0755 -d $mountPoint/bin
ln -sf @shell@ $mountPoint/bin/sh
echo "setting the system closure to '$system'..."
@@ -89,17 +89,16 @@ nix-env "${extraBuildFlags[@]}" -p $mountPoint/nix/var/nix/profiles/system --set
ln -sfn /nix/var/nix/profiles/system $mountPoint/run/current-system
# Copy the NixOS/Nixpkgs sources to the target as the initial contents of the NixOS channel.
-mkdir -m 0755 -p $mountPoint/nix/var/nix/profiles
-mkdir -m 1777 -p $mountPoint/nix/var/nix/profiles/per-user
-mkdir -m 0755 -p $mountPoint/nix/var/nix/profiles/per-user/root
+install -m 0755 -d $mountPoint/nix/var/nix/profiles
+install -m 1777 -d $mountPoint/nix/var/nix/profiles/per-user
+install -m 0755 -d $mountPoint/nix/var/nix/profiles/per-user/root
if [ -z "$noChannelCopy" ] && [ -n "$channel" ]; then
echo "copying channel..."
nix-env --option build-use-substitutes false "${extraBuildFlags[@]}" -p $mountPoint/nix/var/nix/profiles/per-user/root/channels --set "$channel" --quiet
fi
-mkdir -m 0700 -p $mountPoint/root/.nix-defexpr
+install -m 0700 -d $mountPoint/root/.nix-defexpr
ln -sfn /nix/var/nix/profiles/per-user/root/channels $mountPoint/root/.nix-defexpr/channels
# Mark the target as a NixOS installation, otherwise switch-to-configuration will chicken out.
touch $mountPoint/etc/NIXOS
-
diff --git a/nixos/modules/misc/crashdump.nix b/nixos/modules/misc/crashdump.nix
index 5ef4b7781bd0..6e0b49fa9af0 100644
--- a/nixos/modules/misc/crashdump.nix
+++ b/nixos/modules/misc/crashdump.nix
@@ -18,26 +18,23 @@ in
default = false;
description = ''
If enabled, NixOS will set up a kernel that will
- boot on crash, and leave the user to a stage1 debug1devices
- interactive shell to be able to save the crashed kernel dump.
+ boot on crash, and leave the user in systemd rescue
+ to be able to save the crashed kernel dump at
+ /proc/vmcore.
It also activates the NMI watchdog.
'';
};
- kernelPackages = mkOption {
- type = types.package;
- default = pkgs.linuxPackages;
- # We don't want to evaluate all of linuxPackages for the manual
- # - some of it might not even evaluate correctly.
- defaultText = "pkgs.linuxPackages";
- example = literalExample "pkgs.linuxPackages_2_6_25";
+ reservedMemory = mkOption {
+ default = "128M";
description = ''
- This will override the boot.kernelPackages, and will add some
- kernel configuration parameters for the crash dump to work.
+ The amount of memory reserved for the crashdump kernel.
+ If you choose a too high value, dmesg will mention
+ "crashkernel reservation failed".
'';
};
kernelParams = mkOption {
type = types.listOf types.str;
- default = [ "debug1devices" ];
+ default = [ "1" "boot.shell_on_fail" ];
description = ''
Parameters that will be passed to the kernel kexec-ed on crash.
'';
@@ -51,29 +48,29 @@ in
config = mkIf crashdump.enable {
boot = {
postBootCommands = ''
+ echo "loading crashdump kernel...";
${pkgs.kexectools}/sbin/kexec -p /run/current-system/kernel \
--initrd=/run/current-system/initrd \
- --append="init=$(readlink -f /run/current-system/init) system=$(readlink -f /run/current-system) irqpoll maxcpus=1 reset_devices ${kernelParams}" --reset-vga --console-vga
+ --reset-vga --console-vga \
+ --command-line="systemConfig=$(readlink -f /run/current-system) init=$(readlink -f /run/current-system/init) irqpoll maxcpus=1 reset_devices ${kernelParams}"
'';
kernelParams = [
- "crashkernel=64M"
+ "crashkernel=${crashdump.reservedMemory}"
"nmi_watchdog=panic"
"softlockup_panic=1"
"idle=poll"
];
- kernelPackages = mkOverride 50 (crashdump.kernelPackages // {
- kernel = crashdump.kernelPackages.kernel.override
- (attrs: {
- extraConfig = (optionalString (attrs ? extraConfig) attrs.extraConfig) +
- ''
+ kernelPatches = [ {
+ name = "crashdump-config";
+ patch = null;
+ extraConfig = ''
CRASH_DUMP y
DEBUG_INFO y
PROC_VMCORE y
LOCKUP_DETECTOR y
HARDLOCKUP_DETECTOR y
'';
- });
- });
+ } ];
};
};
}
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 508a76d3cab5..7d0cbf6aad02 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -207,11 +207,12 @@
ripple-data-api = 186;
mediatomb = 187;
rdnssd = 188;
- # ihaskell = 189; # unused
+ ihaskell = 189;
i2p = 190;
lambdabot = 191;
asterisk = 192;
plex = 193;
+ plexpy = 195;
grafana = 196;
skydns = 197;
# ripple-rest = 198; # unused, removed 2017-08-12
@@ -296,6 +297,9 @@
clickhouse = 278;
rslsync = 279;
minio = 280;
+ kanboard = 281;
+ pykms = 282;
+ kodi = 283;
# When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
@@ -480,7 +484,7 @@
#ripple-data-api = 186; #unused
mediatomb = 187;
#rdnssd = 188; # unused
- # ihaskell = 189; # unused
+ ihaskell = 189;
i2p = 190;
lambdabot = 191;
asterisk = 192;
@@ -561,6 +565,9 @@
clickhouse = 278;
rslsync = 279;
minio = 280;
+ kanboard = 281;
+ pykms = 282;
+ kodi = 283;
# When adding a gid, make sure it doesn't match an existing
# uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix
index 0fe91435ce8c..51953d1110c4 100644
--- a/nixos/modules/misc/locate.nix
+++ b/nixos/modules/misc/locate.nix
@@ -125,13 +125,16 @@ in {
warnings = optional (isMLocate && cfg.localuser != null) "mlocate does not support searching as user other than root"
++ optional (isFindutils && cfg.pruneNames != []) "findutils locate does not support pruning by directory component"
++ optional (isFindutils && cfg.pruneBindMounts) "findutils locate does not support skipping bind mounts";
-
+
+ # directory creation needs to be separated from main service
+ # because ReadWritePaths fails when the directory doesn't already exist
+ systemd.tmpfiles.rules = [ "d ${dirOf cfg.output} 0755 root root -" ];
+
systemd.services.update-locatedb =
{ description = "Update Locate Database";
path = mkIf (!isMLocate) [ pkgs.su ];
script =
''
- mkdir -m 0755 -p ${dirOf cfg.output}
exec ${cfg.locate}/bin/updatedb \
${optionalString (cfg.localuser != null && ! isMLocate) ''--localuser=${cfg.localuser}''} \
--output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags}
@@ -147,8 +150,13 @@ in {
serviceConfig.PrivateTmp = "yes";
serviceConfig.PrivateNetwork = "yes";
serviceConfig.NoNewPrivileges = "yes";
- serviceConfig.ReadOnlyDirectories = "/";
- serviceConfig.ReadWriteDirectories = dirOf cfg.output;
+ serviceConfig.ReadOnlyPaths = "/";
+ # Use dirOf cfg.output because mlocate creates temporary files next to
+ # the actual database. We could specify and create them as well,
+ # but that would make this quite brittle when they change something.
+ # NOTE: If /var/cache does not exist, this leads to the misleading error message:
+ # update-locatedb.service: Failed at step NAMESPACE spawning …/update-locatedb-start: No such file or directory
+ serviceConfig.ReadWritePaths = dirOf cfg.output;
};
systemd.timers.update-locatedb =
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index ce6fea445c38..99d3c0112f2a 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -9,7 +9,7 @@
./config/fonts/ghostscript.nix
./config/gnu.nix
./config/i18n.nix
- ./config/krb5.nix
+ ./config/krb5/default.nix
./config/ldap.nix
./config/networking.nix
./config/no-x-libs.nix
@@ -35,11 +35,6 @@
./hardware/ksm.nix
./hardware/mcelog.nix
./hardware/network/b43.nix
- ./hardware/network/intel-2100bg.nix
- ./hardware/network/intel-2200bg.nix
- ./hardware/network/intel-3945abg.nix
- ./hardware/network/ralink.nix
- ./hardware/network/rtl8192c.nix
./hardware/nitrokey.nix
./hardware/opengl.nix
./hardware/pcmcia.nix
@@ -73,6 +68,7 @@
./programs/adb.nix
./programs/atop.nix
./programs/bash/bash.nix
+ ./programs/bcc.nix
./programs/blcr.nix
./programs/browserpass.nix
./programs/cdemu.nix
@@ -102,6 +98,8 @@
./programs/spacefm.nix
./programs/ssh.nix
./programs/ssmtp.nix
+ ./programs/sysdig.nix
+ ./programs/sway.nix
./programs/thefuck.nix
./programs/tmux.nix
./programs/venus.nix
@@ -134,8 +132,6 @@
./security/rtkit.nix
./security/wrappers/default.nix
./security/sudo.nix
- ./service-managers/docker.nix
- ./service-managers/trivial.nix
./services/admin/salt/master.nix
./services/admin/salt/minion.nix
./services/amqp/activemq/default.nix
@@ -189,7 +185,7 @@
./services/databases/neo4j.nix
./services/databases/openldap.nix
./services/databases/opentsdb.nix
- ./services/databases/postage.nix
+ ./services/databases/pgmanage.nix
./services/databases/postgresql.nix
./services/databases/redis.nix
./services/databases/riak.nix
@@ -267,6 +263,7 @@
./services/mail/offlineimap.nix
./services/mail/opendkim.nix
./services/mail/opensmtpd.nix
+ ./services/mail/pfix-srsd.nix
./services/mail/postfix.nix
./services/mail/postsrsd.nix
./services/mail/postgrey.nix
@@ -300,13 +297,14 @@
./services/misc/fstrim.nix
./services/misc/gammu-smsd.nix
./services/misc/geoip-updater.nix
+ ./services/misc/gitea.nix
#./services/misc/gitit.nix
./services/misc/gitlab.nix
./services/misc/gitolite.nix
./services/misc/gogs.nix
./services/misc/gollum.nix
./services/misc/gpsd.nix
- #./services/misc/ihaskell.nix
+ ./services/misc/ihaskell.nix
./services/misc/irkerd.nix
./services/misc/jackett.nix
./services/misc/logkeys.nix
@@ -330,6 +328,8 @@
./services/misc/parsoid.nix
./services/misc/phd.nix
./services/misc/plex.nix
+ ./services/misc/plexpy.nix
+ ./services/misc/pykms.nix
./services/misc/radarr.nix
./services/misc/redmine.nix
./services/misc/rippled.nix
@@ -346,6 +346,7 @@
./services/misc/svnserve.nix
./services/misc/synergy.nix
./services/misc/taskserver
+ ./services/misc/tzupdate.nix
./services/misc/uhub.nix
./services/misc/zookeeper.nix
./services/monitoring/apcupsd.nix
@@ -355,6 +356,7 @@
./services/monitoring/collectd.nix
./services/monitoring/das_watchdog.nix
./services/monitoring/dd-agent/dd-agent.nix
+ ./services/monitoring/fusion-inventory.nix
./services/monitoring/grafana.nix
./services/monitoring/graphite.nix
./services/monitoring/hdaps.nix
@@ -371,6 +373,7 @@
./services/monitoring/prometheus/collectd-exporter.nix
./services/monitoring/prometheus/fritzbox-exporter.nix
./services/monitoring/prometheus/json-exporter.nix
+ ./services/monitoring/prometheus/minio-exporter.nix
./services/monitoring/prometheus/nginx-exporter.nix
./services/monitoring/prometheus/node-exporter.nix
./services/monitoring/prometheus/snmp-exporter.nix
@@ -410,6 +413,7 @@
./services/networking/asterisk.nix
./services/networking/atftpd.nix
./services/networking/avahi-daemon.nix
+ ./services/networking/babeld.nix
./services/networking/bind.nix
./services/networking/autossh.nix
./services/networking/bird.nix
@@ -618,6 +622,7 @@
./services/web-servers/phpfpm/default.nix
./services/web-servers/shellinabox.nix
./services/web-servers/tomcat.nix
+ ./services/web-servers/traefik.nix
./services/web-servers/uwsgi.nix
./services/web-servers/varnish/default.nix
./services/web-servers/winstone.nix
@@ -693,6 +698,7 @@
./tasks/filesystems/bcachefs.nix
./tasks/filesystems/btrfs.nix
./tasks/filesystems/cifs.nix
+ ./tasks/filesystems/ecryptfs.nix
./tasks/filesystems/exfat.nix
./tasks/filesystems/ext.nix
./tasks/filesystems/f2fs.nix
diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix
index 6e6ae98e19fc..3c7e516c497f 100644
--- a/nixos/modules/profiles/all-hardware.nix
+++ b/nixos/modules/profiles/all-hardware.nix
@@ -41,15 +41,12 @@
# Virtio (QEMU, KVM etc.) support.
"virtio_net" "virtio_pci" "virtio_blk" "virtio_scsi" "virtio_balloon" "virtio_console"
-
+
# VMware support.
"mptspi" "vmw_balloon" "vmwgfx" "vmw_vmci" "vmw_vsock_vmci_transport" "vmxnet3" "vsock"
# Hyper-V support.
"hv_storvsc"
-
- # Keyboards
- "usbhid" "hid_apple" "hid_logitech_dj" "hid_lenovo_tpkbd" "hid_roccat"
];
# Include lots of firmware.
diff --git a/nixos/modules/programs/bcc.nix b/nixos/modules/programs/bcc.nix
new file mode 100644
index 000000000000..3522ab22fa8e
--- /dev/null
+++ b/nixos/modules/programs/bcc.nix
@@ -0,0 +1,9 @@
+{ config, lib, pkgs, ... }:
+{
+ options.programs.bcc.enable = lib.mkEnableOption "bcc";
+
+ config = lib.mkIf config.programs.bcc.enable {
+ environment.systemPackages = [ config.boot.kernelPackages.bcc ];
+ boot.extraModulePackages = [ config.boot.kernelPackages.bcc ];
+ };
+}
diff --git a/nixos/modules/programs/command-not-found/command-not-found.nix b/nixos/modules/programs/command-not-found/command-not-found.nix
index 55529d73cb60..bbe7165c62fb 100644
--- a/nixos/modules/programs/command-not-found/command-not-found.nix
+++ b/nixos/modules/programs/command-not-found/command-not-found.nix
@@ -25,7 +25,14 @@ in
{
options.programs.command-not-found = {
- enable = mkEnableOption "command-not-found hook for interactive shell";
+ enable = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Whether interactive shells should show which Nix package (if
+ any) provides a missing command.
+ '';
+ };
dbPath = mkOption {
default = "/nix/var/nix/profiles/per-user/root/channels/nixos/programs.sqlite" ;
diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index e0fbba897fa4..0935bf0cae71 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -148,11 +148,11 @@ in
[
{
hostNames = [ "myhost" "myhost.mydomain.com" "10.10.1.4" ];
- publicKeyFile = "./pubkeys/myhost_ssh_host_dsa_key.pub";
+ publicKeyFile = ./pubkeys/myhost_ssh_host_dsa_key.pub;
}
{
hostNames = [ "myhost2" ];
- publicKeyFile = "./pubkeys/myhost2_ssh_host_dsa_key.pub";
+ publicKeyFile = ./pubkeys/myhost2_ssh_host_dsa_key.pub;
}
]
'';
diff --git a/nixos/modules/programs/sway.nix b/nixos/modules/programs/sway.nix
new file mode 100644
index 000000000000..9070722c770b
--- /dev/null
+++ b/nixos/modules/programs/sway.nix
@@ -0,0 +1,69 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+ cfg = config.programs.sway;
+ sway = pkgs.sway;
+
+ swayWrapped = pkgs.writeScriptBin "sway" ''
+ #! ${pkgs.stdenv.shell}
+ ${cfg.extraSessionCommands}
+ PATH="${sway}/bin:$PATH"
+ exec ${pkgs.dbus.dbus-launch} --exit-with-session sway-setcap
+ '';
+ swayJoined = pkgs.symlinkJoin {
+ name = "sway-wrapped";
+ paths = [ swayWrapped sway ];
+ };
+in
+{
+ options.programs.sway = {
+ enable = mkEnableOption "sway";
+
+ extraSessionCommands = mkOption {
+ default = "";
+ type = types.lines;
+ example = ''
+ export XKB_DEFAULT_LAYOUT=us,de
+ export XKB_DEFAULT_VARIANT=,nodeadkeys
+ export XKB_DEFAULT_OPTIONS=grp:alt_shift_toggle,
+ '';
+ description = ''
+ Shell commands executed just before sway is started.
+ '';
+ };
+
+ extraPackages = mkOption {
+ type = with types; listOf package;
+ default = with pkgs; [
+ i3status xwayland rxvt_unicode dmenu
+ ];
+ example = literalExample ''
+ with pkgs; [
+ i3status xwayland rxvt_unicode dmenu
+ ]
+ '';
+ description = ''
+ Extra packages to be installed system wide.
+ '';
+ };
+ };
+
+ config = mkIf cfg.enable {
+ environment.systemPackages = [ swayJoined ] ++ cfg.extraPackages;
+ security.wrappers.sway = {
+ program = "sway-setcap";
+ source = "${sway}/bin/sway";
+ capabilities = "cap_sys_ptrace,cap_sys_tty_config=eip";
+ owner = "root";
+ group = "sway";
+ permissions = "u+rx,g+rx";
+ };
+
+ users.extraGroups.sway = {};
+
+ hardware.opengl.enable = mkDefault true;
+ fonts.enableDefaultFonts = mkDefault true;
+ };
+}
diff --git a/nixos/modules/programs/sysdig.nix b/nixos/modules/programs/sysdig.nix
new file mode 100644
index 000000000000..fbbf29065564
--- /dev/null
+++ b/nixos/modules/programs/sysdig.nix
@@ -0,0 +1,14 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.programs.sysdig;
+in {
+ options.programs.sysdig.enable = mkEnableOption "sysdig";
+
+ config = mkIf cfg.enable {
+ environment.systemPackages = [ pkgs.sysdig ];
+ boot.extraModulePackages = [ config.boot.kernelPackages.sysdig ];
+ };
+}
diff --git a/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix b/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix
index 9452489e2fb4..e7cf17c2c00c 100644
--- a/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix
+++ b/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix
@@ -5,74 +5,74 @@ with lib;
let
cfg = config.programs.zsh.syntaxHighlighting;
in
- {
- options = {
- programs.zsh.syntaxHighlighting = {
- enable = mkEnableOption "zsh-syntax-highlighting";
+{
+ options = {
+ programs.zsh.syntaxHighlighting = {
+ enable = mkEnableOption "zsh-syntax-highlighting";
- highlighters = mkOption {
- default = [ "main" ];
+ highlighters = mkOption {
+ default = [ "main" ];
- # https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters.md
- type = types.listOf(types.enum([
- "main"
- "brackets"
- "pattern"
- "cursor"
- "root"
- "line"
- ]));
+ # https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters.md
+ type = types.listOf(types.enum([
+ "main"
+ "brackets"
+ "pattern"
+ "cursor"
+ "root"
+ "line"
+ ]));
- description = ''
- Specifies the highlighters to be used by zsh-syntax-highlighting.
+ description = ''
+ Specifies the highlighters to be used by zsh-syntax-highlighting.
- The following defined options can be found here:
- https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters.md
- '';
- };
+ The following defined options can be found here:
+ https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters.md
+ '';
+ };
- patterns = mkOption {
- default = {};
- type = types.attrsOf types.string;
+ patterns = mkOption {
+ default = {};
+ type = types.attrsOf types.string;
- example = literalExample ''
- {
- "rm -rf *" = "fg=white,bold,bg=red";
- }
- '';
+ example = literalExample ''
+ {
+ "rm -rf *" = "fg=white,bold,bg=red";
+ }
+ '';
- description = ''
- Specifies custom patterns to be highlighted by zsh-syntax-highlighting.
+ description = ''
+ Specifies custom patterns to be highlighted by zsh-syntax-highlighting.
- Please refer to the docs for more information about the usage:
- https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters/pattern.md
- '';
- };
+ Please refer to the docs for more information about the usage:
+ https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters/pattern.md
+ '';
};
};
+ };
- config = mkIf cfg.enable {
- environment.systemPackages = with pkgs; [ zsh-syntax-highlighting ];
+ config = mkIf cfg.enable {
+ environment.systemPackages = with pkgs; [ zsh-syntax-highlighting ];
- programs.zsh.interactiveShellInit = with pkgs; with builtins; ''
- source ${zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+ assertions = [
+ {
+ assertion = length(attrNames cfg.patterns) > 0 -> elem "pattern" cfg.highlighters;
+ message = ''
+ When highlighting patterns, "pattern" needs to be included in the list of highlighters.
+ '';
+ }
+ ];
- ${optionalString (length(cfg.highlighters) > 0)
- "ZSH_HIGHLIGHT_HIGHLIGHTERS=(${concatStringsSep " " cfg.highlighters})"
- }
-
- ${let
- n = attrNames cfg.patterns;
- in
- optionalString (length(n) > 0)
- (assert(elem "pattern" cfg.highlighters); (foldl (
- a: b:
- ''
- ${a}
- ZSH_HIGHLIGHT_PATTERNS+=('${b}' '${attrByPath [b] "" cfg.patterns}')
- ''
- ) "") n)
- }
- '';
- };
- }
+ programs.zsh.interactiveShellInit = with pkgs;
+ lib.concatStringsSep "\n" ([
+ "source ${zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh"
+ ] ++ optional (length(cfg.highlighters) > 0)
+ "ZSH_HIGHLIGHT_HIGHLIGHTERS=(${concatStringsSep " " cfg.highlighters})"
+ ++ optionals (length(attrNames cfg.patterns) > 0)
+ (mapAttrsToList (
+ pattern: design:
+ "ZSH_HIGHLIGHT_PATTERNS+=('${pattern}' '${design}')"
+ ) cfg.patterns)
+ );
+ };
+}
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index deff4067957a..f30cbe427f09 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -11,7 +11,11 @@ with lib;
(mkRenamedOptionModule [ "fonts" "extraFonts" ] [ "fonts" "fonts" ])
(mkRenamedOptionModule [ "networking" "enableWLAN" ] [ "networking" "wireless" "enable" ])
- (mkRenamedOptionModule [ "networking" "enableRT73Firmware" ] [ "networking" "enableRalinkFirmware" ])
+ (mkRenamedOptionModule [ "networking" "enableRT73Firmware" ] [ "hardware" "enableRedistributableFirmware" ])
+ (mkRenamedOptionModule [ "networking" "enableIntel3945ABGFirmware" ] [ "hardware" "enableRedistributableFirmware" ])
+ (mkRenamedOptionModule [ "networking" "enableIntel2100BGFirmware" ] [ "hardware" "enableRedistributableFirmware" ])
+ (mkRenamedOptionModule [ "networking" "enableRalinkFirmware" ] [ "hardware" "enableRedistributableFirmware" ])
+ (mkRenamedOptionModule [ "networking" "enableRTL8192cFirmware" ] [ "hardware" "enableRedistributableFirmware" ])
(mkRenamedOptionModule [ "services" "cadvisor" "host" ] [ "services" "cadvisor" "listenAddress" ])
(mkChangedOptionModule [ "services" "printing" "gutenprint" ] [ "services" "printing" "drivers" ]
@@ -108,6 +112,9 @@ with lib;
(mkAliasOptionModule [ "environment" "checkConfigurationOptions" ] [ "_module" "check" ])
+ # opendkim
+ (mkRenamedOptionModule [ "services" "opendkim" "keyFile" ] [ "services" "opendkim" "keyPath" ])
+
# XBMC
(mkRenamedOptionModule [ "services" "xserver" "windowManager" "xbmc" ] [ "services" "xserver" "desktopManager" "kodi" ])
(mkRenamedOptionModule [ "services" "xserver" "desktopManager" "xbmc" ] [ "services" "xserver" "desktopManager" "kodi" ])
diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix
index a40c5ef9ebe1..fb011019f7f5 100644
--- a/nixos/modules/security/acme.nix
+++ b/nixos/modules/security/acme.nix
@@ -139,6 +139,20 @@ in
'';
};
+ production = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ If set to true, use Let's Encrypt's production environment
+ instead of the staging environment. The main benefit of the
+ staging environment is to get much higher rate limits.
+
+ See
+ https://letsencrypt.org/docs/staging-environment
+ for more detail.
+ '';
+ };
+
certs = mkOption {
default = { };
type = with types; attrsOf (submodule certOpts);
@@ -177,7 +191,9 @@ in
cmdline = [ "-v" "-d" domain "--default_root" data.webroot "--valid_min" cfg.validMin ]
++ optionals (data.email != null) [ "--email" data.email ]
++ concatMap (p: [ "-f" p ]) data.plugins
- ++ concatLists (mapAttrsToList (name: root: [ "-d" (if root == null then name else "${name}:${root}")]) data.extraDomains);
+ ++ concatLists (mapAttrsToList (name: root: [ "-d" (if root == null then name else "${name}:${root}")]) data.extraDomains)
+ ++ (if cfg.production then []
+ else ["--server" "https://acme-staging.api.letsencrypt.org/directory"]);
acmeService = {
description = "Renew ACME Certificate for ${cert}";
after = [ "network.target" "network-online.target" ];
diff --git a/nixos/modules/security/acme.xml b/nixos/modules/security/acme.xml
index 823806f4641b..6130ed82ed38 100644
--- a/nixos/modules/security/acme.xml
+++ b/nixos/modules/security/acme.xml
@@ -89,8 +89,5 @@ services.nginx = {
};
}
-
-At the moment you still have to restart Nginx after the ACME
-certs arrive.
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index ede4ace5ed03..5ded36329f33 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -486,8 +486,9 @@ in
++ optionals config.krb5.enable [pam_krb5 pam_ccreds]
++ optionals config.security.pam.enableOTPW [ pkgs.otpw ]
++ optionals config.security.pam.oath.enable [ pkgs.oathToolkit ]
- ++ optionals config.security.pam.enableU2F [ pkgs.pam_u2f ]
- ++ optionals config.security.pam.enableEcryptfs [ pkgs.ecryptfs ];
+ ++ optionals config.security.pam.enableU2F [ pkgs.pam_u2f ];
+
+ boot.supportedFilesystems = optionals config.security.pam.enableEcryptfs [ "ecryptfs" ];
security.wrappers = {
unix_chkpwd = {
@@ -495,10 +496,7 @@ in
owner = "root";
setuid = true;
};
- } // (if config.security.pam.enableEcryptfs then {
- "mount.ecryptfs_private".source = "${pkgs.ecryptfs.out}/bin/mount.ecryptfs_private";
- "umount.ecryptfs_private".source = "${pkgs.ecryptfs.out}/bin/umount.ecryptfs_private";
- } else {});
+ };
environment.etc =
mapAttrsToList (n: v: makePAMService v) config.security.pam.services;
@@ -521,6 +519,7 @@ in
ftp = {};
i3lock = {};
i3lock-color = {};
+ swaylock = {};
screen = {};
vlock = {};
xlock = {};
diff --git a/nixos/modules/security/pam_usb.nix b/nixos/modules/security/pam_usb.nix
index 6f811dab8d76..9bc73bf0b85c 100644
--- a/nixos/modules/security/pam_usb.nix
+++ b/nixos/modules/security/pam_usb.nix
@@ -22,7 +22,7 @@ in
description = ''
Enable USB login for all login systems that support it. For
more information, visit .
+ xlink:href="https://github.com/aluzzardi/pam_usb/wiki/Getting-Started#setting-up-devices-and-users" />.
'';
};
diff --git a/nixos/modules/service-managers/docker.nix b/nixos/modules/service-managers/docker.nix
deleted file mode 100644
index 8e9c763b18af..000000000000
--- a/nixos/modules/service-managers/docker.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
- cfg = config.docker-containers;
-
- containerModule = {
- script = mkOption {
- type = types.lines;
- description = "Shell commands executed as the service's main process.";
- };
- };
-
- toContainer = name: value: pkgs.dockerTools.buildImage {
- inherit name;
- config = {
- Cmd = [ value.script ];
- };
- };
-in {
- options.docker-containers = mkOption {
- default = {};
- type = with types; attrsOf (types.submodule containerModule);
- description = "Definition of docker containers";
- };
-
- config.system.build.toplevel-docker = lib.mapAttrs toContainer cfg;
-}
diff --git a/nixos/modules/service-managers/trivial.nix b/nixos/modules/service-managers/trivial.nix
deleted file mode 100644
index 77e615d1e2e2..000000000000
--- a/nixos/modules/service-managers/trivial.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
- cfg = config.trivial-services;
-
- serviceModule.options = {
- script = mkOption {
- type = types.lines;
- description = "Shell commands executed as the service's main process.";
- };
-
- environment = mkOption {
- default = {};
- type = types.attrs; # FIXME
- example = { PATH = "/foo/bar/bin"; LANG = "nl_NL.UTF-8"; };
- description = "Environment variables passed to the service's processes.";
- };
- };
-
- launcher = name: value: pkgs.writeScript name ''
- #!${pkgs.stdenv.shell} -eu
-
- ${pkgs.writeScript "${name}-entry" value.script}
- '';
-in {
- options.trivial-services = mkOption {
- default = {};
- type = with types; attrsOf (types.submodule serviceModule);
- description = "Definition of trivial services";
- };
-
- config.system.build.toplevel-trivial = lib.mapAttrs launcher cfg;
-}
diff --git a/nixos/modules/services/backup/mysql-backup.nix b/nixos/modules/services/backup/mysql-backup.nix
index 28f607861f77..3f533fa457dc 100644
--- a/nixos/modules/services/backup/mysql-backup.nix
+++ b/nixos/modules/services/backup/mysql-backup.nix
@@ -6,10 +6,28 @@ let
inherit (pkgs) mysql gzip;
- cfg = config.services.mysqlBackup ;
- location = cfg.location ;
- mysqlBackupCron = db : ''
- ${cfg.period} ${cfg.user} ${mysql}/bin/mysqldump ${if cfg.singleTransaction then "--single-transaction" else ""} ${db} | ${gzip}/bin/gzip -c > ${location}/${db}.gz
+ cfg = config.services.mysqlBackup;
+ defaultUser = "mysqlbackup";
+
+ backupScript = ''
+ set -o pipefail
+ failed=""
+ ${concatMapStringsSep "\n" backupDatabaseScript cfg.databases}
+ if [ -n "$failed" ]; then
+ echo "Backup of database(s) failed:$failed"
+ exit 1
+ fi
+ '';
+ backupDatabaseScript = db: ''
+ dest="${cfg.location}/${db}.gz"
+ if ${mysql}/bin/mysqldump ${if cfg.singleTransaction then "--single-transaction" else ""} ${db} | ${gzip}/bin/gzip -c > $dest.tmp; then
+ mv $dest.tmp $dest
+ echo "Backed up to $dest"
+ else
+ echo "Failed to back up to $dest"
+ rm -f $dest.tmp
+ failed="$failed ${db}"
+ fi
'';
in
@@ -26,17 +44,16 @@ in
'';
};
- period = mkOption {
- default = "15 01 * * *";
+ calendar = mkOption {
+ type = types.str;
+ default = "01:15:00";
description = ''
- This option defines (in the format used by cron) when the
- databases should be dumped.
- The default is to update at 01:15 (at night) every day.
+ Configured when to run the backup service systemd unit (DayOfWeek Year-Month-Day Hour:Minute:Second).
'';
};
user = mkOption {
- default = "mysql";
+ default = defaultUser;
description = ''
User to be used to perform backup.
'';
@@ -66,16 +83,49 @@ in
};
- config = mkIf config.services.mysqlBackup.enable {
+ config = mkIf cfg.enable {
+ users.extraUsers = optionalAttrs (cfg.user == defaultUser) (singleton
+ { name = defaultUser;
+ isSystemUser = true;
+ createHome = false;
+ home = cfg.location;
+ group = "nogroup";
+ });
- services.cron.systemCronJobs = map mysqlBackupCron config.services.mysqlBackup.databases;
-
- system.activationScripts.mysqlBackup = stringAfter [ "stdio" "users" ]
- ''
- mkdir -m 0700 -p ${config.services.mysqlBackup.location}
- chown ${config.services.mysqlBackup.user} ${config.services.mysqlBackup.location}
- '';
+ services.mysql.ensureUsers = [{
+ name = cfg.user;
+ ensurePermissions = with lib;
+ let
+ privs = "SELECT, SHOW VIEW, TRIGGER, LOCK TABLES";
+ grant = db: nameValuePair "${db}.*" privs;
+ in
+ listToAttrs (map grant cfg.databases);
+ }];
+ systemd = {
+ timers."mysql-backup" = {
+ description = "Mysql backup timer";
+ wantedBy = [ "timers.target" ];
+ timerConfig = {
+ OnCalendar = cfg.calendar;
+ AccuracySec = "5m";
+ Unit = "mysql-backup.service";
+ };
+ };
+ services."mysql-backup" = {
+ description = "Mysql backup service";
+ enable = true;
+ serviceConfig = {
+ User = cfg.user;
+ PermissionsStartOnly = true;
+ };
+ preStart = ''
+ mkdir -m 0700 -p ${cfg.location}
+ chown -R ${cfg.user} ${cfg.location}
+ '';
+ script = backupScript;
+ };
+ };
};
}
diff --git a/nixos/modules/services/cluster/kubernetes/dashboard.nix b/nixos/modules/services/cluster/kubernetes/dashboard.nix
index 482cbd939cb7..75d71fccfda4 100644
--- a/nixos/modules/services/cluster/kubernetes/dashboard.nix
+++ b/nixos/modules/services/cluster/kubernetes/dashboard.nix
@@ -11,7 +11,7 @@ let
image = pkgs.dockerTools.pullImage {
imageName = name;
imageTag = version;
- sha256 = "0b5v7xa3s91yi9yfsw2b8wijiprnicbb02f5kqa579h4yndb3gfz";
+ sha256 = "1sf54d96nkgic9hir9c6p14gw24ns1k5d5a0r1sg414kjrvic0b4";
};
in {
options.services.kubernetes.addons.dashboard = {
diff --git a/nixos/modules/services/cluster/kubernetes/dns.nix b/nixos/modules/services/cluster/kubernetes/dns.nix
index d70663fa5d7b..226fdadffd1a 100644
--- a/nixos/modules/services/cluster/kubernetes/dns.nix
+++ b/nixos/modules/services/cluster/kubernetes/dns.nix
@@ -8,19 +8,19 @@ let
k8s-dns-kube-dns = pkgs.dockerTools.pullImage {
imageName = "gcr.io/google_containers/k8s-dns-kube-dns-amd64";
imageTag = version;
- sha256 = "0g64jc2076ng28xl4w3w9svf7hc6s9h8rq9mhvvwpfy2p6lgj6gy";
+ sha256 = "0q97xfqrigrfjl2a9cxl5in619py0zv44gch09jm8gqjkxl80imp";
};
k8s-dns-dnsmasq-nanny = pkgs.dockerTools.pullImage {
imageName = "gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64";
imageTag = version;
- sha256 = "0sdpsbj1vismihy7ass1cn96nwmav6sf3r5h6i4k2dxha0y0jsh5";
+ sha256 = "051w5ca4qb88mwva4hbnh9xzlsvv7k1mbk3wz50lmig2mqrqqx6c";
};
k8s-dns-sidecar = pkgs.dockerTools.pullImage {
imageName = "gcr.io/google_containers/k8s-dns-sidecar-amd64";
imageTag = version;
- sha256 = "01zpi189hpy2z62awl38fap908s8rrhc3v5gb6m90y2pycl4ad6q";
+ sha256 = "1z0d129bcm8i2cqq36x5jhnrv9hirj8c6kjrmdav8vgf7py78vsm";
};
cfg = config.services.kubernetes.addons.dns;
diff --git a/nixos/modules/services/continuous-integration/buildkite-agent.nix b/nixos/modules/services/continuous-integration/buildkite-agent.nix
index 267bc16862c9..9c06e1d43bbe 100644
--- a/nixos/modules/services/continuous-integration/buildkite-agent.nix
+++ b/nixos/modules/services/continuous-integration/buildkite-agent.nix
@@ -9,9 +9,8 @@ let
token="${cfg.token}"
name="${cfg.name}"
meta-data="${cfg.meta-data}"
- hooks-path="${pkgs.buildkite-agent}/share/hooks"
- build-path="/var/lib/buildkite-agent/builds"
- bootstrap-script="${pkgs.buildkite-agent}/share/bootstrap.sh"
+ hooks-path="${cfg.package}/share/hooks"
+ build-path="${cfg.dataDir}"
'';
in
@@ -20,6 +19,26 @@ in
services.buildkite-agent = {
enable = mkEnableOption "buildkite-agent";
+ package = mkOption {
+ default = pkgs.buildkite-agent;
+ defaultText = "pkgs.buildkite-agent";
+ description = "Which buildkite-agent derivation to use";
+ type = types.package;
+ };
+
+ dataDir = mkOption {
+ default = "/var/lib/buildkite-agent";
+ description = "The workdir for the agent";
+ type = types.str;
+ };
+
+ runtimePackages = mkOption {
+ default = [ pkgs.bash pkgs.nix ];
+ defaultText = "[ pkgs.bash pkgs.nix ]";
+ description = "Add programs to the buildkite-agent environment";
+ type = types.listOf types.package;
+ };
+
token = mkOption {
type = types.str;
description = ''
@@ -62,27 +81,31 @@ in
config = mkIf config.services.buildkite-agent.enable {
users.extraUsers.buildkite-agent =
{ name = "buildkite-agent";
- home = "/var/lib/buildkite-agent";
+ home = cfg.dataDir;
createHome = true;
description = "Buildkite agent user";
};
- environment.systemPackages = [ pkgs.buildkite-agent ];
+ environment.systemPackages = [ cfg.package ];
systemd.services.buildkite-agent =
{ description = "Buildkite Agent";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
- environment.HOME = "/var/lib/buildkite-agent";
+ path = cfg.runtimePackages;
+ environment = config.networking.proxy.envVars // {
+ HOME = cfg.dataDir;
+ NIX_REMOTE = "daemon";
+ };
preStart = ''
- ${pkgs.coreutils}/bin/mkdir -m 0700 -p /var/lib/buildkite-agent/.ssh
+ ${pkgs.coreutils}/bin/mkdir -m 0700 -p ${cfg.dataDir}/.ssh
- echo "${cfg.openssh.privateKey}" > /var/lib/buildkite-agent/.ssh/id_rsa
- ${pkgs.coreutils}/bin/chmod 600 /var/lib/buildkite-agent/.ssh/id_rsa
+ echo "${cfg.openssh.privateKey}" > ${cfg.dataDir}/.ssh/id_rsa
+ ${pkgs.coreutils}/bin/chmod 600 ${cfg.dataDir}/.ssh/id_rsa
- echo "${cfg.openssh.publicKey}" > /var/lib/buildkite-agent/.ssh/id_rsa.pub
- ${pkgs.coreutils}/bin/chmod 600 /var/lib/buildkite-agent/.ssh/id_rsa.pub
- '';
+ echo "${cfg.openssh.publicKey}" > ${cfg.dataDir}/.ssh/id_rsa.pub
+ ${pkgs.coreutils}/bin/chmod 600 ${cfg.dataDir}/.ssh/id_rsa.pub
+ '';
serviceConfig =
{ ExecStart = "${pkgs.buildkite-agent}/bin/buildkite-agent start --config ${configFile}";
diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix
index c14aa4167231..0dd59e4fb444 100644
--- a/nixos/modules/services/continuous-integration/jenkins/default.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/default.nix
@@ -78,6 +78,13 @@ in {
'';
};
+ package = mkOption {
+ default = pkgs.jenkins;
+ defaultText = "pkgs.jenkins";
+ type = types.package;
+ description = "Jenkins package to use.";
+ };
+
packages = mkOption {
default = [ pkgs.stdenv pkgs.git pkgs.jdk config.programs.ssh.package pkgs.nix ];
defaultText = "[ pkgs.stdenv pkgs.git pkgs.jdk config.programs.ssh.package pkgs.nix ]";
@@ -194,7 +201,7 @@ in {
'';
script = ''
- ${pkgs.jdk}/bin/java ${concatStringsSep " " cfg.extraJavaOptions} -jar ${pkgs.jenkins}/webapps/jenkins.war --httpListenAddress=${cfg.listenAddress} \
+ ${pkgs.jdk}/bin/java ${concatStringsSep " " cfg.extraJavaOptions} -jar ${cfg.package}/webapps/jenkins.war --httpListenAddress=${cfg.listenAddress} \
--httpPort=${toString cfg.port} \
--prefix=${cfg.prefix} \
${concatStringsSep " " cfg.extraOptions}
diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix
index 845e6d4c22ef..c6c463bce7d5 100644
--- a/nixos/modules/services/databases/mysql.nix
+++ b/nixos/modules/services/databases/mysql.nix
@@ -67,7 +67,7 @@ in
type = types.nullOr types.str;
default = null;
example = literalExample "0.0.0.0";
- description = "Address to bind to. The default it to bind to all addresses";
+ description = "Address to bind to. The default is to bind to all addresses";
};
port = mkOption {
diff --git a/nixos/modules/services/databases/postage.nix b/nixos/modules/services/databases/pgmanage.nix
similarity index 53%
rename from nixos/modules/services/databases/postage.nix
rename to nixos/modules/services/databases/pgmanage.nix
index d49c9a83a46f..86733a3e5a07 100644
--- a/nixos/modules/services/databases/postage.nix
+++ b/nixos/modules/services/databases/pgmanage.nix
@@ -3,16 +3,16 @@
with lib;
let
- cfg = config.services.postage;
+ cfg = config.services.pgmanage;
confFile = pkgs.writeTextFile {
- name = "postage.conf";
+ name = "pgmanage.conf";
text = ''
- connection_file = ${postageConnectionsFile}
+ connection_file = ${pgmanageConnectionsFile}
allow_custom_connections = ${builtins.toJSON cfg.allowCustomConnections}
- postage_port = ${toString cfg.port}
+ pgmanage_port = ${toString cfg.port}
super_only = ${builtins.toJSON cfg.superOnly}
@@ -20,7 +20,7 @@ let
login_timeout = ${toString cfg.loginTimeout}
- web_root = ${cfg.package}/etc/postage/web_root
+ web_root = ${cfg.package}/etc/pgmanage/web_root
data_root = ${cfg.dataRoot}
@@ -33,24 +33,23 @@ let
'';
};
- postageConnectionsFile = pkgs.writeTextFile {
- name = "postage-connections.conf";
+ pgmanageConnectionsFile = pkgs.writeTextFile {
+ name = "pgmanage-connections.conf";
text = concatStringsSep "\n"
(mapAttrsToList (name : conn : "${name}: ${conn}") cfg.connections);
};
- postage = "postage";
-in {
+ pgmanage = "pgmanage";
- options.services.postage = {
+ pgmanageOptions = {
enable = mkEnableOption "PostgreSQL Administration for the web";
package = mkOption {
type = types.package;
- default = pkgs.postage;
- defaultText = "pkgs.postage";
+ default = pkgs.pgmanage;
+ defaultText = "pkgs.pgmanage";
description = ''
- The postage package to use.
+ The pgmanage package to use.
'';
};
@@ -62,14 +61,14 @@ in {
"mini-server" = "hostaddr=127.0.0.1 port=5432 dbname=postgres sslmode=require";
};
description = ''
- Postage requires at least one PostgreSQL server be defined.
+ pgmanage requires at least one PostgreSQL server be defined.
Detailed information about PostgreSQL connection strings is available at:
Note that you should not specify your user name or password. That
information will be entered on the login screen. If you specify a
- username or password, it will be removed by Postage before attempting to
+ username or password, it will be removed by pgmanage before attempting to
connect to a database.
'';
};
@@ -78,7 +77,7 @@ in {
type = types.bool;
default = false;
description = ''
- This tells Postage whether or not to allow anyone to use a custom
+ This tells pgmanage whether or not to allow anyone to use a custom
connection from the login screen.
'';
};
@@ -87,7 +86,7 @@ in {
type = types.int;
default = 8080;
description = ''
- This tells Postage what port to listen on for browser requests.
+ This tells pgmanage what port to listen on for browser requests.
'';
};
@@ -95,7 +94,7 @@ in {
type = types.bool;
default = true;
description = ''
- This tells Postage whether or not to set the listening socket to local
+ This tells pgmanage whether or not to set the listening socket to local
addresses only.
'';
};
@@ -104,10 +103,10 @@ in {
type = types.bool;
default = true;
description = ''
- This tells Postage whether or not to only allow super users to
+ This tells pgmanage whether or not to only allow super users to
login. The recommended value is true and will restrict users who are not
super users from logging in to any PostgreSQL instance through
- Postage. Note that a connection will be made to PostgreSQL in order to
+ pgmanage. Note that a connection will be made to PostgreSQL in order to
test if the user is a superuser.
'';
};
@@ -116,8 +115,8 @@ in {
type = types.nullOr types.str;
default = null;
description = ''
- This tells Postage to only allow users in a certain PostgreSQL group to
- login to Postage. Note that a connection will be made to PostgreSQL in
+ This tells pgmanage to only allow users in a certain PostgreSQL group to
+ login to pgmanage. Note that a connection will be made to PostgreSQL in
order to test if the user is a member of the login group.
'';
};
@@ -133,10 +132,10 @@ in {
dataRoot = mkOption {
type = types.str;
- default = "/var/lib/postage";
+ default = "/var/lib/pgmanage";
description = ''
- This tells Postage where to put the SQL file history. All tabs are saved
- to this location so that if you get disconnected from Postage you
+ This tells pgmanage where to put the SQL file history. All tabs are saved
+ to this location so that if you get disconnected from pgmanage you
don't lose your work.
'';
};
@@ -156,15 +155,15 @@ in {
});
default = null;
description = ''
- These options tell Postage where the TLS Certificate and Key files
+ These options tell pgmanage where the TLS Certificate and Key files
reside. If you use these options then you'll only be able to access
- Postage through a secure TLS connection. These options are only
- necessary if you wish to connect directly to Postage using a secure TLS
- connection. As an alternative, you can set up Postage in a reverse proxy
+ pgmanage through a secure TLS connection. These options are only
+ necessary if you wish to connect directly to pgmanage using a secure TLS
+ connection. As an alternative, you can set up pgmanage in a reverse proxy
configuration. This allows your web server to terminate the secure
- connection and pass on the request to Postage. You can find help to set
+ connection and pass on the request to pgmanage. You can find help to set
up this configuration in:
-
+
'';
};
@@ -177,29 +176,47 @@ in {
};
};
- config = mkIf cfg.enable {
- systemd.services.postage = {
- description = "postage - PostgreSQL Administration for the web";
- wants = [ "postgresql.service" ];
- after = [ "postgresql.service" ];
- wantedBy = [ "multi-user.target" ];
- serviceConfig = {
- User = postage;
- Group = postage;
- ExecStart = "${pkgs.postage}/sbin/postage -c ${confFile}" +
- optionalString cfg.localOnly " --local-only=true";
+
+in {
+
+ options.services.pgmanage = pgmanageOptions;
+
+ # This is deprecated and should be removed for NixOS-18.03.
+ options.services.postage = pgmanageOptions;
+
+ config = mkMerge [
+ { assertions = [
+ { assertion = !config.services.postage.enable;
+ message =
+ "services.postage is deprecated in favour of pgmanage. " +
+ "They have the same options so just substitute postage for pgmanage." ;
+ }
+ ];
+ }
+ (mkIf cfg.enable {
+ systemd.services.pgmanage = {
+ description = "pgmanage - PostgreSQL Administration for the web";
+ wants = [ "postgresql.service" ];
+ after = [ "postgresql.service" ];
+ wantedBy = [ "multi-user.target" ];
+ serviceConfig = {
+ User = pgmanage;
+ Group = pgmanage;
+ ExecStart = "${pkgs.pgmanage}/sbin/pgmanage -c ${confFile}" +
+ optionalString cfg.localOnly " --local-only=true";
+ };
};
- };
- users = {
- users."${postage}" = {
- name = postage;
- group = postage;
- home = cfg.dataRoot;
- createHome = true;
+ users = {
+ users."${pgmanage}" = {
+ name = pgmanage;
+ group = pgmanage;
+ home = cfg.dataRoot;
+ createHome = true;
+ };
+ groups."${pgmanage}" = {
+ name = pgmanage;
+ };
};
- groups."${postage}" = {
- name = postage;
- };
- };
- };
+ })
+ ];
}
diff --git a/nixos/modules/services/desktops/geoclue2.nix b/nixos/modules/services/desktops/geoclue2.nix
index 0e041fdbfbcf..c5a000d5c6a7 100644
--- a/nixos/modules/services/desktops/geoclue2.nix
+++ b/nixos/modules/services/desktops/geoclue2.nix
@@ -17,7 +17,7 @@ with lib;
default = false;
description = ''
Whether to enable GeoClue 2 daemon, a DBus service
- that provides location informationfor accessing.
+ that provides location information for accessing.
'';
};
diff --git a/nixos/modules/services/desktops/gnome3/at-spi2-core.nix b/nixos/modules/services/desktops/gnome3/at-spi2-core.nix
index 6e4c59f4bb37..55ed2d9ee21b 100644
--- a/nixos/modules/services/desktops/gnome3/at-spi2-core.nix
+++ b/nixos/modules/services/desktops/gnome3/at-spi2-core.nix
@@ -34,6 +34,8 @@ with lib;
services.dbus.packages = [ pkgs.at_spi2_core ];
+ systemd.packages = [ pkgs.at_spi2_core ];
+
};
}
diff --git a/nixos/modules/services/mail/nullmailer.nix b/nixos/modules/services/mail/nullmailer.nix
index b2c738ab6ebd..59cb512c115b 100644
--- a/nixos/modules/services/mail/nullmailer.nix
+++ b/nixos/modules/services/mail/nullmailer.nix
@@ -35,6 +35,18 @@ with lib;
description = "Whether to set the system sendmail to nullmailer's.";
};
+ remotesFile = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ description = ''
+ Path to the remotes control file. This file contains a
+ list of remote servers to which to send each message.
+
+ See man 8 nullmailer-send for syntax and available
+ options.
+ '';
+ };
+
config = {
adminaddr = mkOption {
type = types.nullOr types.str;
@@ -142,7 +154,16 @@ with lib;
type = types.nullOr types.str;
default = null;
description = ''
- If set, content will override the envelope sender on all messages.
+ A list of remote servers to which to send each message. Each line
+ contains a remote host name or address followed by an optional
+ protocol string, separated by white space.
+
+ See man 8 nullmailer-send for syntax and available
+ options.
+
+ WARNING: This is stored world-readable in the nix store. If you need
+ to specify any secret credentials here, consider using the
+ remotesFile option instead.
'';
};
@@ -164,13 +185,19 @@ with lib;
cfg = config.services.nullmailer;
in mkIf cfg.enable {
+ assertions = [
+ { assertion = cfg.config.remotes == null || cfg.remotesFile == null;
+ message = "Only one of `remotesFile` or `config.remotes` may be used at a time.";
+ }
+ ];
+
environment = {
systemPackages = [ pkgs.nullmailer ];
etc = let
- getval = attr: builtins.getAttr attr cfg.config;
- attrs = builtins.attrNames cfg.config;
- attrs' = builtins.filter (attr: ! isNull (getval attr)) attrs;
- in foldl' (as: attr: as // { "nullmailer/${attr}".text = getval attr; }) {} attrs';
+ validAttrs = filterAttrs (name: value: value != null) cfg.config;
+ in
+ (foldl' (as: name: as // { "nullmailer/${name}".text = validAttrs.${name}; }) {} (attrNames validAttrs))
+ // optionalAttrs (cfg.remotesFile != null) { "nullmailer/remotes".source = cfg.remotesFile; };
};
users = {
@@ -192,7 +219,7 @@ with lib;
preStart = ''
mkdir -p /var/spool/nullmailer/{queue,tmp}
- rm -f var/spool/nullmailer/trigger && mkfifo -m 660 /var/spool/nullmailer/trigger
+ rm -f /var/spool/nullmailer/trigger && mkfifo -m 660 /var/spool/nullmailer/trigger
chown ${cfg.user} /var/spool/nullmailer/*
'';
diff --git a/nixos/modules/services/mail/opendkim.nix b/nixos/modules/services/mail/opendkim.nix
index f065208ddfc1..59a8373843a1 100644
--- a/nixos/modules/services/mail/opendkim.nix
+++ b/nixos/modules/services/mail/opendkim.nix
@@ -8,10 +8,12 @@ let
defaultSock = "local:/run/opendkim/opendkim.sock";
+ keyFile = "${cfg.keyPath}/${cfg.selector}.private";
+
args = [ "-f" "-l"
"-p" cfg.socket
"-d" cfg.domains
- "-k" cfg.keyFile
+ "-k" keyFile
"-s" cfg.selector
] ++ optionals (cfg.configFile != null) [ "-x" cfg.configFile ];
@@ -57,9 +59,13 @@ in {
'';
};
- keyFile = mkOption {
+ keyPath = mkOption {
type = types.path;
- description = "Secret key file used for signing messages.";
+ description = ''
+ The path that opendkim should put its generated private keys into.
+ The DNS settings will be found in this directory with the name selector.txt.
+ '';
+ default = "/var/lib/opendkim/keys";
};
selector = mkOption {
@@ -100,11 +106,25 @@ in {
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
+ preStart = ''
+ mkdir -p "${cfg.keyPath}"
+ cd "${cfg.keyPath}"
+ if ! test -f ${cfg.selector}.private; then
+ ${pkgs.opendkim}/bin/opendkim-genkey -s ${cfg.selector} -d all-domains-generic-key
+ echo "Generated OpenDKIM key! Please update your DNS settings:\n"
+ echo "-------------------------------------------------------------"
+ cat ${cfg.selector}.txt
+ echo "-------------------------------------------------------------"
+ fi
+ chown ${cfg.user}:${cfg.group} ${cfg.selector}.private
+ '';
+
serviceConfig = {
ExecStart = "${pkgs.opendkim}/bin/opendkim ${escapeShellArgs args}";
User = cfg.user;
Group = cfg.group;
RuntimeDirectory = optional (cfg.socket == defaultSock) "opendkim";
+ PermissionsStartOnly = true;
};
};
diff --git a/nixos/modules/services/mail/pfix-srsd.nix b/nixos/modules/services/mail/pfix-srsd.nix
new file mode 100644
index 000000000000..ab5f4c39e8c2
--- /dev/null
+++ b/nixos/modules/services/mail/pfix-srsd.nix
@@ -0,0 +1,56 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+
+ ###### interface
+
+ options = {
+
+ services.pfix-srsd = {
+ enable = mkOption {
+ default = false;
+ type = types.bool;
+ description = "Whether to run the postfix sender rewriting scheme daemon.";
+ };
+
+ domain = mkOption {
+ description = "The domain for which to enable srs";
+ type = types.str;
+ example = "example.com";
+ };
+
+ secretsFile = mkOption {
+ description = ''
+ The secret data used to encode the SRS address.
+ to generate, use a command like:
+ for n in $(seq 5); do dd if=/dev/urandom count=1 bs=1024 status=none | sha256sum | sed 's/ -$//' | sed 's/^/ /'; done
+ '';
+ type = types.path;
+ default = "/var/lib/pfix-srsd/secrets";
+ };
+ };
+ };
+
+ ###### implementation
+
+ config = mkIf config.services.pfix-srsd.enable {
+ environment = {
+ systemPackages = [ pkgs.pfixtools ];
+ };
+
+ systemd.services."pfix-srsd" = {
+ description = "Postfix sender rewriting scheme daemon";
+ before = [ "postfix.service" ];
+ #note that we use requires rather than wants because postfix
+ #is unable to process (almost) all mail without srsd
+ requiredBy = [ "postfix.service" ];
+ serviceConfig = {
+ Type = "forking";
+ PIDFile = "/var/run/pfix-srsd.pid";
+ ExecStart = "${pkgs.pfixtools}/bin/pfix-srsd -p /var/run/pfix-srsd.pid -I ${config.services.pfix-srsd.domain} ${config.services.pfix-srsd.secretsFile}";
+ };
+ };
+ };
+}
\ No newline at end of file
diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index d88a38def82c..867c0ea6761c 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -28,7 +28,7 @@ let
mainCf = let
escape = replaceStrings ["$"] ["$$"];
- mkList = items: "\n " + concatMapStringsSep "\n " escape items;
+ mkList = items: "\n " + concatStringsSep "\n " items;
mkVal = value:
if isList value then mkList value
else " " + (if value == true then "yes"
@@ -60,9 +60,11 @@ let
manpage_directory = "${pkgs.postfix}/share/man";
html_directory = "${pkgs.postfix}/share/postfix/doc/html";
shlib_directory = false;
- relayhost = if cfg.lookupMX || cfg.relayHost == ""
- then cfg.relayHost
- else "[${cfg.relayHost}]";
+ relayhost = if cfg.relayHost == "" then "" else
+ if cfg.lookupMX
+ then "${cfg.relayHost}:${toString cfg.relayPort}"
+ else "[${cfg.relayHost}]:${toString cfg.relayPort}";
+
mail_spool_directory = "/var/spool/mail/";
setgid_group = setgidGroup;
}
@@ -79,6 +81,12 @@ let
// optionalAttrs haveTransport { transport_maps = "hash:/etc/postfix/transport"; }
// optionalAttrs haveVirtual { virtual_alias_maps = "${cfg.virtualMapType}:/etc/postfix/virtual"; }
// optionalAttrs (cfg.dnsBlacklists != []) { smtpd_client_restrictions = clientRestrictions; }
+ // optionalAttrs cfg.useSrs {
+ sender_canonical_maps = "tcp:127.0.0.1:10001";
+ sender_canonical_classes = "envelope_sender";
+ recipient_canonical_maps = "tcp:127.0.0.1:10002";
+ recipient_canonical_classes= "envelope_recipient";
+ }
// optionalAttrs cfg.enableHeaderChecks { header_checks = "regexp:/etc/postfix/header_checks"; }
// optionalAttrs (cfg.sslCert != "") {
smtp_tls_CAfile = cfg.sslCACert;
@@ -452,6 +460,14 @@ in
";
};
+ relayPort = mkOption {
+ type = types.int;
+ default = 25;
+ description = "
+ SMTP port for relay mail relay.
+ ";
+ };
+
lookupMX = mkOption {
type = types.bool;
default = false;
@@ -626,6 +642,12 @@ in
description = "Maps to be compiled and placed into /var/lib/postfix/conf.";
};
+ useSrs = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Whether to enable sender rewriting scheme";
+ };
+
};
};
@@ -646,6 +668,8 @@ in
systemPackages = [ pkgs.postfix ];
};
+ services.pfix-srsd.enable = config.services.postfix.useSrs;
+
services.mail.sendmailSetuidWrapper = mkIf config.services.postfix.setSendmail {
program = "sendmail";
source = "${pkgs.postfix}/bin/sendmail";
diff --git a/nixos/modules/services/mail/spamassassin.nix b/nixos/modules/services/mail/spamassassin.nix
index fc8396cd85e9..d483a8c3d67d 100644
--- a/nixos/modules/services/mail/spamassassin.nix
+++ b/nixos/modules/services/mail/spamassassin.nix
@@ -42,7 +42,7 @@ in
Then you can Use this sieve filter:
require ["fileinto", "reject", "envelope"];
-
+
if header :contains "X-Spam-Flag" "YES" {
fileinto "spam";
}
@@ -67,11 +67,11 @@ in
initPreConf = mkOption {
type = types.str;
description = "The SpamAssassin init.pre config.";
- default =
- ''
+ default =
+ ''
#
# to update this list, run this command in the rules directory:
- # grep 'loadplugin.*Mail::SpamAssassin::Plugin::.*' -o -h * | sort | uniq
+ # grep 'loadplugin.*Mail::SpamAssassin::Plugin::.*' -o -h * | sort | uniq
#
#loadplugin Mail::SpamAssassin::Plugin::AccessDB
@@ -122,7 +122,11 @@ in
config = mkIf cfg.enable {
# Allow users to run 'spamc'.
- environment.systemPackages = [ pkgs.spamassassin ];
+
+ environment = {
+ etc = singleton { source = spamdEnv; target = "spamassassin"; };
+ systemPackages = [ pkgs.spamassassin ];
+ };
users.extraUsers = singleton {
name = "spamd";
@@ -138,7 +142,7 @@ in
systemd.services.sa-update = {
script = ''
- set +e
+ set +e
${pkgs.su}/bin/su -s "${pkgs.bash}/bin/bash" -c "${pkgs.spamassassin}/bin/sa-update --gpghomedir=/var/lib/spamassassin/sa-update-keys/ --siteconfigpath=${spamdEnv}/" spamd
v=$?
@@ -153,7 +157,7 @@ in
'';
};
- systemd.timers.sa-update = {
+ systemd.timers.sa-update = {
description = "sa-update-service";
partOf = [ "sa-update.service" ];
wantedBy = [ "timers.target" ];
@@ -177,15 +181,10 @@ in
# 0 and 1 no error, exitcode > 1 means error:
# https://spamassassin.apache.org/full/3.1.x/doc/sa-update.html#exit_codes
preStart = ''
- # this abstraction requires no centralized config at all
- if [ -d /etc/spamassassin ]; then
- echo "This spamassassin does not support global '/etc/spamassassin' folder for configuration as this would be impure. Merge your configs into 'services.spamassassin' and remove the '/etc/spamassassin' folder to make this service work. Also see 'https://github.com/NixOS/nixpkgs/pull/26470'.";
- exit 1
- fi
echo "Recreating '/var/lib/spamasassin' with creating '3.004001' (or similar) and 'sa-update-keys'"
mkdir -p /var/lib/spamassassin
chown spamd:spamd /var/lib/spamassassin -R
- set +e
+ set +e
${pkgs.su}/bin/su -s "${pkgs.bash}/bin/bash" -c "${pkgs.spamassassin}/bin/sa-update --gpghomedir=/var/lib/spamassassin/sa-update-keys/ --siteconfigpath=${spamdEnv}/" spamd
v=$?
set -e
diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix
new file mode 100644
index 000000000000..f0b44b7bedeb
--- /dev/null
+++ b/nixos/modules/services/misc/gitea.nix
@@ -0,0 +1,270 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.gitea;
+ configFile = pkgs.writeText "app.ini" ''
+ APP_NAME = ${cfg.appName}
+ RUN_USER = ${cfg.user}
+ RUN_MODE = prod
+
+ [database]
+ DB_TYPE = ${cfg.database.type}
+ HOST = ${cfg.database.host}:${toString cfg.database.port}
+ NAME = ${cfg.database.name}
+ USER = ${cfg.database.user}
+ PASSWD = #dbpass#
+ PATH = ${cfg.database.path}
+
+ [repository]
+ ROOT = ${cfg.repositoryRoot}
+
+ [server]
+ DOMAIN = ${cfg.domain}
+ HTTP_ADDR = ${cfg.httpAddress}
+ HTTP_PORT = ${toString cfg.httpPort}
+ ROOT_URL = ${cfg.rootUrl}
+ STATIC_ROOT_PATH = ${cfg.staticRootPath}
+
+ [session]
+ COOKIE_NAME = session
+ COOKIE_SECURE = ${boolToString cfg.cookieSecure}
+
+ [security]
+ SECRET_KEY = #secretkey#
+ INSTALL_LOCK = true
+
+ ${cfg.extraConfig}
+ '';
+in
+
+{
+ options = {
+ services.gitea = {
+ enable = mkOption {
+ default = false;
+ type = types.bool;
+ description = "Enable Gitea Service.";
+ };
+
+ useWizard = mkOption {
+ default = false;
+ type = types.bool;
+ description = "Do not generate a configuration and use gitea' installation wizard instead. The first registered user will be administrator.";
+ };
+
+ stateDir = mkOption {
+ default = "/var/lib/gitea";
+ type = types.str;
+ description = "gitea data directory.";
+ };
+
+ user = mkOption {
+ type = types.str;
+ default = "gitea";
+ description = "User account under which gitea runs.";
+ };
+
+ database = {
+ type = mkOption {
+ type = types.enum [ "sqlite3" "mysql" "postgres" ];
+ example = "mysql";
+ default = "sqlite3";
+ description = "Database engine to use.";
+ };
+
+ host = mkOption {
+ type = types.str;
+ default = "127.0.0.1";
+ description = "Database host address.";
+ };
+
+ port = mkOption {
+ type = types.int;
+ default = 3306;
+ description = "Database host port.";
+ };
+
+ name = mkOption {
+ type = types.str;
+ default = "gitea";
+ description = "Database name.";
+ };
+
+ user = mkOption {
+ type = types.str;
+ default = "gitea";
+ description = "Database user.";
+ };
+
+ password = mkOption {
+ type = types.str;
+ default = "";
+ description = ''
+ The password corresponding to .
+ Warning: this is stored in cleartext in the Nix store!
+ Use instead.
+ '';
+ };
+
+ passwordFile = mkOption {
+ type = types.nullOr types.path;
+ default = null;
+ example = "/run/keys/gitea-dbpassword";
+ description = ''
+ A file containing the password corresponding to
+ .
+ '';
+ };
+
+ path = mkOption {
+ type = types.str;
+ default = "${cfg.stateDir}/data/gitea.db";
+ description = "Path to the sqlite3 database file.";
+ };
+ };
+
+ appName = mkOption {
+ type = types.str;
+ default = "gitea: Gitea Service";
+ description = "Application name.";
+ };
+
+ repositoryRoot = mkOption {
+ type = types.str;
+ default = "${cfg.stateDir}/repositories";
+ description = "Path to the git repositories.";
+ };
+
+ domain = mkOption {
+ type = types.str;
+ default = "localhost";
+ description = "Domain name of your server.";
+ };
+
+ rootUrl = mkOption {
+ type = types.str;
+ default = "http://localhost:3000/";
+ description = "Full public URL of gitea server.";
+ };
+
+ httpAddress = mkOption {
+ type = types.str;
+ default = "0.0.0.0";
+ description = "HTTP listen address.";
+ };
+
+ httpPort = mkOption {
+ type = types.int;
+ default = 3000;
+ description = "HTTP listen port.";
+ };
+
+ cookieSecure = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Marks session cookies as "secure" as a hint for browsers to only send
+ them via HTTPS. This option is recommend, if gitea is being served over HTTPS.
+ '';
+ };
+
+ staticRootPath = mkOption {
+ type = types.str;
+ default = "${pkgs.gitea.data}";
+ example = "/var/lib/gitea/data";
+ description = "Upper level of template and static files path.";
+ };
+
+ extraConfig = mkOption {
+ type = types.str;
+ default = "";
+ description = "Configuration lines appended to the generated gitea configuration file.";
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+
+ systemd.services.gitea = {
+ description = "gitea";
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+ path = [ pkgs.gitea.bin ];
+
+ preStart = let
+ runConfig = "${cfg.stateDir}/custom/conf/app.ini";
+ secretKey = "${cfg.stateDir}/custom/conf/secret_key";
+ in ''
+ mkdir -p ${cfg.stateDir}
+
+ # copy custom configuration and generate a random secret key if needed
+ ${optionalString (cfg.useWizard == false) ''
+ mkdir -p ${cfg.stateDir}/custom/conf
+ cp -f ${configFile} ${runConfig}
+
+ if [ ! -e ${secretKey} ]; then
+ head -c 16 /dev/urandom | base64 > ${secretKey}
+ fi
+
+ KEY=$(head -n1 ${secretKey})
+ DBPASS=$(head -n1 ${cfg.database.passwordFile})
+ sed -e "s,#secretkey#,$KEY,g" \
+ -e "s,#dbpass#,$DBPASS,g" \
+ -i ${runConfig}
+ chmod 640 ${runConfig} ${secretKey}
+ ''}
+
+ mkdir -p ${cfg.repositoryRoot}
+ # update all hooks' binary paths
+ HOOKS=$(find ${cfg.repositoryRoot} -mindepth 4 -maxdepth 4 -type f -wholename "*git/hooks/*")
+ if [ "$HOOKS" ]
+ then
+ sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gitea,${pkgs.gitea.bin}/bin/gitea,g' $HOOKS
+ sed -ri 's,/nix/store/[a-z0-9.-]+/bin/env,${pkgs.coreutils}/bin/env,g' $HOOKS
+ sed -ri 's,/nix/store/[a-z0-9.-]+/bin/bash,${pkgs.bash}/bin/bash,g' $HOOKS
+ sed -ri 's,/nix/store/[a-z0-9.-]+/bin/perl,${pkgs.perl}/bin/perl,g' $HOOKS
+ fi
+ if [ ! -d ${cfg.stateDir}/conf/locale ]
+ then
+ mkdir -p ${cfg.stateDir}/conf
+ cp -r ${pkgs.gitea.out}/locale ${cfg.stateDir}/conf/locale
+ fi
+ '';
+
+ serviceConfig = {
+ Type = "simple";
+ User = cfg.user;
+ WorkingDirectory = cfg.stateDir;
+ ExecStart = "${pkgs.gitea.bin}/bin/gitea web";
+ Restart = "always";
+ };
+
+ environment = {
+ USER = cfg.user;
+ HOME = cfg.stateDir;
+ GITEA_WORK_DIR = cfg.stateDir;
+ };
+ };
+
+ users = mkIf (cfg.user == "gitea") {
+ extraUsers.gitea = {
+ description = "Gitea Service";
+ home = cfg.stateDir;
+ createHome = true;
+ };
+ };
+
+ warnings = optional (cfg.database.password != "")
+ ''config.services.gitea.database.password will be stored as plaintext
+ in the Nix store. Use database.passwordFile instead.'';
+
+ # Create database passwordFile default when password is configured.
+ services.gitea.database.passwordFile =
+ (mkDefault (toString (pkgs.writeTextFile {
+ name = "gitea-database-password";
+ text = cfg.database.password;
+ })));
+ };
+}
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index d6c8ac547246..7b2b40e59232 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -414,7 +414,7 @@ in {
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
+ openssl genrsa 2048
'';
};
@@ -567,11 +567,12 @@ in {
mkdir -p ${cfg.statePath}/log
mkdir -p ${cfg.statePath}/tmp/pids
mkdir -p ${cfg.statePath}/tmp/sockets
+ mkdir -p ${cfg.statePath}/shell
rm -rf ${cfg.statePath}/config ${cfg.statePath}/shell/hooks
mkdir -p ${cfg.statePath}/config
- tr -dc A-Za-z0-9 < /dev/urandom | head -c 32 > ${cfg.statePath}/config/gitlab_shell_secret
+ ${pkgs.openssl}/bin/openssl rand -hex 32 > ${cfg.statePath}/config/gitlab_shell_secret
# The uploads directory is hardcoded somewhere deep in rails. It is
# symlinked in the gitlab package to /run/gitlab/uploads to make it
@@ -580,6 +581,7 @@ in {
mkdir -p ${cfg.statePath}/{log,uploads}
ln -sf ${cfg.statePath}/log /run/gitlab/log
ln -sf ${cfg.statePath}/uploads /run/gitlab/uploads
+ ln -sf ${cfg.statePath}/tmp /run/gitlab/tmp
chown -R ${cfg.user}:${cfg.group} /run/gitlab
# Prepare home directory
@@ -617,7 +619,7 @@ in {
fi
# enable required pg_trgm extension for gitlab
- ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql gitlab -c "CREATE EXTENSION IF NOT EXISTS pg_trgm"
+ ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql ${cfg.databaseName} -c "CREATE EXTENSION IF NOT EXISTS pg_trgm"
# Always do the db migrations just to be sure the database is up-to-date
${gitlab-rake}/bin/gitlab-rake db:migrate RAILS_ENV=production
@@ -630,11 +632,23 @@ in {
touch "${cfg.statePath}/db-seeded"
fi
+ # The gitlab:shell:create_hooks task seems broken for fixing links
+ # so we instead delete all the hooks and create them anew
+ rm -f ${cfg.statePath}/repositories/**/*.git/hooks
+ ${gitlab-rake}/bin/gitlab-rake gitlab:shell:create_hooks RAILS_ENV=production
+
# Change permissions in the last step because some of the
# intermediary scripts like to create directories as root.
chown -R ${cfg.user}:${cfg.group} ${cfg.statePath}
chmod -R ug+rwX,o-rwx+X ${cfg.statePath}
chmod -R u+rwX,go-rwx+X ${gitlabEnv.HOME}
+ chmod -R ug+rwX,o-rwx ${cfg.statePath}/repositories
+ chmod -R ug-s ${cfg.statePath}/repositories
+ find ${cfg.statePath}/repositories -type d -print0 | xargs -0 chmod g+s
+ chmod 770 ${cfg.statePath}/uploads
+ chown -R ${cfg.user} ${cfg.statePath}/uploads
+ find ${cfg.statePath}/uploads -type f -exec chmod 0644 {} \;
+ find ${cfg.statePath}/uploads -type d -not -path ${cfg.statePath}/uploads -exec chmod 0770 {} \;
'';
serviceConfig = {
diff --git a/nixos/modules/services/misc/gitlab.xml b/nixos/modules/services/misc/gitlab.xml
index f9636f8e1278..4b00f50abd63 100644
--- a/nixos/modules/services/misc/gitlab.xml
+++ b/nixos/modules/services/misc/gitlab.xml
@@ -66,6 +66,35 @@ services.gitlab = {
db = "uPgq1gtwwHiatiuE0YHqbGa5lEIXH7fMsvuTNgdzJi8P0Dg12gibTzBQbq5LT7PNzcc3BP9P1snHVnduqtGF43PgrQtU7XL93ts6gqe9CBNhjtaqUwutQUDkygP5NrV6";
secret = "devzJ0Tz0POiDBlrpWmcsjjrLaltyiAdS8TtgT9YNBOoUcDsfppiY3IXZjMVtKgXrFImIennFGOpPN8IkP8ATXpRgDD5rxVnKuTTwYQaci2NtaV1XxOQGjdIE50VGsR3";
otp = "e1GATJVuS2sUh7jxiPzZPre4qtzGGaS22FR50Xs1TerRVdgI3CBVUi5XYtQ38W4xFeS4mDqi5cQjExE838iViSzCdcG19XSL6qNsfokQP9JugwiftmhmCadtsnHErBMI";
+ jws = ''
+ -----BEGIN RSA PRIVATE KEY-----
+ MIIEpAIBAAKCAQEArrtx4oHKwXoqUbMNqnHgAklnnuDon3XG5LJB35yPsXKv/8GK
+ ke92wkI+s1Xkvsp8tg9BIY/7c6YK4SR07EWL+dB5qwctsWR2Q8z+/BKmTx9D99pm
+ hnsjuNIXTF7BXrx3RX6BxZpH5Vzzh9nCwWKT/JCFqtwH7afNGGL7aMf+hdaiUg/Q
+ SD05yRObioiO4iXDolsJOhrnbZvlzVHl1ZYxFJv0H6/Snc0BBA9Fl/3uj6ANpbjP
+ eXF1SnJCqT87bj46r5NdVauzaRxAsIfqHroHK4UZ98X5LjGQFGvSqTvyjPBS4I1i
+ s7VJU28ObuutHxIxSlH0ibn4HZqWmKWlTS652wIDAQABAoIBAGtPcUTTw2sJlR3x
+ 4k2wfAvLexkHNbZhBdKEa5JiO5mWPuLKwUiZEY2CU7Gd6csG3oqNWcm7/IjtC7dz
+ xV8p4yp8T4yq7vQIJ93B80NqTLtBD2QTvG2RCMJEPMzJUObWxkVmyVpLQyZo7KOd
+ KE/OM+aj94OUeEYLjRkSCScz1Gvq/qFG/nAy7KPCmN9JDHuhX26WHo2Rr1OnPNT/
+ 7diph0bB9F3b8gjjNTqXDrpdAqVOgR/PsjEBz6DMY+bdyMIn87q2yfmMexxRofN6
+ LulpzSaa6Yup8N8H6PzVO6KAkQuf1aQRj0sMwGk1IZEnj6I0KbuHIZkw21Nc6sf2
+ ESFySDECgYEA1PnCNn5tmLnwe62Ttmrzl20zIS3Me1gUVJ1NTfr6+ai0I9iMYU21
+ 5czuAjJPm9JKQF2vY8UAaCj2ZoObtHa/anb3xsCd8NXoM3iJq5JDoXI1ldz3Y+ad
+ U/bZUg1DLRvAniTuXmw9iOTwTwPxlDIGq5k+wG2Xmi1lk7zH8ezr9BMCgYEA0gfk
+ EhgcmPH8Z5cU3YYwOdt6HSJOM0OyN4k/5gnkv+HYVoJTj02gkrJmLr+mi1ugKj46
+ 7huYO9TVnrKP21tmbaSv1dp5hS3letVRIxSloEtVGXmmdvJvBRzDWos+G+KcvADi
+ fFCz6w8v9NmO40CB7y/3SxTmSiSxDQeoi9LhDBkCgYEAsPgMWm25sfOnkY2NNUIv
+ wT8bAlHlHQT2d8zx5H9NttBpR3P0ShJhuF8N0sNthSQ7ULrIN5YGHYcUH+DyLAWU
+ TuomP3/kfa+xL7vUYb269tdJEYs4AkoppxBySoz8qenqpz422D0G8M6TpIS5Y5Qi
+ GMrQ6uLl21YnlpiCaFOfSQMCgYEAmZxj1kgEQmhZrnn1LL/D7czz1vMMNrpAUhXz
+ wg9iWmSXkU3oR1sDIceQrIhHCo2M6thwyU0tXjUft93pEQocM/zLDaGoVxtmRxxV
+ J08mg8IVD3jFoyFUyWxsBIDqgAKRl38eJsXvkO+ep3mm49Z+Ma3nM+apN3j2dQ0w
+ 3HLzXaECgYBFLMEAboVFwi5+MZjGvqtpg2PVTisfuJy2eYnPwHs+AXUgi/xRNFjI
+ YHEa7UBPb5TEPSzWImQpETi2P5ywcUYL1EbN/nqPWmjFnat8wVmJtV4sUpJhubF4
+ Vqm9LxIWc1uQ1q1HDCejRIxIN3aSH+wgRS3Kcj8kCTIoXd1aERb04g==
+ -----END RSA PRIVATE KEY-----
+ '';
};
extraConfig = {
gitlab = {
diff --git a/nixos/modules/services/misc/gitolite.nix b/nixos/modules/services/misc/gitolite.nix
index 6bb8adeccf79..f395b9558b5a 100644
--- a/nixos/modules/services/misc/gitolite.nix
+++ b/nixos/modules/services/misc/gitolite.nix
@@ -41,6 +41,15 @@ in
'';
};
+ enableGitAnnex = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Enable git-annex support. Uses the extraGitoliteRc option
+ to apply the necessary configuration.
+ '';
+ };
+
commonHooks = mkOption {
type = types.listOf types.path;
default = [];
@@ -75,6 +84,8 @@ in
will need to take any customizations you may have in
~/.gitolite.rc, convert them to appropriate Perl
statements, add them to this option, and remove the file.
+
+ See also the enableGitAnnex option.
'';
};
@@ -124,6 +135,11 @@ in
''} >>"$out/gitolite.rc"
'';
in {
+ services.gitolite.extraGitoliteRc = optionalString cfg.enableGitAnnex ''
+ # Enable git-annex support:
+ push( @{$RC{ENABLE}}, 'git-annex-shell ua');
+ '';
+
users.extraUsers.${cfg.user} = {
description = "Gitolite user";
home = cfg.dataDir;
@@ -198,6 +214,7 @@ in
'';
};
- environment.systemPackages = [ pkgs.gitolite pkgs.git ];
+ environment.systemPackages = [ pkgs.gitolite pkgs.git ]
+ ++ optional cfg.enableGitAnnex pkgs.gitAndTools.git-annex;
});
}
diff --git a/nixos/modules/services/misc/gogs.nix b/nixos/modules/services/misc/gogs.nix
index d6e827a53fdf..f6d326e43d94 100644
--- a/nixos/modules/services/misc/gogs.nix
+++ b/nixos/modules/services/misc/gogs.nix
@@ -25,6 +25,7 @@ let
HTTP_ADDR = ${cfg.httpAddress}
HTTP_PORT = ${toString cfg.httpPort}
ROOT_URL = ${cfg.rootUrl}
+ STATIC_ROOT_PATH = ${cfg.staticRootPath}
[session]
COOKIE_NAME = session
@@ -175,6 +176,13 @@ in
'';
};
+ staticRootPath = mkOption {
+ type = types.str;
+ default = "${pkgs.gogs.data}";
+ example = "/var/lib/gogs/data";
+ description = "Upper level of template and static files path.";
+ };
+
extraConfig = mkOption {
type = types.str;
default = "";
@@ -195,6 +203,8 @@ in
runConfig = "${cfg.stateDir}/custom/conf/app.ini";
secretKey = "${cfg.stateDir}/custom/conf/secret_key";
in ''
+ mkdir -p ${cfg.stateDir}
+
# copy custom configuration and generate a random secret key if needed
${optionalString (cfg.useWizard == false) ''
mkdir -p ${cfg.stateDir}/custom/conf
@@ -240,7 +250,7 @@ in
};
};
- users = {
+ users = mkIf (cfg.user == "gogs") {
extraUsers.gogs = {
description = "Go Git Service";
uid = config.ids.uids.gogs;
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index bf1304ee7ac2..beca820d2d60 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -189,6 +189,7 @@ in
sshKey = "/root/.ssh/id_buildfarm";
system = "x86_64-linux";
maxJobs = 2;
+ speedFactor = 2;
supportedFeatures = [ "kvm" ];
mandatoryFeatures = [ "perf" ];
}
@@ -428,7 +429,7 @@ in
fi
'';
- nix.nrBuildUsers = mkDefault (lib.max 10 cfg.maxJobs);
+ nix.nrBuildUsers = mkDefault (lib.max 32 cfg.maxJobs);
users.extraUsers = nixbldUsers;
diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix
index 515864ec2e2d..41cadb4a6de0 100644
--- a/nixos/modules/services/misc/nixos-manual.nix
+++ b/nixos/modules/services/misc/nixos-manual.nix
@@ -135,8 +135,9 @@ in
};
};
- services.mingetty.helpLine = mkIf cfg.showManual
- "\nPress for the NixOS manual.";
+ services.mingetty.helpLine = "\nRun `nixos-help` "
+ + lib.optionalString cfg.showManual "or press "
+ + "for the NixOS manual.";
};
diff --git a/nixos/modules/services/misc/plex.nix b/nixos/modules/services/misc/plex.nix
index e37b486375bd..46221ace3084 100644
--- a/nixos/modules/services/misc/plex.nix
+++ b/nixos/modules/services/misc/plex.nix
@@ -137,7 +137,7 @@ in
User = cfg.user;
Group = cfg.group;
PermissionsStartOnly = "true";
- ExecStart = "/bin/sh -c ${cfg.package}/usr/lib/plexmediaserver/Plex\\ Media\\ Server";
+ ExecStart = "\"${cfg.package}/usr/lib/plexmediaserver/Plex Media Server\"";
KillSignal = "SIGQUIT";
Restart = "on-failure";
};
diff --git a/nixos/modules/services/misc/plexpy.nix b/nixos/modules/services/misc/plexpy.nix
new file mode 100644
index 000000000000..df9f12581247
--- /dev/null
+++ b/nixos/modules/services/misc/plexpy.nix
@@ -0,0 +1,81 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+ cfg = config.services.plexpy;
+in
+{
+ options = {
+ services.plexpy = {
+ enable = mkEnableOption "PlexPy Plex Monitor";
+
+ dataDir = mkOption {
+ type = types.str;
+ default = "/var/lib/plexpy";
+ description = "The directory where PlexPy stores its data files.";
+ };
+
+ configFile = mkOption {
+ type = types.str;
+ default = "/var/lib/plexpy/config.ini";
+ description = "The location of PlexPy's config file.";
+ };
+
+ port = mkOption {
+ type = types.int;
+ default = 8181;
+ description = "TCP port where PlexPy listens.";
+ };
+
+ user = mkOption {
+ type = types.str;
+ default = "plexpy";
+ description = "User account under which PlexPy runs.";
+ };
+
+ group = mkOption {
+ type = types.str;
+ default = "nogroup";
+ description = "Group under which PlexPy runs.";
+ };
+
+ package = mkOption {
+ type = types.package;
+ default = pkgs.plexpy;
+ defaultText = "pkgs.plexpy";
+ description = ''
+ The PlexPy package to use.
+ '';
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+ systemd.services.plexpy = {
+ description = "PlexPy Plex Monitor";
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+ preStart = ''
+ test -d "${cfg.dataDir}" || {
+ echo "Creating initial PlexPy data directory in \"${cfg.dataDir}\"."
+ mkdir -p "${cfg.dataDir}"
+ chown ${cfg.user}:${cfg.group} "${cfg.dataDir}"
+ }
+ '';
+ serviceConfig = {
+ Type = "simple";
+ User = cfg.user;
+ Group = cfg.group;
+ PermissionsStartOnly = "true";
+ GuessMainPID = "false";
+ ExecStart = "${cfg.package}/bin/plexpy --datadir ${cfg.dataDir} --config ${cfg.configFile} --port ${toString cfg.port} --pidfile ${cfg.dataDir}/plexpy.pid --nolaunch";
+ Restart = "on-failure";
+ };
+ };
+
+ users.extraUsers = mkIf (cfg.user == "plexpy") {
+ plexpy = { group = cfg.group; uid = config.ids.uids.plexpy; };
+ };
+ };
+}
diff --git a/nixos/modules/services/misc/pykms.nix b/nixos/modules/services/misc/pykms.nix
new file mode 100644
index 000000000000..897e856e2a2d
--- /dev/null
+++ b/nixos/modules/services/misc/pykms.nix
@@ -0,0 +1,90 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.pykms;
+
+ home = "/var/lib/pykms";
+
+ services = {
+ serviceConfig = {
+ Restart = "on-failure";
+ RestartSec = "10s";
+ StartLimitInterval = "1min";
+ PrivateTmp = true;
+ ProtectSystem = "full";
+ ProtectHome = true;
+ };
+ };
+
+in {
+
+ options = {
+ services.pykms = rec {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Whether to enable the PyKMS service.";
+ };
+
+ listenAddress = mkOption {
+ type = types.str;
+ default = "0.0.0.0";
+ description = "The IP address on which to listen.";
+ };
+
+ port = mkOption {
+ type = types.int;
+ default = 1688;
+ description = "The port on which to listen.";
+ };
+
+ verbose = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Show verbose output.";
+ };
+
+ openFirewallPort = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Whether the listening port should be opened automatically.";
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+ networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewallPort [ cfg.port ];
+
+ systemd.services = {
+ pykms = services // {
+ description = "Python KMS";
+ wantedBy = [ "multi-user.target" ];
+ serviceConfig = with pkgs; {
+ User = "pykms";
+ Group = "pykms";
+ ExecStartPre = "${getBin pykms}/bin/create_pykms_db.sh ${home}/clients.db";
+ ExecStart = "${getBin pykms}/bin/server.py ${optionalString cfg.verbose "--verbose"} ${cfg.listenAddress} ${toString cfg.port}";
+ WorkingDirectory = home;
+ MemoryLimit = "64M";
+ };
+ };
+ };
+
+ users = {
+ extraUsers.pykms = {
+ name = "pykms";
+ group = "pykms";
+ home = home;
+ createHome = true;
+ uid = config.ids.uids.pykms;
+ description = "PyKMS daemon user";
+ };
+
+ extraGroups.pykms = {
+ gid = config.ids.gids.pykms;
+ };
+ };
+ };
+}
diff --git a/nixos/modules/services/misc/tzupdate.nix b/nixos/modules/services/misc/tzupdate.nix
new file mode 100644
index 000000000000..570982ced29a
--- /dev/null
+++ b/nixos/modules/services/misc/tzupdate.nix
@@ -0,0 +1,45 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.tzupdate;
+in {
+ options.services.tzupdate = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Enable the tzupdate timezone updating service. This provides
+ a one-shot service which can be activated with systemctl to
+ update the timezone.
+ '';
+ };
+ };
+
+ config = mkIf cfg.enable {
+ # We need to have imperative time zone management for this to work.
+ # This will give users an error if they have set an explicit time
+ # zone, which is better than silently overriding it.
+ time.timeZone = null;
+
+ # We provide a one-shot service which can be manually run. We could
+ # provide a service that runs on startup, but it's tricky to get
+ # a service to run after you have *internet* access.
+ systemd.services.tzupdate = {
+ description = "tzupdate timezone update service";
+ wants = [ "network-online.target" ];
+ after = [ "network-online.target" ];
+
+ serviceConfig = {
+ Type = "oneshot";
+ # We could link directly into pkgs.tzdata, but at least timedatectl seems
+ # to expect the symlink to point directly to a file in etc.
+ # Setting the "debian timezone file" to point at /dev/null stops it doing anything.
+ ExecStart = "${pkgs.tzupdate}/bin/tzupdate -z /etc/zoneinfo -d /dev/null";
+ };
+ };
+ };
+
+ meta.maintainers = [ maintainers.michaelpj ];
+}
diff --git a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix
index 8d3d4f2065ec..beaa2c01b298 100644
--- a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix
+++ b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix
@@ -23,7 +23,7 @@ let
# proxy_password: password
# tags: mytag0, mytag1
- ${optionalString (cfg.tags != null ) "tags: ${concatStringsSep "," cfg.tags }"}
+ ${optionalString (cfg.tags != null ) "tags: ${concatStringsSep ", " cfg.tags }"}
# collect_ec2_tags: no
# recent_point_threshold: 30
diff --git a/nixos/modules/services/monitoring/fusion-inventory.nix b/nixos/modules/services/monitoring/fusion-inventory.nix
new file mode 100644
index 000000000000..1c00f3c299e9
--- /dev/null
+++ b/nixos/modules/services/monitoring/fusion-inventory.nix
@@ -0,0 +1,66 @@
+# Fusion Inventory daemon.
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.fusionInventory;
+
+ configFile = pkgs.writeText "fusion_inventory.conf" ''
+ server = ${concatStringsSep ", " cfg.servers}
+
+ logger = stderr
+
+ ${cfg.extraConfig}
+ '';
+
+in {
+
+ ###### interface
+
+ options = {
+
+ services.fusionInventory = {
+
+ enable = mkEnableOption "Fusion Inventory Agent";
+
+ servers = mkOption {
+ type = types.listOf types.str;
+ description = ''
+ The urls of the OCS/GLPI servers to connect to.
+ '';
+ };
+
+ extraConfig = mkOption {
+ default = "";
+ type = types.lines;
+ description = ''
+ Configuration that is injected verbatim into the configuration file.
+ '';
+ };
+ };
+ };
+
+
+ ###### implementation
+
+ config = mkIf cfg.enable {
+
+ users.extraUsers = singleton {
+ name = "fusion-inventory";
+ description = "FusionInventory user";
+ };
+
+ systemd.services."fusion-inventory" = {
+ description = "Fusion Inventory Agent";
+ wantedBy = [ "multi-user.target" ];
+
+ environment = {
+ OPTIONS = "--no-category=software";
+ };
+ serviceConfig = {
+ ExecStart = "${pkgs.fusionInventory}/bin/fusioninventory-agent --conf-file=${configFile} --daemon --no-fork";
+ };
+ };
+ };
+}
diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
index 332a04634d06..4b1ad34b3a4e 100644
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
@@ -7,10 +7,23 @@ let
writeTextOrNull = f: t: mapNullable (pkgs.writeTextDir f) t;
dataDir = cfg.dataDir;
+ staticDir = cfg.dataDir + "/static";
+
+ graphiteLocalSettingsDir = pkgs.runCommand "graphite_local_settings"
+ {inherit graphiteLocalSettings;} ''
+ mkdir -p $out
+ ln -s $graphiteLocalSettings $out/graphite_local_settings.py
+ '';
+
+ graphiteLocalSettings = pkgs.writeText "graphite_local_settings.py" (
+ "STATIC_ROOT = '${staticDir}'\n" +
+ optionalString (! isNull config.time.timeZone) "TIME_ZONE = '${config.time.timeZone}'\n"
+ + cfg.web.extraConfig
+ );
graphiteApiConfig = pkgs.writeText "graphite-api.yaml" ''
- time_zone: ${config.time.timeZone}
search_index: ${dataDir}/index
+ ${optionalString (!isNull config.time.timeZone) ''time_zone: ${config.time.timeZone}''}
${optionalString (cfg.api.finders != []) ''finders:''}
${concatMapStringsSep "\n" (f: " - " + f.moduleName) cfg.api.finders}
${optionalString (cfg.api.functions != []) ''functions:''}
@@ -94,6 +107,15 @@ in {
default = 8080;
type = types.int;
};
+
+ extraConfig = mkOption {
+ type = types.str;
+ default = "";
+ description = ''
+ Graphite webapp settings. See:
+
+ '';
+ };
};
api = {
@@ -445,7 +467,15 @@ in {
];
})
- (mkIf cfg.web.enable {
+ (mkIf cfg.web.enable (let
+ python27' = pkgs.python27.override {
+ packageOverrides = self: super: {
+ django = self.django_1_8;
+ django_tagging = self.django_tagging_0_4_3;
+ };
+ };
+ pythonPackages = python27'.pkgs;
+ in {
systemd.services.graphiteWeb = {
description = "Graphite Web Interface";
wantedBy = [ "multi-user.target" ];
@@ -455,14 +485,18 @@ in {
PYTHONPATH = let
penv = pkgs.python.buildEnv.override {
extraLibs = [
- pkgs.python27Packages.graphite_web
- pkgs.python27Packages.pysqlite
+ pythonPackages.graphite_web
+ pythonPackages.pysqlite
];
};
penvPack = "${penv}/${pkgs.python.sitePackages}";
- # opt/graphite/webapp contains graphite/settings.py
- # explicitly adding pycairo in path because it cannot be imported via buildEnv
- in "${penvPack}/opt/graphite/webapp:${penvPack}:${pkgs.pythonPackages.pycairo}/${pkgs.python.sitePackages}";
+ in concatStringsSep ":" [
+ "${graphiteLocalSettingsDir}"
+ "${penvPack}/opt/graphite/webapp"
+ "${penvPack}"
+ # explicitly adding pycairo in path because it cannot be imported via buildEnv
+ "${pkgs.pythonPackages.pycairo}/${pkgs.python.sitePackages}"
+ ];
DJANGO_SETTINGS_MODULE = "graphite.settings";
GRAPHITE_CONF_DIR = configDir;
GRAPHITE_STORAGE_DIR = dataDir;
@@ -470,9 +504,9 @@ in {
};
serviceConfig = {
ExecStart = ''
- ${pkgs.python27Packages.waitress}/bin/waitress-serve \
- --host=${cfg.web.listenAddress} --port=${toString cfg.web.port} \
- --call django.core.handlers.wsgi:WSGIHandler'';
+ ${pkgs.python27Packages.waitress-django}/bin/waitress-serve-django \
+ --host=${cfg.web.listenAddress} --port=${toString cfg.web.port}
+ '';
User = "graphite";
Group = "graphite";
PermissionsStartOnly = true;
@@ -482,21 +516,25 @@ in {
mkdir -p ${dataDir}/{whisper/,log/webapp/}
chmod 0700 ${dataDir}/{whisper/,log/webapp/}
- # populate database
- ${pkgs.python27Packages.graphite_web}/bin/manage-graphite.py syncdb --noinput
+ ${pkgs.pythonPackages.django_1_8}/bin/django-admin.py migrate --noinput
- # create index
- ${pkgs.python27Packages.graphite_web}/bin/build-index.sh
-
- chown -R graphite:graphite ${cfg.dataDir}
+ chown -R graphite:graphite ${dataDir}
touch ${dataDir}/db-created
fi
+
+ # Only collect static files when graphite_web changes.
+ if ! [ "${dataDir}/current_graphite_web" -ef "${pythonPackages.graphite_web}" ]; then
+ mkdir -p ${staticDir}
+ ${pkgs.pythonPackages.django_1_8}/bin/django-admin.py collectstatic --noinput --clear
+ chown -R graphite:graphite ${staticDir}
+ ln -sfT "${pythonPackages.graphite_web}" "${dataDir}/current_graphite_web"
+ fi
'';
};
- environment.systemPackages = [ pkgs.python27Packages.graphite_web ];
- })
+ environment.systemPackages = [ pythonPackages.graphite_web ];
+ }))
(mkIf cfg.api.enable {
systemd.services.graphiteApi = {
@@ -506,7 +544,7 @@ in {
environment = {
PYTHONPATH = let
aenv = pkgs.python.buildEnv.override {
- extraLibs = [ cfg.api.package pkgs.cairo ] ++ cfg.api.finders;
+ extraLibs = [ cfg.api.package pkgs.cairo pkgs.pythonPackages.cffi ] ++ cfg.api.finders;
};
in "${aenv}/${pkgs.python.sitePackages}";
GRAPHITE_API_CONFIG = graphiteApiConfig;
diff --git a/nixos/modules/services/monitoring/monit.nix b/nixos/modules/services/monitoring/monit.nix
index e07ffd2e8b54..71f50cc0f19d 100644
--- a/nixos/modules/services/monitoring/monit.nix
+++ b/nixos/modules/services/monitoring/monit.nix
@@ -17,20 +17,22 @@ in
};
config = mkOption {
default = "";
- description = "monit.conf content";
+ description = "monitrc content";
};
};
};
config = mkIf config.services.monit.enable {
+ environment.systemPackages = [ pkgs.monit ];
+
environment.etc = [
{
source = pkgs.writeTextFile {
- name = "monit.conf";
+ name = "monitrc";
text = config.services.monit.config;
};
- target = "monit.conf";
+ target = "monitrc";
mode = "0400";
}
];
@@ -40,9 +42,9 @@ in
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
- ExecStart = "${pkgs.monit}/bin/monit -I -c /etc/monit.conf";
- ExecStop = "${pkgs.monit}/bin/monit -c /etc/monit.conf quit";
- ExecReload = "${pkgs.monit}/bin/monit -c /etc/monit.conf reload";
+ ExecStart = "${pkgs.monit}/bin/monit -I -c /etc/monitrc";
+ ExecStop = "${pkgs.monit}/bin/monit -c /etc/monitrc quit";
+ ExecReload = "${pkgs.monit}/bin/monit -c /etc/monitrc reload";
KillMode = "process";
Restart = "always";
};
diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix
index 723b04dc0fe9..cc6d51f0ef1b 100644
--- a/nixos/modules/services/monitoring/munin.nix
+++ b/nixos/modules/services/monitoring/munin.nix
@@ -193,6 +193,9 @@ in
};
};
+ # munin_stats plugin breaks as of 2.0.33 when this doesn't exist
+ systemd.tmpfiles.rules = [ "d /var/run/munin 0755 munin munin -" ];
+
}) (mkIf cronCfg.enable {
systemd.timers.munin-cron = {
@@ -212,9 +215,11 @@ in
};
};
- system.activationScripts.munin-cron = stringAfter [ "users" "groups" ] ''
- mkdir -p /var/{run,log,www,lib}/munin
- chown -R munin:munin /var/{run,log,www,lib}/munin
- '';
+ systemd.tmpfiles.rules = [
+ "d /var/run/munin 0755 munin munin -"
+ "d /var/log/munin 0755 munin munin -"
+ "d /var/www/munin 0755 munin munin -"
+ "d /var/lib/munin 0755 munin munin -"
+ ];
})];
}
diff --git a/nixos/modules/services/monitoring/prometheus/minio-exporter.nix b/nixos/modules/services/monitoring/prometheus/minio-exporter.nix
new file mode 100644
index 000000000000..4314671523cf
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/minio-exporter.nix
@@ -0,0 +1,117 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+ cfg = config.services.prometheus.minioExporter;
+in {
+ options = {
+ services.prometheus.minioExporter = {
+ enable = mkEnableOption "prometheus minio exporter";
+
+ port = mkOption {
+ type = types.int;
+ default = 9290;
+ description = ''
+ Port to listen on.
+ '';
+ };
+
+ listenAddress = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ example = "0.0.0.0";
+ description = ''
+ Address to listen on for web interface and telemetry.
+ '';
+ };
+
+ minioAddress = mkOption {
+ type = types.str;
+ example = "https://10.0.0.1:9000";
+ default = if config.services.minio.enable then "http://localhost:9000" else null;
+ description = ''
+ The URL of the minio server.
+ Use HTTPS if Minio accepts secure connections only.
+ By default this connects to the local minio server if enabled.
+ '';
+ };
+
+ minioAccessKey = mkOption ({
+ type = types.str;
+ example = "BKIKJAA5BMMU2RHO6IBB";
+ description = ''
+ The value of the Minio access key.
+ It is required in order to connect to the server.
+ By default this uses the one from the local minio server if enabled
+ and config.services.minio.accessKey.
+ '';
+ } // optionalAttrs (config.services.minio.enable && config.services.minio.accessKey != "") {
+ default = config.services.minio.accessKey;
+ });
+
+ minioAccessSecret = mkOption ({
+ type = types.str;
+ description = ''
+ The calue of the Minio access secret.
+ It is required in order to connect to the server.
+ By default this uses the one from the local minio server if enabled
+ and config.services.minio.secretKey.
+ '';
+ } // optionalAttrs (config.services.minio.enable && config.services.minio.secretKey != "") {
+ default = config.services.minio.secretKey;
+ });
+
+ minioBucketStats = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Collect statistics about the buckets and files in buckets.
+ It requires more computation, use it carefully in case of large buckets..
+ '';
+ };
+
+ extraFlags = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ description = ''
+ Extra commandline options when launching the minio exporter.
+ '';
+ };
+
+ openFirewall = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Open port in firewall for incoming connections.
+ '';
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+ networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port;
+
+ systemd.services.prometheus-minio-exporter = {
+ description = "Prometheus exporter for Minio server metrics";
+ unitConfig.Documentation = "https://github.com/joe-pll/minio-exporter";
+ wantedBy = [ "multi-user.target" ];
+ after = optional config.services.minio.enable "minio.service";
+ serviceConfig = {
+ DynamicUser = true;
+ Restart = "always";
+ PrivateTmp = true;
+ WorkingDirectory = /tmp;
+ ExecStart = ''
+ ${pkgs.prometheus-minio-exporter}/bin/minio-exporter \
+ -web.listen-address ${optionalString (cfg.listenAddress != null) cfg.listenAddress}:${toString cfg.port} \
+ -minio.server ${cfg.minioAddress} \
+ -minio.access-key ${cfg.minioAccessKey} \
+ -minio.access-secret ${cfg.minioAccessSecret} \
+ ${optionalString cfg.minioBucketStats "-minio.bucket-stats"} \
+ ${concatStringsSep " \\\n " cfg.extraFlags}
+ '';
+ };
+ };
+ };
+}
diff --git a/nixos/modules/services/monitoring/prometheus/node-exporter.nix b/nixos/modules/services/monitoring/prometheus/node-exporter.nix
index b5b852438d77..bad4389ce799 100644
--- a/nixos/modules/services/monitoring/prometheus/node-exporter.nix
+++ b/nixos/modules/services/monitoring/prometheus/node-exporter.nix
@@ -4,9 +4,6 @@ with lib;
let
cfg = config.services.prometheus.nodeExporter;
- cmdlineArgs = cfg.extraFlags ++ [
- "-web.listen-address=${cfg.listenAddress}"
- ];
in {
options = {
services.prometheus.nodeExporter = {
@@ -33,7 +30,16 @@ in {
default = [];
example = ''[ "systemd" ]'';
description = ''
- Collectors to enable. Only collectors explicitly listed here will be enabled.
+ Collectors to enable. The collectors listed here are enabled in addition to the default ones.
+ '';
+ };
+
+ disabledCollectors = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ example = ''[ "timex" ]'';
+ description = ''
+ Collectors to disable which are enabled by default.
'';
};
@@ -64,14 +70,14 @@ in {
wantedBy = [ "multi-user.target" ];
script = ''
exec ${pkgs.prometheus-node-exporter}/bin/node_exporter \
- ${optionalString (cfg.enabledCollectors != [])
- ''-collectors.enabled ${concatStringsSep "," cfg.enabledCollectors}''} \
- -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
+ ${concatMapStringsSep " " (x: "--collector." + x) cfg.enabledCollectors} \
+ ${concatMapStringsSep " " (x: "--no-collector." + x) cfg.disabledCollectors} \
+ --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
${concatStringsSep " \\\n " cfg.extraFlags}
'';
serviceConfig = {
User = "nobody";
- Restart = "always";
+ Restart = "always";
PrivateTmp = true;
WorkingDirectory = /tmp;
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
diff --git a/nixos/modules/services/network-filesystems/glusterfs.nix b/nixos/modules/services/network-filesystems/glusterfs.nix
index e7f52bc4a7d1..8ac9f801dcb8 100644
--- a/nixos/modules/services/network-filesystems/glusterfs.nix
+++ b/nixos/modules/services/network-filesystems/glusterfs.nix
@@ -41,6 +41,57 @@ in
default = "INFO";
};
+ useRpcbind = mkOption {
+ type = types.bool;
+ description = ''
+ Enable use of rpcbind. This is required for Gluster's NFS functionality.
+
+ You may want to turn it off to reduce the attack surface for DDoS reflection attacks.
+
+ See https://davelozier.com/glusterfs-and-rpcbind-portmap-ddos-reflection-attacks/
+ and https://bugzilla.redhat.com/show_bug.cgi?id=1426842 for details.
+ '';
+ default = true;
+ };
+
+ enableGlustereventsd = mkOption {
+ type = types.bool;
+ description = "Whether to enable the GlusterFS Events Daemon";
+ default = true;
+ };
+
+ killMode = mkOption {
+ type = types.enum ["control-group" "process" "mixed" "none"];
+ description = ''
+ The systemd KillMode to use for glusterd.
+
+ glusterd spawns other daemons like gsyncd.
+ If you want these to stop when glusterd is stopped (e.g. to ensure
+ that NixOS config changes are reflected even for these sub-daemons),
+ set this to 'control-group'.
+ If however you want running volume processes (glusterfsd) and thus
+ gluster mounts not be interrupted when glusterd is restarted
+ (for example, when you want to restart them manually at a later time),
+ set this to 'process'.
+ '';
+ default = "control-group";
+ };
+
+ stopKillTimeout = mkOption {
+ type = types.str;
+ description = ''
+ The systemd TimeoutStopSec to use.
+
+ After this time after having been asked to shut down, glusterd
+ (and depending on the killMode setting also its child processes)
+ are killed by systemd.
+
+ The default is set low because GlusterFS (as of 3.10) is known to
+ not tell its children (like gsyncd) to terminate at all.
+ '';
+ default = "5s";
+ };
+
extraFlags = mkOption {
type = types.listOf types.str;
description = "Extra flags passed to the GlusterFS daemon";
@@ -89,7 +140,7 @@ in
config = mkIf cfg.enable {
environment.systemPackages = [ pkgs.glusterfs ];
- services.rpcbind.enable = true;
+ services.rpcbind.enable = cfg.useRpcbind;
environment.etc = mkIf (cfg.tlsSettings != null) {
"ssl/glusterfs.pem".source = cfg.tlsSettings.tlsPem;
@@ -104,9 +155,8 @@ in
wantedBy = [ "multi-user.target" ];
- requires = [ "rpcbind.service" ];
- after = [ "rpcbind.service" "network.target" "local-fs.target" ];
- before = [ "network-online.target" ];
+ requires = lib.optional cfg.useRpcbind "rpcbind.service";
+ after = [ "network.target" "local-fs.target" ] ++ lib.optional cfg.useRpcbind "rpcbind.service";
preStart = ''
install -m 0755 -d /var/log/glusterfs
@@ -130,11 +180,12 @@ in
PIDFile="/run/glusterd.pid";
LimitNOFILE=65536;
ExecStart="${glusterfs}/sbin/glusterd -p /run/glusterd.pid --log-level=${cfg.logLevel} ${toString cfg.extraFlags}";
- KillMode="process";
+ KillMode=cfg.killMode;
+ TimeoutStopSec=cfg.stopKillTimeout;
};
};
- systemd.services.glustereventsd = {
+ systemd.services.glustereventsd = mkIf cfg.enableGlustereventsd {
inherit restartTriggers;
description = "Gluster Events Notifier";
@@ -143,6 +194,10 @@ in
after = [ "syslog.target" "network.target" ];
+ preStart = ''
+ install -m 0755 -d /var/log/glusterfs
+ '';
+
serviceConfig = {
Type="simple";
Environment="PYTHONPATH=${glusterfs}/usr/lib/python2.7/site-packages";
diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix
index 36e5efecf431..d4a695ef5880 100644
--- a/nixos/modules/services/network-filesystems/ipfs.nix
+++ b/nixos/modules/services/network-filesystems/ipfs.nix
@@ -7,7 +7,7 @@ let
ipfsFlags = toString ([
(optionalString cfg.autoMount "--mount")
- (optionalString cfg.autoMigrate "--migrate")
+ #(optionalString cfg.autoMigrate "--migrate")
(optionalString cfg.enableGC "--enable-gc")
(optionalString (cfg.serviceFdlimit != null) "--manage-fdlimit=false")
(optionalString (cfg.defaultMode == "offline") "--offline")
@@ -36,6 +36,7 @@ let
baseService = recursiveUpdate commonEnv {
wants = [ "ipfs-init.service" ];
+ # NB: migration must be performed prior to pre-start, else we get the failure message!
preStart = ''
ipfs repo fsck # workaround for BUG #4212 (https://github.com/ipfs/go-ipfs/issues/4214)
ipfs --local config Addresses.API ${cfg.apiAddress}
@@ -97,11 +98,17 @@ in {
description = "systemd service that is enabled by default";
};
+ /*
autoMigrate = mkOption {
type = types.bool;
default = false;
- description = "Whether IPFS should try to migrate the file system automatically";
+ description = ''
+ Whether IPFS should try to migrate the file system automatically.
+
+ The daemon will need to be able to download a binary from https://ipfs.io to perform the migration.
+ '';
};
+ */
autoMount = mkOption {
type = types.bool;
diff --git a/nixos/modules/services/network-filesystems/kbfs.nix b/nixos/modules/services/network-filesystems/kbfs.nix
index cf1d7617cca6..7b2eea3b5850 100644
--- a/nixos/modules/services/network-filesystems/kbfs.nix
+++ b/nixos/modules/services/network-filesystems/kbfs.nix
@@ -55,8 +55,11 @@ in {
Restart = "on-failure";
PrivateTmp = true;
};
+ wantedBy = [ "default.target" ];
};
services.keybase.enable = true;
+
+ environment.systemPackages = [ pkgs.kbfs ];
};
}
diff --git a/nixos/modules/services/network-filesystems/openafs-client/default.nix b/nixos/modules/services/network-filesystems/openafs-client/default.nix
index 94f93162cfee..0946e379e796 100644
--- a/nixos/modules/services/network-filesystems/openafs-client/default.nix
+++ b/nixos/modules/services/network-filesystems/openafs-client/default.nix
@@ -93,7 +93,6 @@ in
preStop = ''
${pkgs.utillinux}/bin/umount /afs
${openafsPkgs}/sbin/afsd -shutdown
- ${pkgs.kmod}/sbin/rmmod libafs
'';
};
};
diff --git a/nixos/modules/services/networking/babeld.nix b/nixos/modules/services/networking/babeld.nix
new file mode 100644
index 000000000000..dd76bac9df76
--- /dev/null
+++ b/nixos/modules/services/networking/babeld.nix
@@ -0,0 +1,98 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+ cfg = config.services.babeld;
+
+ paramsString = params:
+ concatMapStringsSep "" (name: "${name} ${boolToString (getAttr name params)}")
+ (attrNames params);
+
+ interfaceConfig = name:
+ let
+ interface = getAttr name cfg.interfaces;
+ in
+ "interface ${name} ${paramsString interface}\n";
+
+ configFile = with cfg; pkgs.writeText "babeld.conf" (
+ (optionalString (cfg.interfaceDefaults != null) ''
+ default ${paramsString cfg.interfaceDefaults}
+ '')
+ + (concatMapStrings interfaceConfig (attrNames cfg.interfaces))
+ + extraConfig);
+
+in
+
+{
+
+ ###### interface
+
+ options = {
+
+ services.babeld = {
+
+ enable = mkOption {
+ default = false;
+ description = ''
+ Whether to run the babeld network routing daemon.
+ '';
+ };
+
+ interfaceDefaults = mkOption {
+ default = null;
+ description = ''
+ A set describing default parameters for babeld interfaces.
+ See babeld8 for options.
+ '';
+ type = types.nullOr (types.attrsOf types.unspecified);
+ example =
+ {
+ wired = true;
+ "split-horizon" = true;
+ };
+ };
+
+ interfaces = mkOption {
+ default = {};
+ description = ''
+ A set describing babeld interfaces.
+ See babeld8 for options.
+ '';
+ type = types.attrsOf (types.attrsOf types.unspecified);
+ example =
+ { enp0s2 =
+ { wired = true;
+ "hello-interval" = 5;
+ "split-horizon" = "auto";
+ };
+ };
+ };
+
+ extraConfig = mkOption {
+ default = "";
+ description = ''
+ Options that will be copied to babeld.conf.
+ See babeld8 for details.
+ '';
+ };
+ };
+
+ };
+
+
+ ###### implementation
+
+ config = mkIf config.services.babeld.enable {
+
+ systemd.services.babeld = {
+ description = "Babel routing daemon";
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+ serviceConfig.ExecStart = "${pkgs.babeld}/bin/babeld -c ${configFile}";
+ };
+
+ };
+
+}
diff --git a/nixos/modules/services/networking/connman.nix b/nixos/modules/services/networking/connman.nix
index d0683b877801..546d27069232 100644
--- a/nixos/modules/services/networking/connman.nix
+++ b/nixos/modules/services/networking/connman.nix
@@ -115,10 +115,5 @@ in {
wireless.enable = true;
networkmanager.enable = false;
};
-
- powerManagement.resumeCommands = ''
- systemctl restart connman
- '';
-
};
}
diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix
index 166ee7732375..6333970cb338 100644
--- a/nixos/modules/services/networking/consul.nix
+++ b/nixos/modules/services/networking/consul.nix
@@ -183,6 +183,7 @@ in
ExecReload = "${cfg.package.bin}/bin/consul reload";
PermissionsStartOnly = true;
User = if cfg.dropPrivileges then "consul" else null;
+ Restart = "on-failure";
TimeoutStartSec = "0";
} // (optionalAttrs (cfg.leaveOnStop) {
ExecStop = "${cfg.package.bin}/bin/consul leave";
diff --git a/nixos/modules/services/networking/dnscache.nix b/nixos/modules/services/networking/dnscache.nix
index f782be97f6fa..379203cd1ab6 100644
--- a/nixos/modules/services/networking/dnscache.nix
+++ b/nixos/modules/services/networking/dnscache.nix
@@ -18,10 +18,13 @@ let
'') 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/@
+ # if a list of root servers was not provided in config, copy it
+ # over. (this is also done by dnscache-conf, but we 'rm -rf
+ # /var/lib/dnscache/root' below & replace it wholesale with this,
+ # so we have to ensure servers/@ exists ourselves.)
+ if [ ! -e $out/servers/@ ]; then
+ # symlink does not work here, due chroot
+ cp ${pkgs.djbdns}/etc/dnsroots.global $out/servers/@;
fi
'';
diff --git a/nixos/modules/services/networking/dnschain.nix b/nixos/modules/services/networking/dnschain.nix
index ab7bbb15ad4f..ee1cd3600039 100644
--- a/nixos/modules/services/networking/dnschain.nix
+++ b/nixos/modules/services/networking/dnschain.nix
@@ -158,7 +158,7 @@ in
serviceConfig = {
User = "dnschain";
Restart = "on-failure";
- ExecStart = "${pkgs.dnschain}/bin/dnschain";
+ ExecStart = "${pkgs.nodePackages.dnschain}/bin/dnschain";
};
preStart = ''
diff --git a/nixos/modules/services/networking/dnsmasq.nix b/nixos/modules/services/networking/dnsmasq.nix
index fcf5aa5f175b..91a3e54474ac 100644
--- a/nixos/modules/services/networking/dnsmasq.nix
+++ b/nixos/modules/services/networking/dnsmasq.nix
@@ -55,6 +55,14 @@ in
'';
};
+ alwaysKeepRunning = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ If enabled, systemd will always respawn dnsmasq even if shut down manually. The default, disabled, will only restart it on error.
+ '';
+ };
+
extraConfig = mkOption {
type = types.lines;
default = "";
@@ -101,10 +109,12 @@ in
BusName = "uk.org.thekelleys.dnsmasq";
ExecStart = "${dnsmasq}/bin/dnsmasq -k --enable-dbus --user=dnsmasq -C ${dnsmasqConf}";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+ PrivateTmp = true;
+ ProtectSystem = true;
+ ProtectHome = true;
+ Restart = if cfg.alwaysKeepRunning then "always" else "on-failure";
};
restartTriggers = [ config.environment.etc.hosts.source ];
};
-
};
-
}
diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix
index 68a814b23053..9bd88ca1707b 100644
--- a/nixos/modules/services/networking/firewall.nix
+++ b/nixos/modules/services/networking/firewall.nix
@@ -95,18 +95,18 @@ let
ip46tables -N nixos-fw-log-refuse
${optionalString cfg.logRefusedConnections ''
- ip46tables -A nixos-fw-log-refuse -p tcp --syn -j LOG --log-level info --log-prefix "rejected connection: "
+ ip46tables -A nixos-fw-log-refuse -p tcp --syn -j LOG --log-level info --log-prefix "refused connection: "
''}
${optionalString (cfg.logRefusedPackets && !cfg.logRefusedUnicastsOnly) ''
ip46tables -A nixos-fw-log-refuse -m pkttype --pkt-type broadcast \
- -j LOG --log-level info --log-prefix "rejected broadcast: "
+ -j LOG --log-level info --log-prefix "refused broadcast: "
ip46tables -A nixos-fw-log-refuse -m pkttype --pkt-type multicast \
- -j LOG --log-level info --log-prefix "rejected multicast: "
+ -j LOG --log-level info --log-prefix "refused multicast: "
''}
ip46tables -A nixos-fw-log-refuse -m pkttype ! --pkt-type unicast -j nixos-fw-refuse
${optionalString cfg.logRefusedPackets ''
ip46tables -A nixos-fw-log-refuse \
- -j LOG --log-level info --log-prefix "rejected packet: "
+ -j LOG --log-level info --log-prefix "refused packet: "
''}
ip46tables -A nixos-fw-log-refuse -j nixos-fw-refuse
diff --git a/nixos/modules/services/networking/keybase.nix b/nixos/modules/services/networking/keybase.nix
index ca5c279ac6f0..a149f16a84cb 100644
--- a/nixos/modules/services/networking/keybase.nix
+++ b/nixos/modules/services/networking/keybase.nix
@@ -28,11 +28,12 @@ in {
description = "Keybase service";
serviceConfig = {
ExecStart = ''
- ${pkgs.keybase}/bin/keybase service
+ ${pkgs.keybase}/bin/keybase service --auto-forked
'';
Restart = "on-failure";
PrivateTmp = true;
};
+ wantedBy = [ "default.target" ];
};
environment.systemPackages = [ pkgs.keybase ];
diff --git a/nixos/modules/services/networking/libreswan.nix b/nixos/modules/services/networking/libreswan.nix
index e7a6c565f4ff..280158b89f61 100644
--- a/nixos/modules/services/networking/libreswan.nix
+++ b/nixos/modules/services/networking/libreswan.nix
@@ -17,7 +17,7 @@ let
else substring (head nonchars).ind (add 1 (sub (last nonchars).ind (head nonchars).ind)) str;
indent = str: concatStrings (concatMap (s: [" " (trim [" " "\t"] s) "\n"]) (splitString "\n" str));
configText = indent (toString cfg.configSetup);
- connectionText = concatStrings (mapAttrsToList (n: v:
+ connectionText = concatStrings (mapAttrsToList (n: v:
''
conn ${n}
${indent v}
@@ -27,7 +27,7 @@ let
''
config setup
${configText}
-
+
${connectionText}
'';
@@ -93,6 +93,9 @@ in
"${pkgs.libreswan}"
"${pkgs.iproute}"
"${pkgs.procps}"
+ "${pkgs.nssTools}"
+ "${pkgs.iptables}"
+ "${pkgs.nettools}"
];
wants = [ "network-online.target" ];
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index e03309c87299..6bdae32f72bb 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -32,6 +32,11 @@ let
ipv6.ip6-privacy=2
ethernet.cloned-mac-address=${cfg.ethernet.macAddress}
wifi.cloned-mac-address=${cfg.wifi.macAddress}
+ ${optionalString (cfg.wifi.powersave != null)
+ ''wifi.powersave=${if cfg.wifi.powersave then "3" else "2"}''}
+
+ [device]
+ wifi.scan-rand-mac-address=${if cfg.wifi.scanRandMacAddress then "yes" else "no"}
'';
/*
@@ -179,7 +184,27 @@ in {
};
ethernet.macAddress = macAddressOpt;
- wifi.macAddress = macAddressOpt;
+
+ wifi = {
+ macAddress = macAddressOpt;
+
+ powersave = mkOption {
+ type = types.nullOr types.bool;
+ default = null;
+ description = ''
+ Whether to enable Wi-Fi power saving.
+ '';
+ };
+
+ scanRandMacAddress = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Whether to enable MAC address randomization of a Wi-Fi device
+ during scanning.
+ '';
+ };
+ };
useDnsmasq = mkOption {
type = types.bool;
diff --git a/nixos/modules/services/networking/softether.nix b/nixos/modules/services/networking/softether.nix
index 16530078b978..9087b75c29c1 100644
--- a/nixos/modules/services/networking/softether.nix
+++ b/nixos/modules/services/networking/softether.nix
@@ -3,7 +3,6 @@
with lib;
let
- pkg = pkgs.softether;
cfg = config.services.softether;
in
@@ -17,6 +16,15 @@ in
enable = mkEnableOption "SoftEther VPN services";
+ package = mkOption {
+ type = types.package;
+ default = pkgs.softether;
+ defaultText = "pkgs.softether";
+ description = ''
+ softether derivation to use.
+ '';
+ };
+
vpnserver.enable = mkEnableOption "SoftEther VPN Server";
vpnbridge.enable = mkEnableOption "SoftEther VPN Bridge";
@@ -41,7 +49,7 @@ in
dataDir = mkOption {
type = types.string;
- default = "${pkg.dataDir}";
+ default = "${cfg.package.dataDir}";
description = ''
Data directory for SoftEther VPN.
'';
@@ -57,12 +65,13 @@ in
mkMerge [{
environment.systemPackages = [
- (pkgs.lib.overrideDerivation pkg (attrs: {
+ (pkgs.lib.overrideDerivation cfg.package (attrs: {
dataDir = cfg.dataDir;
}))
];
systemd.services."softether-init" = {
description = "SoftEther VPN services initial task";
+ wantedBy = [ "network.target" ];
serviceConfig = {
Type = "oneshot";
RemainAfterExit = false;
@@ -71,11 +80,11 @@ in
for d in vpnserver vpnbridge vpnclient vpncmd; do
if ! test -e ${cfg.dataDir}/$d; then
${pkgs.coreutils}/bin/mkdir -m0700 -p ${cfg.dataDir}/$d
- install -m0600 ${pkg}${cfg.dataDir}/$d/hamcore.se2 ${cfg.dataDir}/$d/hamcore.se2
+ install -m0600 ${cfg.package}${cfg.dataDir}/$d/hamcore.se2 ${cfg.dataDir}/$d/hamcore.se2
fi
done
rm -rf ${cfg.dataDir}/vpncmd/vpncmd
- ln -s ${pkg}${cfg.dataDir}/vpncmd/vpncmd ${cfg.dataDir}/vpncmd/vpncmd
+ ln -s ${cfg.package}${cfg.dataDir}/vpncmd/vpncmd ${cfg.dataDir}/vpncmd/vpncmd
'';
};
}
@@ -83,17 +92,17 @@ in
(mkIf (cfg.vpnserver.enable) {
systemd.services.vpnserver = {
description = "SoftEther VPN Server";
- after = [ "softether-init.service" "network.target" ];
- wants = [ "softether-init.service" ];
- wantedBy = [ "multi-user.target" ];
+ after = [ "softether-init.service" ];
+ requires = [ "softether-init.service" ];
+ wantedBy = [ "network.target" ];
serviceConfig = {
Type = "forking";
- ExecStart = "${pkg}/bin/vpnserver start";
- ExecStop = "${pkg}/bin/vpnserver stop";
+ ExecStart = "${cfg.package}/bin/vpnserver start";
+ ExecStop = "${cfg.package}/bin/vpnserver stop";
};
preStart = ''
rm -rf ${cfg.dataDir}/vpnserver/vpnserver
- ln -s ${pkg}${cfg.dataDir}/vpnserver/vpnserver ${cfg.dataDir}/vpnserver/vpnserver
+ ln -s ${cfg.package}${cfg.dataDir}/vpnserver/vpnserver ${cfg.dataDir}/vpnserver/vpnserver
'';
postStop = ''
rm -rf ${cfg.dataDir}/vpnserver/vpnserver
@@ -104,17 +113,17 @@ in
(mkIf (cfg.vpnbridge.enable) {
systemd.services.vpnbridge = {
description = "SoftEther VPN Bridge";
- after = [ "softether-init.service" "network.target" ];
- wants = [ "softether-init.service" ];
- wantedBy = [ "multi-user.target" ];
+ after = [ "softether-init.service" ];
+ requires = [ "softether-init.service" ];
+ wantedBy = [ "network.target" ];
serviceConfig = {
Type = "forking";
- ExecStart = "${pkg}/bin/vpnbridge start";
- ExecStop = "${pkg}/bin/vpnbridge stop";
+ ExecStart = "${cfg.package}/bin/vpnbridge start";
+ ExecStop = "${cfg.package}/bin/vpnbridge stop";
};
preStart = ''
rm -rf ${cfg.dataDir}/vpnbridge/vpnbridge
- ln -s ${pkg}${cfg.dataDir}/vpnbridge/vpnbridge ${cfg.dataDir}/vpnbridge/vpnbridge
+ ln -s ${cfg.package}${cfg.dataDir}/vpnbridge/vpnbridge ${cfg.dataDir}/vpnbridge/vpnbridge
'';
postStop = ''
rm -rf ${cfg.dataDir}/vpnbridge/vpnbridge
@@ -125,17 +134,17 @@ in
(mkIf (cfg.vpnclient.enable) {
systemd.services.vpnclient = {
description = "SoftEther VPN Client";
- after = [ "softether-init.service" "network.target" ];
- wants = [ "softether-init.service" ];
- wantedBy = [ "multi-user.target" ];
+ after = [ "softether-init.service" ];
+ requires = [ "softether-init.service" ];
+ wantedBy = [ "network.target" ];
serviceConfig = {
Type = "forking";
- ExecStart = "${pkg}/bin/vpnclient start";
- ExecStop = "${pkg}/bin/vpnclient stop";
+ ExecStart = "${cfg.package}/bin/vpnclient start";
+ ExecStop = "${cfg.package}/bin/vpnclient stop";
};
preStart = ''
rm -rf ${cfg.dataDir}/vpnclient/vpnclient
- ln -s ${pkg}${cfg.dataDir}/vpnclient/vpnclient ${cfg.dataDir}/vpnclient/vpnclient
+ ln -s ${cfg.package}${cfg.dataDir}/vpnclient/vpnclient ${cfg.dataDir}/vpnclient/vpnclient
'';
postStart = ''
sleep 1
diff --git a/nixos/modules/services/networking/strongswan.nix b/nixos/modules/services/networking/strongswan.nix
index b0eb0460b9ba..3a3f64221c42 100644
--- a/nixos/modules/services/networking/strongswan.nix
+++ b/nixos/modules/services/networking/strongswan.nix
@@ -32,8 +32,10 @@ let
${caConf}
'';
- strongswanConf = {setup, connections, ca, secrets}: toFile "strongswan.conf" ''
+ strongswanConf = {setup, connections, ca, secrets, managePlugins, enabledPlugins}: toFile "strongswan.conf" ''
charon {
+ ${if managePlugins then "load_modular = no" else ""}
+ ${if managePlugins then ("load = " + (concatStringsSep " " enabledPlugins)) else ""}
plugins {
stroke {
secrets_file = ${ipsecSecrets secrets}
@@ -112,6 +114,25 @@ in
file.
'';
};
+
+ managePlugins = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ If set to true, this option will disable automatic plugin loading and
+ then tell strongSwan to enable the plugins specified in the
+ option.
+ '';
+ };
+
+ enabledPlugins = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ description = ''
+ A list of additional plugins to enable if
+ is true.
+ '';
+ };
};
config = with cfg; mkIf enable {
@@ -122,7 +143,7 @@ in
wants = [ "keys.target" ];
after = [ "network-online.target" "keys.target" ];
environment = {
- STRONGSWAN_CONF = strongswanConf { inherit setup connections ca secrets; };
+ STRONGSWAN_CONF = strongswanConf { inherit setup connections ca secrets managePlugins enabledPlugins; };
};
serviceConfig = {
ExecStart = "${pkgs.strongswan}/sbin/ipsec start --nofork";
diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix
index d5db328310c1..adb80ea29840 100644
--- a/nixos/modules/services/networking/tinc.nix
+++ b/nixos/modules/services/networking/tinc.nix
@@ -141,7 +141,6 @@ in
${optionalString (data.ed25519PrivateKeyFile != null) "Ed25519PrivateKeyFile = ${data.ed25519PrivateKeyFile}"}
${optionalString (data.listenAddress != null) "ListenAddress = ${data.listenAddress}"}
${optionalString (data.bindToAddress != null) "BindToAddress = ${data.bindToAddress}"}
- Device = /dev/net/tun
Interface = tinc.${network}
${data.extraConfig}
'';
@@ -164,10 +163,17 @@ in
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
path = [ data.package ];
+ restartTriggers =
+ let
+ drvlist = [ config.environment.etc."tinc/${network}/tinc.conf".source ]
+ ++ mapAttrsToList (host: _: config.environment.etc."tinc/${network}/hosts/${host}".source) data.hosts;
+ in # drvlist might be too long to be used directly
+ [ (builtins.hashString "sha256" (concatMapStrings (d: d.outPath) drvlist)) ];
serviceConfig = {
Type = "simple";
Restart = "always";
RestartSec = "3";
+ ExecStart = "${data.package}/bin/tincd -D -U tinc.${network} -n ${network} ${optionalString (data.chroot) "-R"} --pidfile /run/tinc.${network}.pid -d ${toString data.debugLevel}";
};
preStart = ''
mkdir -p /etc/tinc/${network}/hosts
@@ -187,9 +193,6 @@ in
[ -f "/etc/tinc/${network}/rsa_key.priv" ] || tincd -n ${network} -K 4096
fi
'';
- script = ''
- tincd -D -U tinc.${network} -n ${network} ${optionalString (data.chroot) "-R"} --pidfile /run/tinc.${network}.pid -d ${toString data.debugLevel}
- '';
})
);
diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix
index f3a04d97c98e..545ee327d596 100644
--- a/nixos/modules/services/networking/unbound.nix
+++ b/nixos/modules/services/networking/unbound.nix
@@ -8,9 +8,9 @@ let
stateDir = "/var/lib/unbound";
- access = concatMapStrings (x: " access-control: ${x} allow\n") cfg.allowedAccess;
+ access = concatMapStringsSep "\n " (x: "access-control: ${x} allow") cfg.allowedAccess;
- interfaces = concatMapStrings (x: " interface: ${x}\n") cfg.interfaces;
+ interfaces = concatMapStringsSep "\n " (x: "interface: ${x}") cfg.interfaces;
isLocalAddress = x: substring 0 3 x == "::1" || substring 0 9 x == "127.0.0.1";
@@ -105,7 +105,7 @@ in
description = "Unbound recursive Domain Name Server";
after = [ "network.target" ];
before = [ "nss-lookup.target" ];
- wants = [" nss-lookup.target" ];
+ wants = [ "nss-lookup.target" ];
wantedBy = [ "multi-user.target" ];
preStart = ''
diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix
index 4f54b45639f6..24accd41511c 100644
--- a/nixos/modules/services/networking/wireguard.nix
+++ b/nixos/modules/services/networking/wireguard.nix
@@ -95,6 +95,14 @@ let
type = with types; listOf (submodule peerOpts);
};
+ allowedIPsAsRoutes = mkOption {
+ example = false;
+ default = true;
+ type = types.bool;
+ description = ''
+ Determines whether to add allowed IPs as routes or not.
+ '';
+ };
};
};
@@ -187,6 +195,7 @@ let
description = "WireGuard Tunnel - ${name}";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
+ environment.DEVICE = name;
serviceConfig = {
Type = "oneshot";
@@ -217,11 +226,11 @@ let
"${ipCommand} link set up dev ${name}"
- (map (peer:
+ (optionals (values.allowedIPsAsRoutes != false) (map (peer:
(map (allowedIP:
"${ipCommand} route replace ${allowedIP} dev ${name} table ${values.table}"
) peer.allowedIPs)
- ) values.peers)
+ ) values.peers))
values.postSetup
]);
diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix
index c91ba91fcb4d..908c8730ad2a 100644
--- a/nixos/modules/services/networking/wpa_supplicant.nix
+++ b/nixos/modules/services/networking/wpa_supplicant.nix
@@ -148,6 +148,7 @@ in {
wants = [ "network.target" ];
requires = lib.concatMap deviceUnit ifaces;
wantedBy = [ "multi-user.target" ];
+ stopIfChanged = false;
path = [ pkgs.wpa_supplicant ];
diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc.nix
index 763843fdec00..72313ab2ee14 100644
--- a/nixos/modules/services/networking/znc.nix
+++ b/nixos/modules/services/networking/znc.nix
@@ -212,6 +212,14 @@ in
'';
};
+ openFirewall = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to open ports in the firewall for ZNC.
+ '';
+ };
+
zncConf = mkOption {
default = "";
example = "See: http://wiki.znc.in/Configuration";
@@ -276,14 +284,6 @@ 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;
@@ -329,7 +329,7 @@ in
};
mutable = mkOption {
- default = false;
+ default = true;
type = types.bool;
description = ''
Indicates whether to allow the contents of the `dataDir` directory to be changed
@@ -359,7 +359,7 @@ in
config = mkIf cfg.enable {
networking.firewall = mkIf cfg.openFirewall {
- allowedTCPPorts = [ cfg.port ];
+ allowedTCPPorts = [ cfg.confOptions.port ];
};
systemd.services.znc = {
diff --git a/nixos/modules/services/scheduling/atd.nix b/nixos/modules/services/scheduling/atd.nix
index 0216c9771c96..77a3f6b51e80 100644
--- a/nixos/modules/services/scheduling/atd.nix
+++ b/nixos/modules/services/scheduling/atd.nix
@@ -42,6 +42,8 @@ in
config = mkIf cfg.enable {
+ # Not wrapping "batch" because it's a shell script (kernel drops perms
+ # anyway) and it's patched to invoke the "at" setuid wrapper.
security.wrappers = builtins.listToAttrs (
map (program: { name = "${program}"; value = {
source = "${at}/bin/${program}";
@@ -49,7 +51,7 @@ in
group = "atd";
setuid = true;
setgid = true;
- };}) [ "at" "atq" "atrm" "batch" ]);
+ };}) [ "at" "atq" "atrm" ]);
environment.systemPackages = [ at ];
diff --git a/nixos/modules/services/scheduling/fcron.nix b/nixos/modules/services/scheduling/fcron.nix
index af4f9f41fd04..ac589be57736 100644
--- a/nixos/modules/services/scheduling/fcron.nix
+++ b/nixos/modules/services/scheduling/fcron.nix
@@ -137,10 +137,7 @@ in
after = [ "local-fs.target" ];
wantedBy = [ "multi-user.target" ];
- # FIXME use specific path
- environment = {
- PATH = "/run/current-system/sw/bin";
- };
+ path = [ pkgs.fcron ];
preStart = ''
install \
@@ -149,7 +146,7 @@ in
--group fcron \
--directory /var/spool/fcron
# load system crontab file
- /run/wrappers/bin/fcrontab -u systab ${pkgs.writeText "systab" cfg.systab}
+ /run/wrappers/bin/fcrontab -u systab - < ${pkgs.writeText "systab" cfg.systab}
'';
serviceConfig = {
diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix
index 2ea22a945940..c51dd5d94655 100644
--- a/nixos/modules/services/search/elasticsearch.nix
+++ b/nixos/modules/services/search/elasticsearch.nix
@@ -174,11 +174,13 @@ in {
LimitNOFILE = "1024000";
};
preStart = ''
- # Only set vm.max_map_count if lower than ES required minimum
- # This avoids conflict if configured via boot.kernel.sysctl
- if [ `${pkgs.procps}/bin/sysctl -n vm.max_map_count` -lt 262144 ]; then
- ${pkgs.procps}/bin/sysctl -w vm.max_map_count=262144
- fi
+ ${optionalString (!config.boot.isContainer) ''
+ # Only set vm.max_map_count if lower than ES required minimum
+ # This avoids conflict if configured via boot.kernel.sysctl
+ if [ `${pkgs.procps}/bin/sysctl -n vm.max_map_count` -lt 262144 ]; then
+ ${pkgs.procps}/bin/sysctl -w vm.max_map_count=262144
+ fi
+ ''}
mkdir -m 0700 -p ${cfg.dataDir}
diff --git a/nixos/modules/services/search/solr.nix b/nixos/modules/services/search/solr.nix
index 33d74e897237..90140a337ed8 100644
--- a/nixos/modules/services/search/solr.nix
+++ b/nixos/modules/services/search/solr.nix
@@ -15,8 +15,6 @@ let
sha256 = "01mzvh53wrs1p2ym765jwd00gl6kn8f9k3nhdrnhdqr8dhimfb2p";
};
- buildPhases = [ "unpackPhase" "installPhase" ];
-
installPhase = ''
mkdir -p $out/lib
cp common/lib/*.jar $out/lib/
diff --git a/nixos/modules/services/security/hologram-server.nix b/nixos/modules/services/security/hologram-server.nix
index 8315c9ea5d61..e267fed27955 100644
--- a/nixos/modules/services/security/hologram-server.nix
+++ b/nixos/modules/services/security/hologram-server.nix
@@ -23,8 +23,6 @@ let
stats = cfg.statsAddress;
listen = cfg.listenAddress;
});
-
- script = "${pkgs.hologram.bin}/bin/hologram-server --debug --conf ${cfgFile}";
in {
options = {
services.hologram-server = {
@@ -96,15 +94,9 @@ in {
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
- inherit script;
- };
-
- docker-containers.hologram-server = {
- inherit script;
- };
-
- trivial-services.hologram-server = {
- inherit script;
+ serviceConfig = {
+ ExecStart = "${pkgs.hologram.bin}/bin/hologram-server --debug --conf ${cfgFile}";
+ };
};
};
}
diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix
index 3e5087766b1c..ef48d52e7a94 100644
--- a/nixos/modules/services/security/oauth2_proxy.nix
+++ b/nixos/modules/services/security/oauth2_proxy.nix
@@ -385,7 +385,7 @@ in
httpAddress = mkOption {
type = types.str;
- default = "127.0.0.1:4180";
+ default = "http://127.0.0.1:4180";
description = ''
HTTPS listening address. This module does not expose the port by
default. If you want this URL to be accessible to other machines, please
diff --git a/nixos/modules/services/security/sshguard.nix b/nixos/modules/services/security/sshguard.nix
index 5a183443f71d..7f09e8893c4d 100644
--- a/nixos/modules/services/security/sshguard.nix
+++ b/nixos/modules/services/security/sshguard.nix
@@ -89,7 +89,7 @@ in {
environment.systemPackages = [ pkgs.sshguard pkgs.iptables pkgs.ipset ];
- environment.etc."sshguard.conf".text = let
+ environment.etc."sshguard.conf".text = let
list_services = ( name: "-t ${name} ");
in ''
BACKEND="${pkgs.sshguard}/libexec/sshg-fw-ipset"
diff --git a/nixos/modules/services/web-apps/atlassian/confluence.nix b/nixos/modules/services/web-apps/atlassian/confluence.nix
index 2344b9922d0b..84c41b6e53c2 100644
--- a/nixos/modules/services/web-apps/atlassian/confluence.nix
+++ b/nixos/modules/services/web-apps/atlassian/confluence.nix
@@ -127,14 +127,11 @@ in
- jrePackage = let
- jreSwitch = unfree: free: if config.nixpkgs.config.allowUnfree or false then unfree else free;
- in mkOption {
+ jrePackage = mkOption {
type = types.package;
- default = jreSwitch pkgs.oraclejre8 pkgs.openjdk8.jre;
- defaultText = jreSwitch "pkgs.oraclejre8" "pkgs.openjdk8.jre";
- example = literalExample "pkgs.openjdk8.jre";
- description = "Java Runtime to use for Confluence. Note that Atlassian recommends the Oracle JRE.";
+ default = pkgs.oraclejre8;
+ defaultText = "pkgs.oraclejre8";
+ description = "Note that Atlassian only support the Oracle JRE (JRASERVER-46152).";
};
};
};
@@ -178,14 +175,13 @@ in
${pkg}/conf/server.xml.dist > ${cfg.home}/server.xml
'';
- script = "${pkg}/bin/start-confluence.sh -fg";
- stopScript = "${pkg}/bin/stop-confluence.sh";
-
serviceConfig = {
User = cfg.user;
Group = cfg.group;
PrivateTmp = true;
PermissionsStartOnly = true;
+ ExecStart = "${pkg}/bin/start-confluence.sh -fg";
+ ExecStop = "${pkg}/bin/stop-confluence.sh";
};
};
};
diff --git a/nixos/modules/services/web-apps/atlassian/crowd.nix b/nixos/modules/services/web-apps/atlassian/crowd.nix
index b54c91d7de92..0ac941b6ec99 100644
--- a/nixos/modules/services/web-apps/atlassian/crowd.nix
+++ b/nixos/modules/services/web-apps/atlassian/crowd.nix
@@ -9,9 +9,10 @@ let
pkg = pkgs.atlassian-crowd.override {
home = cfg.home;
port = cfg.listenPort;
- proxyUrl = "${cfg.proxy.scheme}://${cfg.proxy.name}:${toString cfg.proxy.port}";
openidPassword = cfg.openidPassword;
- };
+ } // (optionalAttrs cfg.proxy.enable {
+ proxyUrl = "${cfg.proxy.scheme}://${cfg.proxy.name}:${toString cfg.proxy.port}";
+ });
in
@@ -92,14 +93,11 @@ in
};
};
- jrePackage = let
- jreSwitch = unfree: free: if config.nixpkgs.config.allowUnfree or false then unfree else free;
- in mkOption {
+ jrePackage = mkOption {
type = types.package;
- default = jreSwitch pkgs.oraclejre8 pkgs.openjdk8.jre;
- defaultText = jreSwitch "pkgs.oraclejre8" "pkgs.openjdk8.jre";
- example = literalExample "pkgs.openjdk8.jre";
- description = "Java Runtime to use for Crowd. Note that Atlassian recommends the Oracle JRE.";
+ default = pkgs.oraclejre8;
+ defaultText = "pkgs.oraclejre8";
+ description = "Note that Atlassian only support the Oracle JRE (JRASERVER-46152).";
};
};
};
@@ -142,13 +140,12 @@ in
${pkg}/apache-tomcat/conf/server.xml.dist > ${cfg.home}/server.xml
'';
- script = "${pkg}/start_crowd.sh";
-
serviceConfig = {
User = cfg.user;
Group = cfg.group;
PrivateTmp = true;
PermissionsStartOnly = true;
+ ExecStart = "${pkg}/start_crowd.sh -fg";
};
};
};
diff --git a/nixos/modules/services/web-apps/atlassian/jira.nix b/nixos/modules/services/web-apps/atlassian/jira.nix
index 19b6a8d30851..81ee8154326c 100644
--- a/nixos/modules/services/web-apps/atlassian/jira.nix
+++ b/nixos/modules/services/web-apps/atlassian/jira.nix
@@ -6,7 +6,7 @@ let
cfg = config.services.jira;
- pkg = pkgs.atlassian-jira.override {
+ pkg = pkgs.atlassian-jira.override (optionalAttrs cfg.sso.enable {
enableSSO = cfg.sso.enable;
crowdProperties = ''
application.name ${cfg.sso.applicationName}
@@ -21,7 +21,7 @@ let
session.validationinterval ${toString cfg.sso.validationInterval}
session.lastvalidation session.lastvalidation
'';
- };
+ });
in
@@ -131,14 +131,11 @@ in
};
};
- jrePackage = let
- jreSwitch = unfree: free: if config.nixpkgs.config.allowUnfree or false then unfree else free;
- in mkOption {
+ jrePackage = mkOption {
type = types.package;
- default = jreSwitch pkgs.oraclejre8 pkgs.openjdk8.jre;
- defaultText = jreSwitch "pkgs.oraclejre8" "pkgs.openjdk8.jre";
- example = literalExample "pkgs.openjdk8.jre";
- description = "Java Runtime to use for JIRA. Note that Atlassian recommends the Oracle JRE.";
+ default = pkgs.oraclejre8;
+ defaultText = "pkgs.oraclejre8";
+ description = "Note that Atlassian only support the Oracle JRE (JRASERVER-46152).";
};
};
};
@@ -183,14 +180,13 @@ in
${pkg}/conf/server.xml.dist > ${cfg.home}/server.xml
'';
- script = "${pkg}/bin/start-jira.sh -fg";
- stopScript = "${pkg}/bin/stop-jira.sh";
-
serviceConfig = {
User = cfg.user;
Group = cfg.group;
PrivateTmp = true;
PermissionsStartOnly = true;
+ ExecStart = "${pkg}/bin/start-jira.sh -fg";
+ ExecStop = "${pkg}/bin/stop-jira.sh";
};
};
};
diff --git a/nixos/modules/services/web-apps/mattermost.nix b/nixos/modules/services/web-apps/mattermost.nix
index bc88a808abc9..be74a2b1955b 100644
--- a/nixos/modules/services/web-apps/mattermost.nix
+++ b/nixos/modules/services/web-apps/mattermost.nix
@@ -173,7 +173,7 @@ in
preStart = ''
mkdir -p ${cfg.statePath}/{data,config,logs}
- ln -sf ${pkgs.mattermost}/{bin,fonts,i18n,templates,webapp} ${cfg.statePath}
+ ln -sf ${pkgs.mattermost}/{bin,fonts,i18n,templates,client} ${cfg.statePath}
'' + lib.optionalString (!cfg.mutableConfig) ''
ln -sf ${mattermostConfJSON} ${cfg.statePath}/config/config.json
'' + lib.optionalString cfg.mutableConfig ''
@@ -184,10 +184,12 @@ in
fi
'' + lib.optionalString cfg.localDatabaseCreate ''
if ! test -e "${cfg.statePath}/.db-created"; then
- ${config.services.postgresql.package}/bin/psql postgres -c \
- "CREATE ROLE ${cfg.localDatabaseUser} WITH LOGIN NOCREATEDB NOCREATEROLE ENCRYPTED PASSWORD '${cfg.localDatabasePassword}'"
- ${config.services.postgresql.package}/bin/createdb \
- --owner ${cfg.localDatabaseUser} ${cfg.localDatabaseName}
+ ${pkgs.sudo}/bin/sudo -u ${config.services.postgresql.superUser} \
+ ${config.services.postgresql.package}/bin/psql postgres -c \
+ "CREATE ROLE ${cfg.localDatabaseUser} WITH LOGIN NOCREATEDB NOCREATEROLE ENCRYPTED PASSWORD '${cfg.localDatabasePassword}'"
+ ${pkgs.sudo}/bin/sudo -u ${config.services.postgresql.superUser} \
+ ${config.services.postgresql.package}/bin/createdb \
+ --owner ${cfg.localDatabaseUser} ${cfg.localDatabaseName}
touch ${cfg.statePath}/.db-created
fi
'' + ''
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index 1c3c7835d961..f9f2511f45dc 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -676,6 +676,7 @@ in
''
; Needed for PHP's mail() function.
sendmail_path = sendmail -t -i
+ '' + optionalString (!isNull config.time.timeZone) ''
; Apparently PHP doesn't use $TZ.
date.timezone = "${config.time.timeZone}"
diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
index aa0fe4f14796..02695c1c43a1 100644
--- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
@@ -83,11 +83,11 @@ let
# Unpack Mediawiki and put the config file in its root directory.
mediawikiRoot = pkgs.stdenv.mkDerivation rec {
- name= "mediawiki-1.27.3";
+ name= "mediawiki-1.29.1";
src = pkgs.fetchurl {
- url = "http://download.wikimedia.org/mediawiki/1.27/${name}.tar.gz";
- sha256 = "08x8mvc0y1gwq8rg0zm98wc6hc5j8imb6dcpx6s7392j5dc71m0i";
+ url = "http://download.wikimedia.org/mediawiki/1.29/${name}.tar.gz";
+ sha256 = "03mpazbxvb011s2nmlw5p6dc43yjgl5yrsilmj1imyykm57bwb3m";
};
skins = config.skins;
diff --git a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
index c6f4bcd0f666..1c654667dfc7 100644
--- a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
@@ -13,6 +13,7 @@ let
define('DB_HOST', '${config.dbHost}');
define('DB_CHARSET', 'utf8');
$table_prefix = '${config.tablePrefix}';
+ define('AUTOMATIC_UPDATER_DISABLED', true);
${config.extraConfig}
if ( !defined('ABSPATH') )
define('ABSPATH', dirname(__FILE__) . '/');
diff --git a/nixos/modules/services/web-servers/lighttpd/default.nix b/nixos/modules/services/web-servers/lighttpd/default.nix
index 45a65965112a..700b4469c565 100644
--- a/nixos/modules/services/web-servers/lighttpd/default.nix
+++ b/nixos/modules/services/web-servers/lighttpd/default.nix
@@ -15,7 +15,8 @@ let
# Some modules are always imported and should not appear in the config:
# disallowedModules = [ "mod_indexfile" "mod_dirlisting" "mod_staticfile" ];
#
- # Get full module list: "ls -1 $lighttpd/lib/*.so"
+ # For full module list, see the output of running ./configure in the lighttpd
+ # source.
allKnownModules = [
"mod_rewrite"
"mod_redirect"
@@ -38,12 +39,15 @@ let
"mod_accesslog"
# Remaining list of modules, order assumed to be unimportant.
"mod_authn_file"
+ "mod_authn_gssapi"
+ "mod_authn_ldap"
"mod_authn_mysql"
"mod_cml"
"mod_deflate"
"mod_evasive"
"mod_extforward"
"mod_flv_streaming"
+ "mod_geoip"
"mod_magnet"
"mod_mysql_vhost"
"mod_scgi"
diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix
index 8a04e07eeeac..801601aafd9d 100644
--- a/nixos/modules/services/web-servers/nginx/vhost-options.nix
+++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix
@@ -142,10 +142,10 @@ with lib;
globalRedirect = mkOption {
type = types.nullOr types.str;
default = null;
- example = http://newserver.example.org/;
+ example = "newserver.example.org";
description = ''
If set, all requests for this host are redirected permanently to
- the given URL.
+ the given hostname.
'';
};
diff --git a/nixos/modules/services/web-servers/traefik.nix b/nixos/modules/services/web-servers/traefik.nix
new file mode 100644
index 000000000000..4ede4fc20967
--- /dev/null
+++ b/nixos/modules/services/web-servers/traefik.nix
@@ -0,0 +1,115 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.traefik;
+ configFile =
+ if cfg.configFile == null then
+ pkgs.runCommand "config.toml" {
+ buildInputs = [ pkgs.remarshal ];
+ } ''
+ remarshal -if json -of toml \
+ < ${pkgs.writeText "config.json" (builtins.toJSON cfg.configOptions)} \
+ > $out
+ ''
+ else cfg.configFile;
+
+in {
+ options.services.traefik = {
+ enable = mkEnableOption "Traefik web server";
+
+ configFile = mkOption {
+ default = null;
+ example = literalExample "/path/to/config.toml";
+ type = types.nullOr types.path;
+ description = ''
+ Path to verbatim traefik.toml to use.
+ (Using that option has precedence over configOptions)
+ '';
+ };
+
+ configOptions = mkOption {
+ description = ''
+ Config for Traefik.
+ '';
+ type = types.attrs;
+ default = {
+ defaultEntryPoints = ["http"];
+ entryPoints.http.address = ":80";
+ };
+ example = {
+ defaultEntrypoints = [ "http" ];
+ web.address = ":8080";
+ entryPoints.http.address = ":80";
+
+ file = {};
+ frontends = {
+ frontend1 = {
+ backend = "backend1";
+ routes.test_1.rule = "Host:localhost";
+ };
+ };
+ backends.backend1 = {
+ servers.server1.url = "http://localhost:8000";
+ };
+ };
+ };
+
+ dataDir = mkOption {
+ default = "/var/lib/traefik";
+ type = types.path;
+ description = ''
+ Location for any persistent data traefik creates, ie. acme
+ '';
+ };
+
+ package = mkOption {
+ default = pkgs.traefik;
+ defaultText = "pkgs.traefik";
+ type = types.package;
+ description = "Traefik package to use.";
+ };
+ };
+
+ config = mkIf cfg.enable {
+ systemd.services.traefik = {
+ description = "Traefik web server";
+ after = [ "network-online.target" ];
+ wantedBy = [ "multi-user.target" ];
+ serviceConfig = {
+ PermissionsStartOnly = true;
+ ExecStart = ''${cfg.package.bin}/bin/traefik --configfile=${configFile}'';
+ ExecStartPre = [
+ ''${pkgs.coreutils}/bin/mkdir -p "${cfg.dataDir}"''
+ ''${pkgs.coreutils}/bin/chmod 700 "${cfg.dataDir}"''
+ ''${pkgs.coreutils}/bin/chown -R traefik:traefik "${cfg.dataDir}"''
+ ];
+ Type = "simple";
+ User = "traefik";
+ Group = "traefik";
+ Restart = "on-failure";
+ StartLimitInterval = 86400;
+ StartLimitBurst = 5;
+ AmbientCapabilities = "cap_net_bind_service";
+ CapabilityBoundingSet = "cap_net_bind_service";
+ NoNewPrivileges = true;
+ LimitNPROC = 64;
+ LimitNOFILE = 1048576;
+ PrivateTmp = true;
+ PrivateDevices = true;
+ ProtectHome = true;
+ ProtectSystem = "full";
+ ReadWriteDirectories = cfg.dataDir;
+ };
+ };
+
+ users.extraUsers.traefik = {
+ group = "traefik";
+ home = cfg.dataDir;
+ createHome = true;
+ };
+
+ users.extraGroups.traefik = {};
+ };
+}
diff --git a/nixos/modules/services/x11/compton.nix b/nixos/modules/services/x11/compton.nix
index 56bc66b71796..11cbcac6fa85 100644
--- a/nixos/modules/services/x11/compton.nix
+++ b/nixos/modules/services/x11/compton.nix
@@ -7,6 +7,14 @@ let
cfg = config.services.compton;
+ floatBetween = a: b: with lib; with types;
+ addCheck str (x: versionAtLeast x a && versionOlder x b);
+
+ pairOf = x: with types; addCheck (listOf x) (y: lib.length y == 2);
+
+ opacityRules = optionalString (length cfg.opacityRules != 0)
+ (concatMapStringsSep ",\n" (rule: ''"${rule}"'') cfg.opacityRules);
+
configFile = pkgs.writeText "compton.conf"
(optionalString cfg.fade ''
# fading
@@ -30,7 +38,11 @@ let
active-opacity = ${cfg.activeOpacity};
inactive-opacity = ${cfg.inactiveOpacity};
menu-opacity = ${cfg.menuOpacity};
-
+
+ opacity-rule = [
+ ${opacityRules}
+ ];
+
# other options
backend = ${toJSON cfg.backend};
vsync = ${toJSON cfg.vSync};
@@ -57,7 +69,7 @@ in {
};
fadeDelta = mkOption {
- type = types.int;
+ type = types.addCheck types.int (x: x > 0);
default = 10;
example = 5;
description = ''
@@ -66,11 +78,12 @@ in {
};
fadeSteps = mkOption {
- type = types.listOf types.str;
+ type = pairOf (floatBetween "0.01" "1.01");
default = [ "0.028" "0.03" ];
example = [ "0.04" "0.04" ];
description = ''
Opacity change between fade steps (in and out).
+ (numbers in range 0.01 - 1.0)
'';
};
@@ -97,7 +110,7 @@ in {
};
shadowOffsets = mkOption {
- type = types.listOf types.int;
+ type = pairOf types.int;
default = [ (-15) (-15) ];
example = [ (-10) (-15) ];
description = ''
@@ -106,11 +119,11 @@ in {
};
shadowOpacity = mkOption {
- type = types.str;
+ type = floatBetween "0.0" "1.01";
default = "0.75";
example = "0.8";
description = ''
- Window shadows opacity (number in range 0 - 1).
+ Window shadows opacity (number in range 0.0 - 1.0).
'';
};
@@ -129,52 +142,67 @@ in {
};
activeOpacity = mkOption {
- type = types.str;
+ type = floatBetween "0.0" "1.01";
default = "1.0";
example = "0.8";
description = ''
- Opacity of active windows.
+ Opacity of active windows (number in range 0.0 - 1.0).
'';
};
inactiveOpacity = mkOption {
- type = types.str;
+ type = floatBetween "0.1" "1.01";
default = "1.0";
example = "0.8";
description = ''
- Opacity of inactive windows.
+ Opacity of inactive windows (number in range 0.1 - 1.0).
'';
};
menuOpacity = mkOption {
- type = types.str;
+ type = floatBetween "0.0" "1.01";
default = "1.0";
example = "0.8";
description = ''
- Opacity of dropdown and popup menu.
+ Opacity of dropdown and popup menu (number in range 0.0 - 1.0).
+ '';
+ };
+
+ opacityRules = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ example = [
+ "95:class_g = 'URxvt' && !_NET_WM_STATE@:32a"
+ "0:_NET_WM_STATE@:32a *= '_NET_WM_STATE_HIDDEN'"
+ ];
+ description = ''
+ Rules that control the opacity of windows, in format PERCENT:PATTERN.
'';
};
backend = mkOption {
- type = types.str;
- default = "glx";
+ type = types.enum [ "glx" "xrender" ];
+ default = "xrender";
description = ''
Backend to use: glx or xrender.
'';
};
vSync = mkOption {
- type = types.str;
- default = "none";
- example = "opengl-swc";
- description = ''
- Enable vertical synchronization using the specified method.
- See compton(1) man page available methods.
- '';
+ type = types.enum [
+ "none" "drm" "opengl"
+ "opengl-oml" "opengl-swc" "opengl-mswc"
+ ];
+ default = "none";
+ example = "opengl-swc";
+ description = ''
+ Enable vertical synchronization using the specified method.
+ See compton(1) man page an explanation.
+ '';
};
refreshRate = mkOption {
- type = types.int;
+ type = types.addCheck types.int (x: x >= 0);
default = 0;
example = 60;
description = ''
@@ -193,7 +221,7 @@ in {
};
extraOptions = mkOption {
- type = types.str;
+ type = types.lines;
default = "";
example = ''
unredir-if-possible = true;
diff --git a/nixos/modules/services/x11/desktop-managers/lxqt.nix b/nixos/modules/services/x11/desktop-managers/lxqt.nix
index 89ad2882363d..fb907618d35b 100644
--- a/nixos/modules/services/x11/desktop-managers/lxqt.nix
+++ b/nixos/modules/services/x11/desktop-managers/lxqt.nix
@@ -41,7 +41,7 @@ in
name = "lxqt";
bgSupport = true;
start = ''
- exec ${pkgs.lxqt.lxqt-common}/bin/startlxqt
+ exec ${pkgs.lxqt.lxqt-session}/bin/startlxqt
'';
};
diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix
index 7a95ac6549d8..ab8a0a48b483 100644
--- a/nixos/modules/services/x11/desktop-managers/mate.nix
+++ b/nixos/modules/services/x11/desktop-managers/mate.nix
@@ -72,6 +72,7 @@ in
];
services.gnome3.gnome-keyring.enable = true;
+ services.upower.enable = config.powerManagement.enable;
environment.pathsToLink = [ "/share" ];
};
diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index f099117f4777..7f54bb182fe9 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -47,7 +47,7 @@ in
${getBin config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1"
''}
- exec "${plasma5.startkde}"
+ exec "${getBin plasma5.plasma-workspace}/bin/startkde"
'';
};
@@ -142,7 +142,8 @@ in
kde-gtk-config breeze-gtk
- phonon-backend-gstreamer
+ libsForQt56.phonon-backend-gstreamer
+ libsForQt5.phonon-backend-gstreamer
]
++ lib.optionals cfg.enableQt4Support [ breeze-qt4 pkgs.phonon-backend-gstreamer ]
@@ -174,7 +175,7 @@ in
serif = [ "Noto Serif" ];
};
- programs.ssh.askPassword = "${plasma5.ksshaskpass.out}/bin/ksshaskpass";
+ programs.ssh.askPassword = mkDefault "${plasma5.ksshaskpass.out}/bin/ksshaskpass";
# Enable helpful DBus services.
services.udisks2.enable = true;
@@ -189,7 +190,12 @@ in
];
services.xserver.displayManager.sddm = {
- theme = "breeze";
+ theme = mkDefault "breeze";
+ };
+
+ boot.plymouth = {
+ theme = mkDefault "breeze";
+ themePackages = mkDefault [ pkgs.breeze-plymouth ];
};
security.pam.services.kde = { allowNullPassword = true; };
diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index 58773685ec1f..3fa482fb6722 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -92,9 +92,12 @@ let
${config.hardware.pulseaudio.package.out}/bin/pactl load-module module-x11-publish "display=$DISPLAY"
''}
- # Tell systemd about our $DISPLAY. This is needed by the
- # ssh-agent unit.
- ${config.systemd.package}/bin/systemctl --user import-environment DISPLAY
+ # Tell systemd about our $DISPLAY and $XAUTHORITY.
+ # This is needed by the ssh-agent unit.
+ #
+ # Also tell systemd about the dbus session bus address.
+ # This is required by user units using the session bus.
+ ${config.systemd.package}/bin/systemctl --user import-environment DISPLAY XAUTHORITY DBUS_SESSION_BUS_ADDRESS
# Load X defaults.
${xorg.xrdb}/bin/xrdb -merge ${xresourcesXft}
diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index b0a3ff1bb753..e83f26516f5f 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -64,6 +64,14 @@ in
};
};
+ wayland = mkOption {
+ default = true;
+ description = ''
+ Allow GDM run on Wayland instead of Xserver
+ '';
+ type = types.bool;
+ };
+
};
};
@@ -94,6 +102,7 @@ in
# GDM needs different xserverArgs, presumable because using wayland by default.
services.xserver.tty = null;
services.xserver.display = null;
+ services.xserver.verbose = null;
services.xserver.displayManager.job =
{
@@ -116,6 +125,7 @@ in
"getty@tty1.service"
];
+ systemd.services."getty@tty1".enable = false;
systemd.services.display-manager.conflicts = [ "getty@tty1.service" ];
systemd.services.display-manager.serviceConfig = {
# Restart = "always"; - already defined in xserver.nix
@@ -139,6 +149,7 @@ in
# presented and there's a little delay.
environment.etc."gdm/custom.conf".text = ''
[daemon]
+ WaylandEnable=${if cfg.gdm.wayland then "true" else "false"}
${optionalString cfg.gdm.autoLogin.enable (
if cfg.gdm.autoLogin.delay > 0 then ''
TimedLoginEnable=true
diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix
index e6cc02e4d491..facaea131ae5 100644
--- a/nixos/modules/services/x11/display-managers/sddm.nix
+++ b/nixos/modules/services/x11/display-managers/sddm.nix
@@ -19,6 +19,17 @@ let
Xsetup = pkgs.writeScript "Xsetup" ''
#!/bin/sh
+
+ # Prior to Qt 5.9.2, there is a QML cache invalidation bug which sometimes
+ # strikes new Plasma 5 releases. If the QML cache is not invalidated, SDDM
+ # will segfault without explanation. We really tore our hair out for awhile
+ # before finding the bug:
+ # https://bugreports.qt.io/browse/QTBUG-62302
+ # We work around the problem by deleting the QML cache before startup. It
+ # will be regenerated, causing a small but perceptible delay when SDDM
+ # starts.
+ rm -fr /var/lib/sddm/.cache/sddm-greeter/qmlcache
+
${cfg.setupScript}
'';
diff --git a/nixos/modules/services/x11/hardware/libinput.nix b/nixos/modules/services/x11/hardware/libinput.nix
index d75c785270b3..44555cb6e2a9 100644
--- a/nixos/modules/services/x11/hardware/libinput.nix
+++ b/nixos/modules/services/x11/hardware/libinput.nix
@@ -75,12 +75,13 @@ in {
default = null;
description =
''
- Enables a click method. Permitted values are none, buttonareas, clickfinger.
+ Enables a click method. Permitted values are none,
+ buttonareas, clickfinger.
Not all devices support all methods, if an option is unsupported,
- the default click method for this device is used.
+ the default click method for this device is used.
'';
};
-
+
leftHanded = mkOption {
type = types.bool;
default = false;
@@ -96,7 +97,7 @@ in {
simultaneously produces a middle mouse button click.
'';
};
-
+
naturalScrolling = mkOption {
type = types.bool;
default = false;
@@ -120,7 +121,8 @@ in {
example = "edge";
description =
''
- Specify the scrolling method.
+ Specify the scrolling method: twofinger, edge,
+ or none
'';
};
@@ -141,7 +143,8 @@ in {
example = "disabled";
description =
''
- Sets the send events mode to disabled, enabled, or "disable when an external mouse is connected".
+ Sets the send events mode to disabled, enabled,
+ or disabled-on-external-mouse
'';
};
diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix
index 992709ed0000..30d853841ea4 100644
--- a/nixos/modules/services/x11/redshift.nix
+++ b/nixos/modules/services/x11/redshift.nix
@@ -19,18 +19,31 @@ in {
};
latitude = mkOption {
- type = types.str;
+ type = types.nullOr types.str;
+ default = null;
description = ''
Your current latitude, between
- -90.0 and 90.0.
+ -90.0 and 90.0. Must be provided
+ along with longitude.
'';
};
longitude = mkOption {
- type = types.str;
+ type = types.nullOr types.str;
+ default = null;
description = ''
Your current longitude, between
- between -180.0 and 180.0.
+ between -180.0 and 180.0. Must be
+ provided along with latitude.
+ '';
+ };
+
+ provider = mkOption {
+ type = types.enum [ "manual" "geoclue2" ];
+ default = "manual";
+ description = ''
+ The location provider to use for determining your location. If set to
+ manual you must also provide latitude/longitude.
'';
};
@@ -93,14 +106,33 @@ in {
};
config = mkIf cfg.enable {
- systemd.user.services.redshift = {
+ assertions = [
+ {
+ assertion =
+ if cfg.provider == "manual"
+ then (cfg.latitude != null && cfg.longitude != null)
+ else (cfg.latitude == null && cfg.longitude == null);
+ message = "Latitude and longitude must be provided together, and with provider set to null.";
+ }
+ ];
+
+ services.geoclue2.enable = mkIf (cfg.provider == "geoclue2") true;
+
+ systemd.user.services.redshift =
+ let
+ providerString =
+ if cfg.provider == "manual"
+ then "${cfg.latitude}:${cfg.longitude}"
+ else cfg.provider;
+ in
+ {
description = "Redshift colour temperature adjuster";
wantedBy = [ "graphical-session.target" ];
partOf = [ "graphical-session.target" ];
serviceConfig = {
ExecStart = ''
${cfg.package}/bin/redshift \
- -l ${cfg.latitude}:${cfg.longitude} \
+ -l ${providerString} \
-t ${toString cfg.temperature.day}:${toString cfg.temperature.night} \
-b ${toString cfg.brightness.day}:${toString cfg.brightness.night} \
${lib.strings.concatStringsSep " " cfg.extraOptions}
diff --git a/nixos/modules/services/x11/xautolock.nix b/nixos/modules/services/x11/xautolock.nix
index 60ce9e6ed5c0..28fc92024bcb 100644
--- a/nixos/modules/services/x11/xautolock.nix
+++ b/nixos/modules/services/x11/xautolock.nix
@@ -31,7 +31,17 @@ in
type = types.string;
description = ''
- The script to use when locking the computer.
+ The script to use when automatically locking the computer.
+ '';
+ };
+
+ nowlocker = mkOption {
+ default = null;
+ example = "i3lock -i /path/to/img";
+ type = types.nullOr types.string;
+
+ description = ''
+ The script to use when manually locking the computer with xautolock -locknow.
'';
};
@@ -45,28 +55,82 @@ in
};
notifier = mkOption {
- default = "notify-send 'Locking in 10 seconds'";
- type = types.string;
+ default = null;
+ example = literalExample ''
+ "${pkgs.libnotify}/bin/notify-send \"Locking in 10 seconds\""
+ '';
+ type = types.nullOr types.string;
description = ''
Notification script to be used to warn about the pending autolock.
'';
};
+
+ killer = mkOption {
+ default = null; # default according to `man xautolock` is none
+ example = "systemctl suspend";
+ type = types.nullOr types.string;
+
+ description = ''
+ The script to use when nothing has happend for as long as
+ '';
+ };
+
+ killtime = mkOption {
+ default = 20; # default according to `man xautolock`
+ type = types.int;
+
+ description = ''
+ Minutes xautolock waits until it executes the script specified in
+ (Has to be at least 10 minutes)
+ '';
+ };
+
+ extraOptions = mkOption {
+ type = types.listOf types.str;
+ default = [ ];
+ example = [ "-detectsleep" ];
+ description = ''
+ Additional command-line arguments to pass to
+ xautolock.
+ '';
+ };
};
};
config = mkIf cfg.enable {
environment.systemPackages = with pkgs; [ xautolock ];
-
- services.xserver.displayManager.sessionCommands = with builtins; with pkgs; ''
- ${xautolock}/bin/xautolock \
- ${concatStringsSep " \\\n" ([
- "-time ${toString(cfg.time)}"
- "-locker ${cfg.locker}"
- ] ++ optional cfg.enableNotifier (concatStringsSep " " [
- "-notify ${toString(cfg.notify)}"
- "-notifier \"${cfg.notifier}\""
- ]))} &
- '';
+ systemd.user.services.xautolock = {
+ description = "xautolock service";
+ wantedBy = [ "graphical-session.target" ];
+ partOf = [ "graphical-session.target" ];
+ serviceConfig = with lib; {
+ ExecStart = strings.concatStringsSep " " ([
+ "${pkgs.xautolock}/bin/xautolock"
+ "-noclose"
+ "-time ${toString cfg.time}"
+ "-locker '${cfg.locker}'"
+ ] ++ optionals cfg.enableNotifier [
+ "-notify ${toString cfg.notify}"
+ "-notifier '${cfg.notifier}'"
+ ] ++ optionals (cfg.nowlocker != null) [
+ "-nowlocker '${cfg.nowlocker}'"
+ ] ++ optionals (cfg.killer != null) [
+ "-killer '${cfg.killer}'"
+ "-killtime ${toString cfg.killtime}"
+ ] ++ cfg.extraOptions);
+ Restart = "always";
+ };
+ };
+ assertions = [
+ {
+ assertion = cfg.enableNotifier -> cfg.notifier != null;
+ message = "When enabling the notifier for xautolock, you also need to specify the notify script";
+ }
+ {
+ assertion = cfg.killer != null -> cfg.killtime >= 10;
+ message = "killtime has to be at least 10 minutes according to `man xautolock`";
+ }
+ ];
};
}
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 3ce124d3da27..d4fe475690ce 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -480,6 +480,15 @@ in
'';
};
+ verbose = mkOption {
+ type = types.nullOr types.int;
+ default = 3;
+ example = 7;
+ description = ''
+ Controls verbosity of X logging.
+ '';
+ };
+
useGlamor = mkOption {
type = types.bool;
default = false;
@@ -631,10 +640,11 @@ in
[ "-config ${configFile}"
"-xkbdir" "${cfg.xkbDir}"
# Log at the default verbosity level to stderr rather than /var/log/X.*.log.
- "-verbose" "3" "-logfile" "/dev/null"
+ "-logfile" "/dev/null"
] ++ optional (cfg.display != null) ":${toString cfg.display}"
++ optional (cfg.tty != null) "vt${toString cfg.tty}"
++ optional (cfg.dpi != null) "-dpi ${toString cfg.dpi}"
+ ++ optional (cfg.verbose != null) "-verbose ${toString cfg.verbose}"
++ optional (!cfg.enableTCP) "-nolisten tcp"
++ optional (cfg.autoRepeatDelay != null) "-ardelay ${toString cfg.autoRepeatDelay}"
++ optional (cfg.autoRepeatInterval != null) "-arinterval ${toString cfg.autoRepeatInterval}"
diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index cf70a891c0ca..4db9631743e3 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -193,11 +193,6 @@ in
"sd_mod"
"sr_mod"
- # Standard IDE stuff.
- "ide_cd"
- "ide_disk"
- "ide_generic"
-
# SD cards and internal eMMC drives.
"mmc_block"
@@ -211,21 +206,11 @@ in
"xhci_hcd"
"xhci_pci"
"usbhid"
- "hid_generic" "hid_lenovo"
- "hid_apple" "hid_logitech_dj" "hid_lenovo_tpkbd" "hid_roccat"
+ "hid_generic" "hid_lenovo" "hid_apple" "hid_roccat"
# Misc. keyboard stuff.
"pcips2" "atkbd" "i8042"
- # Temporary fix for https://github.com/NixOS/nixpkgs/issues/18451
- # Remove as soon as upstream gets fixed - marking it:
- # TODO
- # FIXME
- "i8042"
-
- # To wait for SCSI devices to appear.
- "scsi_wait_scan"
-
# Needed by the stage 2 init script.
"rtc_cmos"
];
diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index 82b5bcda9217..cc03e54ead63 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -197,7 +197,7 @@ sub GrubFs {
if ($status != 0) {
die "Failed to retrieve subvolume info for @{[$fs->mount]}\n";
}
- my @ids = join("", @id_info) =~ m/Subvolume ID:[ \t\n]*([^ \t\n]*)/;
+ my @ids = join("\n", @id_info) =~ m/^(?!\/\n).*Subvolume ID:[ \t\n]*([0-9]+)/s;
if ($#ids > 0) {
die "Btrfs subvol name for @{[$fs->device]} listed multiple times in mount\n"
} elsif ($#ids == 0) {
diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix
index d45b1686c1ea..4b0c498424b5 100644
--- a/nixos/modules/system/boot/plymouth.nix
+++ b/nixos/modules/system/boot/plymouth.nix
@@ -72,7 +72,7 @@ in
environment.systemPackages = [ plymouth ];
environment.etc."plymouth/plymouthd.conf".source = configFile;
- environment.etc."plymouth/plymouthd.defaults".source = "${plymouth}/share/plymouth/plymouth.defaults";
+ environment.etc."plymouth/plymouthd.defaults".source = "${plymouth}/share/plymouth/plymouthd.defaults";
environment.etc."plymouth/logo.png".source = cfg.logo;
environment.etc."plymouth/themes".source = "${themesEnv}/share/plymouth/themes";
# XXX: Needed because we supply a different set of plugins in initrd.
@@ -97,12 +97,26 @@ in
moduleName="$(sed -n 's,ModuleName *= *,,p' ${themesEnv}/share/plymouth/themes/${cfg.theme}/${cfg.theme}.plymouth)"
mkdir -p $out/lib/plymouth/renderers
- cp ${plymouth}/lib/plymouth/{text,details,$moduleName}.so $out/lib/plymouth
+ # module might come from a theme
+ cp ${themesEnv}/lib/plymouth/{text,details,$moduleName}.so $out/lib/plymouth
cp ${plymouth}/lib/plymouth/renderers/{drm,frame-buffer}.so $out/lib/plymouth/renderers
mkdir -p $out/share/plymouth/themes
cp ${plymouth}/share/plymouth/plymouthd.defaults $out/share/plymouth
- cp -r ${themesEnv}/share/plymouth/themes/{text,details,${cfg.theme}} $out/share/plymouth/themes
+
+ # copy themes into working directory for patching
+ mkdir themes
+ # use -L to copy the directories proper, not the symlinks to them
+ cp -r -L ${themesEnv}/share/plymouth/themes/{text,details,${cfg.theme}} themes
+
+ # patch out any attempted references to the theme or plymouth's themes directory
+ chmod -R +w themes
+ find themes -type f | while read file
+ do
+ sed -i "s,/nix/.*/share/plymouth/themes,$out/share/plymouth/themes,g" $file
+ done
+
+ cp -r themes/* $out/share/plymouth/themes
cp ${cfg.logo} $out/share/plymouth/logo.png
'';
diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix
index a3fb733c289d..2147d43c4f19 100644
--- a/nixos/modules/system/boot/resolved.nix
+++ b/nixos/modules/system/boot/resolved.nix
@@ -31,8 +31,15 @@ in
example = [ "example.com" ];
type = types.listOf types.str;
description = ''
- A list of domains. These domains are used as search suffixes when resolving single-label host names (domain names which contain no dot), in order to qualify them into fully-qualified domain names (FQDNs).
- For compatibility reasons, if this setting is not specified, the search domains listed in /etc/resolv.conf are used instead, if that file exists and any domains are configured in it.
+ A list of domains. These domains are used as search suffixes
+ when resolving single-label host names (domain names which
+ contain no dot), in order to qualify them into fully-qualified
+ domain names (FQDNs).
+
+ For compatibility reasons, if this setting is not specified,
+ the search domains listed in
+ /etc/resolv.conf are used instead, if
+ that file exists and any domains are configured in it.
'';
};
@@ -41,10 +48,30 @@ in
example = "false";
type = types.enum [ "true" "resolve" "false" ];
description = ''
- Controls Link-Local Multicast Name Resolution support (RFC 4794) on the local host.
- If true, enables full LLMNR responder and resolver support.
- If false, disables both.
- If set to "resolve", only resolution support is enabled, but responding is disabled.
+ Controls Link-Local Multicast Name Resolution support
+ (RFC 4795) on the local host.
+
+ If set to
+
+
+ "true"
+
+ Enables full LLMNR responder and resolver support.
+
+
+
+ "false"
+
+ Disables both.
+
+
+
+ "resolve"
+
+ Only resolution support is enabled, but responding is disabled.
+
+
+
'';
};
@@ -53,9 +80,36 @@ in
example = "true";
type = types.enum [ "true" "allow-downgrade" "false" ];
description = ''
- If true all DNS lookups are DNSSEC-validated locally (excluding LLMNR and Multicast DNS). Note that this mode requires a DNS server that supports DNSSEC. If the DNS server does not properly support DNSSEC all validations will fail.
- If set to "allow-downgrade" DNSSEC validation is attempted, but if the server does not support DNSSEC properly, DNSSEC mode is automatically disabled. Note that this mode makes DNSSEC validation vulnerable to "downgrade" attacks, where an attacker might be able to trigger a downgrade to non-DNSSEC mode by synthesizing a DNS response that suggests DNSSEC was not supported.
- If set to false, DNS lookups are not DNSSEC validated.
+ If set to
+
+
+ "true"
+
+ all DNS lookups are DNSSEC-validated locally (excluding
+ LLMNR and Multicast DNS). Note that this mode requires a
+ DNS server that supports DNSSEC. If the DNS server does
+ not properly support DNSSEC all validations will fail.
+
+
+
+ "allow-downgrade"
+
+ DNSSEC validation is attempted, but if the server does not
+ support DNSSEC properly, DNSSEC mode is automatically
+ disabled. Note that this mode makes DNSSEC validation
+ vulnerable to "downgrade" attacks, where an attacker might
+ be able to trigger a downgrade to non-DNSSEC mode by
+ synthesizing a DNS response that suggests DNSSEC was not
+ supported.
+
+
+
+ "false"
+
+ DNS lookups are not DNSSEC validated.
+
+
+
'';
};
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index ed1f5d20afb6..dd9ba7104485 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -875,7 +875,12 @@ in
systemd.services.systemd-remount-fs.restartIfChanged = false;
systemd.services.systemd-update-utmp.restartIfChanged = false;
systemd.services.systemd-user-sessions.restartIfChanged = false; # Restart kills all active sessions.
- systemd.services.systemd-logind.restartTriggers = [ config.environment.etc."systemd/logind.conf".source ];
+ # Restarting systemd-logind breaks X11
+ # - upstream commit: https://cgit.freedesktop.org/xorg/xserver/commit/?id=dc48bd653c7e101
+ # - systemd announcement: https://github.com/systemd/systemd/blob/22043e4317ecd2bc7834b48a6d364de76bb26d91/NEWS#L103-L112
+ # - this might be addressed in the future by xorg
+ #systemd.services.systemd-logind.restartTriggers = [ config.environment.etc."systemd/logind.conf".source ];
+ systemd.services.systemd-logind.restartIfChanged = false;
systemd.services.systemd-logind.stopIfChanged = false;
systemd.services.systemd-journald.restartTriggers = [ config.environment.etc."systemd/journald.conf".source ];
systemd.services.systemd-journald.stopIfChanged = false;
diff --git a/nixos/modules/tasks/encrypted-devices.nix b/nixos/modules/tasks/encrypted-devices.nix
index fa0abb43c0ce..da0c9408d891 100644
--- a/nixos/modules/tasks/encrypted-devices.nix
+++ b/nixos/modules/tasks/encrypted-devices.nix
@@ -36,7 +36,7 @@ let
keyFile = mkOption {
default = null;
- example = "/root/.swapkey";
+ example = "/mnt-root/root/.swapkey";
type = types.nullOr types.str;
description = "File system location of keyfile. This unlocks the drive after the root has been mounted to /mnt-root.";
};
@@ -57,7 +57,7 @@ in
config = mkIf anyEncrypted {
assertions = map (dev: {
- assertion = dev.label != null;
+ assertion = dev.encrypted.label != null;
message = ''
The filesystem for ${dev.mountPoint} has encrypted.enable set to true, but no encrypted.label set
'';
@@ -67,7 +67,6 @@ in
luks = {
devices =
map (dev: { name = dev.encrypted.label; device = dev.encrypted.blkDev; } ) keylessEncDevs;
- cryptoModules = [ "aes" "sha256" "sha1" "xts" ];
forceLuksSupportInInitrd = true;
};
postMountCommands =
diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix
index 6ceb36714b28..b3690fad1a6a 100644
--- a/nixos/modules/tasks/filesystems.nix
+++ b/nixos/modules/tasks/filesystems.nix
@@ -115,11 +115,18 @@ let
};
- config = {
+ config = let
+ defaultFormatOptions =
+ # -F needed to allow bare block device without partitions
+ if (builtins.substring 0 3 config.fsType) == "ext" then "-F"
+ # -q needed for non-interactive operations
+ else if config.fsType == "jfs" then "-q"
+ # (same here)
+ else if config.fsType == "reiserfs" then "-q"
+ else null;
+ in {
options = mkIf config.autoResize [ "x-nixos.autoresize" ];
-
- # -F needed to allow bare block device without partitions
- formatOptions = mkIf ((builtins.substring 0 3 config.fsType) == "ext") (mkDefault "-F");
+ formatOptions = mkIf (defaultFormatOptions != null) (mkDefault defaultFormatOptions);
};
};
diff --git a/nixos/modules/tasks/filesystems/ecryptfs.nix b/nixos/modules/tasks/filesystems/ecryptfs.nix
new file mode 100644
index 000000000000..12a407cabbfb
--- /dev/null
+++ b/nixos/modules/tasks/filesystems/ecryptfs.nix
@@ -0,0 +1,14 @@
+{ config, lib, pkgs, ... }:
+# TODO: make ecryptfs work in initramfs?
+
+with lib;
+
+{
+ config = mkIf (any (fs: fs == "ecryptfs") config.boot.supportedFilesystems) {
+ system.fsPackages = [ pkgs.ecryptfs ];
+ security.wrappers = {
+ "mount.ecryptfs_private".source = "${pkgs.ecryptfs.out}/bin/mount.ecryptfs_private";
+ "umount.ecryptfs_private".source = "${pkgs.ecryptfs.out}/bin/umount.ecryptfs_private";
+ };
+ };
+}
diff --git a/nixos/modules/tasks/filesystems/ext.nix b/nixos/modules/tasks/filesystems/ext.nix
index cc9d0ef37d59..3a8999c242bd 100644
--- a/nixos/modules/tasks/filesystems/ext.nix
+++ b/nixos/modules/tasks/filesystems/ext.nix
@@ -5,7 +5,8 @@
system.fsPackages = [ pkgs.e2fsprogs ];
- boot.initrd.availableKernelModules = [ "ext2" "ext3" "ext4" ];
+ # As of kernel 4.3, there is no separate ext3 driver (they're also handled by ext4.ko)
+ boot.initrd.availableKernelModules = [ "ext2" "ext4" ];
boot.initrd.extraUtilsCommands =
''
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index 145fae432c65..7fee99115329 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -140,6 +140,17 @@ in
this once.
'';
};
+
+ requestEncryptionCredentials = mkOption {
+ type = types.bool;
+ default = config.boot.zfs.enableUnstable;
+ description = ''
+ Request encryption keys or passwords for all encrypted datasets on import.
+
+ Dataset encryption is only supported in zfsUnstable at the moment.
+ '';
+ };
+
};
services.zfs.autoSnapshot = {
@@ -263,6 +274,10 @@ in
assertion = !cfgZfs.forceImportAll || cfgZfs.forceImportRoot;
message = "If you enable boot.zfs.forceImportAll, you must also enable boot.zfs.forceImportRoot";
}
+ {
+ assertion = cfgZfs.requestEncryptionCredentials -> cfgZfs.enableUnstable;
+ message = "This feature is only available for zfs unstable. Set the NixOS option boot.zfs.enableUnstable.";
+ }
];
boot = {
@@ -306,6 +321,9 @@ in
done
echo
if [[ -n "$msg" ]]; then echo "$msg"; fi
+ ${lib.optionalString cfgZfs.requestEncryptionCredentials ''
+ zfs load-key -a
+ ''}
'') rootPools));
};
diff --git a/nixos/modules/tasks/kbd.nix b/nixos/modules/tasks/kbd.nix
index 3975dd5b0ffd..7fb3cbc5c1bc 100644
--- a/nixos/modules/tasks/kbd.nix
+++ b/nixos/modules/tasks/kbd.nix
@@ -98,22 +98,10 @@ in
'') config.i18n.consoleColors}
'';
- /* XXX: systemd-vconsole-setup needs a "main" terminal. By default
- * /dev/tty0 is used which wouldn't work when the service is restarted
- * from X11. We set this to /dev/tty1; not ideal because it may also be
- * owned by X11 or something else.
- *
- * See #22470.
- */
systemd.services."systemd-vconsole-setup" =
- { wantedBy = [ "sysinit.target" ];
- before = [ "display-manager.service" ];
+ { before = [ "display-manager.service" ];
after = [ "systemd-udev-settle.service" ];
restartTriggers = [ vconsoleConf kbdEnv ];
- serviceConfig.ExecStart = [
- ""
- "${pkgs.systemd}/lib/systemd/systemd-vconsole-setup /dev/tty1"
- ];
};
}
diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix
index 7ede8752bcc3..1f424f84c6e0 100644
--- a/nixos/modules/tasks/network-interfaces-scripted.nix
+++ b/nixos/modules/tasks/network-interfaces-scripted.nix
@@ -9,6 +9,12 @@ let
interfaces = attrValues cfg.interfaces;
hasVirtuals = any (i: i.virtual) interfaces;
+ slaves = concatMap (i: i.interfaces) (attrValues cfg.bonds)
+ ++ concatMap (i: i.interfaces) (attrValues cfg.bridges)
+ ++ concatMap (i: i.interfaces) (attrValues cfg.vswitches)
+ ++ concatMap (i: [i.interface]) (attrValues cfg.macvlans)
+ ++ concatMap (i: [i.interface]) (attrValues cfg.vlans);
+
# We must escape interfaces due to the systemd interpretation
subsystemDevice = interface:
"sys-subsystem-net-devices-${escapeSystemdPath interface}.device";
@@ -87,6 +93,7 @@ let
after = [ "network-pre.target" "systemd-udevd.service" "systemd-sysctl.service" ];
before = [ "network.target" "shutdown.target" ];
wants = [ "network.target" ];
+ partOf = map (i: "network-addresses-${i.name}.service") interfaces;
conflicts = [ "shutdown.target" ];
wantedBy = [ "multi-user.target" ] ++ optional hasDefaultGatewaySet "network-online.target";
@@ -116,24 +123,32 @@ let
# Set the default gateway.
${optionalString (cfg.defaultGateway != null && cfg.defaultGateway.address != "") ''
- # FIXME: get rid of "|| true" (necessary to make it idempotent).
- ip route add default ${optionalString (cfg.defaultGateway.metric != null)
+ ${optionalString (cfg.defaultGateway.interface != null) ''
+ ip route replace ${cfg.defaultGateway.address} dev ${cfg.defaultGateway.interface} ${optionalString (cfg.defaultGateway.metric != null)
+ "metric ${toString cfg.defaultGateway.metric}"
+ } proto static
+ ''}
+ ip route replace default ${optionalString (cfg.defaultGateway.metric != null)
"metric ${toString cfg.defaultGateway.metric}"
} via "${cfg.defaultGateway.address}" ${
optionalString (cfg.defaultGatewayWindowSize != null)
"window ${toString cfg.defaultGatewayWindowSize}"} ${
optionalString (cfg.defaultGateway.interface != null)
- "dev ${cfg.defaultGateway.interface}"} proto static || true
+ "dev ${cfg.defaultGateway.interface}"} proto static
''}
${optionalString (cfg.defaultGateway6 != null && cfg.defaultGateway6.address != "") ''
- # FIXME: get rid of "|| true" (necessary to make it idempotent).
- ip -6 route add ::/0 ${optionalString (cfg.defaultGateway6.metric != null)
+ ${optionalString (cfg.defaultGateway6.interface != null) ''
+ ip -6 route replace ${cfg.defaultGateway6.address} dev ${cfg.defaultGateway6.interface} ${optionalString (cfg.defaultGateway6.metric != null)
+ "metric ${toString cfg.defaultGateway6.metric}"
+ } proto static
+ ''}
+ ip -6 route replace default ${optionalString (cfg.defaultGateway6.metric != null)
"metric ${toString cfg.defaultGateway6.metric}"
} via "${cfg.defaultGateway6.address}" ${
optionalString (cfg.defaultGatewayWindowSize != null)
"window ${toString cfg.defaultGatewayWindowSize}"} ${
optionalString (cfg.defaultGateway6.interface != null)
- "dev ${cfg.defaultGateway6.interface}"} proto static || true
+ "dev ${cfg.defaultGateway6.interface}"} proto static
''}
'';
};
@@ -152,9 +167,11 @@ let
in
nameValuePair "network-addresses-${i.name}"
{ description = "Address configuration of ${i.name}";
- wantedBy = [ "network-setup.service" ];
- # propagate stop and reload from network-setup
- partOf = [ "network-setup.service" ];
+ wantedBy = [
+ "network-setup.service"
+ "network-link-${i.name}.service"
+ "network.target"
+ ];
# order before network-setup because the routes that are configured
# there may need ip addresses configured
before = [ "network-setup.service" ];
@@ -206,7 +223,7 @@ let
after = [ "dev-net-tun.device" "network-pre.target" ];
wantedBy = [ "network-setup.service" (subsystemDevice i.name) ];
partOf = [ "network-setup.service" ];
- before = [ "network-setup.service" (subsystemDevice i.name) ];
+ before = [ "network-setup.service" ];
path = [ pkgs.iproute ];
serviceConfig = {
Type = "oneshot";
@@ -232,7 +249,7 @@ let
partOf = [ "network-setup.service" ] ++ optional v.rstp "mstpd.service";
after = [ "network-pre.target" ] ++ deps ++ optional v.rstp "mstpd.service"
++ concatMap (i: [ "network-addresses-${i}.service" "network-link-${i}.service" ]) v.interfaces;
- before = [ "network-setup.service" (subsystemDevice n) ];
+ before = [ "network-setup.service" ];
serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true;
path = [ pkgs.iproute ];
@@ -331,7 +348,7 @@ let
partOf = [ "network-setup.service" ];
after = [ "network-pre.target" ] ++ deps
++ concatMap (i: [ "network-addresses-${i}.service" "network-link-${i}.service" ]) v.interfaces;
- before = [ "network-setup.service" (subsystemDevice n) ];
+ before = [ "network-setup.service" ];
serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true;
path = [ pkgs.iproute pkgs.gawk ];
@@ -369,7 +386,7 @@ let
bindsTo = deps;
partOf = [ "network-setup.service" ];
after = [ "network-pre.target" ] ++ deps;
- before = [ "network-setup.service" (subsystemDevice n) ];
+ before = [ "network-setup.service" ];
serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true;
path = [ pkgs.iproute ];
@@ -394,7 +411,7 @@ let
bindsTo = deps;
partOf = [ "network-setup.service" ];
after = [ "network-pre.target" ] ++ deps;
- before = [ "network-setup.service" (subsystemDevice n) ];
+ before = [ "network-setup.service" ];
serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true;
path = [ pkgs.iproute ];
@@ -422,7 +439,7 @@ let
bindsTo = deps;
partOf = [ "network-setup.service" ];
after = [ "network-pre.target" ] ++ deps;
- before = [ "network-setup.service" (subsystemDevice n) ];
+ before = [ "network-setup.service" ];
serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true;
path = [ pkgs.iproute ];
@@ -465,5 +482,8 @@ in
config = mkMerge [
bondWarnings
(mkIf (!cfg.useNetworkd) normalConfig)
+ { # Ensure slave interfaces are brought up
+ networking.interfaces = genAttrs slaves (i: {});
+ }
];
}
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 8ce7b2d2cf36..b7e85e402aa9 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -923,10 +923,22 @@ in
assertions =
(flip map interfaces (i: {
assertion = i.subnetMask == null;
- message = "The networking.interfaces.${i.name}.subnetMask option is defunct. Use prefixLength instead.";
+ message = ''
+ The networking.interfaces."${i.name}".subnetMask option is defunct. Use prefixLength instead.
+ '';
+ })) ++ (flip map interfaces (i: {
+ # With the linux kernel, interface name length is limited by IFNAMSIZ
+ # to 16 bytes, including the trailing null byte.
+ # See include/linux/if.h in the kernel sources
+ assertion = stringLength i.name < 16;
+ message = ''
+ The name of networking.interfaces."${i.name}" is too long, it needs to be less than 16 characters.
+ '';
})) ++ (flip map slaveIfs (i: {
assertion = i.ip4 == [ ] && i.ipAddress == null && i.ip6 == [ ] && i.ipv6Address == null;
- message = "The networking.interfaces.${i.name} must not have any defined ips when it is a slave.";
+ message = ''
+ The networking.interfaces."${i.name}" must not have any defined ips when it is a slave.
+ '';
})) ++ [
{
assertion = cfg.hostId == null || (stringLength cfg.hostId == 8 && isHexString cfg.hostId);
diff --git a/nixos/modules/tasks/powertop.nix b/nixos/modules/tasks/powertop.nix
index 0ec4974789b4..609831506e16 100644
--- a/nixos/modules/tasks/powertop.nix
+++ b/nixos/modules/tasks/powertop.nix
@@ -16,6 +16,7 @@ in {
powertop = {
wantedBy = [ "multi-user.target" ];
description = "Powertop tunings";
+ path = [ pkgs.kmod ];
serviceConfig = {
Type = "oneshot";
RemainAfterExit = "yes";
diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix
index 3e47710361a8..1eb3ca707afd 100644
--- a/nixos/modules/virtualisation/amazon-image.nix
+++ b/nixos/modules/virtualisation/amazon-image.nix
@@ -33,7 +33,7 @@ let cfg = config.ec2; in
config.boot.kernelPackages.ena
];
boot.initrd.kernelModules = [ "xen-blkfront" "xen-netfront" ];
- boot.initrd.availableKernelModules = [ "ixgbevf" "ena" ];
+ boot.initrd.availableKernelModules = [ "ixgbevf" "ena" "nvme" ];
boot.kernelParams = mkIf cfg.hvm [ "console=ttyS0" ];
# Prevent the nouveau kernel module from being loaded, as it
diff --git a/nixos/modules/virtualisation/brightbox-image.nix b/nixos/modules/virtualisation/brightbox-image.nix
index 7f45f0f34f71..08bbcfd9d7c2 100644
--- a/nixos/modules/virtualisation/brightbox-image.nix
+++ b/nixos/modules/virtualisation/brightbox-image.nix
@@ -33,9 +33,9 @@ in
}
''
# Create partition table
- ${pkgs.parted}/sbin/parted /dev/vda mklabel msdos
- ${pkgs.parted}/sbin/parted /dev/vda mkpart primary ext4 1 ${diskSize}
- ${pkgs.parted}/sbin/parted /dev/vda print
+ ${pkgs.parted}/sbin/parted --script /dev/vda mklabel msdos
+ ${pkgs.parted}/sbin/parted --script /dev/vda mkpart primary ext4 1 ${diskSize}
+ ${pkgs.parted}/sbin/parted --script /dev/vda print
. /sys/class/block/vda1/uevent
mknod /dev/vda1 b $MAJOR $MINOR
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 82dfc1c9f1ce..e68bfd860601 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -537,7 +537,7 @@ in
type = types.bool;
default = false;
description = ''
- Wether the container is automatically started at boot-time.
+ Whether the container is automatically started at boot-time.
'';
};
@@ -596,6 +596,8 @@ in
{ config, pkgs, ... }:
{ services.postgresql.enable = true;
services.postgresql.package = pkgs.postgresql96;
+
+ system.stateVersion = "17.03";
};
};
}
diff --git a/nixos/modules/virtualisation/ec2-amis.nix b/nixos/modules/virtualisation/ec2-amis.nix
index 745518f85972..14826b6272f7 100644
--- a/nixos/modules/virtualisation/ec2-amis.nix
+++ b/nixos/modules/virtualisation/ec2-amis.nix
@@ -223,5 +223,21 @@ let self = {
"17.03".us-west-2.hvm-ebs = "ami-a93daac9";
"17.03".us-west-2.hvm-s3 = "ami-5139ae31";
- latest = self."17.03";
+ # 17.09.1483.d0f0657ca0
+ "17.09".eu-west-1.hvm-ebs = "ami-cf33e7b6";
+ "17.09".eu-west-2.hvm-ebs = "ami-7d061419";
+ "17.09".eu-central-1.hvm-ebs = "ami-7548fa1a";
+ "17.09".us-east-1.hvm-ebs = "ami-6f669d15";
+ "17.09".us-east-2.hvm-ebs = "ami-cbe1ccae";
+ "17.09".us-west-1.hvm-ebs = "ami-9d95a5fd";
+ "17.09".us-west-2.hvm-ebs = "ami-d3956fab";
+ "17.09".ca-central-1.hvm-ebs = "ami-ee4ef78a";
+ "17.09".ap-southeast-1.hvm-ebs = "ami-1dfc807e";
+ "17.09".ap-southeast-2.hvm-ebs = "ami-dcb350be";
+ "17.09".ap-northeast-1.hvm-ebs = "ami-00ec3d66";
+ "17.09".ap-northeast-2.hvm-ebs = "ami-1107dd7f";
+ "17.09".sa-east-1.hvm-ebs = "ami-0377086f";
+ "17.09".ap-south-1.hvm-ebs = "ami-4a064625";
+
+ latest = self."17.09";
}; in self
diff --git a/nixos/modules/virtualisation/grow-partition.nix b/nixos/modules/virtualisation/grow-partition.nix
index 5039118d78ee..2cb932d208f0 100644
--- a/nixos/modules/virtualisation/grow-partition.nix
+++ b/nixos/modules/virtualisation/grow-partition.nix
@@ -24,7 +24,12 @@ with lib;
copy_bin_and_libs ${pkgs.gnused}/bin/sed
copy_bin_and_libs ${pkgs.utillinux}/sbin/sfdisk
copy_bin_and_libs ${pkgs.utillinux}/sbin/lsblk
- cp -v ${pkgs.cloud-utils}/bin/.growpart-wrapped $out/bin/growpart
+
+ substitute "${pkgs.cloud-utils}/bin/.growpart-wrapped" "$out/bin/growpart" \
+ --replace "${pkgs.bash}/bin/sh" "/bin/sh" \
+ --replace "awk" "gawk" \
+ --replace "sed" "gnused"
+
ln -s sed $out/bin/gnused
'';
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index a17e2c9ca471..3c89ca68113b 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -92,7 +92,7 @@ let
-drive index=0,id=drive1,file=$NIX_DISK_IMAGE,if=${cfg.qemu.diskInterface},cache=writeback,werror=report \
-kernel ${config.system.build.toplevel}/kernel \
-initrd ${config.system.build.toplevel}/initrd \
- -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo} ${kernelConsole} $QEMU_KERNEL_PARAMS" \
+ -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo}/registration ${kernelConsole} $QEMU_KERNEL_PARAMS" \
''} \
$extraDisks \
${qemuGraphics} \
@@ -102,15 +102,7 @@ let
'';
- regInfo = pkgs.runCommand "reginfo"
- { exportReferencesGraph =
- map (x: [("closure-" + baseNameOf x) x]) config.virtualisation.pathsInNixDB;
- buildInputs = [ pkgs.perl ];
- preferLocalBuild = true;
- }
- ''
- printRegistration=1 perl ${pkgs.pathsFromGraph} closure-* > $out
- '';
+ regInfo = pkgs.closureInfo { rootPaths = config.virtualisation.pathsInNixDB; };
# Generate a hard disk image containing a /boot partition and GRUB
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index f61d80f55991..125e6b7050bc 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -42,12 +42,11 @@ in rec {
name = "nixos-${nixos.channel.version}";
meta = {
description = "Release-critical builds for the NixOS channel";
- maintainers = [ pkgs.lib.maintainers.eelco ];
+ maintainers = with pkgs.lib.maintainers; [ eelco fpletz ];
};
constituents =
let
- all = x: map (system: x.${system})
- (supportedSystems ++ limitedSupportedSystems);
+ all = x: map (system: x.${system}) supportedSystems;
in [
nixos.channel
(all nixos.dummy)
@@ -61,7 +60,7 @@ in rec {
nixos.tests.chromium
(all nixos.tests.firefox)
(all nixos.tests.firewall)
- nixos.tests.gnome3.x86_64-linux # FIXME: i686-linux
+ (all nixos.tests.gnome3)
nixos.tests.installer.zfsroot.x86_64-linux # ZFS is 64bit only
(all nixos.tests.installer.lvm)
(all nixos.tests.installer.luksroot)
@@ -80,9 +79,8 @@ in rec {
(all nixos.tests.boot.uefiCdrom)
(all nixos.tests.boot.uefiUsb)
(all nixos.tests.boot-stage1)
- nixos.tests.hibernate.x86_64-linux # i686 is flaky, see #23107
+ (all nixos.tests.hibernate)
nixos.tests.docker
- nixos.tests.docker-edge
(all nixos.tests.ecryptfs)
(all nixos.tests.env)
(all nixos.tests.ipv6)
@@ -93,7 +91,7 @@ in rec {
(all nixos.tests.keymap.dvp)
(all nixos.tests.keymap.neo)
(all nixos.tests.keymap.qwertz)
- nixos.tests.plasma5.x86_64-linux # avoid big build on i686
+ (all nixos.tests.plasma5)
#(all nixos.tests.lightdm)
(all nixos.tests.login)
(all nixos.tests.misc)
diff --git a/nixos/release.nix b/nixos/release.nix
index ac7755a160f4..28eb76d888e4 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -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.atd = callTest tests/atd.nix {};
tests.acme = callTest tests/acme.nix {};
tests.avahi = callTest tests/avahi.nix {};
tests.bittorrent = callTest tests/bittorrent.nix {};
@@ -249,12 +250,14 @@ in rec {
tests.firewall = callTest tests/firewall.nix {};
tests.fleet = hydraJob (import tests/fleet.nix { system = "x86_64-linux"; });
#tests.gitlab = callTest tests/gitlab.nix {};
+ tests.gitolite = callTest tests/gitolite.nix {};
tests.glance = callTest tests/glance.nix {};
tests.gocd-agent = callTest tests/gocd-agent.nix {};
tests.gocd-server = callTest tests/gocd-server.nix {};
tests.gnome3 = callTest tests/gnome3.nix {};
tests.gnome3-gdm = callTest tests/gnome3-gdm.nix {};
- tests.grafama = callTest tests/grafana.nix {};
+ tests.grafana = callTest tests/grafana.nix {};
+ tests.graphite = callTest tests/graphite.nix {};
tests.hardened = callTest tests/hardened.nix { };
tests.hibernate = callTest tests/hibernate.nix {};
tests.hound = callTest tests/hound.nix {};
@@ -267,6 +270,10 @@ in rec {
tests.plasma5 = callTest tests/plasma5.nix {};
tests.keymap = callSubTests tests/keymap.nix {};
tests.initrdNetwork = callTest tests/initrd-network.nix {};
+ tests.kafka_0_9 = callTest tests/kafka_0_9.nix {};
+ tests.kafka_0_10 = callTest tests/kafka_0_10.nix {};
+ tests.kafka_0_11 = callTest tests/kafka_0_11.nix {};
+ tests.kafka_1_0 = callTest tests/kafka_1_0.nix {};
tests.kernel-copperhead = callTest tests/kernel-copperhead.nix {};
tests.kernel-latest = callTest tests/kernel-latest.nix {};
tests.kernel-lts = callTest tests/kernel-lts.nix {};
@@ -278,11 +285,13 @@ in rec {
tests.login = callTest tests/login.nix {};
#tests.logstash = callTest tests/logstash.nix {};
tests.mathics = callTest tests/mathics.nix {};
+ tests.mesos = callTest tests/mesos.nix {};
tests.misc = callTest tests/misc.nix {};
tests.mongodb = callTest tests/mongodb.nix {};
tests.mumble = callTest tests/mumble.nix {};
tests.munin = callTest tests/munin.nix {};
tests.mysql = callTest tests/mysql.nix {};
+ tests.mysqlBackup = callTest tests/mysql-backup.nix {};
tests.mysqlReplication = callTest tests/mysql-replication.nix {};
tests.nat.firewall = callTest tests/nat.nix { withFirewall = true; };
tests.nat.firewall-conntrack = callTest tests/nat.nix { withFirewall = true; withConntrackHelpers = true; };
@@ -301,8 +310,11 @@ in rec {
#tests.panamax = hydraJob (import tests/panamax.nix { system = "x86_64-linux"; });
tests.peerflix = callTest tests/peerflix.nix {};
tests.postgresql = callSubTests tests/postgresql.nix {};
- tests.pgjwt = callTest tests/pgjwt.nix {};
+ tests.pgmanage = callTest tests/pgmanage.nix {};
+ tests.postgis = callTest tests/postgis.nix {};
+ #tests.pgjwt = callTest tests/pgjwt.nix {};
tests.printing = callTest tests/printing.nix {};
+ tests.prometheus = callTest tests/prometheus.nix {};
tests.proxy = callTest tests/proxy.nix {};
tests.pumpio = callTest tests/pump.io.nix {};
# tests.quagga = callTest tests/quagga.nix {};
@@ -322,7 +334,7 @@ in rec {
tests.wordpress = callTest tests/wordpress.nix {};
tests.xfce = callTest tests/xfce.nix {};
tests.xmonad = callTest tests/xmonad.nix {};
-
+ tests.zookeeper = callTest tests/zookeeper.nix {};
/* Build a bunch of typical closures so that Hydra can keep track of
the evolution of closure sizes. */
diff --git a/nixos/tests/atd.nix b/nixos/tests/atd.nix
new file mode 100644
index 000000000000..c2c0a716e0de
--- /dev/null
+++ b/nixos/tests/atd.nix
@@ -0,0 +1,36 @@
+import ./make-test.nix ({ pkgs, lib, ... }:
+
+{
+ name = "atd";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ bjornfor ];
+ };
+
+ machine =
+ { config, pkgs, ... }:
+ { services.atd.enable = true;
+ users.extraUsers.alice = { isNormalUser = true; };
+ };
+
+ # "at" has a resolution of 1 minute
+ testScript = ''
+ startAll;
+
+ $machine->fail("test -f ~root/at-1");
+ $machine->fail("test -f ~root/batch-1");
+ $machine->fail("test -f ~alice/at-1");
+ $machine->fail("test -f ~alice/batch-1");
+
+ $machine->succeed("echo 'touch ~root/at-1' | at now+1min");
+ $machine->succeed("echo 'touch ~root/batch-1' | batch");
+ $machine->succeed("su - alice -c \"echo 'touch at-1' | at now+1min\"");
+ $machine->succeed("su - alice -c \"echo 'touch batch-1' | batch\"");
+
+ $machine->succeed("sleep 1.5m");
+
+ $machine->succeed("test -f ~root/at-1");
+ $machine->succeed("test -f ~root/batch-1");
+ $machine->succeed("test -f ~alice/at-1");
+ $machine->succeed("test -f ~alice/batch-1");
+ '';
+})
diff --git a/nixos/tests/gitlab.nix b/nixos/tests/gitlab.nix
index 357911046960..7268636b62ad 100644
--- a/nixos/tests/gitlab.nix
+++ b/nixos/tests/gitlab.nix
@@ -9,9 +9,57 @@ import ./make-test.nix ({ pkgs, ...} : {
nodes = {
gitlab = { config, pkgs, ... }: {
virtualisation.memorySize = 768;
- services.gitlab.enable = true;
- services.gitlab.databasePassword = "gitlab";
+
+ services.nginx = {
+ enable = true;
+ virtualHosts = {
+ "localhost" = {
+ locations."/".proxyPass = "http://unix:/run/gitlab/gitlab-workhorse.socket";
+ };
+ };
+ };
+
systemd.services.gitlab.serviceConfig.TimeoutStartSec = "10min";
+ services.gitlab = {
+ enable = true;
+ databasePassword = "dbPassword";
+ secrets = {
+ secret = "secret";
+ otp = "otpsecret";
+ db = "dbsecret";
+
+ # nix-shell -p openssl --run "openssl genrsa 2048"
+ jws = ''
+ -----BEGIN RSA PRIVATE KEY-----
+ MIIEpAIBAAKCAQEA13/qEio76OWUtWO0WIz9lWnsTWOU8Esv4sQHDq9PCEFsLt21
+ PAXrlWhLjjWcxGfsrDwnh7YErGHYL62BMSxMdFJolaknlQK/O/V8UETDe45VoHM+
+ Znk270RfUcfYFgiihnXUZXVmL0om9TsQSk646wCcjCY9LxtxUyKNhvT7KjgYw2aX
+ z34aw7M+Js3T2p1TjZPSC82GtmtKkJEKFMi5EjprLTDE7EdcUzr9Xuw+kQ+gRm9k
+ 7FE+JQqSoprwE3Q0v2OAn3UhLMgg0gNFRnsc5l6IAshDzV+H22RPqKKlJjVjjfPY
+ 0TQSvYLVApigHbDPH0BoCXfjFfQazbbP3OUHrwIDAQABAoIBAQCMU+tkcMQaYIV5
+ qLdjgkwO467QpivyXcOM8wF1eosIYTHFQvIlZ+WEoSmyLQ8shlADyBgls01Pw1c3
+ lNAv6RzQEmmwKzpvOh61OKH+0whIiOMRXHoh2IUBQZCgfHYlwvGyhUAN4WjtGmhM
+ AG4XNTQNM5S9Xpkw97nP3Qwz+YskbbkrfqtCEVy9ro+4nhbjqPsuO3adbnkva4zR
+ cyurRhrHgHU6LPjn5NHnHH4qw2faY2oAsL8pmpkTbO5IqWDvOcbjNfjVPgVoq26O
+ bbaa1qs4nmc80qQgMjRPJef535xyf3eLsSlDvpf6O8sPrJzVR1zaqEqixpQCZDac
+ +kRiSBrhAoGBAOwHiq0PuyJh6VzBu7ybqX6+gF/wA4Jkwzx6mbfaBgurvU1aospp
+ kisIonAkxSbxllZMnjbkShZEdATYKeT9o5NEhnU4YnHfc5bJZbiWOZAzYGLcY7g8
+ vDQ31pBItyY4pFgPbSpNlbUvUsoPVJ45RasRADDTNCzMzdjFQQXst2V9AoGBAOm7
+ sSpzYfFPLEAhieAkuhtbsX58Boo46djiKVfzGftfp6F9aHTOfzGORU5jrZ16mSbS
+ qkkC6BEFrATX2051dzzXC89fWoJYALrsffE5I3KlKXsCAWSnCP1MMxOfH+Ls61Mr
+ 7pK/LKfvJt53mUH4jIdbmmFUDwbg18oBEH+x9PmbAoGAS/+JqXu9N67rIxDGUE6W
+ 3tacI0f2+U9Uhe67/DTZaXyc8YFTlXU0uWKIWy+bw5RaYeM9tlL/f/f+m2i25KK+
+ vrZ7zNag7CWU5GJovGyykDnauTpZaYM03mN0VPT08/uc/zXIYqyknbhlIeaZynCK
+ fDB3LUF0NVCknz20WCIGU0kCgYEAkxY0ZXx61Dp4pFr2wwEZxQGs7uXpz64FKyEX
+ 12r6nMATY4Lh6y/Px0W6w5vis8lk+5Ny6cNUevHQ0LNuJS+yu6ywl+1vrbrnqroM
+ f3LvpcPeGLSoX8jl1VDQi7aFgG6LoKly1xJLbdsH4NPutB9PgBbbTghx9GgmI88L
+ rPA2M6UCgYBOmkYJocNgxg6B1/n4Tb9fN1Q/XuJrFDE6NxVUoke+IIyMPRH7FC3m
+ VMYzu+b7zTVJjaBb1cmJemxl/xajziWDofJYPefhdbOVU7HXtmJFY0IG3pVxU1zW
+ 3bmDj5QAtCUDpuuNa6GEIT0YR4+D/V7o3DmlZ0tVIwKJmVJoQ2f5dw==
+ -----END RSA PRIVATE KEY-----
+ '';
+ };
+ };
};
};
@@ -19,6 +67,6 @@ import ./make-test.nix ({ pkgs, ...} : {
$gitlab->start();
$gitlab->waitForUnit("gitlab.service");
$gitlab->waitForUnit("gitlab-sidekiq.service");
- $gitlab->waitUntilSucceeds("curl http://localhost:8080/users/sign_in");
+ $gitlab->waitUntilSucceeds("curl http://localhost:80/users/sign_in");
'';
})
diff --git a/nixos/tests/gitolite.nix b/nixos/tests/gitolite.nix
new file mode 100644
index 000000000000..4b4e081acc5f
--- /dev/null
+++ b/nixos/tests/gitolite.nix
@@ -0,0 +1,139 @@
+import ./make-test.nix ({ pkgs, ...}:
+
+let
+ adminPrivateKey = pkgs.writeText "id_ed25519" ''
+ -----BEGIN OPENSSH PRIVATE KEY-----
+ b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
+ QyNTUxOQAAACDu7qxYQAPdAU6RrhB3llk2N1v4PTwcVzcX1oX265uC3gAAAJBJiYxDSYmM
+ QwAAAAtzc2gtZWQyNTUxOQAAACDu7qxYQAPdAU6RrhB3llk2N1v4PTwcVzcX1oX265uC3g
+ AAAEDE1W6vMwSEUcF1r7Hyypm/+sCOoDmKZgPxi3WOa1mD2u7urFhAA90BTpGuEHeWWTY3
+ W/g9PBxXNxfWhfbrm4LeAAAACGJmb0BtaW5pAQIDBAU=
+ -----END OPENSSH PRIVATE KEY-----
+ '';
+
+ adminPublicKey = ''
+ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO7urFhAA90BTpGuEHeWWTY3W/g9PBxXNxfWhfbrm4Le root@client
+ '';
+
+ alicePrivateKey = pkgs.writeText "id_ed25519" ''
+ -----BEGIN OPENSSH PRIVATE KEY-----
+ b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
+ QyNTUxOQAAACBbeWvHh/AWGWI6EIc1xlSihyXtacNQ9KeztlW/VUy8wQAAAJAwVQ5VMFUO
+ VQAAAAtzc2gtZWQyNTUxOQAAACBbeWvHh/AWGWI6EIc1xlSihyXtacNQ9KeztlW/VUy8wQ
+ AAAEB7lbfkkdkJoE+4TKHPdPQWBKLSx+J54Eg8DaTr+3KoSlt5a8eH8BYZYjoQhzXGVKKH
+ Je1pw1D0p7O2Vb9VTLzBAAAACGJmb0BtaW5pAQIDBAU=
+ -----END OPENSSH PRIVATE KEY-----
+ '';
+
+ alicePublicKey = pkgs.writeText "id_ed25519.pub" ''
+ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFt5a8eH8BYZYjoQhzXGVKKHJe1pw1D0p7O2Vb9VTLzB alice@client
+ '';
+
+ bobPrivateKey = pkgs.writeText "id_ed25519" ''
+ -----BEGIN OPENSSH PRIVATE KEY-----
+ b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
+ QyNTUxOQAAACCWTaJ1D9Xjxy6759FvQ9oXTes1lmWBciXPkEeqTikBMAAAAJDQBmNV0AZj
+ VQAAAAtzc2gtZWQyNTUxOQAAACCWTaJ1D9Xjxy6759FvQ9oXTes1lmWBciXPkEeqTikBMA
+ AAAEDM1IYYFUwk/IVxauha9kuR6bbRtT3gZ6ZA0GLb9txb/pZNonUP1ePHLrvn0W9D2hdN
+ 6zWWZYFyJc+QR6pOKQEwAAAACGJmb0BtaW5pAQIDBAU=
+ -----END OPENSSH PRIVATE KEY-----
+ '';
+
+ bobPublicKey = pkgs.writeText "id_ed25519.pub" ''
+ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJZNonUP1ePHLrvn0W9D2hdN6zWWZYFyJc+QR6pOKQEw bob@client
+ '';
+
+ gitoliteAdminConfSnippet = ''
+ repo alice-project
+ RW+ = alice
+ '';
+in
+{
+ name = "gitolite";
+
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ bjornfor ];
+ };
+
+ nodes = {
+
+ server =
+ { config, pkgs, lib, ... }:
+ {
+ services.gitolite = {
+ enable = true;
+ adminPubkey = adminPublicKey;
+ };
+ services.openssh.enable = true;
+ };
+
+ client =
+ { config, pkgs, lib, ... }:
+ {
+ environment.systemPackages = [ pkgs.git ];
+ programs.ssh.extraConfig = ''
+ Host *
+ UserKnownHostsFile /dev/null
+ StrictHostKeyChecking no
+ # there's nobody around that can input password
+ PreferredAuthentications publickey
+ '';
+ users.extraUsers.alice = { isNormalUser = true; };
+ users.extraUsers.bob = { isNormalUser = true; };
+ };
+
+ };
+
+ testScript = ''
+ startAll;
+
+ subtest "can setup ssh keys on system", sub {
+ $client->mustSucceed("mkdir -p ~root/.ssh");
+ $client->mustSucceed("cp ${adminPrivateKey} ~root/.ssh/id_ed25519");
+ $client->mustSucceed("chmod 600 ~root/.ssh/id_ed25519");
+
+ $client->mustSucceed("sudo -u alice mkdir -p ~alice/.ssh");
+ $client->mustSucceed("sudo -u alice cp ${alicePrivateKey} ~alice/.ssh/id_ed25519");
+ $client->mustSucceed("sudo -u alice chmod 600 ~alice/.ssh/id_ed25519");
+
+ $client->mustSucceed("sudo -u bob mkdir -p ~bob/.ssh");
+ $client->mustSucceed("sudo -u bob cp ${bobPrivateKey} ~bob/.ssh/id_ed25519");
+ $client->mustSucceed("sudo -u bob chmod 600 ~bob/.ssh/id_ed25519");
+ };
+
+ subtest "gitolite server starts", sub {
+ $server->waitForUnit("gitolite-init.service");
+ $server->waitForUnit("sshd.service");
+ $client->mustSucceed('ssh gitolite@server info');
+ };
+
+ subtest "admin can clone and configure gitolite-admin.git", sub {
+ $client->mustSucceed('git clone gitolite@server:gitolite-admin.git');
+ $client->mustSucceed("git config --global user.name 'System Administrator'");
+ $client->mustSucceed("git config --global user.email root\@domain.example");
+ $client->mustSucceed("cp ${alicePublicKey} gitolite-admin/keydir/alice.pub");
+ $client->mustSucceed("cp ${bobPublicKey} gitolite-admin/keydir/bob.pub");
+ $client->mustSucceed('(cd gitolite-admin && git add . && git commit -m "Add keys for alice, bob" && git push)');
+ $client->mustSucceed("printf '${gitoliteAdminConfSnippet}' >> gitolite-admin/conf/gitolite.conf");
+ $client->mustSucceed('(cd gitolite-admin && git add . && git commit -m "Add repo for alice" && git push)');
+ };
+
+ subtest "non-admins cannot clone gitolite-admin.git", sub {
+ $client->mustFail('sudo -i -u alice git clone gitolite@server:gitolite-admin.git');
+ $client->mustFail('sudo -i -u bob git clone gitolite@server:gitolite-admin.git');
+ };
+
+ subtest "non-admins can clone testing.git", sub {
+ $client->mustSucceed('sudo -i -u alice git clone gitolite@server:testing.git');
+ $client->mustSucceed('sudo -i -u bob git clone gitolite@server:testing.git');
+ };
+
+ subtest "alice can clone alice-project.git", sub {
+ $client->mustSucceed('sudo -i -u alice git clone gitolite@server:alice-project.git');
+ };
+
+ subtest "bob cannot clone alice-project.git", sub {
+ $client->mustFail('sudo -i -u bob git clone gitolite@server:alice-project.git');
+ };
+ '';
+})
diff --git a/nixos/tests/gnome3-gdm.nix b/nixos/tests/gnome3-gdm.nix
index 2c9c745021af..4b459e93e1be 100644
--- a/nixos/tests/gnome3-gdm.nix
+++ b/nixos/tests/gnome3-gdm.nix
@@ -21,7 +21,7 @@ import ./make-test.nix ({ pkgs, ...} : {
};
services.xserver.desktopManager.gnome3.enable = true;
- virtualisation.memorySize = 512;
+ virtualisation.memorySize = 1024;
};
testScript =
diff --git a/nixos/tests/graphite.nix b/nixos/tests/graphite.nix
new file mode 100644
index 000000000000..a22ef224580a
--- /dev/null
+++ b/nixos/tests/graphite.nix
@@ -0,0 +1,32 @@
+import ./make-test.nix ({ pkgs, ...} :
+{
+ name = "graphite";
+ nodes = {
+ one =
+ { config, pkgs, ... }: {
+ time.timeZone = "UTC";
+ services.graphite = {
+ web.enable = true;
+ api = {
+ enable = true;
+ port = 8082;
+ };
+ carbon.enableCache = true;
+ seyren.enable = true;
+ pager.enable = true;
+ };
+ };
+ };
+
+ testScript = ''
+ startAll;
+ $one->waitForUnit("default.target");
+ $one->requireActiveUnit("graphiteWeb.service");
+ $one->requireActiveUnit("graphiteApi.service");
+ $one->requireActiveUnit("graphitePager.service");
+ $one->requireActiveUnit("carbonCache.service");
+ $one->requireActiveUnit("seyren.service");
+ $one->succeed("echo \"foo 1 `date +%s`\" | nc -q0 localhost 2003");
+ $one->waitUntilSucceeds("curl 'http://localhost:8080/metrics/find/?query=foo&format=treejson' --silent | grep foo")
+ '';
+})
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index c1dae2a34fa3..da9582deec1d 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -260,9 +260,9 @@ in {
{ createPartitions =
''
$machine->succeed(
- "parted /dev/vda mklabel msdos",
- "parted /dev/vda -- mkpart primary linux-swap 1M 1024M",
- "parted /dev/vda -- mkpart primary ext2 1024M -1s",
+ "parted --script /dev/vda mklabel msdos",
+ "parted --script /dev/vda -- mkpart primary linux-swap 1M 1024M",
+ "parted --script /dev/vda -- mkpart primary ext2 1024M -1s",
"udevadm settle",
"mkswap /dev/vda1 -L swap",
"swapon -L swap",
@@ -277,11 +277,11 @@ in {
{ createPartitions =
''
$machine->succeed(
- "parted /dev/vda mklabel gpt",
- "parted -s /dev/vda -- mkpart ESP fat32 1M 50MiB", # /boot
- "parted -s /dev/vda -- set 1 boot on",
- "parted -s /dev/vda -- mkpart primary linux-swap 50MiB 1024MiB",
- "parted -s /dev/vda -- mkpart primary ext2 1024MiB -1MiB", # /
+ "parted --script /dev/vda mklabel gpt",
+ "parted --script /dev/vda -- mkpart ESP fat32 1M 50MiB", # /boot
+ "parted --script /dev/vda -- set 1 boot on",
+ "parted --script /dev/vda -- mkpart primary linux-swap 50MiB 1024MiB",
+ "parted --script /dev/vda -- mkpart primary ext2 1024MiB -1MiB", # /
"udevadm settle",
"mkswap /dev/vda2 -L swap",
"swapon -L swap",
@@ -300,10 +300,10 @@ in {
{ createPartitions =
''
$machine->succeed(
- "parted /dev/vda mklabel msdos",
- "parted /dev/vda -- mkpart primary ext2 1M 50MB", # /boot
- "parted /dev/vda -- mkpart primary linux-swap 50MB 1024M",
- "parted /dev/vda -- mkpart primary ext2 1024M -1s", # /
+ "parted --script /dev/vda mklabel msdos",
+ "parted --script /dev/vda -- mkpart primary ext2 1M 50MB", # /boot
+ "parted --script /dev/vda -- mkpart primary linux-swap 50MB 1024M",
+ "parted --script /dev/vda -- mkpart primary ext2 1024M -1s", # /
"udevadm settle",
"mkswap /dev/vda2 -L swap",
"swapon -L swap",
@@ -321,10 +321,10 @@ in {
{ createPartitions =
''
$machine->succeed(
- "parted /dev/vda mklabel msdos",
- "parted /dev/vda -- mkpart primary ext2 1M 50MB", # /boot
- "parted /dev/vda -- mkpart primary linux-swap 50MB 1024M",
- "parted /dev/vda -- mkpart primary ext2 1024M -1s", # /
+ "parted --script /dev/vda mklabel msdos",
+ "parted --script /dev/vda -- mkpart primary ext2 1M 50MB", # /boot
+ "parted --script /dev/vda -- mkpart primary linux-swap 50MB 1024M",
+ "parted --script /dev/vda -- mkpart primary ext2 1024M -1s", # /
"udevadm settle",
"mkswap /dev/vda2 -L swap",
"swapon -L swap",
@@ -357,9 +357,9 @@ in {
createPartitions =
''
$machine->succeed(
- "parted /dev/vda mklabel msdos",
- "parted /dev/vda -- mkpart primary linux-swap 1M 1024M",
- "parted /dev/vda -- mkpart primary 1024M -1s",
+ "parted --script /dev/vda mklabel msdos",
+ "parted --script /dev/vda -- mkpart primary linux-swap 1M 1024M",
+ "parted --script /dev/vda -- mkpart primary 1024M -1s",
"udevadm settle",
"mkswap /dev/vda1 -L swap",
@@ -380,11 +380,11 @@ in {
{ createPartitions =
''
$machine->succeed(
- "parted /dev/vda mklabel msdos",
- "parted /dev/vda -- mkpart primary 1M 2048M", # PV1
- "parted /dev/vda -- set 1 lvm on",
- "parted /dev/vda -- mkpart primary 2048M -1s", # PV2
- "parted /dev/vda -- set 2 lvm on",
+ "parted --script /dev/vda mklabel msdos",
+ "parted --script /dev/vda -- mkpart primary 1M 2048M", # PV1
+ "parted --script /dev/vda -- set 1 lvm on",
+ "parted --script /dev/vda -- mkpart primary 2048M -1s", # PV2
+ "parted --script /dev/vda -- set 2 lvm on",
"udevadm settle",
"pvcreate /dev/vda1 /dev/vda2",
"vgcreate MyVolGroup /dev/vda1 /dev/vda2",
@@ -402,10 +402,10 @@ in {
luksroot = makeInstallerTest "luksroot"
{ createPartitions = ''
$machine->succeed(
- "parted /dev/vda mklabel msdos",
- "parted /dev/vda -- mkpart primary ext2 1M 50MB", # /boot
- "parted /dev/vda -- mkpart primary linux-swap 50M 1024M",
- "parted /dev/vda -- mkpart primary 1024M -1s", # LUKS
+ "parted --script /dev/vda mklabel msdos",
+ "parted --script /dev/vda -- mkpart primary ext2 1M 50MB", # /boot
+ "parted --script /dev/vda -- mkpart primary linux-swap 50M 1024M",
+ "parted --script /dev/vda -- mkpart primary 1024M -1s", # LUKS
"udevadm settle",
"mkswap /dev/vda2 -L swap",
"swapon -L swap",
@@ -434,7 +434,7 @@ in {
{ createPartitions =
''
$machine->succeed(
- "parted /dev/vda --"
+ "parted --script /dev/vda --"
. " mklabel msdos"
. " mkpart primary ext2 1M 100MB" # /boot
. " mkpart extended 100M -1s"
@@ -469,9 +469,9 @@ in {
{ createPartitions =
''
$machine->succeed(
- "parted /dev/sda mklabel msdos",
- "parted /dev/sda -- mkpart primary linux-swap 1M 1024M",
- "parted /dev/sda -- mkpart primary ext2 1024M -1s",
+ "parted --script /dev/sda mklabel msdos",
+ "parted --script /dev/sda -- mkpart primary linux-swap 1M 1024M",
+ "parted --script /dev/sda -- mkpart primary ext2 1024M -1s",
"udevadm settle",
"mkswap /dev/sda1 -L swap",
"swapon -L swap",
diff --git a/nixos/tests/kafka_0_10.nix b/nixos/tests/kafka_0_10.nix
new file mode 100644
index 000000000000..6e7820f64bc4
--- /dev/null
+++ b/nixos/tests/kafka_0_10.nix
@@ -0,0 +1,48 @@
+import ./make-test.nix ({ pkgs, lib, ... } :
+let
+ kafkaPackage = pkgs.apacheKafka_0_10;
+in {
+ name = "kafka_0_10";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ nequissimus ];
+ };
+
+ nodes = {
+ zookeeper1 = { config, ... }: {
+ services.zookeeper = {
+ enable = true;
+ };
+
+ networking.firewall.allowedTCPPorts = [ 2181 ];
+ };
+ kafka = { config, ... }: {
+ services.apache-kafka = {
+ enable = true;
+ extraProperties = ''
+ offsets.topic.replication.factor = 1
+ '';
+ package = kafkaPackage;
+ zookeeper = "zookeeper1:2181";
+ };
+
+ networking.firewall.allowedTCPPorts = [ 9092 ];
+ virtualisation.memorySize = 2048;
+ };
+ };
+
+ testScript = ''
+ startAll;
+
+ $zookeeper1->waitForUnit("zookeeper");
+ $zookeeper1->waitForUnit("network.target");
+ $zookeeper1->waitForOpenPort(2181);
+
+ $kafka->waitForUnit("apache-kafka");
+ $kafka->waitForUnit("network.target");
+ $kafka->waitForOpenPort(9092);
+
+ $kafka->waitUntilSucceeds("${kafkaPackage}/bin/kafka-topics.sh --create --zookeeper zookeeper1:2181 --partitions 1 --replication-factor 1 --topic testtopic");
+ $kafka->mustSucceed("echo 'test 1' | ${kafkaPackage}/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic testtopic");
+ $kafka->mustSucceed("${kafkaPackage}/bin/kafka-console-consumer.sh --bootstrap-server localhost:9092 --topic testtopic --from-beginning --max-messages 1 | grep 'test 1'");
+ '';
+})
diff --git a/nixos/tests/kafka_0_11.nix b/nixos/tests/kafka_0_11.nix
new file mode 100644
index 000000000000..39f9c36bb229
--- /dev/null
+++ b/nixos/tests/kafka_0_11.nix
@@ -0,0 +1,48 @@
+import ./make-test.nix ({ pkgs, lib, ... } :
+let
+ kafkaPackage = pkgs.apacheKafka_0_11;
+in {
+ name = "kafka_0_11";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ nequissimus ];
+ };
+
+ nodes = {
+ zookeeper1 = { config, ... }: {
+ services.zookeeper = {
+ enable = true;
+ };
+
+ networking.firewall.allowedTCPPorts = [ 2181 ];
+ };
+ kafka = { config, ... }: {
+ services.apache-kafka = {
+ enable = true;
+ extraProperties = ''
+ offsets.topic.replication.factor = 1
+ '';
+ package = kafkaPackage;
+ zookeeper = "zookeeper1:2181";
+ };
+
+ networking.firewall.allowedTCPPorts = [ 9092 ];
+ virtualisation.memorySize = 2048;
+ };
+ };
+
+ testScript = ''
+ startAll;
+
+ $zookeeper1->waitForUnit("zookeeper");
+ $zookeeper1->waitForUnit("network.target");
+ $zookeeper1->waitForOpenPort(2181);
+
+ $kafka->waitForUnit("apache-kafka");
+ $kafka->waitForUnit("network.target");
+ $kafka->waitForOpenPort(9092);
+
+ $kafka->waitUntilSucceeds("${kafkaPackage}/bin/kafka-topics.sh --create --zookeeper zookeeper1:2181 --partitions 1 --replication-factor 1 --topic testtopic");
+ $kafka->mustSucceed("echo 'test 1' | ${kafkaPackage}/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic testtopic");
+ $kafka->mustSucceed("${kafkaPackage}/bin/kafka-console-consumer.sh --bootstrap-server localhost:9092 --topic testtopic --from-beginning --max-messages 1 | grep 'test 1'");
+ '';
+})
diff --git a/nixos/tests/kafka_0_9.nix b/nixos/tests/kafka_0_9.nix
new file mode 100644
index 000000000000..fee82aba2bda
--- /dev/null
+++ b/nixos/tests/kafka_0_9.nix
@@ -0,0 +1,48 @@
+import ./make-test.nix ({ pkgs, lib, ... } :
+let
+ kafkaPackage = pkgs.apacheKafka_0_9;
+in {
+ name = "kafka_0_9";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ nequissimus ];
+ };
+
+ nodes = {
+ zookeeper1 = { config, ... }: {
+ services.zookeeper = {
+ enable = true;
+ };
+
+ networking.firewall.allowedTCPPorts = [ 2181 ];
+ };
+ kafka = { config, ... }: {
+ services.apache-kafka = {
+ enable = true;
+ extraProperties = ''
+ offsets.topic.replication.factor = 1
+ '';
+ package = kafkaPackage;
+ zookeeper = "zookeeper1:2181";
+ };
+
+ networking.firewall.allowedTCPPorts = [ 9092 ];
+ virtualisation.memorySize = 2048;
+ };
+ };
+
+ testScript = ''
+ startAll;
+
+ $zookeeper1->waitForUnit("zookeeper");
+ $zookeeper1->waitForUnit("network.target");
+ $zookeeper1->waitForOpenPort(2181);
+
+ $kafka->waitForUnit("apache-kafka");
+ $kafka->waitForUnit("network.target");
+ $kafka->waitForOpenPort(9092);
+
+ $kafka->waitUntilSucceeds("${kafkaPackage}/bin/kafka-topics.sh --create --zookeeper zookeeper1:2181 --partitions 1 --replication-factor 1 --topic testtopic");
+ $kafka->mustSucceed("echo 'test 1' | ${kafkaPackage}/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic testtopic");
+ $kafka->mustSucceed("${kafkaPackage}/bin/kafka-console-consumer.sh --zookeeper zookeeper1:2181 --topic testtopic --from-beginning --max-messages 1 | grep 'test 1'");
+ '';
+})
diff --git a/nixos/tests/kafka_1_0.nix b/nixos/tests/kafka_1_0.nix
new file mode 100644
index 000000000000..936840dbcfdc
--- /dev/null
+++ b/nixos/tests/kafka_1_0.nix
@@ -0,0 +1,48 @@
+import ./make-test.nix ({ pkgs, lib, ... } :
+let
+ kafkaPackage = pkgs.apacheKafka_1_0;
+in {
+ name = "kafka_1_0";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ nequissimus ];
+ };
+
+ nodes = {
+ zookeeper1 = { config, ... }: {
+ services.zookeeper = {
+ enable = true;
+ };
+
+ networking.firewall.allowedTCPPorts = [ 2181 ];
+ };
+ kafka = { config, ... }: {
+ services.apache-kafka = {
+ enable = true;
+ extraProperties = ''
+ offsets.topic.replication.factor = 1
+ '';
+ package = kafkaPackage;
+ zookeeper = "zookeeper1:2181";
+ };
+
+ networking.firewall.allowedTCPPorts = [ 9092 ];
+ virtualisation.memorySize = 2048;
+ };
+ };
+
+ testScript = ''
+ startAll;
+
+ $zookeeper1->waitForUnit("zookeeper");
+ $zookeeper1->waitForUnit("network.target");
+ $zookeeper1->waitForOpenPort(2181);
+
+ $kafka->waitForUnit("apache-kafka");
+ $kafka->waitForUnit("network.target");
+ $kafka->waitForOpenPort(9092);
+
+ $kafka->waitUntilSucceeds("${kafkaPackage}/bin/kafka-topics.sh --create --zookeeper zookeeper1:2181 --partitions 1 --replication-factor 1 --topic testtopic");
+ $kafka->mustSucceed("echo 'test 1' | ${kafkaPackage}/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic testtopic");
+ $kafka->mustSucceed("${kafkaPackage}/bin/kafka-console-consumer.sh --bootstrap-server localhost:9092 --topic testtopic --from-beginning --max-messages 1 | grep 'test 1'");
+ '';
+})
diff --git a/nixos/tests/krb5/default.nix b/nixos/tests/krb5/default.nix
new file mode 100644
index 000000000000..dd5b2f37202e
--- /dev/null
+++ b/nixos/tests/krb5/default.nix
@@ -0,0 +1,5 @@
+{ system ? builtins.currentSystem }:
+{
+ example-config = import ./example-config.nix { inherit system; };
+ deprecated-config = import ./deprecated-config.nix { inherit system; };
+}
diff --git a/nixos/tests/krb5/deprecated-config.nix b/nixos/tests/krb5/deprecated-config.nix
new file mode 100644
index 000000000000..980b3e762dc6
--- /dev/null
+++ b/nixos/tests/krb5/deprecated-config.nix
@@ -0,0 +1,48 @@
+# Verifies that the configuration suggested in deprecated example values
+# will result in the expected output.
+
+import ../make-test.nix ({ pkgs, ...} : {
+ name = "krb5-with-deprecated-config";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ eqyiel ];
+ };
+
+ machine =
+ { config, pkgs, ... }: {
+ krb5 = {
+ enable = true;
+ defaultRealm = "ATHENA.MIT.EDU";
+ domainRealm = "athena.mit.edu";
+ kdc = "kerberos.mit.edu";
+ kerberosAdminServer = "kerberos.mit.edu";
+ };
+ };
+
+ testScript =
+ let snapshot = pkgs.writeText "krb5-with-deprecated-config.conf" ''
+ [libdefaults]
+ default_realm = ATHENA.MIT.EDU
+
+ [realms]
+ ATHENA.MIT.EDU = {
+ admin_server = kerberos.mit.edu
+ kdc = kerberos.mit.edu
+ }
+
+ [domain_realm]
+ .athena.mit.edu = ATHENA.MIT.EDU
+ athena.mit.edu = ATHENA.MIT.EDU
+
+ [capaths]
+
+
+ [appdefaults]
+
+
+ [plugins]
+
+ '';
+ in ''
+ $machine->succeed("diff /etc/krb5.conf ${snapshot}");
+ '';
+})
diff --git a/nixos/tests/krb5/example-config.nix b/nixos/tests/krb5/example-config.nix
new file mode 100644
index 000000000000..d5328720931e
--- /dev/null
+++ b/nixos/tests/krb5/example-config.nix
@@ -0,0 +1,106 @@
+# Verifies that the configuration suggested in (non-deprecated) example values
+# will result in the expected output.
+
+import ../make-test.nix ({ pkgs, ...} : {
+ name = "krb5-with-example-config";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ eqyiel ];
+ };
+
+ machine =
+ { config, pkgs, ... }: {
+ krb5 = {
+ enable = true;
+ kerberos = pkgs.krb5Full;
+ libdefaults = {
+ default_realm = "ATHENA.MIT.EDU";
+ };
+ realms = {
+ "ATHENA.MIT.EDU" = {
+ admin_server = "athena.mit.edu";
+ kdc = "athena.mit.edu";
+ };
+ };
+ domain_realm = {
+ "example.com" = "EXAMPLE.COM";
+ ".example.com" = "EXAMPLE.COM";
+ };
+ capaths = {
+ "ATHENA.MIT.EDU" = {
+ "EXAMPLE.COM" = ".";
+ };
+ "EXAMPLE.COM" = {
+ "ATHENA.MIT.EDU" = ".";
+ };
+ };
+ appdefaults = {
+ pam = {
+ debug = false;
+ ticket_lifetime = 36000;
+ renew_lifetime = 36000;
+ max_timeout = 30;
+ timeout_shift = 2;
+ initial_timeout = 1;
+ };
+ };
+ plugins = {
+ ccselect = {
+ disable = "k5identity";
+ };
+ };
+ extraConfig = ''
+ [logging]
+ kdc = SYSLOG:NOTICE
+ admin_server = SYSLOG:NOTICE
+ default = SYSLOG:NOTICE
+ '';
+ };
+ };
+
+ testScript =
+ let snapshot = pkgs.writeText "krb5-with-example-config.conf" ''
+ [libdefaults]
+ default_realm = ATHENA.MIT.EDU
+
+ [realms]
+ ATHENA.MIT.EDU = {
+ admin_server = athena.mit.edu
+ kdc = athena.mit.edu
+ }
+
+ [domain_realm]
+ .example.com = EXAMPLE.COM
+ example.com = EXAMPLE.COM
+
+ [capaths]
+ ATHENA.MIT.EDU = {
+ EXAMPLE.COM = .
+ }
+ EXAMPLE.COM = {
+ ATHENA.MIT.EDU = .
+ }
+
+ [appdefaults]
+ pam = {
+ debug = false
+ initial_timeout = 1
+ max_timeout = 30
+ renew_lifetime = 36000
+ ticket_lifetime = 36000
+ timeout_shift = 2
+ }
+
+ [plugins]
+ ccselect = {
+ disable = k5identity
+ }
+
+ [logging]
+ kdc = SYSLOG:NOTICE
+ admin_server = SYSLOG:NOTICE
+ default = SYSLOG:NOTICE
+ '';
+ in ''
+ $machine->succeed("diff /etc/krb5.conf ${snapshot}");
+ '';
+})
diff --git a/nixos/tests/mesos.nix b/nixos/tests/mesos.nix
index 6e9af126f032..34671df047c8 100644
--- a/nixos/tests/mesos.nix
+++ b/nixos/tests/mesos.nix
@@ -56,9 +56,7 @@ import ./make-test.nix ({ pkgs, ...} : rec {
src = ./mesos_test.py;
phases = [ "installPhase" "fixupPhase" ];
installPhase = ''
- mkdir $out
- cp $src $out/mesos_test.py
- chmod +x $out/mesos_test.py
+ install -Dvm 0755 $src $out/bin/mesos_test.py
echo "done" > test.result
tar czf $out/test.tar.gz test.result
@@ -74,18 +72,18 @@ import ./make-test.nix ({ pkgs, ...} : rec {
$master->waitForOpenPort(5050);
$slave->waitForOpenPort(5051);
- # is slave registred?
+ # is slave registered?
$master->waitUntilSucceeds("curl -s --fail http://master:5050/master/slaves".
" | grep -q \"\\\"hostname\\\":\\\"slave\\\"\"");
- # try to run docker image
+ # try to run docker image
$master->succeed("${pkgs.mesos}/bin/mesos-execute --master=master:5050".
" --resources=\"cpus:0.1;mem:32\" --name=simple-docker".
" --containerizer=mesos --docker_image=echo:latest".
" --shell=true --command=\"echo done\" | grep -q TASK_FINISHED");
# simple command with .tar.gz uri
- $master->succeed("${testFramework}/mesos_test.py master ".
+ $master->succeed("${testFramework}/bin/mesos_test.py master ".
"${testFramework}/test.tar.gz");
'';
})
diff --git a/nixos/tests/minio.nix b/nixos/tests/minio.nix
index a349265b2f57..07a292a9baa5 100644
--- a/nixos/tests/minio.nix
+++ b/nixos/tests/minio.nix
@@ -12,6 +12,9 @@ import ./make-test.nix ({ pkgs, ...} : {
secretKey = "V7f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12";
};
environment.systemPackages = [ pkgs.minio-client ];
+
+ # Minio requires at least 1GiB of free disk space to run.
+ virtualisation.diskSize = 4 * 1024;
};
};
@@ -20,7 +23,6 @@ import ./make-test.nix ({ pkgs, ...} : {
startAll;
$machine->waitForUnit("minio.service");
$machine->waitForOpenPort(9000);
- $machine->succeed("curl --fail http://localhost:9000/minio/index.html");
# Create a test bucket on the server
$machine->succeed("mc config host add minio http://localhost:9000 BKIKJAA5BMMU2RHO6IBB V7f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12 S3v4");
diff --git a/nixos/tests/mysql-backup.nix b/nixos/tests/mysql-backup.nix
new file mode 100644
index 000000000000..f5bcc460cba7
--- /dev/null
+++ b/nixos/tests/mysql-backup.nix
@@ -0,0 +1,42 @@
+# Test whether mysqlBackup option works
+import ./make-test.nix ({ pkgs, ... } : {
+ name = "mysql-backup";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ rvl ];
+ };
+
+ nodes = {
+ master = { config, pkgs, ... }: {
+ services.mysql = {
+ enable = true;
+ initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ];
+ package = pkgs.mysql;
+ };
+
+ services.mysqlBackup = {
+ enable = true;
+ databases = [ "doesnotexist" "testdb" ];
+ };
+ };
+ };
+
+ testScript =
+ '' startAll;
+
+ # Need to have mysql started so that it can be populated with data.
+ $master->waitForUnit("mysql.service");
+
+ # Wait for testdb to be populated.
+ $master->sleep(10);
+
+ # Do a backup and wait for it to finish.
+ $master->startJob("mysql-backup.service");
+ $master->waitForJob("mysql-backup.service");
+
+ # Check that data appears in backup
+ $master->succeed("${pkgs.gzip}/bin/zcat /var/backup/mysql/testdb.gz | grep hello");
+
+ # Check that a failed backup is logged
+ $master->succeed("journalctl -u mysql-backup.service | grep 'fail.*doesnotexist' > /dev/null");
+ '';
+})
diff --git a/nixos/tests/pgjwt.nix b/nixos/tests/pgjwt.nix
index 2cf2963ae316..d186c42a2a98 100644
--- a/nixos/tests/pgjwt.nix
+++ b/nixos/tests/pgjwt.nix
@@ -1,42 +1,37 @@
-import ./make-test.nix ({ pkgs, ...} :
+import ./make-test.nix ({ pkgs, lib, ...}:
let
- test = pkgs.writeText "test.sql" ''
- CREATE EXTENSION pgcrypto;
- CREATE EXTENSION pgjwt;
- select sign('{"sub":"1234567890","name":"John Doe","admin":true}', 'secret');
- select * from verify('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiYWRtaW4iOnRydWV9.TJVA95OrM7E2cBab30RMHrHDcEfxjoYZgeFONFh7HgQ', 'secret');
+ test = with pkgs; runCommand "patch-test" {
+ nativeBuildInputs = [ pgjwt ];
+ }
+ ''
+ sed -e '12 i CREATE EXTENSION pgcrypto;\nCREATE EXTENSION pgtap;\nSET search_path TO tap,public;' ${pgjwt.src}/test.sql > $out;
'';
in
-{
+with pkgs; {
name = "pgjwt";
- meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ spinus ];
+ meta = with lib.maintainers; {
+ maintainers = [ spinus willibutz ];
};
nodes = {
- master =
- { pkgs, config, ... }:
-
- {
- services.postgresql = let mypg = pkgs.postgresql95; in {
- enable = true;
- package = mypg;
- extraPlugins =[pkgs.pgjwt];
- initialScript = pkgs.writeText "postgresql-init.sql"
- ''
- CREATE ROLE postgres WITH superuser login createdb;
- '';
- };
+ master = { pkgs, config, ... }:
+ {
+ services.postgresql = {
+ enable = true;
+ extraPlugins = [ pgjwt pgtap ];
};
+ };
};
- testScript = ''
+ testScript = { nodes, ... }:
+ let
+ sqlSU = "${nodes.master.config.services.postgresql.superUser}";
+ pgProve = "${pkgs.perlPackages.TAPParserSourceHandlerpgTAP}";
+ in
+ ''
startAll;
$master->waitForUnit("postgresql");
- $master->succeed("timeout 10 bash -c 'while ! psql postgres -c \"SELECT 1;\";do sleep 1;done;'");
- $master->succeed("cat ${test} | psql postgres");
- # I can't make original test working :[
- # $master->succeed("${pkgs.perlPackages.TAPParserSourceHandlerpgTAP}/bin/pg_prove -d postgres ${pkgs.pgjwt.src}/test.sql");
-
+ $master->copyFileFromHost("${test}","/tmp/test.sql");
+ $master->succeed("${pkgs.sudo}/bin/sudo -u ${sqlSU} PGOPTIONS=--search_path=tap,public ${pgProve}/bin/pg_prove -d postgres -v -f /tmp/test.sql");
'';
})
diff --git a/nixos/tests/pgmanage.nix b/nixos/tests/pgmanage.nix
new file mode 100644
index 000000000000..110cbd5c5b40
--- /dev/null
+++ b/nixos/tests/pgmanage.nix
@@ -0,0 +1,39 @@
+import ./make-test.nix ({ pkgs, ... } :
+let
+ role = "test";
+ password = "secret";
+ conn = "local";
+in
+{
+ name = "pgmanage";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ basvandijk ];
+ };
+ nodes = {
+ one = { config, pkgs, ... }: {
+ services = {
+ postgresql = {
+ enable = true;
+ initialScript = pkgs.writeText "pg-init-script" ''
+ CREATE ROLE ${role} SUPERUSER LOGIN PASSWORD '${password}';
+ '';
+ };
+ pgmanage = {
+ enable = true;
+ connections = {
+ "${conn}" = "hostaddr=127.0.0.1 port=${toString config.services.postgresql.port} dbname=postgres";
+ };
+ };
+ };
+ };
+ };
+
+ testScript = ''
+ startAll;
+ $one->waitForUnit("default.target");
+ $one->requireActiveUnit("pgmanage.service");
+
+ # Test if we can log in.
+ $one->waitUntilSucceeds("curl 'http://localhost:8080/pgmanage/auth' --data 'action=login&connname=${conn}&username=${role}&password=${password}' --fail");
+ '';
+})
diff --git a/nixos/tests/postgis.nix b/nixos/tests/postgis.nix
index 1dba5c363c09..f6ce3fe38ed3 100644
--- a/nixos/tests/postgis.nix
+++ b/nixos/tests/postgis.nix
@@ -9,15 +9,11 @@ import ./make-test.nix ({ pkgs, ...} : {
{ pkgs, config, ... }:
{
- services.postgresql = let mypg = pkgs.postgresql95; in {
+ services.postgresql = let mypg = pkgs.postgresql100; in {
enable = true;
package = mypg;
- extraPlugins = [ (pkgs.postgis.override { postgresql = mypg; }).v_2_2_1 ];
- initialScript = pkgs.writeText "postgresql-init.sql"
- ''
- CREATE ROLE postgres WITH superuser login createdb;
- '';
- };
+ extraPlugins = [ (pkgs.postgis.override { postgresql = mypg; }).v_2_4_0 ];
+ };
};
};
diff --git a/nixos/tests/prometheus.nix b/nixos/tests/prometheus.nix
index ade097597bb8..374fb2d634b4 100644
--- a/nixos/tests/prometheus.nix
+++ b/nixos/tests/prometheus.nix
@@ -5,9 +5,6 @@ import ./make-test.nix {
one = { config, pkgs, ... }: {
services.prometheus = {
enable = true;
- globalConfig = {
- labels = { foo = "bar"; };
- };
scrapeConfigs = [{
job_name = "prometheus";
static_configs = [{
diff --git a/nixos/tests/run-in-machine.nix b/nixos/tests/run-in-machine.nix
index d1102f8d4073..a6dfece44a92 100644
--- a/nixos/tests/run-in-machine.nix
+++ b/nixos/tests/run-in-machine.nix
@@ -2,7 +2,16 @@
with import ../lib/testing.nix { inherit system; };
-runInMachine {
- drv = pkgs.hello;
- machine = { config, pkgs, ... }: { /* services.sshd.enable = true; */ };
-}
+let
+ output = runInMachine {
+ drv = pkgs.hello;
+ machine = { config, pkgs, ... }: { /* services.sshd.enable = true; */ };
+ };
+in pkgs.runCommand "verify-output" { inherit output; } ''
+ if [ ! -e "$output/bin/hello" ]; then
+ echo "Derivation built using runInMachine produced incorrect output:" >&2
+ ls -laR "$output" >&2
+ exit 1
+ fi
+ "$output/bin/hello" > "$out"
+''
diff --git a/nixos/tests/testdb.sql b/nixos/tests/testdb.sql
index 4fb28fea3df9..3c68c49ae82c 100644
--- a/nixos/tests/testdb.sql
+++ b/nixos/tests/testdb.sql
@@ -8,3 +8,4 @@ insert into tests values (1, 'a');
insert into tests values (2, 'b');
insert into tests values (3, 'c');
insert into tests values (4, 'd');
+insert into tests values (5, 'hello');
diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix
index a1ab7614871a..c519d7dae8be 100644
--- a/nixos/tests/virtualbox.nix
+++ b/nixos/tests/virtualbox.nix
@@ -107,8 +107,8 @@ let
buildInputs = [ pkgs.utillinux pkgs.perl ];
} ''
- ${pkgs.parted}/sbin/parted /dev/vda mklabel msdos
- ${pkgs.parted}/sbin/parted /dev/vda -- mkpart primary ext2 1M -1s
+ ${pkgs.parted}/sbin/parted --script /dev/vda mklabel msdos
+ ${pkgs.parted}/sbin/parted --script /dev/vda -- mkpart primary ext2 1M -1s
. /sys/class/block/vda1/uevent
mknod /dev/vda1 b $MAJOR $MINOR
diff --git a/nixos/tests/zookeeper.nix b/nixos/tests/zookeeper.nix
new file mode 100644
index 000000000000..d247654adade
--- /dev/null
+++ b/nixos/tests/zookeeper.nix
@@ -0,0 +1,28 @@
+import ./make-test.nix ({ pkgs, ...} : {
+ name = "zookeeper";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ nequissimus ];
+ };
+
+ nodes = {
+ server = { pkgs, config, ... }: {
+ services.zookeeper = {
+ enable = true;
+ };
+
+ networking.firewall.allowedTCPPorts = [ 2181 ];
+ };
+ };
+
+ testScript = ''
+ startAll;
+
+ $server->waitForUnit("zookeeper");
+ $server->waitForUnit("network.target");
+ $server->waitForOpenPort(2181);
+
+ $server->waitUntilSucceeds("${pkgs.zookeeper}/bin/zkCli.sh -server localhost:2181 create /foo bar");
+ $server->waitUntilSucceeds("${pkgs.zookeeper}/bin/zkCli.sh -server localhost:2181 set /foo hello");
+ $server->waitUntilSucceeds("${pkgs.zookeeper}/bin/zkCli.sh -server localhost:2181 get /foo | grep hello");
+ '';
+})
diff --git a/pkgs/applications/altcoins/bitcoin-abc.nix b/pkgs/applications/altcoins/bitcoin-abc.nix
new file mode 100644
index 000000000000..011e3cd7c874
--- /dev/null
+++ b/pkgs/applications/altcoins/bitcoin-abc.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost
+, zlib, miniupnpc, qtbase ? null , qttools ? null, utillinux, protobuf, qrencode, libevent
+, withGui }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+
+ name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version;
+ version = "0.16.0";
+
+ src = fetchFromGitHub {
+ owner = "bitcoin-ABC";
+ repo = "bitcoin-abc";
+ rev = "v${version}";
+ sha256 = "0wwcgvd8zgl5qh6z1sa3kdv1lr9cwwbs9j2gaad5mqr9sfwbbxdh";
+ };
+
+ patches = [ ./fix-bitcoin-qt-build.patch ];
+
+ nativeBuildInputs = [ pkgconfig autoreconfHook ];
+ buildInputs = [ openssl db48 boost zlib
+ miniupnpc utillinux protobuf libevent ]
+ ++ optionals withGui [ qtbase qttools qrencode ];
+
+ configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
+ ++ optionals withGui [ "--with-gui=qt5" ];
+
+ meta = {
+ description = "Peer-to-peer electronic cash system (Cash client)";
+ longDescription= ''
+ Bitcoin ABC is the name of open source software which enables the use of Bitcoin.
+ It is designed to facilite a hard fork to increase Bitcoin's block size limit.
+ "ABC" stands for "Adjustable Blocksize Cap".
+
+ Bitcoin ABC is a fork of the Bitcoin Core software project.
+ '';
+ homepage = https://bitcoinabc.org/;
+ maintainers = with maintainers; [ lassulus ];
+ license = licenses.mit;
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/applications/altcoins/bitcoin-classic.nix b/pkgs/applications/altcoins/bitcoin-classic.nix
index d2878a17fb3a..9a2145d91cfb 100644
--- a/pkgs/applications/altcoins/bitcoin-classic.nix
+++ b/pkgs/applications/altcoins/bitcoin-classic.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost
-, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, libevent
+, zlib, miniupnpc, qtbase ? null, qttools ? null, utillinux, protobuf, qrencode, libevent
, withGui }:
with stdenv.lib;
@@ -16,13 +16,15 @@ stdenv.mkDerivation rec {
sha256 = "129gkg035gv7zmc463jl2spvdh0fl4q8v4jdaslfnp34hbwi1p07";
};
+ patches = [ ./fix-bitcoin-qt-build.patch ];
+
nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs = [ openssl db48 boost zlib
miniupnpc utillinux protobuf libevent ]
- ++ optionals withGui [ qt4 qrencode ];
+ ++ optionals withGui [ qtbase qttools qrencode ];
configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
- ++ optionals withGui [ "--with-gui=qt4" ];
+ ++ optionals withGui [ "--with-gui=qt5" ];
meta = {
description = "Peer-to-peer electronic cash system (Classic client)";
diff --git a/pkgs/applications/altcoins/bitcoin-unlimited.nix b/pkgs/applications/altcoins/bitcoin-unlimited.nix
index 2ad8e3fb3500..9eb1e54b9093 100644
--- a/pkgs/applications/altcoins/bitcoin-unlimited.nix
+++ b/pkgs/applications/altcoins/bitcoin-unlimited.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
owner = "bitcoinunlimited";
repo = "bitcoinunlimited";
rev = "v${version}";
- sha256 = "0rhk6xvzvzyfppg0pgq72nqgm2rmkiw0nhg3rwnzcvvj90nrz3da";
+ sha256 = "17cmyns1908s2rqs0zwr05f3541nqm2pg08n2xn97g2k3yimdg5q";
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];
diff --git a/pkgs/applications/altcoins/dapp.nix b/pkgs/applications/altcoins/dapp.nix
index 51de4d202e84..6ad66a24397f 100644
--- a/pkgs/applications/altcoins/dapp.nix
+++ b/pkgs/applications/altcoins/dapp.nix
@@ -1,15 +1,15 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper
-, seth, git, solc, shellcheck, nodejs, hsevm }:
+, seth, git, solc, shellcheck, nodejs, hevm }:
stdenv.mkDerivation rec {
name = "dapp";
- version = "0.5.3";
+ version = "0.5.7";
src = fetchFromGitHub {
owner = "dapphub";
repo = "dapp";
rev = "v${version}";
- sha256 = "13b2krd02py8jnzjis44lay5i31d95z0myrsy5afzw7fa25giird";
+ sha256 = "128f35hczarihb263as391wr9zbyc1q1p49qbxh30via23r1brb0";
};
nativeBuildInputs = [makeWrapper shellcheck];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
checkPhase = "make test";
makeFlags = ["prefix=$(out)"];
postInstall = let path = lib.makeBinPath [
- nodejs solc git seth hsevm
+ nodejs solc git seth hevm
]; in ''
wrapProgram "$out/bin/dapp" --prefix PATH : "${path}"
'';
diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index 31dcc78d3d7f..1a21efc32322 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -1,14 +1,17 @@
-{ callPackage, boost155, boost162, boost163, openssl_1_1_0, haskellPackages }:
+{ callPackage, boost155, boost162, openssl_1_1_0, haskellPackages, darwin, libsForQt5 }:
rec {
bitcoin = callPackage ./bitcoin.nix { withGui = true; };
bitcoind = callPackage ./bitcoin.nix { withGui = false; };
+ bitcoin-abc = libsForQt5.callPackage ./bitcoin-abc.nix { withGui = true; };
+ bitcoind-abc = callPackage ./bitcoin-abc.nix { withGui = false; };
+
bitcoin-unlimited = callPackage ./bitcoin-unlimited.nix { withGui = true; };
bitcoind-unlimited = callPackage ./bitcoin-unlimited.nix { withGui = false; };
- bitcoin-classic = callPackage ./bitcoin-classic.nix { withGui = true; };
+ bitcoin-classic = libsForQt5.callPackage ./bitcoin-classic.nix { withGui = true; };
bitcoind-classic = callPackage ./bitcoin-classic.nix { withGui = false; };
bitcoin-xt = callPackage ./bitcoin-xt.nix { withGui = true; };
@@ -23,7 +26,10 @@ rec {
dogecoind = callPackage ./dogecoin.nix { withGui = false; };
freicoin = callPackage ./freicoin.nix { boost = boost155; };
- go-ethereum = callPackage ./go-ethereum.nix { };
+ go-ethereum = callPackage ./go-ethereum.nix {
+ inherit (darwin) libobjc;
+ inherit (darwin.apple_sdk.frameworks) IOKit;
+ };
go-ethereum-classic = callPackage ./go-ethereum-classic { };
hivemind = callPackage ./hivemind.nix { withGui = true; };
@@ -43,7 +49,7 @@ rec {
seth = callPackage ./seth.nix { };
dapp = callPackage ./dapp.nix { };
- hsevm = (haskellPackages.callPackage ./hsevm.nix {});
+ hevm = (haskellPackages.callPackage ./hevm.nix {});
primecoin = callPackage ./primecoin.nix { withGui = true; };
primecoind = callPackage ./primecoin.nix { withGui = false; };
@@ -53,6 +59,5 @@ rec {
zcash = callPackage ./zcash {
withGui = false;
openssl = openssl_1_1_0;
- boost = boost163;
};
}
diff --git a/pkgs/applications/altcoins/dogecoin.nix b/pkgs/applications/altcoins/dogecoin.nix
index d8df6dd8349a..33c2e598fca9 100644
--- a/pkgs/applications/altcoins/dogecoin.nix
+++ b/pkgs/applications/altcoins/dogecoin.nix
@@ -13,11 +13,11 @@ stdenv.mkDerivation rec {
owner = "dogecoin";
repo = "dogecoin";
rev = "v${version}";
- sha256 = "16q3rldj04hkzzjd23h0knszqr5dgixizy4iyc129mz8wa8pbnvy";
+ sha256 = "04rddx20d4fps2w3h1jxa2j8iyqpjv2fh897z0z3r06qjvjzf7rr";
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];
- buildInputs = [ openssl db5 openssl utillinux
+ buildInputs = [ openssl db5 openssl utillinux
protobuf boost zlib miniupnpc ]
++ optionals withGui [ qt4 qrencode ];
diff --git a/pkgs/applications/altcoins/ethabi.nix b/pkgs/applications/altcoins/ethabi.nix
index c584dd65ebb8..e8fb1c49828e 100644
--- a/pkgs/applications/altcoins/ethabi.nix
+++ b/pkgs/applications/altcoins/ethabi.nix
@@ -13,7 +13,7 @@ buildRustPackage rec {
sha256 = "1rg7ydvnhlg8w6blilm3cv6v4q51x1hgrbkln2ikhpdq0vakp5fd";
};
- depsSha256 = "1n4rxipna307r4xppb2iaads7kpa3yjv99fimvpn8l0f999ir2rz";
+ cargoSha256 = "0i9617qwc6d4jvlbydwk03rcsnyvxzpbn2ms10ds4r6x7jy2a4sy";
cargoBuildFlags = ["--features cli"];
diff --git a/pkgs/applications/altcoins/ethrun.nix b/pkgs/applications/altcoins/ethrun.nix
index f61a5884fd4a..2a8c37610dba 100644
--- a/pkgs/applications/altcoins/ethrun.nix
+++ b/pkgs/applications/altcoins/ethrun.nix
@@ -13,12 +13,13 @@ buildRustPackage rec {
sha256 = "1w651g4p2mc4ljp20l8lwvfx3l3fzyp6gf2izr85vyb1wjbaccqn";
};
- depsSha256 = "14x8pbjgkz0g724lnvd9mi2alqd6fipjljw6xsraf9gqwijn1knq";
+ cargoSha256 = "14x8pbjgkz0g724lnvd9mi2alqd6fipjljw6xsraf9gqwijn1kn0";
meta = {
description = "Directly run Ethereum bytecode";
homepage = https://github.com/dapphub/ethrun/;
maintainers = [stdenv.lib.maintainers.dbrock];
+ broken = true; # mark temporary as broken
inherit version;
};
}
diff --git a/pkgs/applications/altcoins/fix-bitcoin-qt-build.patch b/pkgs/applications/altcoins/fix-bitcoin-qt-build.patch
new file mode 100644
index 000000000000..cbbfd85fe5bf
--- /dev/null
+++ b/pkgs/applications/altcoins/fix-bitcoin-qt-build.patch
@@ -0,0 +1,15 @@
+--- bitcoin-abc-v0.15.0-src/build-aux/m4/bitcoin_qt.m4 1970-01-01 01:00:01.000000000 +0100
++++ bitcoin-abc-v0.15.0-src.org/build-aux/m4/bitcoin_qt.m4 2017-09-27 23:38:44.748384197 +0100
+@@ -35,11 +35,7 @@
+ dnl Output: $1 is set to the path of $2 if found. $2 are searched in order.
+ AC_DEFUN([BITCOIN_QT_PATH_PROGS],[
+ BITCOIN_QT_CHECK([
+- if test "x$3" != "x"; then
+- AC_PATH_PROGS($1,$2,,$3)
+- else
+- AC_PATH_PROGS($1,$2)
+- fi
++ AC_PATH_PROGS($1,$2)
+ if test "x$$1" = "x" && test "x$4" != "xyes"; then
+ BITCOIN_QT_FAIL([$1 not found])
+ fi
diff --git a/pkgs/applications/altcoins/go-ethereum-classic/default.nix b/pkgs/applications/altcoins/go-ethereum-classic/default.nix
index 37d6264d82f3..679312d9a8e9 100644
--- a/pkgs/applications/altcoins/go-ethereum-classic/default.nix
+++ b/pkgs/applications/altcoins/go-ethereum-classic/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "go-ethereum-classic-${version}";
- version = "3.5.86";
+ version = "4.0.0";
goPackagePath = "github.com/ethereumproject/go-ethereum";
subPackages = [ "cmd/evm" "cmd/geth" ];
@@ -10,7 +10,7 @@ buildGoPackage rec {
src = fetchgit {
rev = "v${version}";
url = "https://github.com/ethereumproject/go-ethereum";
- sha256 = "1k59hl3qvx4422zqlp259566fnxq5bs67jhm0v6a1zfr1k8iqzwh";
+ sha256 = "06f1w7s45q4zva1xjrx92xinsdrixl0m6zhx5hvdjmg3xqcbwr79";
};
goDeps = ./deps.nix;
diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix
index 4cf68fb76fd6..04e68b1f1282 100644
--- a/pkgs/applications/altcoins/go-ethereum.nix
+++ b/pkgs/applications/altcoins/go-ethereum.nix
@@ -1,10 +1,14 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub, libobjc, IOKit }:
buildGoPackage rec {
name = "go-ethereum-${version}";
- version = "1.7.0";
+ version = "1.7.2";
goPackagePath = "github.com/ethereum/go-ethereum";
+ # Fix for usb-related segmentation faults on darwin
+ propagatedBuildInputs =
+ stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ];
+
# Fixes Cgo related build failures (see https://github.com/NixOS/nixpkgs/issues/25959 )
hardeningDisable = [ "fortify" ];
@@ -12,17 +16,9 @@ buildGoPackage rec {
owner = "ethereum";
repo = "go-ethereum";
rev = "v${version}";
- sha256 = "0ybjaiyrfb320rab6a5r9iiqvkrcd8b2qvixzx0kjmc4a7l1q5zh";
+ sha256 = "11n77zlf8qixhx26sqf33v911716msi6h0z4ng8gxhzhznrn2nrd";
};
- # 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";
diff --git a/pkgs/applications/altcoins/hsevm.nix b/pkgs/applications/altcoins/hevm.nix
similarity index 61%
rename from pkgs/applications/altcoins/hsevm.nix
rename to pkgs/applications/altcoins/hevm.nix
index 173ac83a6db4..51e5f6bcb298 100644
--- a/pkgs/applications/altcoins/hsevm.nix
+++ b/pkgs/applications/altcoins/hevm.nix
@@ -1,24 +1,28 @@
-{ mkDerivation, abstract-par, aeson, ansi-wl-pprint, base
+{ mkDerivation, abstract-par, aeson, ansi-wl-pprint, async, base
, base16-bytestring, base64-bytestring, binary, brick, bytestring
, cereal, containers, cryptonite, data-dword, deepseq, directory
-, filepath, ghci-pretty, here, HUnit, lens, lens-aeson, memory
-, monad-par, mtl, optparse-generic, process, QuickCheck
-, quickcheck-text, readline, rosezipper, scientific, stdenv, tasty, tasty-hunit
-, tasty-quickcheck, temporary, text, text-format
-, unordered-containers, vector, vty
+, filepath, ghci-pretty, here, HUnit, lens
+, lens-aeson, memory, monad-par, mtl, optparse-generic, process
+, QuickCheck, quickcheck-text, readline, rosezipper, scientific
+, stdenv, tasty, tasty-hunit, tasty-quickcheck, temporary, text
+, text-format, time, unordered-containers, vector, vty
+
+, restless-git
+
, fetchFromGitHub, lib, makeWrapper
, ncurses, zlib, bzip2, solc, coreutils
+, bash
}:
lib.overrideDerivation (mkDerivation rec {
- pname = "hsevm";
- version = "0.6.4";
+ pname = "hevm";
+ version = "0.8.5";
src = fetchFromGitHub {
owner = "dapphub";
- repo = "hsevm";
+ repo = "hevm";
rev = "v${version}";
- sha256 = "01b67k9cam4gvsi07q3vx527m1w6p6xll64k1nl27bc8ik6jh8l9";
+ sha256 = "1a27bh0azf2hdg5hp6s9azv2rhzy7vrlq1kmg688g9nfwwwhgkp0";
};
isLibrary = false;
@@ -26,8 +30,9 @@ lib.overrideDerivation (mkDerivation rec {
enableSharedExecutables = false;
postInstall = ''
- rm -rf $out/{lib,share}
- wrapProgram $out/bin/hsevm --add-flags '+RTS -N$((`${coreutils}/bin/nproc` - 1)) -RTS'
+ wrapProgram $out/bin/hevm \
+ --add-flags '+RTS -N$((`${coreutils}/bin/nproc` - 1)) -RTS' \
+ --suffix PATH : "${lib.makeBinPath [bash coreutils]}"
'';
extraLibraries = [
@@ -36,17 +41,17 @@ lib.overrideDerivation (mkDerivation rec {
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
+ unordered-containers vector vty restless-git
];
executableHaskellDepends = [
- readline zlib bzip2
+ async readline zlib bzip2
];
testHaskellDepends = [
base binary bytestring ghci-pretty here HUnit lens mtl QuickCheck
tasty tasty-hunit tasty-quickcheck text vector
];
- homepage = https://github.com/dapphub/hsevm;
+ homepage = https://github.com/dapphub/hevm;
description = "Ethereum virtual machine evaluator";
license = stdenv.lib.licenses.agpl3;
maintainers = [stdenv.lib.maintainers.dbrock];
diff --git a/pkgs/applications/altcoins/memorycoin.nix b/pkgs/applications/altcoins/memorycoin.nix
index 9efab9a8babb..24b891d60eb2 100644
--- a/pkgs/applications/altcoins/memorycoin.nix
+++ b/pkgs/applications/altcoins/memorycoin.nix
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec{
sha256 = "1iyh6dqrg0mirwci5br5n5qw3ghp2cs23wd8ygr56bh9ml4dr1m8";
};
- buildInputs = [ pkgconfig openssl db48 boost zlib utillinux protobuf ]
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ openssl db48 boost zlib utillinux protobuf ]
++ optionals withGui [ qt4 qmake4Hook qrencode ];
qmakeFlags = ["USE_UPNP=-"];
diff --git a/pkgs/applications/altcoins/primecoin.nix b/pkgs/applications/altcoins/primecoin.nix
index e6ed05dd27f1..b1e3dc2dd93d 100644
--- a/pkgs/applications/altcoins/primecoin.nix
+++ b/pkgs/applications/altcoins/primecoin.nix
@@ -16,7 +16,8 @@ stdenv.mkDerivation rec{
qmakeFlags = ["USE_UPNP=-"];
makeFlags = ["USE_UPNP=-"];
- buildInputs = [ pkgconfig openssl db48 boost zlib utillinux protobuf ]
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ openssl db48 boost zlib utillinux protobuf ]
++ optionals withGui [ qt4 qmake4Hook qrencode ];
configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
diff --git a/pkgs/applications/altcoins/stellar-core.nix b/pkgs/applications/altcoins/stellar-core.nix
index 9942f0898a2f..4a4665291d6e 100644
--- a/pkgs/applications/altcoins/stellar-core.nix
+++ b/pkgs/applications/altcoins/stellar-core.nix
@@ -16,7 +16,8 @@ in stdenv.mkDerivation {
leaveDotGit = true;
};
- buildInputs = [ autoconf automake libtool pkgconfig git ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ autoconf automake libtool git ];
propagatedBuildInputs = [ bison flex postgresql ];
diff --git a/pkgs/applications/altcoins/zcash/default.nix b/pkgs/applications/altcoins/zcash/default.nix
index 456ed41931cc..aa912f04efb5 100644
--- a/pkgs/applications/altcoins/zcash/default.nix
+++ b/pkgs/applications/altcoins/zcash/default.nix
@@ -9,18 +9,19 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "zcash" + (toString (optional (!withGui) "d")) + "-" + version;
- version = "1.0.11";
+ version = "1.0.12";
src = fetchFromGitHub {
owner = "zcash";
repo = "zcash";
rev = "v${version}";
- sha256 = "09474jdhsg30maqrwfxigbw3llqi8axhh82lz3a23ii2gj68ni55";
+ sha256 = "19bxhdnkvgncgl9x6nbaf5nwgrdfw99icvdbi9adfh646pd5z64s";
};
enableParallelBuilding = true;
- buildInputs = [ pkgconfig gtest gmock gmp libsnark autoreconfHook openssl wget db62 boost zlib
+ nativeBuildInputs = [ autoreconfHook pkgconfig ];
+ buildInputs = [ gtest gmock gmp libsnark openssl wget db62 boost zlib
protobuf libevent libsodium librustzcash ]
++ optionals stdenv.isLinux [ utillinux ]
++ optionals withGui [ qt4 qrencode ];
diff --git a/pkgs/applications/altcoins/zcash/librustzcash/default.nix b/pkgs/applications/altcoins/zcash/librustzcash/default.nix
index 2b2094c84018..b89582c09e60 100644
--- a/pkgs/applications/altcoins/zcash/librustzcash/default.nix
+++ b/pkgs/applications/altcoins/zcash/librustzcash/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "02l1f46frpvw1r6k1wfh77mrsnmsdvifqx0vnscxz4xgb9ia9d1c";
};
- depsSha256 = "02qx8zdhmj7rmhqqq5q9428x9mlrjxxcnn4yhnygz9gfgvada2hx";
+ cargoSha256 = "1b0kal53ggcr59hbrsdj8fifjycahrmzwq677n9h3fywv4r237m6";
installPhase = ''
mkdir -p $out/lib
diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix
index efb69d4c481f..ad12609429f5 100644
--- a/pkgs/applications/audio/a2jmidid/default.nix
+++ b/pkgs/applications/audio/a2jmidid/default.nix
@@ -12,7 +12,8 @@ in stdenv.mkDerivation rec {
sha256 = "06dgf5655znbvrd7fhrv8msv6zw8vk0hjqglcqkh90960mnnmwz7";
};
- buildInputs = [ makeWrapper pkgconfig alsaLib dbus libjack2 python dbus-python ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ makeWrapper alsaLib dbus libjack2 python dbus-python ];
configurePhase = "${python.interpreter} waf configure --prefix=$out";
diff --git a/pkgs/applications/audio/aj-snapshot/default.nix b/pkgs/applications/audio/aj-snapshot/default.nix
index 06e143704224..115df15d2a57 100644
--- a/pkgs/applications/audio/aj-snapshot/default.nix
+++ b/pkgs/applications/audio/aj-snapshot/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
doCheck = false;
- buildInputs = [ alsaLib minixml jack2Full pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ alsaLib minixml jack2Full ];
meta = with stdenv.lib; {
description = "Tool for storing/restoring JACK and/or ALSA connections to/from cml files";
diff --git a/pkgs/applications/audio/ams-lv2/default.nix b/pkgs/applications/audio/ams-lv2/default.nix
index fbbb9f90f8a5..bc72c3e13144 100644
--- a/pkgs/applications/audio/ams-lv2/default.nix
+++ b/pkgs/applications/audio/ams-lv2/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "1n1dnqnj24xhiy9323lj52nswr5120cj56fpckg802miss05sr6x";
};
- buildInputs = [ cairo fftw gtkmm2 lv2 lvtk pkgconfig python ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ cairo fftw gtkmm2 lv2 lvtk python ];
configurePhase = "python waf configure --prefix=$out";
diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index a4debfe37440..850848abcde6 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -16,7 +16,7 @@ let
# "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH.
# Version to build.
- tag = "5.11";
+ tag = "5.12";
in
@@ -25,12 +25,12 @@ stdenv.mkDerivation rec {
src = fetchgit {
url = "git://git.ardour.org/ardour/ardour.git";
- rev = "bd40b9132cbac2d2b79ba0ef480bd41d837f8f71";
- sha256 = "0xxxjg90jzj5cj364mlhk8srkgaghxif2jj1015bra25pffk41ay";
+ rev = "ae0dcdc0c5d13483271065c360e378202d20170a";
+ sha256 = "0mla5lm51ryikc2rrk53max2m7a5ds6i1ai921l2h95wrha45nkr";
};
buildInputs =
- [ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac
+ [ 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
diff --git a/pkgs/applications/audio/ario/default.nix b/pkgs/applications/audio/ario/default.nix
index 29d0241fa02f..afb3c8342731 100644
--- a/pkgs/applications/audio/ario/default.nix
+++ b/pkgs/applications/audio/ario/default.nix
@@ -14,8 +14,9 @@ stdenv.mkDerivation rec {
patches = [ ./glib-single-include.patch ];
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig gettext gtk2 expat intltool libgcrypt libunique gnutls
+ gettext gtk2 expat intltool libgcrypt libunique gnutls
libxml2 curl mpd_clientlib dbus_glib libnotify libsoup avahi taglib
];
diff --git a/pkgs/applications/audio/artyFX/default.nix b/pkgs/applications/audio/artyFX/default.nix
index 568195c1dba7..9a9095d2fc12 100644
--- a/pkgs/applications/audio/artyFX/default.nix
+++ b/pkgs/applications/audio/artyFX/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "012hcy1mxl7gs2lipfcqp5x0xv1azb9hjrwf0h59yyxnzx96h7c9";
};
- buildInputs = [ cairomm cmake libjack2 libpthreadstubs libXdmcp libxshmfence libsndfile lv2 ntk pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ cairomm cmake libjack2 libpthreadstubs libXdmcp libxshmfence libsndfile lv2 ntk ];
meta = with stdenv.lib; {
homepage = http://openavproductions.com/artyfx/;
diff --git a/pkgs/applications/audio/asunder/default.nix b/pkgs/applications/audio/asunder/default.nix
index b5897c71cd94..99d6357e9216 100644
--- a/pkgs/applications/audio/asunder/default.nix
+++ b/pkgs/applications/audio/asunder/default.nix
@@ -19,7 +19,8 @@ stdenv.mkDerivation rec {
sha256 = "1nq9kd4rd4k2kibf57gdbm0zw2gxa234vvvdhxkm8g5bhx5h3iyq";
};
- buildInputs = [ gtk2 libcddb intltool pkgconfig makeWrapper ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk2 libcddb intltool makeWrapper ];
runtimeDeps =
optional mp3Support lame ++
diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix
index 6d4b18e29b00..8242d035e5b8 100644
--- a/pkgs/applications/audio/audacious/default.nix
+++ b/pkgs/applications/audio/audacious/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, wrapGAppsHook, gettext, glib, gtk3
-, libmowgli, libmcs, dbus_glib, libxml2, xorg, gnome3, alsaLib
+, libmowgli, dbus_glib, libxml2, xorg, gnome3, alsaLib
, libpulseaudio, libjack2, fluidsynth, libmad, libogg, libvorbis
, libcdio082, libcddb, flac, ffmpeg, mpg123, libcue, libmms, libbs2b
, libsndfile, libmodplug, libsamplerate, soxr, lirc, curl, wavpack
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- gettext glib gtk3 libmowgli libmcs dbus_glib libxml2
+ gettext glib gtk3 libmowgli dbus_glib libxml2
xorg.libXcomposite gnome3.defaultIconTheme alsaLib libjack2
libpulseaudio fluidsynth libmad libogg libvorbis libcdio082
libcddb flac ffmpeg mpg123 libcue libmms libbs2b libsndfile
diff --git a/pkgs/applications/audio/audacious/qt-5.nix b/pkgs/applications/audio/audacious/qt-5.nix
index da143c7d946a..803b0115fbdf 100644
--- a/pkgs/applications/audio/audacious/qt-5.nix
+++ b/pkgs/applications/audio/audacious/qt-5.nix
@@ -3,7 +3,7 @@
gettext, pkgconfig,
qtbase,
alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk_pixbuf, lame, libbs2b,
- libcddb, libcdio082, libcue, libjack2, libmad, libmcs, libmms, libmodplug,
+ libcddb, libcdio082, libcue, libjack2, libmad, libmms, libmodplug,
libmowgli, libnotify, libogg, libpulseaudio, libsamplerate, libsidplayfp,
libsndfile, libvorbis, libxml2, lirc, mpg123, neon, qtmultimedia, soxr,
wavpack
@@ -39,7 +39,7 @@ mkDerivation {
# Plugin dependencies
alsaLib curl faad2 ffmpeg flac fluidsynth gdk_pixbuf lame libbs2b libcddb
- libcdio082 libcue libjack2 libmad libmcs libmms libmodplug libmowgli
+ libcdio082 libcue libjack2 libmad libmms libmodplug libmowgli
libnotify libogg libpulseaudio libsamplerate libsidplayfp libsndfile
libvorbis libxml2 lirc mpg123 neon qtmultimedia soxr wavpack
];
diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix
index 3fb9faa26671..26e58c023b82 100644
--- a/pkgs/applications/audio/audacity/default.nix
+++ b/pkgs/applications/audio/audacity/default.nix
@@ -7,12 +7,12 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- version = "2.1.3";
+ version = "2.2.0";
name = "audacity-${version}";
src = fetchurl {
url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz";
- sha256 = "11mx7gb4dbqrgfp7hm0154x3m76ddnmhf2675q5zkxn7jc5qfc6b";
+ sha256 = "09xpr4bjnainz1xmc35v3qg3dadjr9wv8bmn1p4y91aqyihnhjry";
};
patches = [
(fetchpatch {
@@ -51,8 +51,9 @@ stdenv.mkDerivation rec {
"-lswscale"
];
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig file gettext wxGTK30 expat alsaLib
+ file gettext wxGTK30 expat alsaLib
libsndfile soxr libid3tag libjack2 lv2 lilv serd sord sratom suil gtk2
ffmpeg libmad lame libvorbis flac soundtouch
autoconf automake libtool # for the preConfigure phase
diff --git a/pkgs/applications/audio/axoloti/default.nix b/pkgs/applications/audio/axoloti/default.nix
new file mode 100644
index 000000000000..986e476779cb
--- /dev/null
+++ b/pkgs/applications/audio/axoloti/default.nix
@@ -0,0 +1,101 @@
+{ stdenv, fetchFromGitHub, fetchurl, makeWrapper, unzip
+, gnumake, gcc-arm-embedded, dfu-util-axoloti, jdk, ant, libfaketime }:
+
+stdenv.mkDerivation rec {
+ version = "1.0.12-1";
+ name = "axoloti-${version}";
+
+ src = fetchFromGitHub {
+ owner = "axoloti";
+ repo = "axoloti";
+ rev = "${version}";
+ sha256 = "13njmv8zac0kaaxgkv4y4zfjcclafn9cw0m8lj2k4926wnwjmf50";
+ };
+
+ chibi_version = "2.6.9";
+ chibi_name = "ChibiOS_${chibi_version}";
+
+ chibios = fetchurl {
+ url = "mirror://sourceforge/project/chibios/ChibiOS_RT%20stable/Version%20${chibi_version}/${chibi_name}.zip";
+ sha256 = "0lb5s8pkj80mqhsy47mmq0lqk34s2a2m3xagzihalvabwd0frhlj";
+ };
+
+ buildInputs = [ makeWrapper unzip gcc-arm-embedded dfu-util-axoloti jdk ant libfaketime ];
+
+ patchPhase = ''
+ unzip ${chibios}
+ mv ${chibi_name} chibios
+ (cd chibios/ext; unzip -q -o fatfs-0.9-patched.zip)
+
+ # Remove source of non-determinism in ChibiOS
+ substituteInPlace "chibios/os/various/shell.c" \
+ --replace "#ifdef __DATE__" "#if 0"
+
+ # Hardcode full path to compiler tools
+ for f in "firmware/Makefile.patch" \
+ "firmware/Makefile" \
+ "firmware/flasher/Makefile" \
+ "firmware/mounter/Makefile"; do
+ substituteInPlace "$f" \
+ --replace "arm-none-eabi-" "${gcc-arm-embedded}/bin/arm-none-eabi-"
+ done
+
+ # Hardcode path to "make"
+ for f in "firmware/compile_firmware_linux.sh" \
+ "firmware/compile_patch_linux.sh"; do
+ substituteInPlace "$f" \
+ --replace "make" "${gnumake}/bin/make"
+ done
+
+ # Hardcode dfu-util path
+ substituteInPlace "platform_linux/upload_fw_dfu.sh" \
+ --replace "/bin/dfu-util" ""
+ substituteInPlace "platform_linux/upload_fw_dfu.sh" \
+ --replace "./dfu-util" "${dfu-util-axoloti}/bin/dfu-util"
+
+ # Fix build version
+ substituteInPlace "build.xml" \
+ --replace "(git missing)" "${version}"
+
+ # Remove build time
+ substituteInPlace "build.xml" \
+ --replace "" ""
+ substituteInPlace "build.xml" \
+ --replace \
+ '' \
+ ''
+ substituteInPlace "build.xml" \
+ --replace "" ""
+ substituteInPlace "build.xml" \
+ --replace \
+ '{line.separator}' \
+ '{line.separator} '
+ '';
+
+ buildPhase = ''
+ find . -exec touch -d '1970-01-01 00:00' {} \;
+ (cd platform_linux; sh compile_firmware.sh)
+ faketime "1970-01-01 00:00:00" ant -Dbuild.runtime=true
+ '';
+
+ installPhase = ''
+ mkdir -p $out/bin $out/share/axoloti
+
+ cp -r doc firmware chibios platform_linux CMSIS *.txt $out/share/axoloti/
+ install -vD dist/Axoloti.jar $out/share/axoloti/
+
+ makeWrapper ${jdk}/bin/java $out/bin/axoloti --add-flags "-Daxoloti_release=$out/share/axoloti -Daxoloti_runtime=$out/share/axoloti -jar $out/share/axoloti/Axoloti.jar"
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = http://www.axoloti.com;
+ description = ''
+ Sketching embedded digital audio algorithms.
+
+ To fix permissions of the Axoloti USB device node, add a similar udev rule to services.udev.extraRules:
+ SUBSYSTEM=="usb", ATTR{idVendor}=="16c0", ATTR{idProduct}=="0442", OWNER="someuser", GROUP="somegroup"
+ '';
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ TealG ];
+ };
+}
diff --git a/pkgs/applications/audio/axoloti/dfu-util.nix b/pkgs/applications/audio/axoloti/dfu-util.nix
new file mode 100644
index 000000000000..2076e45de546
--- /dev/null
+++ b/pkgs/applications/audio/axoloti/dfu-util.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, pkgconfig, libusb1-axoloti }:
+
+stdenv.mkDerivation rec {
+ name="dfu-util-${version}";
+ version = "0.8";
+
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libusb1-axoloti ];
+
+ src = fetchurl {
+ url = "http://dfu-util.sourceforge.net/releases/${name}.tar.gz";
+ sha256 = "0n7h08avlzin04j93m6hkq9id6hxjiiix7ff9gc2n89aw6dxxjsm";
+ };
+
+ meta = with stdenv.lib; {
+ description = "Device firmware update (DFU) USB programmer";
+ longDescription = ''
+ dfu-util is a program that implements the host (PC) side of the USB
+ DFU 1.0 and 1.1 (Universal Serial Bus Device Firmware Upgrade) protocol.
+
+ DFU is intended to download and upload firmware to devices connected over
+ USB. It ranges from small devices like micro-controller boards up to mobile
+ phones. With dfu-util you are able to download firmware to your device or
+ upload firmware from it.
+ '';
+ homepage = http://dfu-util.gnumonks.org/;
+ license = licenses.gpl2Plus;
+ platforms = platforms.unix;
+ maintainers = [ ];
+ };
+}
diff --git a/pkgs/applications/audio/axoloti/libusb1.nix b/pkgs/applications/audio/axoloti/libusb1.nix
new file mode 100644
index 000000000000..cf71c006046e
--- /dev/null
+++ b/pkgs/applications/audio/axoloti/libusb1.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, pkgconfig, systemd ? null, libobjc, IOKit, fetchpatch }:
+
+stdenv.mkDerivation rec {
+ name = "libusb-1.0.19";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/libusb/${name}.tar.bz2";
+ sha256 = "0h38p9rxfpg9vkrbyb120i1diq57qcln82h5fr7hvy82c20jql3c";
+ };
+
+ outputs = [ "out" "dev" ]; # get rid of propagating systemd closure
+
+ buildInputs = [ pkgconfig ];
+ propagatedBuildInputs =
+ stdenv.lib.optional stdenv.isLinux systemd ++
+ stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ];
+
+ patches = [
+ (fetchpatch {
+ name = "libusb.stdfu.patch";
+ url = "https://raw.githubusercontent.com/axoloti/axoloti/1.0.12/platform_linux/src/libusb.stdfu.patch";
+ sha256 = "194j7j61i4q6x0ihm9ms8dxd4vliw20n2rj6cm9h17qzdl9xr33d";
+ })
+ ];
+
+ NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
+
+ preFixup = stdenv.lib.optionalString stdenv.isLinux ''
+ sed 's,-ludev,-L${systemd.lib}/lib -ludev,' -i $out/lib/libusb-1.0.la
+ '';
+
+ meta = {
+ homepage = http://www.libusb.info;
+ description = "User-space USB library";
+ platforms = stdenv.lib.platforms.unix;
+ maintainers = [ ];
+ };
+}
diff --git a/pkgs/applications/audio/bitmeter/default.nix b/pkgs/applications/audio/bitmeter/default.nix
index ca3148f0e0a4..32daf000dc59 100644
--- a/pkgs/applications/audio/bitmeter/default.nix
+++ b/pkgs/applications/audio/bitmeter/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "09ck2gxqky701dc1p0ip61rrn16v0pdc7ih2hc2sd63zcw53g2a7";
};
- buildInputs = [ libjack2 gtk2 pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libjack2 gtk2 ];
meta = with stdenv.lib; {
homepage = http://devel.tlrmx.org/audio/bitmeter/;
diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix
index 28155fd23178..42e99fa51863 100644
--- a/pkgs/applications/audio/bristol/default.nix
+++ b/pkgs/applications/audio/bristol/default.nix
@@ -9,8 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "1fi2m4gmvxdi260821y09lxsimq82yv4k5bbgk3kyc3x1nyhn7vx";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- alsaLib libjack2 pkgconfig libpulseaudio xorg.libX11 xorg.libXext
+ alsaLib libjack2 libpulseaudio xorg.libX11 xorg.libXext
xorg.xproto
];
diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix
index f09791d9aa1f..35fe510cbb2b 100644
--- a/pkgs/applications/audio/cantata/default.nix
+++ b/pkgs/applications/audio/cantata/default.nix
@@ -34,20 +34,21 @@ assert withOnlineServices -> withTaglib;
assert withReplaygain -> withTaglib;
let
- version = "2.1.0";
+ version = "2.2.0";
pname = "cantata";
fstat = x: fn: "-DENABLE_" + fn + "=" + (if x then "ON" else "OFF");
fstats = x: map (fstat x);
-in
-stdenv.mkDerivation rec {
+ withUdisks = (withTaglib && withDevices);
+
+in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "CDrummond";
repo = "cantata";
rev = "v${version}";
- sha256 = "1mwc3cyrvg8qxjn70h4i6kdkvz85xspb3wi8wrb56jrhil409fkh";
+ sha256 = "1b633chgfs8rya78bzzck5zijna15d1y4nmrz4dcjp862ks5y5q6";
};
buildInputs = [ vlc ]
@@ -60,43 +61,37 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional withLame lame
++ stdenv.lib.optional withMtp libmtp
++ stdenv.lib.optional withMusicbrainz libmusicbrainz5
- ++ stdenv.lib.optional (withTaglib && withDevices) udisks2;
+ ++ stdenv.lib.optional withUdisks udisks2;
nativeBuildInputs = [ cmake pkgconfig ];
enableParallelBuilding = true;
cmakeFlags = stdenv.lib.flatten [
- (fstat withQt5 "QT5")
- (fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ])
- (fstats withReplaygain [ "FFMPEG" "MPG123" "SPEEXDSP" ])
- (fstat withCdda "CDPARANOIA")
- (fstat withCddb "CDDB")
- (fstat withLame "LAME")
- (fstat withMtp "MTP")
- (fstat withMusicbrainz "MUSICBRAINZ")
+ (fstat withQt5 "QT5")
+ (fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ])
+ (fstats withReplaygain [ "FFMPEG" "MPG123" "SPEEXDSP" ])
+ (fstat withCdda "CDPARANOIA")
+ (fstat withCddb "CDDB")
+ (fstat withLame "LAME")
+ (fstat withMtp "MTP")
+ (fstat withMusicbrainz "MUSICBRAINZ")
(fstat withOnlineServices "ONLINE_SERVICES")
- (fstat withDynamic "DYNAMIC")
- (fstat withDevices "DEVICES_SUPPORT")
- (fstat withHttpServer "HTTP_SERVER")
- (fstat withStreams "STREAMS")
+ (fstat withDynamic "DYNAMIC")
+ (fstat withDevices "DEVICES_SUPPORT")
+ (fstat withHttpServer "HTTP_SERVER")
+ (fstat withStreams "STREAMS")
+ (fstat withUdisks "UDISKS2")
"-DENABLE_HTTPS_SUPPORT=ON"
- "-DENABLE_UDISKS2=ON"
];
- # This is already fixed upstream but not released yet. Maybe in version 2.
- preConfigure = ''
- sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/FindTaglib.cmake
- '';
-
meta = with stdenv.lib; {
- homepage = https://github.com/cdrummond/cantata;
+ homepage = https://github.com/cdrummond/cantata;
description = "A graphical client for MPD";
- license = licenses.gpl3;
-
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ fuuzetsu peterhoeg ];
# Technically Cantata can run on Windows so if someone wants to
# bother figuring that one out, be my guest.
- platforms = platforms.linux;
- maintainers = with maintainers; [ fuuzetsu ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix
index 633ba3832c2c..c0dd2e92178c 100644
--- a/pkgs/applications/audio/cmus/default.nix
+++ b/pkgs/applications/audio/cmus/default.nix
@@ -116,7 +116,8 @@ stdenv.mkDerivation rec {
"CONFIG_WAV=y"
] ++ concatMap (a: a.flags) opts);
- buildInputs = [ ncurses pkgconfig ]
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ ncurses ]
++ stdenv.lib.optional stdenv.cc.isClang clangGCC
++ stdenv.lib.optionals stdenv.isDarwin [ libiconv CoreAudio ]
++ concatMap (a: a.deps) opts;
diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix
index 9d157833c0d9..a80cc36b2164 100644
--- a/pkgs/applications/audio/distrho/default.nix
+++ b/pkgs/applications/audio/distrho/default.nix
@@ -14,8 +14,9 @@ stdenv.mkDerivation rec {
sed -e "s#@./scripts#sh scripts#" -i Makefile
'';
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- alsaLib fftwSinglePrec freetype libjack2 pkgconfig premake3
+ alsaLib fftwSinglePrec freetype libjack2 premake3
xorg.libX11 xorg.libXcomposite xorg.libXcursor xorg.libXext
xorg.libXinerama xorg.libXrender ladspa-sdk
];
diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/applications/audio/eq10q/default.nix
index 35079ea27385..3faeeb12d4c6 100644
--- a/pkgs/applications/audio/eq10q/default.nix
+++ b/pkgs/applications/audio/eq10q/default.nix
@@ -7,7 +7,8 @@ stdenv.mkDerivation rec {
sha256 = "16mhcav8gwkp29k9ki4dlkajlcgh1i2wvldabxb046d37dq4qzrk";
};
- buildInputs = [ cmake fftw gtkmm2 libxcb lv2 pkgconfig xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ cmake fftw gtkmm2 libxcb lv2 xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ];
installFlags = ''
DESTDIR=$(out)
diff --git a/pkgs/applications/audio/espeak/edit.nix b/pkgs/applications/audio/espeak/edit.nix
index 11a0576bf437..8d7db50fd323 100644
--- a/pkgs/applications/audio/espeak/edit.nix
+++ b/pkgs/applications/audio/espeak/edit.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "0x8s7vpb7rw5x37yjzy1f98m4f2csdg89libb74fm36gn8ly0hli";
};
- buildInputs = [ pkgconfig unzip portaudio wxGTK ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ unzip portaudio wxGTK ];
# TODO:
# Uhm, seems like espeakedit still wants espeak-data/ in $HOME, even thought
diff --git a/pkgs/applications/audio/faust/faust1.nix b/pkgs/applications/audio/faust/faust1.nix
index b9e98281a7c6..4875ee8b57da 100644
--- a/pkgs/applications/audio/faust/faust1.nix
+++ b/pkgs/applications/audio/faust/faust1.nix
@@ -158,7 +158,8 @@ let
stdenv.mkDerivation ((faust2ApplBase args) // {
- buildInputs = [ makeWrapper pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ makeWrapper ];
propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs;
diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix
index 274f7c9c3b84..901df19ebf59 100644
--- a/pkgs/applications/audio/faust/faust2.nix
+++ b/pkgs/applications/audio/faust/faust2.nix
@@ -187,7 +187,8 @@ let
stdenv.mkDerivation ((faust2ApplBase args) // {
- buildInputs = [ makeWrapper pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ makeWrapper ];
propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs;
diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix
index bb37cac5500e..a8bf05187e33 100644
--- a/pkgs/applications/audio/fluidsynth/default.nix
+++ b/pkgs/applications/audio/fluidsynth/default.nix
@@ -20,7 +20,8 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin
"-framework CoreAudio -framework CoreServices";
- buildInputs = [ glib libsndfile pkgconfig ]
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ glib libsndfile ]
++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib libpulseaudio libjack2 ]
++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices CoreAudio AudioUnit ];
diff --git a/pkgs/applications/audio/fmsynth/default.nix b/pkgs/applications/audio/fmsynth/default.nix
index 22944ffefe44..58d095080fe5 100644
--- a/pkgs/applications/audio/fmsynth/default.nix
+++ b/pkgs/applications/audio/fmsynth/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1bk0bpr069hzx2508rgfbwpxiqgr7dmdkhqdywmd2i4rmibgrm1q";
};
- buildInputs = [ gtkmm2 lv2 lvtk pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtkmm2 lv2 lvtk ];
buildPhase = ''
cd lv2
diff --git a/pkgs/applications/audio/fomp/default.nix b/pkgs/applications/audio/fomp/default.nix
index bdac87aaf374..367b1db139d5 100644
--- a/pkgs/applications/audio/fomp/default.nix
+++ b/pkgs/applications/audio/fomp/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1hh2xhknanqn3iwp12ihl6bf8p7bqxryms9qk7mh21lixl42b8k5";
};
- buildInputs = [ lv2 pkgconfig python2 ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ lv2 python2 ];
installPhase = ''
python waf configure --prefix=$out
diff --git a/pkgs/applications/audio/foo-yc20/default.nix b/pkgs/applications/audio/foo-yc20/default.nix
index 073d28ef8703..28b2cd98e02c 100644
--- a/pkgs/applications/audio/foo-yc20/default.nix
+++ b/pkgs/applications/audio/foo-yc20/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "0i8261n95n4xic766h70xkrpbvw3sag96n1883ahmg6h7yb94avq";
};
- buildInputs = [ libjack2 gtk2 lv2 faust pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libjack2 gtk2 lv2 faust ];
makeFlags = "PREFIX=$(out)";
diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix
index ab6dd0eee72f..50b1bcde58f3 100644
--- a/pkgs/applications/audio/gmpc/default.nix
+++ b/pkgs/applications/audio/gmpc/default.nix
@@ -14,7 +14,9 @@ stdenv.mkDerivation rec {
sha256 = "10vspwsgr8pwf3qp2bviw6b2l8prgdiswgv7qiqiyr0h1mmk487y";
};
patches = [ ./libmpd-11.8.17-remove-strndup.patch ];
- buildInputs = [ pkgconfig glib ];
+
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ glib ];
};
src = fetchurl {
@@ -22,8 +24,9 @@ stdenv.mkDerivation rec {
sha256 = "0b3bnxf98i5lhjyljvgxgx9xmb6p46cn3a9cccrng14nagri9556";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- libtool intltool pkgconfig glib gtk2 curl mpd_clientlib libsoup
+ libtool intltool glib gtk2 curl mpd_clientlib libsoup
libunique libmpd gob2 vala_0_23 libSM libICE sqlite hicolor_icon_theme
wrapGAppsHook
];
diff --git a/pkgs/applications/audio/gnaural/default.nix b/pkgs/applications/audio/gnaural/default.nix
index 2b78d1a4b6dd..f5887e870db6 100644
--- a/pkgs/applications/audio/gnaural/default.nix
+++ b/pkgs/applications/audio/gnaural/default.nix
@@ -2,7 +2,8 @@
stdenv.mkDerivation rec {
name = "gnaural-1.0.20110606";
- buildInputs = [ pkgconfig gtk2 libsndfile portaudio ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk2 libsndfile portaudio ];
src = fetchurl {
url = "mirror://sourceforge/gnaural/Gnaural/${name}.tar.gz";
sha256 = "0p9rasz1jmxf16vnpj17g3vzdjygcyz3l6nmbq6wr402l61f1vy5";
@@ -13,5 +14,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2;
maintainers = [ maintainers.ehmry ];
platforms = platforms.linux;
+ broken = true;
};
}
diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix
index f49962450a09..3d074bf1e19e 100644
--- a/pkgs/applications/audio/gpodder/default.nix
+++ b/pkgs/applications/audio/gpodder/default.nix
@@ -51,6 +51,13 @@ python2Packages.buildPythonApplication rec {
feedparser dbus-python mygpoclient pygtk eyeD3 podcastparser html5lib
] ++ stdenv.lib.optional ipodSupport libgpod;
+ preBuild = ''
+ make PREFIX="$out" \
+ share/applications/gpodder-url-handler.desktop \
+ share/applications/gpodder.desktop \
+ share/dbus-1/services/org.gpodder.service
+ '';
+
checkPhase = ''
LC_ALL=C python -m gpodder.unittests
'';
diff --git a/pkgs/applications/audio/gradio/0001-Remove-post-install-script-that-hardcodes-paths.patch b/pkgs/applications/audio/gradio/0001-Remove-post-install-script-that-hardcodes-paths.patch
new file mode 100644
index 000000000000..3a6296baaa64
--- /dev/null
+++ b/pkgs/applications/audio/gradio/0001-Remove-post-install-script-that-hardcodes-paths.patch
@@ -0,0 +1,23 @@
+From 184c64718ee68b2738647f4a106b260c47f00437 Mon Sep 17 00:00:00 2001
+From: Sam Parkinson
+Date: Thu, 26 Oct 2017 14:50:13 +1100
+Subject: [PATCH] Remove post-install script that hardcodes paths
+
+---
+ meson.build | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 25f3e1a..18b43bd 100644
+--- a/meson.build
++++ b/meson.build
+@@ -21,4 +21,5 @@ subdir('src')
+ # subdir('tests')
+ # TODO: unit tests
+
+-meson.add_install_script('meson_post_install.sh')
++# This does not work for nixos; it hard-codes paths
++# meson.add_install_script('meson_post_install.sh')
+--
+2.14.2
+
diff --git a/pkgs/applications/audio/gradio/default.nix b/pkgs/applications/audio/gradio/default.nix
new file mode 100644
index 000000000000..2f4bde92167b
--- /dev/null
+++ b/pkgs/applications/audio/gradio/default.nix
@@ -0,0 +1,72 @@
+{ stdenv, fetchFromGitHub, pkgconfig
+, gcc
+, python3
+, gsettings_desktop_schemas
+, desktop_file_utils
+, glib
+, gtk3
+, intltool
+, libsoup
+, json_glib
+, wrapGAppsHook
+, meson
+, ninja
+, vala
+, sqlite
+, gst_all_1
+, gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ]
+}:
+let
+ version = "6.0.2";
+
+in stdenv.mkDerivation rec {
+ name = "gradio-${version}";
+
+ src = fetchFromGitHub {
+ owner = "haecker-felix";
+ repo = "gradio";
+ rev = "v${version}";
+ sha256 = "05hg26yr7splgpkl8wjxcsdks9sm1is3hcnp7f5mjnp2ch0nn57s";
+ };
+
+ nativeBuildInputs = [
+ pkgconfig
+
+ meson
+ ninja
+ vala
+
+ python3
+ ];
+ buildInputs = [
+ sqlite
+
+ glib
+ intltool
+ libsoup
+ json_glib
+
+ gtk3
+ gst_all_1.gstreamer
+ gst_all_1.gst-plugins-base
+
+ wrapGAppsHook
+ desktop_file_utils
+ gsettings_desktop_schemas
+ ] ++ gst_plugins;
+
+ enableParallelBuilding = true;
+ postInstall = ''
+ ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas
+ '';
+
+ patches = [ ./0001-Remove-post-install-script-that-hardcodes-paths.patch ];
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/haecker-felix/gradio;
+ description = "A GTK3 app for finding and listening to internet radio stations";
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.samdroid-apps ];
+ };
+}
diff --git a/pkgs/applications/audio/greg/default.nix b/pkgs/applications/audio/greg/default.nix
new file mode 100644
index 000000000000..e7a23b6f204c
--- /dev/null
+++ b/pkgs/applications/audio/greg/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, pythonPackages }:
+
+with pythonPackages; buildPythonApplication rec {
+ pname = "greg";
+ version = "0.4.7";
+ name = pname + "-" + version;
+
+ disabled = !isPy3k;
+
+ src = fetchFromGitHub {
+ owner = "manolomartinez";
+ repo = pname;
+ rev = "v" + version;
+ sha256 = "0bdzgh2k1ppgcvqiasxwp3w89q44s4jgwjidlips3ixx1bzm822v";
+ };
+
+ buildInputs = with pythonPackages; [ feedparser ];
+ propagatedBuildInputs = buildInputs;
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/manolomartinez/greg";
+ description = "A command-line podcast aggregator";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ edwtjo ];
+ };
+}
diff --git a/pkgs/applications/audio/groovebasin/default.nix b/pkgs/applications/audio/groovebasin/default.nix
deleted file mode 100644
index 7eb2e85f7bed..000000000000
--- a/pkgs/applications/audio/groovebasin/default.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{ stdenv, fetchFromGitHub, makeWrapper, callPackage, libgroove, python, utillinux, nodejs }:
-
-with stdenv.lib;
-
-let
- nodePackages = callPackage (import ../../../top-level/node-packages.nix) {
- inherit nodejs;
- neededNatives = [ libgroove python utillinux ];
- self = nodePackages;
- generated = ./package.nix;
- };
-
-in nodePackages.buildNodePackage rec {
- version = "1.5.1";
- name = "groovebasin-${version}";
-
- src = fetchFromGitHub {
- owner = "andrewrk";
- repo = "groovebasin";
- rev = "${version}";
- sha256 = "1g7v0qhvgzpb050hf45pibp68qd67hnnry5npw58f4dvaxdd8yhd";
- };
-
- deps = (filter (v: nixType v == "derivation") (attrValues nodePackages));
-
- buildInputs = [ makeWrapper ];
-
- postInstall = ''
- mkdir -p "$out/lib/node_modules/groovebasin/public"
- stylus -o "$out/lib/node_modules/groovebasin/public/" -c --include-css "$out/lib/node_modules/groovebasin/src/client/styles"
- browserify-lite "$out/lib/node_modules/groovebasin/src/client/app.js" --outfile "$out/lib/node_modules/groovebasin/public/app.js"
- wrapProgram "$out/bin/groovebasin" --set NODE_PATH "$out/lib/node_modules/groovebasin/node_modules/"
- '';
-
- passthru.names = ["groovebasin"];
-
- meta = {
- description = "Music player server with a web-based user interface";
- homepage = http://groovebasin.com/;
- license = licenses.mit;
- platforms = platforms.unix;
- maintainers = [ maintainers.andrewrk ];
- longDescription = ''
- Groove Basin runs on a server optionally connected to speakers. Guests can
- control the music player by connecting with a laptop, tablet, or smart phone.
- Further, users can stream their music libraries remotely.
-
- Groove Basin comes with a fast, responsive web interface that supports keyboard
- shortcuts and drag drop. It also provides the ability to upload songs,
- download songs, and import songs by URL, including YouTube URLs.
-
- Groove Basin supports Dynamic Mode which automatically queues random songs,
- favoring songs that have not been queued recently.
-
- Groove Basin automatically performs ReplayGain scanning on every song using
- the EBU R128 loudness standard, and automatically switches between track
- and album mode.
-
- Groove Basin supports the MPD protocol, which means it is compatible with MPD
- clients. There is also a more powerful Groove Basin protocol which you can
- use if the MPD protocol does not meet your needs.
-
- Groove Basin supports Last.fm scrobbling.
- '';
- # groovebasin was built with nodejs 0.10 which reached end of LTS
- # in October 216, it doesn't built with nodejs 4.x
- broken = true;
- };
-}
diff --git a/pkgs/applications/audio/groovebasin/package.nix b/pkgs/applications/audio/groovebasin/package.nix
deleted file mode 100644
index 3f307cd32f05..000000000000
--- a/pkgs/applications/audio/groovebasin/package.nix
+++ /dev/null
@@ -1,4396 +0,0 @@
-{ self, fetchurl, fetchgit ? null, lib }:
-
-{
- by-spec."CSSselect"."~0.4.0" =
- self.by-version."CSSselect"."0.4.1";
- by-version."CSSselect"."0.4.1" = self.buildNodePackage {
- name = "CSSselect-0.4.1";
- version = "0.4.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/CSSselect/-/CSSselect-0.4.1.tgz";
- name = "CSSselect-0.4.1.tgz";
- sha1 = "f8ab7e1f8418ce63cda6eb7bd778a85d7ec492b2";
- };
- deps = {
- "CSSwhat-0.4.7" = self.by-version."CSSwhat"."0.4.7";
- "domutils-1.4.3" = self.by-version."domutils"."1.4.3";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."CSSwhat"."0.4" =
- self.by-version."CSSwhat"."0.4.7";
- by-version."CSSwhat"."0.4.7" = self.buildNodePackage {
- name = "CSSwhat-0.4.7";
- version = "0.4.7";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.7.tgz";
- name = "CSSwhat-0.4.7.tgz";
- sha1 = "867da0ff39f778613242c44cfea83f0aa4ebdf9b";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."abbrev"."1" =
- self.by-version."abbrev"."1.0.7";
- by-version."abbrev"."1.0.7" = self.buildNodePackage {
- name = "abbrev-1.0.7";
- version = "1.0.7";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz";
- name = "abbrev-1.0.7.tgz";
- sha1 = "5b6035b2ee9d4fb5cf859f08a9be81b208491843";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."abstract-leveldown"."~2.2.1" =
- self.by-version."abstract-leveldown"."2.2.2";
- by-version."abstract-leveldown"."2.2.2" = self.buildNodePackage {
- name = "abstract-leveldown-2.2.2";
- version = "2.2.2";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-2.2.2.tgz";
- name = "abstract-leveldown-2.2.2.tgz";
- sha1 = "ecaff98c20641422710ab04b01e8f04d6b64fe77";
- };
- deps = {
- "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."accepts"."~1.2.7" =
- self.by-version."accepts"."1.2.9";
- by-version."accepts"."1.2.9" = self.buildNodePackage {
- name = "accepts-1.2.9";
- version = "1.2.9";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/accepts/-/accepts-1.2.9.tgz";
- name = "accepts-1.2.9.tgz";
- sha1 = "76e9631d05e3ff192a34afb9389f7b3953ded001";
- };
- deps = {
- "mime-types-2.1.1" = self.by-version."mime-types"."2.1.1";
- "negotiator-0.5.3" = self.by-version."negotiator"."0.5.3";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."amdefine".">=0.0.4" =
- self.by-version."amdefine"."0.1.1";
- by-version."amdefine"."0.1.1" = self.buildNodePackage {
- name = "amdefine-0.1.1";
- version = "0.1.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/amdefine/-/amdefine-0.1.1.tgz";
- name = "amdefine-0.1.1.tgz";
- sha1 = "b5c75c532052dccd6a39c0064c772c8d57a06cd2";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."ansi-regex"."^1.0.0" =
- self.by-version."ansi-regex"."1.1.1";
- by-version."ansi-regex"."1.1.1" = self.buildNodePackage {
- name = "ansi-regex-1.1.1";
- version = "1.1.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz";
- name = "ansi-regex-1.1.1.tgz";
- sha1 = "41c847194646375e6a1a5d10c3ca054ef9fc980d";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."ansi-regex"."^1.1.0" =
- self.by-version."ansi-regex"."1.1.1";
- by-spec."ansi-styles"."^2.0.1" =
- self.by-version."ansi-styles"."2.0.1";
- by-version."ansi-styles"."2.0.1" = self.buildNodePackage {
- name = "ansi-styles-2.0.1";
- version = "2.0.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz";
- name = "ansi-styles-2.0.1.tgz";
- sha1 = "b033f57f93e2d28adeb8bc11138fa13da0fd20a3";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."asn1"."0.1.11" =
- self.by-version."asn1"."0.1.11";
- by-version."asn1"."0.1.11" = self.buildNodePackage {
- name = "asn1-0.1.11";
- version = "0.1.11";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz";
- name = "asn1-0.1.11.tgz";
- sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."assert-plus"."^0.1.5" =
- self.by-version."assert-plus"."0.1.5";
- by-version."assert-plus"."0.1.5" = self.buildNodePackage {
- name = "assert-plus-0.1.5";
- version = "0.1.5";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz";
- name = "assert-plus-0.1.5.tgz";
- sha1 = "ee74009413002d84cec7219c6ac811812e723160";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."async"."~0.9.0" =
- self.by-version."async"."0.9.2";
- by-version."async"."0.9.2" = self.buildNodePackage {
- name = "async-0.9.2";
- version = "0.9.2";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/async/-/async-0.9.2.tgz";
- name = "async-0.9.2.tgz";
- sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."aws-sign2"."~0.5.0" =
- self.by-version."aws-sign2"."0.5.0";
- by-version."aws-sign2"."0.5.0" = self.buildNodePackage {
- name = "aws-sign2-0.5.0";
- version = "0.5.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz";
- name = "aws-sign2-0.5.0.tgz";
- sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."base64url"."0.0.3" =
- self.by-version."base64url"."0.0.3";
- by-version."base64url"."0.0.3" = self.buildNodePackage {
- name = "base64url-0.0.3";
- version = "0.0.3";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/base64url/-/base64url-0.0.3.tgz";
- name = "base64url-0.0.3.tgz";
- sha1 = "50c20edac277dde1a0b15059954ced7a2d102d57";
- };
- deps = {
- "tap-0.3.3" = self.by-version."tap"."0.3.3";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."base64url"."~0.0.4" =
- self.by-version."base64url"."0.0.6";
- by-version."base64url"."0.0.6" = self.buildNodePackage {
- name = "base64url-0.0.6";
- version = "0.0.6";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/base64url/-/base64url-0.0.6.tgz";
- name = "base64url-0.0.6.tgz";
- sha1 = "9597b36b330db1c42477322ea87ea8027499b82b";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."base64url"."~1.0.4" =
- self.by-version."base64url"."1.0.4";
- by-version."base64url"."1.0.4" = self.buildNodePackage {
- name = "base64url-1.0.4";
- version = "1.0.4";
- bin = true;
- src = fetchurl {
- url = "http://registry.npmjs.org/base64url/-/base64url-1.0.4.tgz";
- name = "base64url-1.0.4.tgz";
- sha1 = "29a2a7ade9791fbb25f312ab35a2fd3126ceac0e";
- };
- deps = {
- "concat-stream-1.4.10" = self.by-version."concat-stream"."1.4.10";
- "meow-2.0.0" = self.by-version."meow"."2.0.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."bindings"."~1.2.1" =
- self.by-version."bindings"."1.2.1";
- by-version."bindings"."1.2.1" = self.buildNodePackage {
- name = "bindings-1.2.1";
- version = "1.2.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz";
- name = "bindings-1.2.1.tgz";
- sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."bl"."~0.9.0" =
- self.by-version."bl"."0.9.4";
- by-version."bl"."0.9.4" = self.buildNodePackage {
- name = "bl-0.9.4";
- version = "0.9.4";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/bl/-/bl-0.9.4.tgz";
- name = "bl-0.9.4.tgz";
- sha1 = "4702ddf72fbe0ecd82787c00c113aea1935ad0e7";
- };
- deps = {
- "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."bl"."~0.9.4" =
- self.by-version."bl"."0.9.4";
- by-spec."bluebird"."^2.9.26" =
- self.by-version."bluebird"."2.9.30";
- by-version."bluebird"."2.9.30" = self.buildNodePackage {
- name = "bluebird-2.9.30";
- version = "2.9.30";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/bluebird/-/bluebird-2.9.30.tgz";
- name = "bluebird-2.9.30.tgz";
- sha1 = "edda875ec9aad1f29cf1f56d6e82fbab2b0df556";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."boom"."0.4.x" =
- self.by-version."boom"."0.4.2";
- by-version."boom"."0.4.2" = self.buildNodePackage {
- name = "boom-0.4.2";
- version = "0.4.2";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/boom/-/boom-0.4.2.tgz";
- name = "boom-0.4.2.tgz";
- sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b";
- };
- deps = {
- "hoek-0.9.1" = self.by-version."hoek"."0.9.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."boom"."2.x.x" =
- self.by-version."boom"."2.8.0";
- by-version."boom"."2.8.0" = self.buildNodePackage {
- name = "boom-2.8.0";
- version = "2.8.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/boom/-/boom-2.8.0.tgz";
- name = "boom-2.8.0.tgz";
- sha1 = "317bdfd47018fe7dd79b0e9da73efe244119fdf1";
- };
- deps = {
- "hoek-2.14.0" = self.by-version."hoek"."2.14.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."browserify-lite"."~0.2.4" =
- self.by-version."browserify-lite"."0.2.4";
- by-version."browserify-lite"."0.2.4" = self.buildNodePackage {
- name = "browserify-lite-0.2.4";
- version = "0.2.4";
- bin = true;
- src = fetchurl {
- url = "http://registry.npmjs.org/browserify-lite/-/browserify-lite-0.2.4.tgz";
- name = "browserify-lite-0.2.4.tgz";
- sha1 = "00a32f466c8f3dbbd1074250fd0aa775716ab140";
- };
- deps = {
- "pend-1.2.0" = self.by-version."pend"."1.2.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "browserify-lite" = self.by-version."browserify-lite"."0.2.4";
- by-spec."buffer-crc32"."~0.2.3" =
- self.by-version."buffer-crc32"."0.2.5";
- by-version."buffer-crc32"."0.2.5" = self.buildNodePackage {
- name = "buffer-crc32-0.2.5";
- version = "0.2.5";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.5.tgz";
- name = "buffer-crc32-0.2.5.tgz";
- sha1 = "db003ac2671e62ebd6ece78ea2c2e1b405736e91";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."buffer-equal"."~0.0.0" =
- self.by-version."buffer-equal"."0.0.1";
- by-version."buffer-equal"."0.0.1" = self.buildNodePackage {
- name = "buffer-equal-0.0.1";
- version = "0.0.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.1.tgz";
- name = "buffer-equal-0.0.1.tgz";
- sha1 = "91bc74b11ea405bc916bc6aa908faafa5b4aac4b";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."buffer-equal-constant-time"."^1.0.1" =
- self.by-version."buffer-equal-constant-time"."1.0.1";
- by-version."buffer-equal-constant-time"."1.0.1" = self.buildNodePackage {
- name = "buffer-equal-constant-time-1.0.1";
- version = "1.0.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz";
- name = "buffer-equal-constant-time-1.0.1.tgz";
- sha1 = "f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."bunker"."0.1.X" =
- self.by-version."bunker"."0.1.2";
- by-version."bunker"."0.1.2" = self.buildNodePackage {
- name = "bunker-0.1.2";
- version = "0.1.2";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/bunker/-/bunker-0.1.2.tgz";
- name = "bunker-0.1.2.tgz";
- sha1 = "c88992464a8e2a6ede86930375f92b58077ef97c";
- };
- deps = {
- "burrito-0.2.12" = self.by-version."burrito"."0.2.12";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."burrito".">=0.2.5 <0.3" =
- self.by-version."burrito"."0.2.12";
- by-version."burrito"."0.2.12" = self.buildNodePackage {
- name = "burrito-0.2.12";
- version = "0.2.12";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/burrito/-/burrito-0.2.12.tgz";
- name = "burrito-0.2.12.tgz";
- sha1 = "d0d6e6ac81d5e99789c6fa4accb0b0031ea54f6b";
- };
- deps = {
- "traverse-0.5.2" = self.by-version."traverse"."0.5.2";
- "uglify-js-1.1.1" = self.by-version."uglify-js"."1.1.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."camelcase"."^1.0.1" =
- self.by-version."camelcase"."1.1.0";
- by-version."camelcase"."1.1.0" = self.buildNodePackage {
- name = "camelcase-1.1.0";
- version = "1.1.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/camelcase/-/camelcase-1.1.0.tgz";
- name = "camelcase-1.1.0.tgz";
- sha1 = "953b25c3bc98671ee59a44cb9d542672da7331b9";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."camelcase-keys"."^1.0.0" =
- self.by-version."camelcase-keys"."1.0.0";
- by-version."camelcase-keys"."1.0.0" = self.buildNodePackage {
- name = "camelcase-keys-1.0.0";
- version = "1.0.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz";
- name = "camelcase-keys-1.0.0.tgz";
- sha1 = "bd1a11bf9b31a1ce493493a930de1a0baf4ad7ec";
- };
- deps = {
- "camelcase-1.1.0" = self.by-version."camelcase"."1.1.0";
- "map-obj-1.0.1" = self.by-version."map-obj"."1.0.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."caseless"."~0.10.0" =
- self.by-version."caseless"."0.10.0";
- by-version."caseless"."0.10.0" = self.buildNodePackage {
- name = "caseless-0.10.0";
- version = "0.10.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/caseless/-/caseless-0.10.0.tgz";
- name = "caseless-0.10.0.tgz";
- sha1 = "ed6b2719adcd1fd18f58dc081c0f1a5b43963909";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."caseless"."~0.8.0" =
- self.by-version."caseless"."0.8.0";
- by-version."caseless"."0.8.0" = self.buildNodePackage {
- name = "caseless-0.8.0";
- version = "0.8.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/caseless/-/caseless-0.8.0.tgz";
- name = "caseless-0.8.0.tgz";
- sha1 = "5bca2881d41437f54b2407ebe34888c7b9ad4f7d";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."caseless"."~0.9.0" =
- self.by-version."caseless"."0.9.0";
- by-version."caseless"."0.9.0" = self.buildNodePackage {
- name = "caseless-0.9.0";
- version = "0.9.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/caseless/-/caseless-0.9.0.tgz";
- name = "caseless-0.9.0.tgz";
- sha1 = "b7b65ce6bf1413886539cfd533f0b30effa9cf88";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."chalk"."^1.0.0" =
- self.by-version."chalk"."1.0.0";
- by-version."chalk"."1.0.0" = self.buildNodePackage {
- name = "chalk-1.0.0";
- version = "1.0.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz";
- name = "chalk-1.0.0.tgz";
- sha1 = "b3cf4ed0ff5397c99c75b8f679db2f52831f96dc";
- };
- deps = {
- "ansi-styles-2.0.1" = self.by-version."ansi-styles"."2.0.1";
- "escape-string-regexp-1.0.3" = self.by-version."escape-string-regexp"."1.0.3";
- "has-ansi-1.0.3" = self.by-version."has-ansi"."1.0.3";
- "strip-ansi-2.0.1" = self.by-version."strip-ansi"."2.0.1";
- "supports-color-1.3.1" = self.by-version."supports-color"."1.3.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."charm"."0.1.x" =
- self.by-version."charm"."0.1.2";
- by-version."charm"."0.1.2" = self.buildNodePackage {
- name = "charm-0.1.2";
- version = "0.1.2";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/charm/-/charm-0.1.2.tgz";
- name = "charm-0.1.2.tgz";
- sha1 = "06c21eed1a1b06aeb67553cdc53e23274bac2296";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."cheerio"."^0.18.0" =
- self.by-version."cheerio"."0.18.0";
- by-version."cheerio"."0.18.0" = self.buildNodePackage {
- name = "cheerio-0.18.0";
- version = "0.18.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/cheerio/-/cheerio-0.18.0.tgz";
- name = "cheerio-0.18.0.tgz";
- sha1 = "4e1c06377e725b740e996e0dfec353863de677fa";
- };
- deps = {
- "CSSselect-0.4.1" = self.by-version."CSSselect"."0.4.1";
- "entities-1.1.1" = self.by-version."entities"."1.1.1";
- "htmlparser2-3.8.3" = self.by-version."htmlparser2"."3.8.3";
- "dom-serializer-0.0.1" = self.by-version."dom-serializer"."0.0.1";
- "lodash-2.4.2" = self.by-version."lodash"."2.4.2";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."clarinet"."~0.8.1" =
- self.by-version."clarinet"."0.8.1";
- by-version."clarinet"."0.8.1" = self.buildNodePackage {
- name = "clarinet-0.8.1";
- version = "0.8.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/clarinet/-/clarinet-0.8.1.tgz";
- name = "clarinet-0.8.1.tgz";
- sha1 = "ddfd10cd292abf5cab239140774e394bfd1ee7a6";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."combined-stream"."~0.0.4" =
- self.by-version."combined-stream"."0.0.7";
- by-version."combined-stream"."0.0.7" = self.buildNodePackage {
- name = "combined-stream-0.0.7";
- version = "0.0.7";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz";
- name = "combined-stream-0.0.7.tgz";
- sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f";
- };
- deps = {
- "delayed-stream-0.0.5" = self.by-version."delayed-stream"."0.0.5";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."combined-stream"."~0.0.5" =
- self.by-version."combined-stream"."0.0.7";
- by-spec."combined-stream"."~1.0.1" =
- self.by-version."combined-stream"."1.0.5";
- by-version."combined-stream"."1.0.5" = self.buildNodePackage {
- name = "combined-stream-1.0.5";
- version = "1.0.5";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz";
- name = "combined-stream-1.0.5.tgz";
- sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009";
- };
- deps = {
- "delayed-stream-1.0.0" = self.by-version."delayed-stream"."1.0.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."commander"."^2.8.1" =
- self.by-version."commander"."2.8.1";
- by-version."commander"."2.8.1" = self.buildNodePackage {
- name = "commander-2.8.1";
- version = "2.8.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/commander/-/commander-2.8.1.tgz";
- name = "commander-2.8.1.tgz";
- sha1 = "06be367febfda0c330aa1e2a072d3dc9762425d4";
- };
- deps = {
- "graceful-readlink-1.0.1" = self.by-version."graceful-readlink"."1.0.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."concat-stream"."~1.4.7" =
- self.by-version."concat-stream"."1.4.10";
- by-version."concat-stream"."1.4.10" = self.buildNodePackage {
- name = "concat-stream-1.4.10";
- version = "1.4.10";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/concat-stream/-/concat-stream-1.4.10.tgz";
- name = "concat-stream-1.4.10.tgz";
- sha1 = "acc3bbf5602cb8cc980c6ac840fa7d8603e3ef36";
- };
- deps = {
- "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
- "typedarray-0.0.6" = self.by-version."typedarray"."0.0.6";
- "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."connect-static"."~1.5.0" =
- self.by-version."connect-static"."1.5.0";
- by-version."connect-static"."1.5.0" = self.buildNodePackage {
- name = "connect-static-1.5.0";
- version = "1.5.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/connect-static/-/connect-static-1.5.0.tgz";
- name = "connect-static-1.5.0.tgz";
- sha1 = "f8b455532e04de7c3dc7c1e062207f0b7a626ec7";
- };
- deps = {
- "findit2-2.2.3" = self.by-version."findit2"."2.2.3";
- "mime-1.2.11" = self.by-version."mime"."1.2.11";
- "pend-1.2.0" = self.by-version."pend"."1.2.0";
- "streamsink-1.2.0" = self.by-version."streamsink"."1.2.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "connect-static" = self.by-version."connect-static"."1.5.0";
- by-spec."content-disposition"."0.5.0" =
- self.by-version."content-disposition"."0.5.0";
- by-version."content-disposition"."0.5.0" = self.buildNodePackage {
- name = "content-disposition-0.5.0";
- version = "0.5.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/content-disposition/-/content-disposition-0.5.0.tgz";
- name = "content-disposition-0.5.0.tgz";
- sha1 = "4284fe6ae0630874639e44e80a418c2934135e9e";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."content-disposition"."~0.5.0" =
- self.by-version."content-disposition"."0.5.0";
- "content-disposition" = self.by-version."content-disposition"."0.5.0";
- by-spec."content-type"."~1.0.1" =
- self.by-version."content-type"."1.0.1";
- by-version."content-type"."1.0.1" = self.buildNodePackage {
- name = "content-type-1.0.1";
- version = "1.0.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/content-type/-/content-type-1.0.1.tgz";
- name = "content-type-1.0.1.tgz";
- sha1 = "a19d2247327dc038050ce622b7a154ec59c5e600";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."cookie"."0.1.2" =
- self.by-version."cookie"."0.1.2";
- by-version."cookie"."0.1.2" = self.buildNodePackage {
- name = "cookie-0.1.2";
- version = "0.1.2";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz";
- name = "cookie-0.1.2.tgz";
- sha1 = "72fec3d24e48a3432073d90c12642005061004b1";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."cookie-signature"."1.0.6" =
- self.by-version."cookie-signature"."1.0.6";
- by-version."cookie-signature"."1.0.6" = self.buildNodePackage {
- name = "cookie-signature-1.0.6";
- version = "1.0.6";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz";
- name = "cookie-signature-1.0.6.tgz";
- sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."cookies"."~0.5.0" =
- self.by-version."cookies"."0.5.0";
- by-version."cookies"."0.5.0" = self.buildNodePackage {
- name = "cookies-0.5.0";
- version = "0.5.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/cookies/-/cookies-0.5.0.tgz";
- name = "cookies-0.5.0.tgz";
- sha1 = "164cac46a1d3ca3b3b87427414c24931d8381025";
- };
- deps = {
- "keygrip-1.0.1" = self.by-version."keygrip"."1.0.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "cookies" = self.by-version."cookies"."0.5.0";
- by-spec."core-util-is"."~1.0.0" =
- self.by-version."core-util-is"."1.0.1";
- by-version."core-util-is"."1.0.1" = self.buildNodePackage {
- name = "core-util-is-1.0.1";
- version = "1.0.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz";
- name = "core-util-is-1.0.1.tgz";
- sha1 = "6b07085aef9a3ccac6ee53bf9d3df0c1521a5538";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."crc"."3.2.1" =
- self.by-version."crc"."3.2.1";
- by-version."crc"."3.2.1" = self.buildNodePackage {
- name = "crc-3.2.1";
- version = "3.2.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/crc/-/crc-3.2.1.tgz";
- name = "crc-3.2.1.tgz";
- sha1 = "5d9c8fb77a245cd5eca291e5d2d005334bab0082";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."cryptiles"."0.2.x" =
- self.by-version."cryptiles"."0.2.2";
- by-version."cryptiles"."0.2.2" = self.buildNodePackage {
- name = "cryptiles-0.2.2";
- version = "0.2.2";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz";
- name = "cryptiles-0.2.2.tgz";
- sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c";
- };
- deps = {
- "boom-0.4.2" = self.by-version."boom"."0.4.2";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."cryptiles"."2.x.x" =
- self.by-version."cryptiles"."2.0.4";
- by-version."cryptiles"."2.0.4" = self.buildNodePackage {
- name = "cryptiles-2.0.4";
- version = "2.0.4";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/cryptiles/-/cryptiles-2.0.4.tgz";
- name = "cryptiles-2.0.4.tgz";
- sha1 = "09ea1775b9e1c7de7e60a99d42ab6f08ce1a1285";
- };
- deps = {
- "boom-2.8.0" = self.by-version."boom"."2.8.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."css-parse"."1.7.x" =
- self.by-version."css-parse"."1.7.0";
- by-version."css-parse"."1.7.0" = self.buildNodePackage {
- name = "css-parse-1.7.0";
- version = "1.7.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz";
- name = "css-parse-1.7.0.tgz";
- sha1 = "321f6cf73782a6ff751111390fc05e2c657d8c9b";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."ctype"."0.5.3" =
- self.by-version."ctype"."0.5.3";
- by-version."ctype"."0.5.3" = self.buildNodePackage {
- name = "ctype-0.5.3";
- version = "0.5.3";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz";
- name = "ctype-0.5.3.tgz";
- sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."curlydiff"."~2.0.1" =
- self.by-version."curlydiff"."2.0.1";
- by-version."curlydiff"."2.0.1" = self.buildNodePackage {
- name = "curlydiff-2.0.1";
- version = "2.0.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/curlydiff/-/curlydiff-2.0.1.tgz";
- name = "curlydiff-2.0.1.tgz";
- sha1 = "6ac4b754ea5b63af2632022d03a152306f7eac0b";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "curlydiff" = self.by-version."curlydiff"."2.0.1";
- by-spec."debug"."*" =
- self.by-version."debug"."2.2.0";
- by-version."debug"."2.2.0" = self.buildNodePackage {
- name = "debug-2.2.0";
- version = "2.2.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/debug/-/debug-2.2.0.tgz";
- name = "debug-2.2.0.tgz";
- sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da";
- };
- deps = {
- "ms-0.7.1" = self.by-version."ms"."0.7.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."debug"."~2.2.0" =
- self.by-version."debug"."2.2.0";
- by-spec."deep-equal"."~0.0.0" =
- self.by-version."deep-equal"."0.0.0";
- by-version."deep-equal"."0.0.0" = self.buildNodePackage {
- name = "deep-equal-0.0.0";
- version = "0.0.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.0.0.tgz";
- name = "deep-equal-0.0.0.tgz";
- sha1 = "99679d3bbd047156fcd450d3d01eeb9068691e83";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."deep-is"."0.1.x" =
- self.by-version."deep-is"."0.1.3";
- by-version."deep-is"."0.1.3" = self.buildNodePackage {
- name = "deep-is-0.1.3";
- version = "0.1.3";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz";
- name = "deep-is-0.1.3.tgz";
- sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."delayed-stream"."0.0.5" =
- self.by-version."delayed-stream"."0.0.5";
- by-version."delayed-stream"."0.0.5" = self.buildNodePackage {
- name = "delayed-stream-0.0.5";
- version = "0.0.5";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz";
- name = "delayed-stream-0.0.5.tgz";
- sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."delayed-stream"."~1.0.0" =
- self.by-version."delayed-stream"."1.0.0";
- by-version."delayed-stream"."1.0.0" = self.buildNodePackage {
- name = "delayed-stream-1.0.0";
- version = "1.0.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz";
- name = "delayed-stream-1.0.0.tgz";
- sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."depd"."~1.0.1" =
- self.by-version."depd"."1.0.1";
- by-version."depd"."1.0.1" = self.buildNodePackage {
- name = "depd-1.0.1";
- version = "1.0.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/depd/-/depd-1.0.1.tgz";
- name = "depd-1.0.1.tgz";
- sha1 = "80aec64c9d6d97e65cc2a9caa93c0aa6abf73aaa";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."destroy"."1.0.3" =
- self.by-version."destroy"."1.0.3";
- by-version."destroy"."1.0.3" = self.buildNodePackage {
- name = "destroy-1.0.3";
- version = "1.0.3";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz";
- name = "destroy-1.0.3.tgz";
- sha1 = "b433b4724e71fd8551d9885174851c5fc377e2c9";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."diacritics"."~1.2.1" =
- self.by-version."diacritics"."1.2.1";
- by-version."diacritics"."1.2.1" = self.buildNodePackage {
- name = "diacritics-1.2.1";
- version = "1.2.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/diacritics/-/diacritics-1.2.1.tgz";
- name = "diacritics-1.2.1.tgz";
- sha1 = "e4d323a7c564197f7af514c5964bd45d0eb8cf77";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."difflet"."~0.2.0" =
- self.by-version."difflet"."0.2.6";
- by-version."difflet"."0.2.6" = self.buildNodePackage {
- name = "difflet-0.2.6";
- version = "0.2.6";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/difflet/-/difflet-0.2.6.tgz";
- name = "difflet-0.2.6.tgz";
- sha1 = "ab23b31f5649b6faa8e3d2acbd334467365ca6fa";
- };
- deps = {
- "traverse-0.6.6" = self.by-version."traverse"."0.6.6";
- "charm-0.1.2" = self.by-version."charm"."0.1.2";
- "deep-is-0.1.3" = self.by-version."deep-is"."0.1.3";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."dom-serializer"."0" =
- self.by-version."dom-serializer"."0.1.0";
- by-version."dom-serializer"."0.1.0" = self.buildNodePackage {
- name = "dom-serializer-0.1.0";
- version = "0.1.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz";
- name = "dom-serializer-0.1.0.tgz";
- sha1 = "073c697546ce0780ce23be4a28e293e40bc30c82";
- };
- deps = {
- "domelementtype-1.1.3" = self.by-version."domelementtype"."1.1.3";
- "entities-1.1.1" = self.by-version."entities"."1.1.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."dom-serializer"."~0.0.0" =
- self.by-version."dom-serializer"."0.0.1";
- by-version."dom-serializer"."0.0.1" = self.buildNodePackage {
- name = "dom-serializer-0.0.1";
- version = "0.0.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/dom-serializer/-/dom-serializer-0.0.1.tgz";
- name = "dom-serializer-0.0.1.tgz";
- sha1 = "9589827f1e32d22c37c829adabd59b3247af8eaf";
- };
- deps = {
- "domelementtype-1.1.3" = self.by-version."domelementtype"."1.1.3";
- "entities-1.1.1" = self.by-version."entities"."1.1.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."domelementtype"."1" =
- self.by-version."domelementtype"."1.3.0";
- by-version."domelementtype"."1.3.0" = self.buildNodePackage {
- name = "domelementtype-1.3.0";
- version = "1.3.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz";
- name = "domelementtype-1.3.0.tgz";
- sha1 = "b17aed82e8ab59e52dd9c19b1756e0fc187204c2";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."domelementtype"."~1.1.1" =
- self.by-version."domelementtype"."1.1.3";
- by-version."domelementtype"."1.1.3" = self.buildNodePackage {
- name = "domelementtype-1.1.3";
- version = "1.1.3";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz";
- name = "domelementtype-1.1.3.tgz";
- sha1 = "bd28773e2642881aec51544924299c5cd822185b";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."domhandler"."2.3" =
- self.by-version."domhandler"."2.3.0";
- by-version."domhandler"."2.3.0" = self.buildNodePackage {
- name = "domhandler-2.3.0";
- version = "2.3.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz";
- name = "domhandler-2.3.0.tgz";
- sha1 = "2de59a0822d5027fabff6f032c2b25a2a8abe738";
- };
- deps = {
- "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."domutils"."1.4" =
- self.by-version."domutils"."1.4.3";
- by-version."domutils"."1.4.3" = self.buildNodePackage {
- name = "domutils-1.4.3";
- version = "1.4.3";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz";
- name = "domutils-1.4.3.tgz";
- sha1 = "0865513796c6b306031850e175516baf80b72a6f";
- };
- deps = {
- "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."domutils"."1.5" =
- self.by-version."domutils"."1.5.1";
- by-version."domutils"."1.5.1" = self.buildNodePackage {
- name = "domutils-1.5.1";
- version = "1.5.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz";
- name = "domutils-1.5.1.tgz";
- sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf";
- };
- deps = {
- "dom-serializer-0.1.0" = self.by-version."dom-serializer"."0.1.0";
- "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."ee-first"."1.1.0" =
- self.by-version."ee-first"."1.1.0";
- by-version."ee-first"."1.1.0" = self.buildNodePackage {
- name = "ee-first-1.1.0";
- version = "1.1.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz";
- name = "ee-first-1.1.0.tgz";
- sha1 = "6a0d7c6221e490feefd92ec3f441c9ce8cd097f4";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."entities"."1.0" =
- self.by-version."entities"."1.0.0";
- by-version."entities"."1.0.0" = self.buildNodePackage {
- name = "entities-1.0.0";
- version = "1.0.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/entities/-/entities-1.0.0.tgz";
- name = "entities-1.0.0.tgz";
- sha1 = "b2987aa3821347fcde642b24fdfc9e4fb712bf26";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."entities"."~1.1.1" =
- self.by-version."entities"."1.1.1";
- by-version."entities"."1.1.1" = self.buildNodePackage {
- name = "entities-1.1.1";
- version = "1.1.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/entities/-/entities-1.1.1.tgz";
- name = "entities-1.1.1.tgz";
- sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."escape-html"."1.0.1" =
- self.by-version."escape-html"."1.0.1";
- by-version."escape-html"."1.0.1" = self.buildNodePackage {
- name = "escape-html-1.0.1";
- version = "1.0.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz";
- name = "escape-html-1.0.1.tgz";
- sha1 = "181a286ead397a39a92857cfb1d43052e356bff0";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."escape-string-regexp"."^1.0.2" =
- self.by-version."escape-string-regexp"."1.0.3";
- by-version."escape-string-regexp"."1.0.3" = self.buildNodePackage {
- name = "escape-string-regexp-1.0.3";
- version = "1.0.3";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz";
- name = "escape-string-regexp-1.0.3.tgz";
- sha1 = "9e2d8b25bc2555c3336723750e03f099c2735bb5";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."etag"."~1.6.0" =
- self.by-version."etag"."1.6.0";
- by-version."etag"."1.6.0" = self.buildNodePackage {
- name = "etag-1.6.0";
- version = "1.6.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/etag/-/etag-1.6.0.tgz";
- name = "etag-1.6.0.tgz";
- sha1 = "8bcb2c6af1254c481dfc8b997c906ef4e442c207";
- };
- deps = {
- "crc-3.2.1" = self.by-version."crc"."3.2.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."express"."~4.12.3" =
- self.by-version."express"."4.12.4";
- by-version."express"."4.12.4" = self.buildNodePackage {
- name = "express-4.12.4";
- version = "4.12.4";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/express/-/express-4.12.4.tgz";
- name = "express-4.12.4.tgz";
- sha1 = "8fec2510255bc6b2e58107c48239c0fa307c1aa2";
- };
- deps = {
- "accepts-1.2.9" = self.by-version."accepts"."1.2.9";
- "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0";
- "content-type-1.0.1" = self.by-version."content-type"."1.0.1";
- "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
- "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6";
- "debug-2.2.0" = self.by-version."debug"."2.2.0";
- "depd-1.0.1" = self.by-version."depd"."1.0.1";
- "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
- "etag-1.6.0" = self.by-version."etag"."1.6.0";
- "finalhandler-0.3.6" = self.by-version."finalhandler"."0.3.6";
- "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
- "merge-descriptors-1.0.0" = self.by-version."merge-descriptors"."1.0.0";
- "methods-1.1.1" = self.by-version."methods"."1.1.1";
- "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1";
- "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
- "path-to-regexp-0.1.3" = self.by-version."path-to-regexp"."0.1.3";
- "proxy-addr-1.0.8" = self.by-version."proxy-addr"."1.0.8";
- "qs-2.4.2" = self.by-version."qs"."2.4.2";
- "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
- "send-0.12.3" = self.by-version."send"."0.12.3";
- "serve-static-1.9.3" = self.by-version."serve-static"."1.9.3";
- "type-is-1.6.3" = self.by-version."type-is"."1.6.3";
- "vary-1.0.0" = self.by-version."vary"."1.0.0";
- "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "express" = self.by-version."express"."4.12.4";
- by-spec."fast-future"."~1.0.0" =
- self.by-version."fast-future"."1.0.1";
- by-version."fast-future"."1.0.1" = self.buildNodePackage {
- name = "fast-future-1.0.1";
- version = "1.0.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/fast-future/-/fast-future-1.0.1.tgz";
- name = "fast-future-1.0.1.tgz";
- sha1 = "6cbd22d999ab39cd10fc79392486e7a678716818";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."fd-slicer"."~1.0.0" =
- self.by-version."fd-slicer"."1.0.1";
- by-version."fd-slicer"."1.0.1" = self.buildNodePackage {
- name = "fd-slicer-1.0.1";
- version = "1.0.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz";
- name = "fd-slicer-1.0.1.tgz";
- sha1 = "8b5bcbd9ec327c5041bf9ab023fd6750f1177e65";
- };
- deps = {
- "pend-1.2.0" = self.by-version."pend"."1.2.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."fd-slicer"."~1.0.1" =
- self.by-version."fd-slicer"."1.0.1";
- by-spec."finalhandler"."0.3.6" =
- self.by-version."finalhandler"."0.3.6";
- by-version."finalhandler"."0.3.6" = self.buildNodePackage {
- name = "finalhandler-0.3.6";
- version = "0.3.6";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.3.6.tgz";
- name = "finalhandler-0.3.6.tgz";
- sha1 = "daf9c4161b1b06e001466b1411dfdb6973be138b";
- };
- deps = {
- "debug-2.2.0" = self.by-version."debug"."2.2.0";
- "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
- "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."findit2"."~2.2.3" =
- self.by-version."findit2"."2.2.3";
- by-version."findit2"."2.2.3" = self.buildNodePackage {
- name = "findit2-2.2.3";
- version = "2.2.3";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/findit2/-/findit2-2.2.3.tgz";
- name = "findit2-2.2.3.tgz";
- sha1 = "58a466697df8a6205cdfdbf395536b8bd777a5f6";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "findit2" = self.by-version."findit2"."2.2.3";
- by-spec."forever-agent"."~0.5.0" =
- self.by-version."forever-agent"."0.5.2";
- by-version."forever-agent"."0.5.2" = self.buildNodePackage {
- name = "forever-agent-0.5.2";
- version = "0.5.2";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz";
- name = "forever-agent-0.5.2.tgz";
- sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."forever-agent"."~0.6.0" =
- self.by-version."forever-agent"."0.6.1";
- by-version."forever-agent"."0.6.1" = self.buildNodePackage {
- name = "forever-agent-0.6.1";
- version = "0.6.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz";
- name = "forever-agent-0.6.1.tgz";
- sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."form-data"."~0.2.0" =
- self.by-version."form-data"."0.2.0";
- by-version."form-data"."0.2.0" = self.buildNodePackage {
- name = "form-data-0.2.0";
- version = "0.2.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz";
- name = "form-data-0.2.0.tgz";
- sha1 = "26f8bc26da6440e299cbdcfb69035c4f77a6e466";
- };
- deps = {
- "async-0.9.2" = self.by-version."async"."0.9.2";
- "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
- "mime-types-2.0.14" = self.by-version."mime-types"."2.0.14";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."forwarded"."~0.1.0" =
- self.by-version."forwarded"."0.1.0";
- by-version."forwarded"."0.1.0" = self.buildNodePackage {
- name = "forwarded-0.1.0";
- version = "0.1.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz";
- name = "forwarded-0.1.0.tgz";
- sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."fresh"."0.2.4" =
- self.by-version."fresh"."0.2.4";
- by-version."fresh"."0.2.4" = self.buildNodePackage {
- name = "fresh-0.2.4";
- version = "0.2.4";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz";
- name = "fresh-0.2.4.tgz";
- sha1 = "3582499206c9723714190edd74b4604feb4a614c";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."gapitoken"."~0.1.2" =
- self.by-version."gapitoken"."0.1.4";
- by-version."gapitoken"."0.1.4" = self.buildNodePackage {
- name = "gapitoken-0.1.4";
- version = "0.1.4";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/gapitoken/-/gapitoken-0.1.4.tgz";
- name = "gapitoken-0.1.4.tgz";
- sha1 = "643dedb26cb142466f62b73d2782e7822a6f1ad8";
- };
- deps = {
- "jws-0.0.2" = self.by-version."jws"."0.0.2";
- "request-2.57.0" = self.by-version."request"."2.57.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."generate-function"."^2.0.0" =
- self.by-version."generate-function"."2.0.0";
- by-version."generate-function"."2.0.0" = self.buildNodePackage {
- name = "generate-function-2.0.0";
- version = "2.0.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz";
- name = "generate-function-2.0.0.tgz";
- sha1 = "6858fe7c0969b7d4e9093337647ac79f60dfbe74";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."generate-object-property"."^1.1.0" =
- self.by-version."generate-object-property"."1.2.0";
- by-version."generate-object-property"."1.2.0" = self.buildNodePackage {
- name = "generate-object-property-1.2.0";
- version = "1.2.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz";
- name = "generate-object-property-1.2.0.tgz";
- sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0";
- };
- deps = {
- "is-property-1.0.2" = self.by-version."is-property"."1.0.2";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."get-stdin"."^4.0.1" =
- self.by-version."get-stdin"."4.0.1";
- by-version."get-stdin"."4.0.1" = self.buildNodePackage {
- name = "get-stdin-4.0.1";
- version = "4.0.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz";
- name = "get-stdin-4.0.1.tgz";
- sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."glob"."3.2.x" =
- self.by-version."glob"."3.2.11";
- by-version."glob"."3.2.11" = self.buildNodePackage {
- name = "glob-3.2.11";
- version = "3.2.11";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/glob/-/glob-3.2.11.tgz";
- name = "glob-3.2.11.tgz";
- sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d";
- };
- deps = {
- "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
- "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."google-auth-library"."~0.9.3" =
- self.by-version."google-auth-library"."0.9.6";
- by-version."google-auth-library"."0.9.6" = self.buildNodePackage {
- name = "google-auth-library-0.9.6";
- version = "0.9.6";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/google-auth-library/-/google-auth-library-0.9.6.tgz";
- name = "google-auth-library-0.9.6.tgz";
- sha1 = "57aa09f2621d6eafe8852b0167c9100759a67220";
- };
- deps = {
- "async-0.9.2" = self.by-version."async"."0.9.2";
- "gtoken-1.1.1" = self.by-version."gtoken"."1.1.1";
- "lodash.noop-3.0.0" = self.by-version."lodash.noop"."3.0.0";
- "jws-3.0.0" = self.by-version."jws"."3.0.0";
- "request-2.51.0" = self.by-version."request"."2.51.0";
- "string-template-0.2.1" = self.by-version."string-template"."0.2.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."google-p12-pem"."^0.0.1" =
- self.by-version."google-p12-pem"."0.0.1";
- by-version."google-p12-pem"."0.0.1" = self.buildNodePackage {
- name = "google-p12-pem-0.0.1";
- version = "0.0.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/google-p12-pem/-/google-p12-pem-0.0.1.tgz";
- name = "google-p12-pem-0.0.1.tgz";
- sha1 = "965638d464f13b4a866356a5ba047163ec0b08b7";
- };
- deps = {
- "node-forge-0.6.16" = self.by-version."node-forge"."0.6.16";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."googleapis"."~2.0.3" =
- self.by-version."googleapis"."2.0.5";
- by-version."googleapis"."2.0.5" = self.buildNodePackage {
- name = "googleapis-2.0.5";
- version = "2.0.5";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/googleapis/-/googleapis-2.0.5.tgz";
- name = "googleapis-2.0.5.tgz";
- sha1 = "fb2d678f97152eb0a336da84bbc1eeb16a9c8310";
- };
- deps = {
- "async-0.9.2" = self.by-version."async"."0.9.2";
- "gapitoken-0.1.4" = self.by-version."gapitoken"."0.1.4";
- "google-auth-library-0.9.6" = self.by-version."google-auth-library"."0.9.6";
- "request-2.54.0" = self.by-version."request"."2.54.0";
- "string-template-0.2.1" = self.by-version."string-template"."0.2.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "googleapis" = self.by-version."googleapis"."2.0.5";
- by-spec."graceful-readlink".">= 1.0.0" =
- self.by-version."graceful-readlink"."1.0.1";
- by-version."graceful-readlink"."1.0.1" = self.buildNodePackage {
- name = "graceful-readlink-1.0.1";
- version = "1.0.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz";
- name = "graceful-readlink-1.0.1.tgz";
- sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."groove"."~2.3.3" =
- self.by-version."groove"."2.3.4";
- by-version."groove"."2.3.4" = self.buildNodePackage {
- name = "groove-2.3.4";
- version = "2.3.4";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/groove/-/groove-2.3.4.tgz";
- name = "groove-2.3.4.tgz";
- sha1 = "bbfb8e40584c5921f6df9d52d4017f2acb0a7e45";
- };
- deps = {
- "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
- "nan-1.8.4" = self.by-version."nan"."1.8.4";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "groove" = self.by-version."groove"."2.3.4";
- by-spec."gtoken"."^1.1.0" =
- self.by-version."gtoken"."1.1.1";
- by-version."gtoken"."1.1.1" = self.buildNodePackage {
- name = "gtoken-1.1.1";
- version = "1.1.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/gtoken/-/gtoken-1.1.1.tgz";
- name = "gtoken-1.1.1.tgz";
- sha1 = "969af828d1f7efea32a500ea09b0edfa8e0c438a";
- };
- deps = {
- "google-p12-pem-0.0.1" = self.by-version."google-p12-pem"."0.0.1";
- "jws-3.0.0" = self.by-version."jws"."3.0.0";
- "mime-1.3.4" = self.by-version."mime"."1.3.4";
- "request-2.57.0" = self.by-version."request"."2.57.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."har-validator"."^1.4.0" =
- self.by-version."har-validator"."1.7.1";
- by-version."har-validator"."1.7.1" = self.buildNodePackage {
- name = "har-validator-1.7.1";
- version = "1.7.1";
- bin = true;
- src = fetchurl {
- url = "http://registry.npmjs.org/har-validator/-/har-validator-1.7.1.tgz";
- name = "har-validator-1.7.1.tgz";
- sha1 = "8ec8952f8287d21b451ba3e36f27ed8d997d8a95";
- };
- deps = {
- "bluebird-2.9.30" = self.by-version."bluebird"."2.9.30";
- "chalk-1.0.0" = self.by-version."chalk"."1.0.0";
- "commander-2.8.1" = self.by-version."commander"."2.8.1";
- "is-my-json-valid-2.12.0" = self.by-version."is-my-json-valid"."2.12.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."har-validator"."^1.6.1" =
- self.by-version."har-validator"."1.7.1";
- by-spec."has-ansi"."^1.0.3" =
- self.by-version."has-ansi"."1.0.3";
- by-version."has-ansi"."1.0.3" = self.buildNodePackage {
- name = "has-ansi-1.0.3";
- version = "1.0.3";
- bin = true;
- src = fetchurl {
- url = "http://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz";
- name = "has-ansi-1.0.3.tgz";
- sha1 = "c0b5b1615d9e382b0ff67169d967b425e48ca538";
- };
- deps = {
- "ansi-regex-1.1.1" = self.by-version."ansi-regex"."1.1.1";
- "get-stdin-4.0.1" = self.by-version."get-stdin"."4.0.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."hawk"."1.1.1" =
- self.by-version."hawk"."1.1.1";
- by-version."hawk"."1.1.1" = self.buildNodePackage {
- name = "hawk-1.1.1";
- version = "1.1.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz";
- name = "hawk-1.1.1.tgz";
- sha1 = "87cd491f9b46e4e2aeaca335416766885d2d1ed9";
- };
- deps = {
- "hoek-0.9.1" = self.by-version."hoek"."0.9.1";
- "boom-0.4.2" = self.by-version."boom"."0.4.2";
- "cryptiles-0.2.2" = self.by-version."cryptiles"."0.2.2";
- "sntp-0.2.4" = self.by-version."sntp"."0.2.4";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."hawk"."~2.3.0" =
- self.by-version."hawk"."2.3.1";
- by-version."hawk"."2.3.1" = self.buildNodePackage {
- name = "hawk-2.3.1";
- version = "2.3.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/hawk/-/hawk-2.3.1.tgz";
- name = "hawk-2.3.1.tgz";
- sha1 = "1e731ce39447fa1d0f6d707f7bceebec0fd1ec1f";
- };
- deps = {
- "hoek-2.14.0" = self.by-version."hoek"."2.14.0";
- "boom-2.8.0" = self.by-version."boom"."2.8.0";
- "cryptiles-2.0.4" = self.by-version."cryptiles"."2.0.4";
- "sntp-1.0.9" = self.by-version."sntp"."1.0.9";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."hoek"."0.9.x" =
- self.by-version."hoek"."0.9.1";
- by-version."hoek"."0.9.1" = self.buildNodePackage {
- name = "hoek-0.9.1";
- version = "0.9.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz";
- name = "hoek-0.9.1.tgz";
- sha1 = "3d322462badf07716ea7eb85baf88079cddce505";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."hoek"."2.x.x" =
- self.by-version."hoek"."2.14.0";
- by-version."hoek"."2.14.0" = self.buildNodePackage {
- name = "hoek-2.14.0";
- version = "2.14.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/hoek/-/hoek-2.14.0.tgz";
- name = "hoek-2.14.0.tgz";
- sha1 = "81211691f52a5a835ae49edbf1e89c9003476aa4";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."htmlparser2"."~3.8.1" =
- self.by-version."htmlparser2"."3.8.3";
- by-version."htmlparser2"."3.8.3" = self.buildNodePackage {
- name = "htmlparser2-3.8.3";
- version = "3.8.3";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz";
- name = "htmlparser2-3.8.3.tgz";
- sha1 = "996c28b191516a8be86501a7d79757e5c70c1068";
- };
- deps = {
- "domhandler-2.3.0" = self.by-version."domhandler"."2.3.0";
- "domutils-1.5.1" = self.by-version."domutils"."1.5.1";
- "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0";
- "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
- "entities-1.0.0" = self.by-version."entities"."1.0.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."http-signature"."~0.10.0" =
- self.by-version."http-signature"."0.10.1";
- by-version."http-signature"."0.10.1" = self.buildNodePackage {
- name = "http-signature-0.10.1";
- version = "0.10.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz";
- name = "http-signature-0.10.1.tgz";
- sha1 = "4fbdac132559aa8323121e540779c0a012b27e66";
- };
- deps = {
- "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5";
- "asn1-0.1.11" = self.by-version."asn1"."0.1.11";
- "ctype-0.5.3" = self.by-version."ctype"."0.5.3";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."http-signature"."~0.11.0" =
- self.by-version."http-signature"."0.11.0";
- by-version."http-signature"."0.11.0" = self.buildNodePackage {
- name = "http-signature-0.11.0";
- version = "0.11.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz";
- name = "http-signature-0.11.0.tgz";
- sha1 = "1796cf67a001ad5cd6849dca0991485f09089fe6";
- };
- deps = {
- "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5";
- "asn1-0.1.11" = self.by-version."asn1"."0.1.11";
- "ctype-0.5.3" = self.by-version."ctype"."0.5.3";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."httpolyglot"."~0.1.1" =
- self.by-version."httpolyglot"."0.1.1";
- by-version."httpolyglot"."0.1.1" = self.buildNodePackage {
- name = "httpolyglot-0.1.1";
- version = "0.1.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/httpolyglot/-/httpolyglot-0.1.1.tgz";
- name = "httpolyglot-0.1.1.tgz";
- sha1 = "cd0f5c995cbb95dde325d16a7537f90c0048e53d";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "httpolyglot" = self.by-version."httpolyglot"."0.1.1";
- by-spec."human-size"."~1.1.0" =
- self.by-version."human-size"."1.1.0";
- by-version."human-size"."1.1.0" = self.buildNodePackage {
- name = "human-size-1.1.0";
- version = "1.1.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/human-size/-/human-size-1.1.0.tgz";
- name = "human-size-1.1.0.tgz";
- sha1 = "052562be999841c037022c20259990c56ea996f9";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "human-size" = self.by-version."human-size"."1.1.0";
- by-spec."indent-string"."^1.1.0" =
- self.by-version."indent-string"."1.2.1";
- by-version."indent-string"."1.2.1" = self.buildNodePackage {
- name = "indent-string-1.2.1";
- version = "1.2.1";
- bin = true;
- src = fetchurl {
- url = "http://registry.npmjs.org/indent-string/-/indent-string-1.2.1.tgz";
- name = "indent-string-1.2.1.tgz";
- sha1 = "294c5930792f8bb5b14462a4aa425b94f07d3a56";
- };
- deps = {
- "get-stdin-4.0.1" = self.by-version."get-stdin"."4.0.1";
- "minimist-1.1.1" = self.by-version."minimist"."1.1.1";
- "repeating-1.1.3" = self.by-version."repeating"."1.1.3";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."inherits"."*" =
- self.by-version."inherits"."2.0.1";
- by-version."inherits"."2.0.1" = self.buildNodePackage {
- name = "inherits-2.0.1";
- version = "2.0.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz";
- name = "inherits-2.0.1.tgz";
- sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."inherits"."2" =
- self.by-version."inherits"."2.0.1";
- by-spec."inherits"."~2.0.1" =
- self.by-version."inherits"."2.0.1";
- by-spec."ipaddr.js"."1.0.1" =
- self.by-version."ipaddr.js"."1.0.1";
- by-version."ipaddr.js"."1.0.1" = self.buildNodePackage {
- name = "ipaddr.js-1.0.1";
- version = "1.0.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.1.tgz";
- name = "ipaddr.js-1.0.1.tgz";
- sha1 = "5f38801dc73e0400fc7076386f6ed5215fbd8f95";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."is-finite"."^1.0.0" =
- self.by-version."is-finite"."1.0.1";
- by-version."is-finite"."1.0.1" = self.buildNodePackage {
- name = "is-finite-1.0.1";
- version = "1.0.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/is-finite/-/is-finite-1.0.1.tgz";
- name = "is-finite-1.0.1.tgz";
- sha1 = "6438603eaebe2793948ff4a4262ec8db3d62597b";
- };
- deps = {
- "number-is-nan-1.0.0" = self.by-version."number-is-nan"."1.0.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."is-my-json-valid"."^2.12.0" =
- self.by-version."is-my-json-valid"."2.12.0";
- by-version."is-my-json-valid"."2.12.0" = self.buildNodePackage {
- name = "is-my-json-valid-2.12.0";
- version = "2.12.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.0.tgz";
- name = "is-my-json-valid-2.12.0.tgz";
- sha1 = "8fa6c408b26be95b45a23e8f8c4b464a53874d2b";
- };
- deps = {
- "generate-function-2.0.0" = self.by-version."generate-function"."2.0.0";
- "generate-object-property-1.2.0" = self.by-version."generate-object-property"."1.2.0";
- "jsonpointer-1.1.0" = self.by-version."jsonpointer"."1.1.0";
- "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."is-property"."^1.0.0" =
- self.by-version."is-property"."1.0.2";
- by-version."is-property"."1.0.2" = self.buildNodePackage {
- name = "is-property-1.0.2";
- version = "1.0.2";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz";
- name = "is-property-1.0.2.tgz";
- sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."isarray"."0.0.1" =
- self.by-version."isarray"."0.0.1";
- by-version."isarray"."0.0.1" = self.buildNodePackage {
- name = "isarray-0.0.1";
- version = "0.0.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";
- name = "isarray-0.0.1.tgz";
- sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."isstream"."~0.1.1" =
- self.by-version."isstream"."0.1.2";
- by-version."isstream"."0.1.2" = self.buildNodePackage {
- name = "isstream-0.1.2";
- version = "0.1.2";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz";
- name = "isstream-0.1.2.tgz";
- sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."json-stringify-safe"."~5.0.0" =
- self.by-version."json-stringify-safe"."5.0.1";
- by-version."json-stringify-safe"."5.0.1" = self.buildNodePackage {
- name = "json-stringify-safe-5.0.1";
- version = "5.0.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz";
- name = "json-stringify-safe-5.0.1.tgz";
- sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."jsonpointer"."^1.1.0" =
- self.by-version."jsonpointer"."1.1.0";
- by-version."jsonpointer"."1.1.0" = self.buildNodePackage {
- name = "jsonpointer-1.1.0";
- version = "1.1.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/jsonpointer/-/jsonpointer-1.1.0.tgz";
- name = "jsonpointer-1.1.0.tgz";
- sha1 = "c3c72efaed3b97154163dc01dd349e1cfe0f80fc";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."jstream"."~0.2.7" =
- self.by-version."jstream"."0.2.7";
- by-version."jstream"."0.2.7" = self.buildNodePackage {
- name = "jstream-0.2.7";
- version = "0.2.7";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/jstream/-/jstream-0.2.7.tgz";
- name = "jstream-0.2.7.tgz";
- sha1 = "55f06cd6d4204caeac4907a5de1b90aabf4d60da";
- };
- deps = {
- "clarinet-0.8.1" = self.by-version."clarinet"."0.8.1";
- "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."jwa"."~1.0.0" =
- self.by-version."jwa"."1.0.0";
- by-version."jwa"."1.0.0" = self.buildNodePackage {
- name = "jwa-1.0.0";
- version = "1.0.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/jwa/-/jwa-1.0.0.tgz";
- name = "jwa-1.0.0.tgz";
- sha1 = "040b64fb582171a65f3368e96837ea4dcf42f3d8";
- };
- deps = {
- "base64url-0.0.6" = self.by-version."base64url"."0.0.6";
- "buffer-equal-constant-time-1.0.1" = self.by-version."buffer-equal-constant-time"."1.0.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."jws"."0.0.2" =
- self.by-version."jws"."0.0.2";
- by-version."jws"."0.0.2" = self.buildNodePackage {
- name = "jws-0.0.2";
- version = "0.0.2";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/jws/-/jws-0.0.2.tgz";
- name = "jws-0.0.2.tgz";
- sha1 = "8c6916977183cce3361da48c8c2e0c606e7a95c6";
- };
- deps = {
- "tap-0.3.3" = self.by-version."tap"."0.3.3";
- "base64url-0.0.3" = self.by-version."base64url"."0.0.3";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."jws"."^3.0.0" =
- self.by-version."jws"."3.0.0";
- by-version."jws"."3.0.0" = self.buildNodePackage {
- name = "jws-3.0.0";
- version = "3.0.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/jws/-/jws-3.0.0.tgz";
- name = "jws-3.0.0.tgz";
- sha1 = "da5f267897dd4e9cf8137979db33fc54a3c05418";
- };
- deps = {
- "jwa-1.0.0" = self.by-version."jwa"."1.0.0";
- "base64url-1.0.4" = self.by-version."base64url"."1.0.4";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."jws"."~3.0.0" =
- self.by-version."jws"."3.0.0";
- by-spec."keese"."~1.1.1" =
- self.by-version."keese"."1.1.1";
- by-version."keese"."1.1.1" = self.buildNodePackage {
- name = "keese-1.1.1";
- version = "1.1.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/keese/-/keese-1.1.1.tgz";
- name = "keese-1.1.1.tgz";
- sha1 = "69a1f971e64ee5d2094af002f6d92fa806250842";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "keese" = self.by-version."keese"."1.1.1";
- by-spec."keygrip"."~1.0.0" =
- self.by-version."keygrip"."1.0.1";
- by-version."keygrip"."1.0.1" = self.buildNodePackage {
- name = "keygrip-1.0.1";
- version = "1.0.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/keygrip/-/keygrip-1.0.1.tgz";
- name = "keygrip-1.0.1.tgz";
- sha1 = "b02fa4816eef21a8c4b35ca9e52921ffc89a30e9";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."lastfm"."~0.9.2" =
- self.by-version."lastfm"."0.9.2";
- by-version."lastfm"."0.9.2" = self.buildNodePackage {
- name = "lastfm-0.9.2";
- version = "0.9.2";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/lastfm/-/lastfm-0.9.2.tgz";
- name = "lastfm-0.9.2.tgz";
- sha1 = "d00ca2e3b30eb484e510792875525900e4d77d88";
- };
- deps = {
- "underscore-1.6.0" = self.by-version."underscore"."1.6.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "lastfm" = self.by-version."lastfm"."0.9.2";
- by-spec."leveldown"."~1.0.6" =
- self.by-version."leveldown"."1.0.7";
- by-version."leveldown"."1.0.7" = self.buildNodePackage {
- name = "leveldown-1.0.7";
- version = "1.0.7";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/leveldown/-/leveldown-1.0.7.tgz";
- name = "leveldown-1.0.7.tgz";
- sha1 = "39bbe95f92ce09992ec12de47ade5167be2b6874";
- };
- deps = {
- "abstract-leveldown-2.2.2" = self.by-version."abstract-leveldown"."2.2.2";
- "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
- "fast-future-1.0.1" = self.by-version."fast-future"."1.0.1";
- "nan-1.8.4" = self.by-version."nan"."1.8.4";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "leveldown" = self.by-version."leveldown"."1.0.7";
- by-spec."lodash"."~2.4.1" =
- self.by-version."lodash"."2.4.2";
- by-version."lodash"."2.4.2" = self.buildNodePackage {
- name = "lodash-2.4.2";
- version = "2.4.2";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz";
- name = "lodash-2.4.2.tgz";
- sha1 = "fadd834b9683073da179b3eae6d9c0d15053f73e";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."lodash.noop"."~3.0.0" =
- self.by-version."lodash.noop"."3.0.0";
- by-version."lodash.noop"."3.0.0" = self.buildNodePackage {
- name = "lodash.noop-3.0.0";
- version = "3.0.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/lodash.noop/-/lodash.noop-3.0.0.tgz";
- name = "lodash.noop-3.0.0.tgz";
- sha1 = "f383ca8dba97d8f217e49afcd2b824db9e5e8d68";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."lru-cache"."2" =
- self.by-version."lru-cache"."2.6.4";
- by-version."lru-cache"."2.6.4" = self.buildNodePackage {
- name = "lru-cache-2.6.4";
- version = "2.6.4";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.6.4.tgz";
- name = "lru-cache-2.6.4.tgz";
- sha1 = "2675190ccd1b0701ec2f652a4d0d3d400d76c0dd";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."map-obj"."^1.0.0" =
- self.by-version."map-obj"."1.0.1";
- by-version."map-obj"."1.0.1" = self.buildNodePackage {
- name = "map-obj-1.0.1";
- version = "1.0.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz";
- name = "map-obj-1.0.1.tgz";
- sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."media-typer"."0.3.0" =
- self.by-version."media-typer"."0.3.0";
- by-version."media-typer"."0.3.0" = self.buildNodePackage {
- name = "media-typer-0.3.0";
- version = "0.3.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz";
- name = "media-typer-0.3.0.tgz";
- sha1 = "8710d7af0aa626f8fffa1ce00168545263255748";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."meow"."~2.0.0" =
- self.by-version."meow"."2.0.0";
- by-version."meow"."2.0.0" = self.buildNodePackage {
- name = "meow-2.0.0";
- version = "2.0.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/meow/-/meow-2.0.0.tgz";
- name = "meow-2.0.0.tgz";
- sha1 = "8f530a8ecf5d40d3f4b4df93c3472900fba2a8f1";
- };
- deps = {
- "camelcase-keys-1.0.0" = self.by-version."camelcase-keys"."1.0.0";
- "indent-string-1.2.1" = self.by-version."indent-string"."1.2.1";
- "minimist-1.1.1" = self.by-version."minimist"."1.1.1";
- "object-assign-1.0.0" = self.by-version."object-assign"."1.0.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."merge-descriptors"."1.0.0" =
- self.by-version."merge-descriptors"."1.0.0";
- by-version."merge-descriptors"."1.0.0" = self.buildNodePackage {
- name = "merge-descriptors-1.0.0";
- version = "1.0.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.0.tgz";
- name = "merge-descriptors-1.0.0.tgz";
- sha1 = "2169cf7538e1b0cc87fb88e1502d8474bbf79864";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."mess"."~0.1.2" =
- self.by-version."mess"."0.1.2";
- by-version."mess"."0.1.2" = self.buildNodePackage {
- name = "mess-0.1.2";
- version = "0.1.2";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/mess/-/mess-0.1.2.tgz";
- name = "mess-0.1.2.tgz";
- sha1 = "2c81a424efc87a69ad11f1c7129d1f6f6353b9c0";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "mess" = self.by-version."mess"."0.1.2";
- by-spec."methods"."~1.1.1" =
- self.by-version."methods"."1.1.1";
- by-version."methods"."1.1.1" = self.buildNodePackage {
- name = "methods-1.1.1";
- version = "1.1.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/methods/-/methods-1.1.1.tgz";
- name = "methods-1.1.1.tgz";
- sha1 = "17ea6366066d00c58e375b8ec7dfd0453c89822a";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."mime"."1.3.4" =
- self.by-version."mime"."1.3.4";
- by-version."mime"."1.3.4" = self.buildNodePackage {
- name = "mime-1.3.4";
- version = "1.3.4";
- bin = true;
- src = fetchurl {
- url = "http://registry.npmjs.org/mime/-/mime-1.3.4.tgz";
- name = "mime-1.3.4.tgz";
- sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."mime"."^1.2.11" =
- self.by-version."mime"."1.3.4";
- by-spec."mime"."~1.2.11" =
- self.by-version."mime"."1.2.11";
- by-version."mime"."1.2.11" = self.buildNodePackage {
- name = "mime-1.2.11";
- version = "1.2.11";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz";
- name = "mime-1.2.11.tgz";
- sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."mime-db"."~1.12.0" =
- self.by-version."mime-db"."1.12.0";
- by-version."mime-db"."1.12.0" = self.buildNodePackage {
- name = "mime-db-1.12.0";
- version = "1.12.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz";
- name = "mime-db-1.12.0.tgz";
- sha1 = "3d0c63180f458eb10d325aaa37d7c58ae312e9d7";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."mime-db"."~1.13.0" =
- self.by-version."mime-db"."1.13.0";
- by-version."mime-db"."1.13.0" = self.buildNodePackage {
- name = "mime-db-1.13.0";
- version = "1.13.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/mime-db/-/mime-db-1.13.0.tgz";
- name = "mime-db-1.13.0.tgz";
- sha1 = "fd6808168fe30835e7ea2205fc981d3b633e4e34";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."mime-types"."~1.0.1" =
- self.by-version."mime-types"."1.0.2";
- by-version."mime-types"."1.0.2" = self.buildNodePackage {
- name = "mime-types-1.0.2";
- version = "1.0.2";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz";
- name = "mime-types-1.0.2.tgz";
- sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."mime-types"."~2.0.1" =
- self.by-version."mime-types"."2.0.14";
- by-version."mime-types"."2.0.14" = self.buildNodePackage {
- name = "mime-types-2.0.14";
- version = "2.0.14";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz";
- name = "mime-types-2.0.14.tgz";
- sha1 = "310e159db23e077f8bb22b748dabfa4957140aa6";
- };
- deps = {
- "mime-db-1.12.0" = self.by-version."mime-db"."1.12.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."mime-types"."~2.0.3" =
- self.by-version."mime-types"."2.0.14";
- by-spec."mime-types"."~2.1.1" =
- self.by-version."mime-types"."2.1.1";
- by-version."mime-types"."2.1.1" = self.buildNodePackage {
- name = "mime-types-2.1.1";
- version = "2.1.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/mime-types/-/mime-types-2.1.1.tgz";
- name = "mime-types-2.1.1.tgz";
- sha1 = "c7b692796d5166f4826d10b4675c8a916657d04e";
- };
- deps = {
- "mime-db-1.13.0" = self.by-version."mime-db"."1.13.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."minimatch"."0.3" =
- self.by-version."minimatch"."0.3.0";
- by-version."minimatch"."0.3.0" = self.buildNodePackage {
- name = "minimatch-0.3.0";
- version = "0.3.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz";
- name = "minimatch-0.3.0.tgz";
- sha1 = "275d8edaac4f1bb3326472089e7949c8394699dd";
- };
- deps = {
- "lru-cache-2.6.4" = self.by-version."lru-cache"."2.6.4";
- "sigmund-1.0.1" = self.by-version."sigmund"."1.0.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."minimist"."0.0.8" =
- self.by-version."minimist"."0.0.8";
- by-version."minimist"."0.0.8" = self.buildNodePackage {
- name = "minimist-0.0.8";
- version = "0.0.8";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
- name = "minimist-0.0.8.tgz";
- sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."minimist"."^1.1.0" =
- self.by-version."minimist"."1.1.1";
- by-version."minimist"."1.1.1" = self.buildNodePackage {
- name = "minimist-1.1.1";
- version = "1.1.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/minimist/-/minimist-1.1.1.tgz";
- name = "minimist-1.1.1.tgz";
- sha1 = "1bc2bc71658cdca5712475684363615b0b4f695b";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."mkdirp"."0.3.x" =
- self.by-version."mkdirp"."0.3.5";
- by-version."mkdirp"."0.3.5" = self.buildNodePackage {
- name = "mkdirp-0.3.5";
- version = "0.3.5";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
- name = "mkdirp-0.3.5.tgz";
- sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."mkdirp"."~0.3" =
- self.by-version."mkdirp"."0.3.5";
- by-spec."mkdirp"."~0.5.0" =
- self.by-version."mkdirp"."0.5.1";
- by-version."mkdirp"."0.5.1" = self.buildNodePackage {
- name = "mkdirp-0.5.1";
- version = "0.5.1";
- bin = true;
- src = fetchurl {
- url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
- name = "mkdirp-0.5.1.tgz";
- sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
- };
- deps = {
- "minimist-0.0.8" = self.by-version."minimist"."0.0.8";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."mkdirp"."~0.5.1" =
- self.by-version."mkdirp"."0.5.1";
- "mkdirp" = self.by-version."mkdirp"."0.5.1";
- by-spec."ms"."0.7.1" =
- self.by-version."ms"."0.7.1";
- by-version."ms"."0.7.1" = self.buildNodePackage {
- name = "ms-0.7.1";
- version = "0.7.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/ms/-/ms-0.7.1.tgz";
- name = "ms-0.7.1.tgz";
- sha1 = "9cd13c03adbff25b65effde7ce864ee952017098";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."multiparty"."~4.1.2" =
- self.by-version."multiparty"."4.1.2";
- by-version."multiparty"."4.1.2" = self.buildNodePackage {
- name = "multiparty-4.1.2";
- version = "4.1.2";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/multiparty/-/multiparty-4.1.2.tgz";
- name = "multiparty-4.1.2.tgz";
- sha1 = "54f8ec9712052fa1dfd8ec975056c8230d6f2370";
- };
- deps = {
- "fd-slicer-1.0.1" = self.by-version."fd-slicer"."1.0.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "multiparty" = self.by-version."multiparty"."4.1.2";
- by-spec."music-library-index"."~1.3.0" =
- self.by-version."music-library-index"."1.3.0";
- by-version."music-library-index"."1.3.0" = self.buildNodePackage {
- name = "music-library-index-1.3.0";
- version = "1.3.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/music-library-index/-/music-library-index-1.3.0.tgz";
- name = "music-library-index-1.3.0.tgz";
- sha1 = "f7dbf6f7df5a0c8c50382542183872aedc5cb86a";
- };
- deps = {
- "diacritics-1.2.1" = self.by-version."diacritics"."1.2.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "music-library-index" = self.by-version."music-library-index"."1.3.0";
- by-spec."mv"."~2.0.3" =
- self.by-version."mv"."2.0.3";
- by-version."mv"."2.0.3" = self.buildNodePackage {
- name = "mv-2.0.3";
- version = "2.0.3";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/mv/-/mv-2.0.3.tgz";
- name = "mv-2.0.3.tgz";
- sha1 = "e9ab707d71dc38de24edcc637a8e2f5f480c7f32";
- };
- deps = {
- "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
- "ncp-0.6.0" = self.by-version."ncp"."0.6.0";
- "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "mv" = self.by-version."mv"."2.0.3";
- by-spec."nan"."~1.8.4" =
- self.by-version."nan"."1.8.4";
- by-version."nan"."1.8.4" = self.buildNodePackage {
- name = "nan-1.8.4";
- version = "1.8.4";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/nan/-/nan-1.8.4.tgz";
- name = "nan-1.8.4.tgz";
- sha1 = "3c76b5382eab33e44b758d2813ca9d92e9342f34";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."ncp"."~0.6.0" =
- self.by-version."ncp"."0.6.0";
- by-version."ncp"."0.6.0" = self.buildNodePackage {
- name = "ncp-0.6.0";
- version = "0.6.0";
- bin = true;
- src = fetchurl {
- url = "http://registry.npmjs.org/ncp/-/ncp-0.6.0.tgz";
- name = "ncp-0.6.0.tgz";
- sha1 = "df8ce021e262be21b52feb3d3e5cfaab12491f0d";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."negotiator"."0.5.3" =
- self.by-version."negotiator"."0.5.3";
- by-version."negotiator"."0.5.3" = self.buildNodePackage {
- name = "negotiator-0.5.3";
- version = "0.5.3";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz";
- name = "negotiator-0.5.3.tgz";
- sha1 = "269d5c476810ec92edbe7b6c2f28316384f9a7e8";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."node-forge"."0.6.16" =
- self.by-version."node-forge"."0.6.16";
- by-version."node-forge"."0.6.16" = self.buildNodePackage {
- name = "node-forge-0.6.16";
- version = "0.6.16";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/node-forge/-/node-forge-0.6.16.tgz";
- name = "node-forge-0.6.16.tgz";
- sha1 = "aae85babf97034d46f1b74a39bfe5891282ae842";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."node-uuid"."~1.4.0" =
- self.by-version."node-uuid"."1.4.3";
- by-version."node-uuid"."1.4.3" = self.buildNodePackage {
- name = "node-uuid-1.4.3";
- version = "1.4.3";
- bin = true;
- src = fetchurl {
- url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz";
- name = "node-uuid-1.4.3.tgz";
- sha1 = "319bb7a56e7cb63f00b5c0cd7851cd4b4ddf1df9";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."nopt"."~2" =
- self.by-version."nopt"."2.2.1";
- by-version."nopt"."2.2.1" = self.buildNodePackage {
- name = "nopt-2.2.1";
- version = "2.2.1";
- bin = true;
- src = fetchurl {
- url = "http://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz";
- name = "nopt-2.2.1.tgz";
- sha1 = "2aa09b7d1768487b3b89a9c5aa52335bff0baea7";
- };
- deps = {
- "abbrev-1.0.7" = self.by-version."abbrev"."1.0.7";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."number-is-nan"."^1.0.0" =
- self.by-version."number-is-nan"."1.0.0";
- by-version."number-is-nan"."1.0.0" = self.buildNodePackage {
- name = "number-is-nan-1.0.0";
- version = "1.0.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz";
- name = "number-is-nan-1.0.0.tgz";
- sha1 = "c020f529c5282adfdd233d91d4b181c3d686dc4b";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."oauth-sign"."~0.5.0" =
- self.by-version."oauth-sign"."0.5.0";
- by-version."oauth-sign"."0.5.0" = self.buildNodePackage {
- name = "oauth-sign-0.5.0";
- version = "0.5.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz";
- name = "oauth-sign-0.5.0.tgz";
- sha1 = "d767f5169325620eab2e087ef0c472e773db6461";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."oauth-sign"."~0.6.0" =
- self.by-version."oauth-sign"."0.6.0";
- by-version."oauth-sign"."0.6.0" = self.buildNodePackage {
- name = "oauth-sign-0.6.0";
- version = "0.6.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.6.0.tgz";
- name = "oauth-sign-0.6.0.tgz";
- sha1 = "7dbeae44f6ca454e1f168451d630746735813ce3";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."oauth-sign"."~0.8.0" =
- self.by-version."oauth-sign"."0.8.0";
- by-version."oauth-sign"."0.8.0" = self.buildNodePackage {
- name = "oauth-sign-0.8.0";
- version = "0.8.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz";
- name = "oauth-sign-0.8.0.tgz";
- sha1 = "938fdc875765ba527137d8aec9d178e24debc553";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."object-assign"."^1.0.0" =
- self.by-version."object-assign"."1.0.0";
- by-version."object-assign"."1.0.0" = self.buildNodePackage {
- name = "object-assign-1.0.0";
- version = "1.0.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/object-assign/-/object-assign-1.0.0.tgz";
- name = "object-assign-1.0.0.tgz";
- sha1 = "e65dc8766d3b47b4b8307465c8311da030b070a6";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."on-finished"."~2.2.1" =
- self.by-version."on-finished"."2.2.1";
- by-version."on-finished"."2.2.1" = self.buildNodePackage {
- name = "on-finished-2.2.1";
- version = "2.2.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/on-finished/-/on-finished-2.2.1.tgz";
- name = "on-finished-2.2.1.tgz";
- sha1 = "5c85c1cc36299f78029653f667f27b6b99ebc029";
- };
- deps = {
- "ee-first-1.1.0" = self.by-version."ee-first"."1.1.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."os-tmpdir"."^1.0.0" =
- self.by-version."os-tmpdir"."1.0.1";
- by-version."os-tmpdir"."1.0.1" = self.buildNodePackage {
- name = "os-tmpdir-1.0.1";
- version = "1.0.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz";
- name = "os-tmpdir-1.0.1.tgz";
- sha1 = "e9b423a1edaf479882562e92ed71d7743a071b6e";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."osenv"."~0.1.0" =
- self.by-version."osenv"."0.1.2";
- by-version."osenv"."0.1.2" = self.buildNodePackage {
- name = "osenv-0.1.2";
- version = "0.1.2";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/osenv/-/osenv-0.1.2.tgz";
- name = "osenv-0.1.2.tgz";
- sha1 = "f4d23ebeceaef078600fb78c0ea58fac5996a02d";
- };
- deps = {
- "os-tmpdir-1.0.1" = self.by-version."os-tmpdir"."1.0.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "osenv" = self.by-version."osenv"."0.1.2";
- by-spec."parseurl"."~1.3.0" =
- self.by-version."parseurl"."1.3.0";
- by-version."parseurl"."1.3.0" = self.buildNodePackage {
- name = "parseurl-1.3.0";
- version = "1.3.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz";
- name = "parseurl-1.3.0.tgz";
- sha1 = "b58046db4223e145afa76009e61bac87cc2281b3";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."path-to-regexp"."0.1.3" =
- self.by-version."path-to-regexp"."0.1.3";
- by-version."path-to-regexp"."0.1.3" = self.buildNodePackage {
- name = "path-to-regexp-0.1.3";
- version = "0.1.3";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.3.tgz";
- name = "path-to-regexp-0.1.3.tgz";
- sha1 = "21b9ab82274279de25b156ea08fd12ca51b8aecb";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."pend"."~1.2.0" =
- self.by-version."pend"."1.2.0";
- by-version."pend"."1.2.0" = self.buildNodePackage {
- name = "pend-1.2.0";
- version = "1.2.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/pend/-/pend-1.2.0.tgz";
- name = "pend-1.2.0.tgz";
- sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "pend" = self.by-version."pend"."1.2.0";
- by-spec."proxy-addr"."~1.0.8" =
- self.by-version."proxy-addr"."1.0.8";
- by-version."proxy-addr"."1.0.8" = self.buildNodePackage {
- name = "proxy-addr-1.0.8";
- version = "1.0.8";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.8.tgz";
- name = "proxy-addr-1.0.8.tgz";
- sha1 = "db54ec878bcc1053d57646609219b3715678bafe";
- };
- deps = {
- "forwarded-0.1.0" = self.by-version."forwarded"."0.1.0";
- "ipaddr.js-1.0.1" = self.by-version."ipaddr.js"."1.0.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."qs"."2.4.2" =
- self.by-version."qs"."2.4.2";
- by-version."qs"."2.4.2" = self.buildNodePackage {
- name = "qs-2.4.2";
- version = "2.4.2";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/qs/-/qs-2.4.2.tgz";
- name = "qs-2.4.2.tgz";
- sha1 = "f7ce788e5777df0b5010da7f7c4e73ba32470f5a";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."qs"."~2.3.1" =
- self.by-version."qs"."2.3.3";
- by-version."qs"."2.3.3" = self.buildNodePackage {
- name = "qs-2.3.3";
- version = "2.3.3";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/qs/-/qs-2.3.3.tgz";
- name = "qs-2.3.3.tgz";
- sha1 = "e9e85adbe75da0bbe4c8e0476a086290f863b404";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."qs"."~2.4.0" =
- self.by-version."qs"."2.4.2";
- by-spec."qs"."~3.1.0" =
- self.by-version."qs"."3.1.0";
- by-version."qs"."3.1.0" = self.buildNodePackage {
- name = "qs-3.1.0";
- version = "3.1.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/qs/-/qs-3.1.0.tgz";
- name = "qs-3.1.0.tgz";
- sha1 = "d0e9ae745233a12dc43fb4f3055bba446261153c";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."range-parser"."~1.0.2" =
- self.by-version."range-parser"."1.0.2";
- by-version."range-parser"."1.0.2" = self.buildNodePackage {
- name = "range-parser-1.0.2";
- version = "1.0.2";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz";
- name = "range-parser-1.0.2.tgz";
- sha1 = "06a12a42e5131ba8e457cd892044867f2344e549";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."readable-stream"."1.1" =
- self.by-version."readable-stream"."1.1.13";
- by-version."readable-stream"."1.1.13" = self.buildNodePackage {
- name = "readable-stream-1.1.13";
- version = "1.1.13";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz";
- name = "readable-stream-1.1.13.tgz";
- sha1 = "f6eef764f514c89e2b9e23146a75ba106756d23e";
- };
- deps = {
- "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1";
- "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
- "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
- "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."readable-stream"."~1.0.26" =
- self.by-version."readable-stream"."1.0.33";
- by-version."readable-stream"."1.0.33" = self.buildNodePackage {
- name = "readable-stream-1.0.33";
- version = "1.0.33";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz";
- name = "readable-stream-1.0.33.tgz";
- sha1 = "3a360dd66c1b1d7fd4705389860eda1d0f61126c";
- };
- deps = {
- "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1";
- "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
- "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
- "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."readable-stream"."~1.1.9" =
- self.by-version."readable-stream"."1.1.13";
- by-spec."repeating"."^1.1.0" =
- self.by-version."repeating"."1.1.3";
- by-version."repeating"."1.1.3" = self.buildNodePackage {
- name = "repeating-1.1.3";
- version = "1.1.3";
- bin = true;
- src = fetchurl {
- url = "http://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz";
- name = "repeating-1.1.3.tgz";
- sha1 = "3d4114218877537494f97f77f9785fab810fa4ac";
- };
- deps = {
- "is-finite-1.0.1" = self.by-version."is-finite"."1.0.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."request"."^2.37.0" =
- self.by-version."request"."2.57.0";
- by-version."request"."2.57.0" = self.buildNodePackage {
- name = "request-2.57.0";
- version = "2.57.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/request/-/request-2.57.0.tgz";
- name = "request-2.57.0.tgz";
- sha1 = "d445105a42d009b9d724289633b449a6d723d989";
- };
- deps = {
- "bl-0.9.4" = self.by-version."bl"."0.9.4";
- "caseless-0.10.0" = self.by-version."caseless"."0.10.0";
- "forever-agent-0.6.1" = self.by-version."forever-agent"."0.6.1";
- "form-data-0.2.0" = self.by-version."form-data"."0.2.0";
- "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1";
- "mime-types-2.0.14" = self.by-version."mime-types"."2.0.14";
- "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
- "qs-3.1.0" = self.by-version."qs"."3.1.0";
- "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
- "tough-cookie-2.0.0" = self.by-version."tough-cookie"."2.0.0";
- "http-signature-0.11.0" = self.by-version."http-signature"."0.11.0";
- "oauth-sign-0.8.0" = self.by-version."oauth-sign"."0.8.0";
- "hawk-2.3.1" = self.by-version."hawk"."2.3.1";
- "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
- "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4";
- "combined-stream-1.0.5" = self.by-version."combined-stream"."1.0.5";
- "isstream-0.1.2" = self.by-version."isstream"."0.1.2";
- "har-validator-1.7.1" = self.by-version."har-validator"."1.7.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."request"."^2.54.0" =
- self.by-version."request"."2.57.0";
- by-spec."request"."^2.55.0" =
- self.by-version."request"."2.57.0";
- by-spec."request"."~2.51.0" =
- self.by-version."request"."2.51.0";
- by-version."request"."2.51.0" = self.buildNodePackage {
- name = "request-2.51.0";
- version = "2.51.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/request/-/request-2.51.0.tgz";
- name = "request-2.51.0.tgz";
- sha1 = "35d00bbecc012e55f907b1bd9e0dbd577bfef26e";
- };
- deps = {
- "bl-0.9.4" = self.by-version."bl"."0.9.4";
- "caseless-0.8.0" = self.by-version."caseless"."0.8.0";
- "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
- "form-data-0.2.0" = self.by-version."form-data"."0.2.0";
- "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1";
- "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2";
- "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
- "qs-2.3.3" = self.by-version."qs"."2.3.3";
- "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
- "tough-cookie-2.0.0" = self.by-version."tough-cookie"."2.0.0";
- "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
- "oauth-sign-0.5.0" = self.by-version."oauth-sign"."0.5.0";
- "hawk-1.1.1" = self.by-version."hawk"."1.1.1";
- "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
- "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4";
- "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."request"."~2.54.0" =
- self.by-version."request"."2.54.0";
- by-version."request"."2.54.0" = self.buildNodePackage {
- name = "request-2.54.0";
- version = "2.54.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/request/-/request-2.54.0.tgz";
- name = "request-2.54.0.tgz";
- sha1 = "a13917cd8e8fa73332da0bf2f84a30181def1953";
- };
- deps = {
- "bl-0.9.4" = self.by-version."bl"."0.9.4";
- "caseless-0.9.0" = self.by-version."caseless"."0.9.0";
- "forever-agent-0.6.1" = self.by-version."forever-agent"."0.6.1";
- "form-data-0.2.0" = self.by-version."form-data"."0.2.0";
- "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1";
- "mime-types-2.0.14" = self.by-version."mime-types"."2.0.14";
- "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
- "qs-2.4.2" = self.by-version."qs"."2.4.2";
- "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
- "tough-cookie-2.0.0" = self.by-version."tough-cookie"."2.0.0";
- "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
- "oauth-sign-0.6.0" = self.by-version."oauth-sign"."0.6.0";
- "hawk-2.3.1" = self.by-version."hawk"."2.3.1";
- "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
- "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4";
- "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
- "isstream-0.1.2" = self.by-version."isstream"."0.1.2";
- "har-validator-1.7.1" = self.by-version."har-validator"."1.7.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."rimraf"."~2.2.8" =
- self.by-version."rimraf"."2.2.8";
- by-version."rimraf"."2.2.8" = self.buildNodePackage {
- name = "rimraf-2.2.8";
- version = "2.2.8";
- bin = true;
- src = fetchurl {
- url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz";
- name = "rimraf-2.2.8.tgz";
- sha1 = "e439be2aaee327321952730f99a8929e4fc50582";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."runforcover"."~0.0.2" =
- self.by-version."runforcover"."0.0.2";
- by-version."runforcover"."0.0.2" = self.buildNodePackage {
- name = "runforcover-0.0.2";
- version = "0.0.2";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/runforcover/-/runforcover-0.0.2.tgz";
- name = "runforcover-0.0.2.tgz";
- sha1 = "344f057d8d45d33aebc6cc82204678f69c4857cc";
- };
- deps = {
- "bunker-0.1.2" = self.by-version."bunker"."0.1.2";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."sax"."0.5.x" =
- self.by-version."sax"."0.5.8";
- by-version."sax"."0.5.8" = self.buildNodePackage {
- name = "sax-0.5.8";
- version = "0.5.8";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/sax/-/sax-0.5.8.tgz";
- name = "sax-0.5.8.tgz";
- sha1 = "d472db228eb331c2506b0e8c15524adb939d12c1";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."semver"."~4.3.4" =
- self.by-version."semver"."4.3.6";
- by-version."semver"."4.3.6" = self.buildNodePackage {
- name = "semver-4.3.6";
- version = "4.3.6";
- bin = true;
- src = fetchurl {
- url = "http://registry.npmjs.org/semver/-/semver-4.3.6.tgz";
- name = "semver-4.3.6.tgz";
- sha1 = "300bc6e0e86374f7ba61068b5b1ecd57fc6532da";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "semver" = self.by-version."semver"."4.3.6";
- by-spec."send"."0.12.3" =
- self.by-version."send"."0.12.3";
- by-version."send"."0.12.3" = self.buildNodePackage {
- name = "send-0.12.3";
- version = "0.12.3";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/send/-/send-0.12.3.tgz";
- name = "send-0.12.3.tgz";
- sha1 = "cd12dc58fde21e4f91902b39b2fda05a7a6d9bdc";
- };
- deps = {
- "debug-2.2.0" = self.by-version."debug"."2.2.0";
- "depd-1.0.1" = self.by-version."depd"."1.0.1";
- "destroy-1.0.3" = self.by-version."destroy"."1.0.3";
- "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
- "etag-1.6.0" = self.by-version."etag"."1.6.0";
- "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
- "mime-1.3.4" = self.by-version."mime"."1.3.4";
- "ms-0.7.1" = self.by-version."ms"."0.7.1";
- "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1";
- "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."serve-static"."~1.9.3" =
- self.by-version."serve-static"."1.9.3";
- by-version."serve-static"."1.9.3" = self.buildNodePackage {
- name = "serve-static-1.9.3";
- version = "1.9.3";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/serve-static/-/serve-static-1.9.3.tgz";
- name = "serve-static-1.9.3.tgz";
- sha1 = "5f8da07323ad385ff3dc541f1a7917b2e436eb57";
- };
- deps = {
- "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
- "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
- "send-0.12.3" = self.by-version."send"."0.12.3";
- "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "serve-static" = self.by-version."serve-static"."1.9.3";
- by-spec."sigmund"."~1.0.0" =
- self.by-version."sigmund"."1.0.1";
- by-version."sigmund"."1.0.1" = self.buildNodePackage {
- name = "sigmund-1.0.1";
- version = "1.0.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz";
- name = "sigmund-1.0.1.tgz";
- sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."slide"."*" =
- self.by-version."slide"."1.1.6";
- by-version."slide"."1.1.6" = self.buildNodePackage {
- name = "slide-1.1.6";
- version = "1.1.6";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/slide/-/slide-1.1.6.tgz";
- name = "slide-1.1.6.tgz";
- sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."sntp"."0.2.x" =
- self.by-version."sntp"."0.2.4";
- by-version."sntp"."0.2.4" = self.buildNodePackage {
- name = "sntp-0.2.4";
- version = "0.2.4";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz";
- name = "sntp-0.2.4.tgz";
- sha1 = "fb885f18b0f3aad189f824862536bceeec750900";
- };
- deps = {
- "hoek-0.9.1" = self.by-version."hoek"."0.9.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."sntp"."1.x.x" =
- self.by-version."sntp"."1.0.9";
- by-version."sntp"."1.0.9" = self.buildNodePackage {
- name = "sntp-1.0.9";
- version = "1.0.9";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz";
- name = "sntp-1.0.9.tgz";
- sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198";
- };
- deps = {
- "hoek-2.14.0" = self.by-version."hoek"."2.14.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."source-map"."0.1.x" =
- self.by-version."source-map"."0.1.43";
- by-version."source-map"."0.1.43" = self.buildNodePackage {
- name = "source-map-0.1.43";
- version = "0.1.43";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz";
- name = "source-map-0.1.43.tgz";
- sha1 = "c24bc146ca517c1471f5dacbe2571b2b7f9e3346";
- };
- deps = {
- "amdefine-0.1.1" = self.by-version."amdefine"."0.1.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."streamsink"."~1.2.0" =
- self.by-version."streamsink"."1.2.0";
- by-version."streamsink"."1.2.0" = self.buildNodePackage {
- name = "streamsink-1.2.0";
- version = "1.2.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/streamsink/-/streamsink-1.2.0.tgz";
- name = "streamsink-1.2.0.tgz";
- sha1 = "efafee9f1e22d3591ed7de3dcaa95c3f5e79f73c";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."string-template"."~0.2.0" =
- self.by-version."string-template"."0.2.1";
- by-version."string-template"."0.2.1" = self.buildNodePackage {
- name = "string-template-0.2.1";
- version = "0.2.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz";
- name = "string-template-0.2.1.tgz";
- sha1 = "42932e598a352d01fc22ec3367d9d84eec6c9add";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."string_decoder"."~0.10.x" =
- self.by-version."string_decoder"."0.10.31";
- by-version."string_decoder"."0.10.31" = self.buildNodePackage {
- name = "string_decoder-0.10.31";
- version = "0.10.31";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz";
- name = "string_decoder-0.10.31.tgz";
- sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."stringstream"."~0.0.4" =
- self.by-version."stringstream"."0.0.4";
- by-version."stringstream"."0.0.4" = self.buildNodePackage {
- name = "stringstream-0.0.4";
- version = "0.0.4";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz";
- name = "stringstream-0.0.4.tgz";
- sha1 = "0f0e3423f942960b5692ac324a57dd093bc41a92";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."strip-ansi"."^2.0.1" =
- self.by-version."strip-ansi"."2.0.1";
- by-version."strip-ansi"."2.0.1" = self.buildNodePackage {
- name = "strip-ansi-2.0.1";
- version = "2.0.1";
- bin = true;
- src = fetchurl {
- url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz";
- name = "strip-ansi-2.0.1.tgz";
- sha1 = "df62c1aa94ed2f114e1d0f21fd1d50482b79a60e";
- };
- deps = {
- "ansi-regex-1.1.1" = self.by-version."ansi-regex"."1.1.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."stylus"."~0.49.3" =
- self.by-version."stylus"."0.49.3";
- by-version."stylus"."0.49.3" = self.buildNodePackage {
- name = "stylus-0.49.3";
- version = "0.49.3";
- bin = true;
- src = fetchurl {
- url = "http://registry.npmjs.org/stylus/-/stylus-0.49.3.tgz";
- name = "stylus-0.49.3.tgz";
- sha1 = "1fbdabe479ed460872c71a6252a67f95040ba511";
- };
- deps = {
- "css-parse-1.7.0" = self.by-version."css-parse"."1.7.0";
- "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
- "debug-2.2.0" = self.by-version."debug"."2.2.0";
- "sax-0.5.8" = self.by-version."sax"."0.5.8";
- "glob-3.2.11" = self.by-version."glob"."3.2.11";
- "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "stylus" = self.by-version."stylus"."0.49.3";
- by-spec."supports-color"."^1.3.0" =
- self.by-version."supports-color"."1.3.1";
- by-version."supports-color"."1.3.1" = self.buildNodePackage {
- name = "supports-color-1.3.1";
- version = "1.3.1";
- bin = true;
- src = fetchurl {
- url = "http://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz";
- name = "supports-color-1.3.1.tgz";
- sha1 = "15758df09d8ff3b4acc307539fabe27095e1042d";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."tap"."~0.3.3" =
- self.by-version."tap"."0.3.3";
- by-version."tap"."0.3.3" = self.buildNodePackage {
- name = "tap-0.3.3";
- version = "0.3.3";
- bin = true;
- src = fetchurl {
- url = "http://registry.npmjs.org/tap/-/tap-0.3.3.tgz";
- name = "tap-0.3.3.tgz";
- sha1 = "c862237af0a213f97fff46594bd1d44eca705d63";
- };
- deps = {
- "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
- "yamlish-0.0.7" = self.by-version."yamlish"."0.0.7";
- "slide-1.1.6" = self.by-version."slide"."1.1.6";
- "runforcover-0.0.2" = self.by-version."runforcover"."0.0.2";
- "nopt-2.2.1" = self.by-version."nopt"."2.2.1";
- "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
- "difflet-0.2.6" = self.by-version."difflet"."0.2.6";
- "deep-equal-0.0.0" = self.by-version."deep-equal"."0.0.0";
- "buffer-equal-0.0.1" = self.by-version."buffer-equal"."0.0.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."tough-cookie".">=0.12.0" =
- self.by-version."tough-cookie"."2.0.0";
- by-version."tough-cookie"."2.0.0" = self.buildNodePackage {
- name = "tough-cookie-2.0.0";
- version = "2.0.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-2.0.0.tgz";
- name = "tough-cookie-2.0.0.tgz";
- sha1 = "41ce08720b35cf90beb044dd2609fb19e928718f";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."traverse"."0.6.x" =
- self.by-version."traverse"."0.6.6";
- by-version."traverse"."0.6.6" = self.buildNodePackage {
- name = "traverse-0.6.6";
- version = "0.6.6";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz";
- name = "traverse-0.6.6.tgz";
- sha1 = "cbdf560fd7b9af632502fed40f918c157ea97137";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."traverse"."~0.5.1" =
- self.by-version."traverse"."0.5.2";
- by-version."traverse"."0.5.2" = self.buildNodePackage {
- name = "traverse-0.5.2";
- version = "0.5.2";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/traverse/-/traverse-0.5.2.tgz";
- name = "traverse-0.5.2.tgz";
- sha1 = "e203c58d5f7f0e37db6e74c0acb929bb09b61d85";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."tunnel-agent"."~0.4.0" =
- self.by-version."tunnel-agent"."0.4.0";
- by-version."tunnel-agent"."0.4.0" = self.buildNodePackage {
- name = "tunnel-agent-0.4.0";
- version = "0.4.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz";
- name = "tunnel-agent-0.4.0.tgz";
- sha1 = "b1184e312ffbcf70b3b4c78e8c219de7ebb1c550";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."type-is"."~1.6.2" =
- self.by-version."type-is"."1.6.3";
- by-version."type-is"."1.6.3" = self.buildNodePackage {
- name = "type-is-1.6.3";
- version = "1.6.3";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/type-is/-/type-is-1.6.3.tgz";
- name = "type-is-1.6.3.tgz";
- sha1 = "d87d201777f76dfc526ac202679715d41a28c580";
- };
- deps = {
- "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0";
- "mime-types-2.1.1" = self.by-version."mime-types"."2.1.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."typedarray"."~0.0.5" =
- self.by-version."typedarray"."0.0.6";
- by-version."typedarray"."0.0.6" = self.buildNodePackage {
- name = "typedarray-0.0.6";
- version = "0.0.6";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz";
- name = "typedarray-0.0.6.tgz";
- sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."uglify-js"."~1.1.1" =
- self.by-version."uglify-js"."1.1.1";
- by-version."uglify-js"."1.1.1" = self.buildNodePackage {
- name = "uglify-js-1.1.1";
- version = "1.1.1";
- bin = true;
- src = fetchurl {
- url = "http://registry.npmjs.org/uglify-js/-/uglify-js-1.1.1.tgz";
- name = "uglify-js-1.1.1.tgz";
- sha1 = "ee71a97c4cefd06a1a9b20437f34118982aa035b";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."underscore"."^1.6.0" =
- self.by-version."underscore"."1.8.3";
- by-version."underscore"."1.8.3" = self.buildNodePackage {
- name = "underscore-1.8.3";
- version = "1.8.3";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz";
- name = "underscore-1.8.3.tgz";
- sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."underscore"."~1.6.0" =
- self.by-version."underscore"."1.6.0";
- by-version."underscore"."1.6.0" = self.buildNodePackage {
- name = "underscore-1.6.0";
- version = "1.6.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz";
- name = "underscore-1.6.0.tgz";
- sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."utils-merge"."1.0.0" =
- self.by-version."utils-merge"."1.0.0";
- by-version."utils-merge"."1.0.0" = self.buildNodePackage {
- name = "utils-merge-1.0.0";
- version = "1.0.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz";
- name = "utils-merge-1.0.0.tgz";
- sha1 = "0294fb922bb9375153541c4f7096231f287c8af8";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."vary"."~1.0.0" =
- self.by-version."vary"."1.0.0";
- by-version."vary"."1.0.0" = self.buildNodePackage {
- name = "vary-1.0.0";
- version = "1.0.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/vary/-/vary-1.0.0.tgz";
- name = "vary-1.0.0.tgz";
- sha1 = "c5e76cec20d3820d8f2a96e7bee38731c34da1e7";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."xtend"."^4.0.0" =
- self.by-version."xtend"."4.0.0";
- by-version."xtend"."4.0.0" = self.buildNodePackage {
- name = "xtend-4.0.0";
- version = "4.0.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz";
- name = "xtend-4.0.0.tgz";
- sha1 = "8bc36ff87aedbe7ce9eaf0bca36b2354a743840f";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."xtend"."~4.0.0" =
- self.by-version."xtend"."4.0.0";
- by-spec."yamlish"."*" =
- self.by-version."yamlish"."0.0.7";
- by-version."yamlish"."0.0.7" = self.buildNodePackage {
- name = "yamlish-0.0.7";
- version = "0.0.7";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/yamlish/-/yamlish-0.0.7.tgz";
- name = "yamlish-0.0.7.tgz";
- sha1 = "b4af9a1dcc63618873c3d6e451ec3213c39a57fb";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."yauzl"."~2.3.0" =
- self.by-version."yauzl"."2.3.1";
- by-version."yauzl"."2.3.1" = self.buildNodePackage {
- name = "yauzl-2.3.1";
- version = "2.3.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/yauzl/-/yauzl-2.3.1.tgz";
- name = "yauzl-2.3.1.tgz";
- sha1 = "6707fe2b6a4dac9445cc429bf04a11c7dedfa36a";
- };
- deps = {
- "fd-slicer-1.0.1" = self.by-version."fd-slicer"."1.0.1";
- "pend-1.2.0" = self.by-version."pend"."1.2.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "yauzl" = self.by-version."yauzl"."2.3.1";
- by-spec."yawl"."~1.0.2" =
- self.by-version."yawl"."1.0.2";
- by-version."yawl"."1.0.2" = self.buildNodePackage {
- name = "yawl-1.0.2";
- version = "1.0.2";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/yawl/-/yawl-1.0.2.tgz";
- name = "yawl-1.0.2.tgz";
- sha1 = "df1301cb50e5bc74cc36d5c1ef9cfbd1f84b408e";
- };
- deps = {
- "bl-0.9.4" = self.by-version."bl"."0.9.4";
- "pend-1.2.0" = self.by-version."pend"."1.2.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "yawl" = self.by-version."yawl"."1.0.2";
- by-spec."yazl"."~2.2.2" =
- self.by-version."yazl"."2.2.2";
- by-version."yazl"."2.2.2" = self.buildNodePackage {
- name = "yazl-2.2.2";
- version = "2.2.2";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/yazl/-/yazl-2.2.2.tgz";
- name = "yazl-2.2.2.tgz";
- sha1 = "60187f4ce6df314e7501c3c0e40bcf1b58fda183";
- };
- deps = {
- "buffer-crc32-0.2.5" = self.by-version."buffer-crc32"."0.2.5";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "yazl" = self.by-version."yazl"."2.2.2";
- by-spec."ytdl-core".">=0.5.1" =
- self.by-version."ytdl-core"."0.5.1";
- by-version."ytdl-core"."0.5.1" = self.buildNodePackage {
- name = "ytdl-core-0.5.1";
- version = "0.5.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/ytdl-core/-/ytdl-core-0.5.1.tgz";
- name = "ytdl-core-0.5.1.tgz";
- sha1 = "3c48d696b019d7faae635a3f1e4eaa9131110f43";
- };
- deps = {
- "cheerio-0.18.0" = self.by-version."cheerio"."0.18.0";
- "jstream-0.2.7" = self.by-version."jstream"."0.2.7";
- "request-2.57.0" = self.by-version."request"."2.57.0";
- "underscore-1.8.3" = self.by-version."underscore"."1.8.3";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "ytdl-core" = self.by-version."ytdl-core"."0.5.1";
-}
-
diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix
index 1b1bf437ce9d..7ebdce783527 100644
--- a/pkgs/applications/audio/gtkpod/default.nix
+++ b/pkgs/applications/audio/gtkpod/default.nix
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ gnome.gnome_themes_standard ];
- buildInputs = [ pkgconfig makeWrapper intltool curl gettext perl perlXMLParser
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ makeWrapper intltool curl gettext perl perlXMLParser
flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf libglade gnome.anjuta
gnome.gdl gnome.defaultIconTheme
hicolor_icon_theme ];
diff --git a/pkgs/applications/audio/hydrogen/default.nix b/pkgs/applications/audio/hydrogen/default.nix
index 686a6b67e6aa..d68bfbf2ae4e 100644
--- a/pkgs/applications/audio/hydrogen/default.nix
+++ b/pkgs/applications/audio/hydrogen/default.nix
@@ -10,8 +10,9 @@ stdenv.mkDerivation rec {
sha256 = "1dy2jfkdw0nchars4xi4isrz66fqn53a9qk13bqza7lhmsg3s3qy";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- alsaLib boost cmake glib lash libjack2 libarchive liblrdf libsndfile pkgconfig qt4
+ alsaLib boost cmake glib lash libjack2 libarchive liblrdf libsndfile qt4
];
meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/iannix/default.nix b/pkgs/applications/audio/iannix/default.nix
index d56ac7534053..c26980e1bb26 100644
--- a/pkgs/applications/audio/iannix/default.nix
+++ b/pkgs/applications/audio/iannix/default.nix
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "184ydb9f1303v332k5k3f1ki7cb6nkxhh6ij0yn72v7dp7figrgj";
};
- nativeBuildInputs = [ qmake ];
- buildInputs = [ alsaLib pkgconfig qtbase qtscript ];
+ nativeBuildInputs = [ pkgconfig qmake ];
+ buildInputs = [ alsaLib qtbase qtscript ];
qmakeFlags = [ "PREFIX=/" ];
diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix
index 0b0df0b55e4f..ca806aad02fe 100644
--- a/pkgs/applications/audio/ingen/default.nix
+++ b/pkgs/applications/audio/ingen/default.nix
@@ -13,8 +13,9 @@ stdenv.mkDerivation rec {
sha256 = "15s8nrzn68hc2s6iw0zshbz3lfnsq0mr6gflq05xm911b7xbp74k";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- boost ganv glibmm gtkmm2 libjack2 lilv lv2 makeWrapper pkgconfig
+ boost ganv glibmm gtkmm2 libjack2 lilv lv2 makeWrapper
python raul serd sord sratom suil
];
diff --git a/pkgs/applications/audio/jack-capture/default.nix b/pkgs/applications/audio/jack-capture/default.nix
index ec7f7a5c32db..f1e00e876730 100644
--- a/pkgs/applications/audio/jack-capture/default.nix
+++ b/pkgs/applications/audio/jack-capture/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0sk7b92my1v1g7rhkpl1c608rb0rdb28m9zqfll95kflxajd16zv";
};
- buildInputs = [ libjack2 libsndfile pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libjack2 libsndfile ];
buildPhase = "PREFIX=$out make jack_capture";
diff --git a/pkgs/applications/audio/jack-oscrolloscope/default.nix b/pkgs/applications/audio/jack-oscrolloscope/default.nix
index 5f796a29035b..a75513ff059e 100644
--- a/pkgs/applications/audio/jack-oscrolloscope/default.nix
+++ b/pkgs/applications/audio/jack-oscrolloscope/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1pl55in0sj7h5r06n1v91im7d18pplvhbjhjm1fdl39zwnyxiash";
};
- buildInputs = [ SDL libjack2 mesa pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ SDL libjack2 mesa ];
installPhase = ''
mkdir -p $out/bin
diff --git a/pkgs/applications/audio/jack-rack/default.nix b/pkgs/applications/audio/jack-rack/default.nix
index 1d1925779f0d..d68e67d19dd4 100644
--- a/pkgs/applications/audio/jack-rack/default.nix
+++ b/pkgs/applications/audio/jack-rack/default.nix
@@ -5,7 +5,8 @@ stdenv.mkDerivation rec {
url = "mirror://sourceforge/jack-rack/${name}.tar.bz2";
sha256 = "1lmibx9gicagcpcisacj6qhq6i08lkl5x8szysjqvbgpxl9qg045";
};
- buildInputs = [ pkgconfig libjack2 ladspaH gtk2 alsaLib libxml2 librdf ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libjack2 ladspaH gtk2 alsaLib libxml2 librdf ];
meta = {
description = ''An effects "rack" for the JACK low latency audio API'';
diff --git a/pkgs/applications/audio/jackmeter/default.nix b/pkgs/applications/audio/jackmeter/default.nix
index c709483a3b21..060b7f703a31 100644
--- a/pkgs/applications/audio/jackmeter/default.nix
+++ b/pkgs/applications/audio/jackmeter/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "1cnvgx3jv0yvxlqy0l9k285zgvazmh5k8m4l7lxckjfm5bn6hm1r";
};
- buildInputs = [ libjack2 pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libjack2 ];
meta = {
description = "Console jack loudness meter";
diff --git a/pkgs/applications/audio/jackmix/default.nix b/pkgs/applications/audio/jackmix/default.nix
index f0cd3bd04279..aa78527d787e 100644
--- a/pkgs/applications/audio/jackmix/default.nix
+++ b/pkgs/applications/audio/jackmix/default.nix
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
patches = [ ./no_error.patch ];
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig
scons
qt4
lash
diff --git a/pkgs/applications/audio/jalv/default.nix b/pkgs/applications/audio/jalv/default.nix
index e2c86256ce64..99c3e48ae84d 100644
--- a/pkgs/applications/audio/jalv/default.nix
+++ b/pkgs/applications/audio/jalv/default.nix
@@ -10,8 +10,9 @@ stdenv.mkDerivation rec {
sha256 = "1x2wpzzx2cgvz3dgdcgsj8dr0w3zsasy62mvl199bsdj5fbjaili";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- gtk2 libjack2 lilv lv2 pkgconfig python serd sord sratom suil
+ gtk2 libjack2 lilv lv2 python serd sord sratom suil
];
configurePhase = "python waf configure --prefix=$out";
diff --git a/pkgs/applications/audio/jamin/default.nix b/pkgs/applications/audio/jamin/default.nix
index 4af53389ffdf..77946fc41ccc 100644
--- a/pkgs/applications/audio/jamin/default.nix
+++ b/pkgs/applications/audio/jamin/default.nix
@@ -10,8 +10,9 @@ stdenv.mkDerivation {
sha256 = "0g5v74cm0q3p3pzl6xmnp4rqayaymfli7c6z8s78h9rgd24fwbvn";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 pkgconfig perl
+ fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 perl
perlXMLParser makeWrapper
];
diff --git a/pkgs/applications/audio/klick/default.nix b/pkgs/applications/audio/klick/default.nix
index c51795e756c5..3a0da876acfc 100644
--- a/pkgs/applications/audio/klick/default.nix
+++ b/pkgs/applications/audio/klick/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "1289533c0849b1b66463bf27f7ce5f71736b655cfb7672ef884c7e6eb957ac42";
};
- buildInputs = [ scons pkgconfig libsamplerate libsndfile liblo libjack2 boost ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ scons libsamplerate libsndfile liblo libjack2 boost ];
NIX_CFLAGS_COMPILE = "-fpermissive";
buildPhase = ''
diff --git a/pkgs/applications/audio/ladspa-plugins/default.nix b/pkgs/applications/audio/ladspa-plugins/default.nix
index 1b68caccf4ec..a60b3db2fb86 100644
--- a/pkgs/applications/audio/ladspa-plugins/default.nix
+++ b/pkgs/applications/audio/ladspa-plugins/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "1rqwh8xrw6hnp69dg4gy336bfbfpmbx4fjrk0nb8ypjcxkz91c6i";
};
- buildInputs = [ autoreconfHook fftw ladspaH libxml2 pkgconfig perlPackages.perl perlPackages.XMLParser ];
+ nativeBuildInputs = [ autoreconfHook pkgconfig ];
+ buildInputs = [ fftw ladspaH libxml2 perlPackages.perl perlPackages.XMLParser ];
patchPhase = ''
patchShebangs .
diff --git a/pkgs/applications/audio/lingot/default.nix b/pkgs/applications/audio/lingot/default.nix
index 47b65ff2b5a3..65df1b89430e 100644
--- a/pkgs/applications/audio/lingot/default.nix
+++ b/pkgs/applications/audio/lingot/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation {
hardeningDisable = [ "format" ];
- buildInputs = [ pkgconfig intltool gtk2 alsaLib libglade ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ intltool gtk2 alsaLib libglade ];
configureFlags = "--disable-jack";
diff --git a/pkgs/applications/audio/linuxband/default.nix b/pkgs/applications/audio/linuxband/default.nix
index ba1d88373fff..a8e33c23dc0d 100644
--- a/pkgs/applications/audio/linuxband/default.nix
+++ b/pkgs/applications/audio/linuxband/default.nix
@@ -11,7 +11,8 @@ in stdenv.mkDerivation rec {
sha256 = "1r71h4yg775m4gax4irrvygmrsclgn503ykmc2qwjsxa42ri4n2n";
};
- buildInputs = [ makeWrapper pkgconfig MMA libjack2 libsmf python pyGtkGlade pygtksourceview ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ makeWrapper MMA libjack2 libsmf python pyGtkGlade pygtksourceview ];
patchPhase = ''
sed -i 's@/usr/@${MMA}/@g' src/main/config/linuxband.rc.in
diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix
index dcefbb06436f..25d7f2ed015b 100644
--- a/pkgs/applications/audio/lmms/default.nix
+++ b/pkgs/applications/audio/lmms/default.nix
@@ -1,31 +1,47 @@
-{ stdenv, fetchFromGitHub, SDL, alsaLib, cmake, fftwSinglePrec, fluidsynth
-, fltk13, libjack2, libvorbis , libsamplerate, libsndfile, pkgconfig
-, libpulseaudio, qt4, freetype, libgig
-}:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, alsaLib ? null, fftwFloat, fltk13
+, fluidsynth ? null, lame ? null, libgig ? null, libjack2 ? null, libpulseaudio ? null
+, libsamplerate, libsoundio ? null, libsndfile, libvorbis ? null, portaudio ? null
+, qtbase, qttools, SDL ? null }:
stdenv.mkDerivation rec {
name = "lmms-${version}";
- version = "1.1.90";
+ version = "1.2.0-rc4";
src = fetchFromGitHub {
owner = "LMMS";
repo = "lmms";
rev = "v${version}";
- sha256 = "0njiarndwqamqiinr1wbwkzjn87yzr1z5k9cfwk0jdkbalgakkq3";
+ sha256 = "1n3py18zqbvfnkdiz4wc6z60xaajpkd3kn1wxmby5dmc4vccvjj5";
};
+ nativeBuildInputs = [ cmake qttools pkgconfig ];
+
buildInputs = [
- SDL alsaLib cmake fftwSinglePrec fltk13 fluidsynth libjack2 libgig
- libsamplerate libsndfile libvorbis pkgconfig libpulseaudio qt4
+ alsaLib
+ fftwFloat
+ fltk13
+ fluidsynth
+ lame
+ libgig
+ libjack2
+ libpulseaudio
+ libsamplerate
+ libsndfile
+ libsoundio
+ libvorbis
+ portaudio
+ qtbase
+ SDL # TODO: switch to SDL2 in the next version
];
+ cmakeFlags = [ "-DWANT_QT5=ON" ];
enableParallelBuilding = true;
meta = with stdenv.lib; {
- description = "Linux MultiMedia Studio";
+ description = "DAW similar to FL Studio (music production software)";
homepage = https://lmms.io;
license = licenses.gpl2Plus;
platforms = platforms.linux;
- maintainers = [ maintainers.goibhniu ];
+ maintainers = with maintainers; [ goibhniu yegortimoshenko ];
};
}
diff --git a/pkgs/applications/audio/lv2bm/default.nix b/pkgs/applications/audio/lv2bm/default.nix
index a7c8098dd79a..d3821c51fbc6 100644
--- a/pkgs/applications/audio/lv2bm/default.nix
+++ b/pkgs/applications/audio/lv2bm/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "1rrz5sp04zjal6v34ldkl6fjj9xqidb8xm1iscjyljf6z4l516cx";
};
- buildInputs = [ glib lilv lv2 pkgconfig serd sord sratom ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ glib lilv lv2 serd sord sratom ];
installPhase = ''
make install PREFIX=$out
diff --git a/pkgs/applications/audio/mda-lv2/default.nix b/pkgs/applications/audio/mda-lv2/default.nix
index 9d3cdc2eea38..c7d0caec8bf5 100644
--- a/pkgs/applications/audio/mda-lv2/default.nix
+++ b/pkgs/applications/audio/mda-lv2/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0hh40c5d2m0k5gb3vw031l6lqn59dg804an3mkmhkc7qv4gc6xm4";
};
- buildInputs = [ fftwSinglePrec lv2 pkgconfig python ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ fftwSinglePrec lv2 python ];
configurePhase = "python waf configure --prefix=$out";
diff --git a/pkgs/applications/audio/meters_lv2/default.nix b/pkgs/applications/audio/meters_lv2/default.nix
index e412f31f3168..f4245b0a51e3 100644
--- a/pkgs/applications/audio/meters_lv2/default.nix
+++ b/pkgs/applications/audio/meters_lv2/default.nix
@@ -25,7 +25,8 @@ in
stdenv.mkDerivation {
inherit name;
- buildInputs = [ pkgconfig lv2 mesa gtk2 cairo pango fftw ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ lv2 mesa gtk2 cairo pango fftw ];
srcs = [ src robtkSrc ];
sourceRoot = name;
diff --git a/pkgs/applications/audio/minimodem/default.nix b/pkgs/applications/audio/minimodem/default.nix
index 025d216910ea..2e293ee4552d 100644
--- a/pkgs/applications/audio/minimodem/default.nix
+++ b/pkgs/applications/audio/minimodem/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "003xyqjq59wcjafrdv1b8w34xsn4nvzz51wwd7mqddajh0g4dz4g";
};
- buildInputs = [ pkgconfig fftw fftwSinglePrec alsaLib libsndfile libpulseaudio ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ fftw fftwSinglePrec alsaLib libsndfile libpulseaudio ];
meta = {
description = "General-purpose software audio FSK modem";
diff --git a/pkgs/applications/audio/mopidy-iris/default.nix b/pkgs/applications/audio/mopidy-iris/default.nix
index 6e2312c33907..caeba5eb1acb 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.4.1";
+ version = "3.6.1";
src = pythonPackages.fetchPypi {
inherit version;
pname = "Mopidy-Iris";
- sha256 = "04fjj2n5v53ykxnjgna1y8bvk7g3x0yiqisvzrdva693lfz9cbgx";
+ sha256 = "1mfi3qx7pvfq4rz0py39lnbzv7sq703b6k6mypzhj1gdzbisfn46";
};
propagatedBuildInputs = [
@@ -16,6 +16,7 @@ pythonPackages.buildPythonApplication rec {
pythonPackages.configobj
pythonPackages.pylast
pythonPackages.spotipy
+ pythonPackages.raven
];
meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/mp3info/default.nix b/pkgs/applications/audio/mp3info/default.nix
index 1a1ebc56a841..6700f21fc8cc 100644
--- a/pkgs/applications/audio/mp3info/default.nix
+++ b/pkgs/applications/audio/mp3info/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "042f1czcs9n2sbqvg4rsvfwlqib2gk976mfa2kxlfjghx5laqf04";
};
- buildInputs = [ ncurses pkgconfig gtk2 ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ ncurses gtk2 ];
hardeningDisable = [ "format" ];
diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix
index 59adb7cde497..73352b650921 100644
--- a/pkgs/applications/audio/mpc/default.nix
+++ b/pkgs/applications/audio/mpc/default.nix
@@ -17,11 +17,6 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- preConfigure = ''
- export LIBMPDCLIENT_LIBS=${mpd_clientlib}/lib/libmpdclient.${if stdenv.isDarwin then mpd_clientlib.majorVersion + ".dylib" else "so." + mpd_clientlib.majorVersion + ".0." + mpd_clientlib.minorVersion}
- export LIBMPDCLIENT_CFLAGS=${mpd_clientlib}
- '';
-
meta = with stdenv.lib; {
description = "A minimalist command line interface to MPD";
homepage = http://www.musicpd.org/clients/mpc/;
diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix
index 37717babce4a..1e0b46826cf0 100644
--- a/pkgs/applications/audio/mpg123/default.nix
+++ b/pkgs/applications/audio/mpg123/default.nix
@@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
- name = "mpg123-1.25.4";
+ name = "mpg123-1.25.7";
src = fetchurl {
url = "mirror://sourceforge/mpg123/${name}.tar.bz2";
- sha256 = "1rxknrnl3ji5hi5rbckpzhbl1k5r8i53kcys4xdgg0xbi8765dfd";
+ sha256 = "1ws40fglyyk51jvmz8gfapjkw1g51pkch1rffdsbh4b1yay5xc9i";
};
buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
diff --git a/pkgs/applications/audio/mpg321/default.nix b/pkgs/applications/audio/mpg321/default.nix
index b68c44278ee1..ee0ebf234ce5 100644
--- a/pkgs/applications/audio/mpg321/default.nix
+++ b/pkgs/applications/audio/mpg321/default.nix
@@ -1,4 +1,8 @@
-{stdenv, fetchurl, libao, libmad, libid3tag, zlib, alsaLib}:
+{stdenv, fetchurl, libao, libmad, libid3tag, zlib, alsaLib
+# Specify default libao output plugin to use (e.g. "alsa", "pulse" …).
+# If null, it will use the libao system default.
+, defaultAudio ? null
+}:
stdenv.mkDerivation rec {
name = "mpg321-${version}";
@@ -11,9 +15,10 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
- configureFlags = [
- ("--enable-alsa=" + (if stdenv.isLinux then "yes" else "no"))
- ];
+ configureFlags =
+ [ ("--enable-alsa=" + (if stdenv.isLinux then "yes" else "no")) ]
+ ++ (stdenv.lib.optional (defaultAudio != null)
+ "--with-default-audio=${defaultAudio}");
buildInputs = [libao libid3tag libmad zlib]
++ stdenv.lib.optional stdenv.isLinux alsaLib;
diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix
index e43120a715d6..cb0f35ebc156 100644
--- a/pkgs/applications/audio/ncmpc/default.nix
+++ b/pkgs/applications/audio/ncmpc/default.nix
@@ -1,36 +1,25 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, ncurses, mpd_clientlib, libintlOrEmpty }:
+{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, glib, ncurses
+, mpd_clientlib, gettext }:
stdenv.mkDerivation rec {
name = "ncmpc-${version}";
- version = "0.27";
+ version = "0.28";
src = fetchFromGitHub {
owner = "MusicPlayerDaemon";
repo = "ncmpc";
rev = "v${version}";
- sha256 = "0sfal3wadqvy6yas4xzhw35awdylikci8kbdcmgm4l2afpmc1lrr";
+ sha256 = "1z0bdkqsdb3f5k2lsws3qzav4r30fzk8fhxj9l0p738flcka6k4n";
};
buildInputs = [ glib ncurses mpd_clientlib ];
- # ++ libintlOrEmpty;
- nativeBuildInputs = [ autoreconfHook pkgconfig ];
-
- NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
-
- # without this, po/Makefile.in.in is not being created
- preAutoreconf = ''
- ./autogen.sh
- '';
-
- configureFlags = [
- "--enable-colors"
- "--enable-lyrics-screen"
- ];
+ nativeBuildInputs = [ meson ninja pkgconfig gettext ];
meta = with stdenv.lib; {
description = "Curses-based interface for MPD (music player daemon)";
homepage = http://www.musicpd.org/clients/ncmpc/;
license = licenses.gpl2Plus;
platforms = platforms.all;
+ maintainers = with maintainers; [ fpletz ];
};
}
diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix
index 1923377e56a2..4452ab23cd5e 100644
--- a/pkgs/applications/audio/ncmpcpp/default.nix
+++ b/pkgs/applications/audio/ncmpcpp/default.nix
@@ -12,11 +12,11 @@ assert taglibSupport -> (taglib != null);
with stdenv.lib;
stdenv.mkDerivation rec {
name = "ncmpcpp-${version}";
- version = "0.8";
+ version = "0.8.1";
src = fetchurl {
- url = "http://ncmpcpp.rybczak.net/stable/${name}.tar.bz2";
- sha256 = "0nj6ky805a55acj0w57sbn3vfmmkbqp97rhbi0q9848n10f2l3rg";
+ url = "https://ncmpcpp.rybczak.net/stable/${name}.tar.bz2";
+ sha256 = "1zw8d07b2bkssbsybg6jnmpq001w525viajrnz4jvfml3l55gyad";
};
configureFlags = [ "BOOST_LIB_SUFFIX=" ]
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
meta = {
description = "A featureful ncurses based MPD client inspired by ncmpc";
- homepage = http://ncmpcpp.rybczak.net/;
+ homepage = https://ncmpcpp.rybczak.net/;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ jfrankenau koral lovek323 mornfall ];
platforms = platforms.all;
diff --git a/pkgs/applications/audio/non/default.nix b/pkgs/applications/audio/non/default.nix
index f4e5998c0375..3b429290f7c8 100644
--- a/pkgs/applications/audio/non/default.nix
+++ b/pkgs/applications/audio/non/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
sha256 = "080rha4ffp7qycyg1mqcf4vj0s7z8qfvz6bxm0w29xgg2kkmb3fx";
};
- buildInputs = [ pkgconfig python2 cairo libjpeg ntk libjack2 libsndfile
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ python2 cairo libjpeg ntk libjack2 libsndfile
ladspaH liblrdf liblo libsigcxx
];
configurePhase = "python waf configure --prefix=$out";
diff --git a/pkgs/applications/audio/nova-filters/default.nix b/pkgs/applications/audio/nova-filters/default.nix
index b361e6c33ae4..6b50ee1426ce 100644
--- a/pkgs/applications/audio/nova-filters/default.nix
+++ b/pkgs/applications/audio/nova-filters/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "16064vvl2w5lz4xi3lyjk4xx7fphwsxc14ajykvndiz170q32s6i";
};
- buildInputs = [ scons boost ladspaH pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ scons boost ladspaH ];
patchPhase = ''
# remove TERM:
diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix
index da0f74848888..5d13aa7daf42 100644
--- a/pkgs/applications/audio/openmpt123/default.nix
+++ b/pkgs/applications/audio/openmpt123/default.nix
@@ -8,7 +8,8 @@ in stdenv.mkDerivation rec {
url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}.tar.gz";
sha256 = "0qp2nnz6pnl1d7yv9hcjyim7q6yax5881k1jxm8jfgjqagmz5k6p";
};
- buildInputs = [ SDL2 pkgconfig flac libsndfile ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ SDL2 flac libsndfile ];
makeFlags = [ "NO_PULSEAUDIO=1 NO_LTDL=1 TEST=0 EXAMPLES=0" ]
++ stdenv.lib.optional (stdenv.isDarwin) "SHARED_SONAME=0";
installFlags = "PREFIX=\${out}";
diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix
index 7dc3e00ebf7b..8e591487111b 100644
--- a/pkgs/applications/audio/pianobar/default.nix
+++ b/pkgs/applications/audio/pianobar/default.nix
@@ -8,8 +8,9 @@ stdenv.mkDerivation rec {
sha256 = "0n9544bfsdp04xqcjm4nhfvp357dx0c3gpys0rjkq09nzv8b1vy6";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig libao json_c libgcrypt libav curl
+ libao json_c libgcrypt libav curl
];
makeFlags="PREFIX=$(out)";
diff --git a/pkgs/applications/audio/plugin-torture/default.nix b/pkgs/applications/audio/plugin-torture/default.nix
index 556582c34f79..5529998803cf 100644
--- a/pkgs/applications/audio/plugin-torture/default.nix
+++ b/pkgs/applications/audio/plugin-torture/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "1xyhvhm85d9z0kw716cjllrrzksn4s4bw34layg8hf4m5m31sp2p";
};
- buildInputs = [ boost ladspaH lilv lv2 pkgconfig serd sord sratom ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ boost ladspaH lilv lv2 serd sord sratom ];
installPhase = ''
mkdir -p $out/bin
diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix
index 52f2a0ff924c..2bb2960afbf1 100644
--- a/pkgs/applications/audio/praat/default.nix
+++ b/pkgs/applications/audio/praat/default.nix
@@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
cp praat $out/bin
'';
- buildInputs = [ alsaLib gtk2 pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ alsaLib gtk2 ];
meta = {
description = "Doing phonetics by computer";
diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix
index c140e1a46e55..00f58750408b 100644
--- a/pkgs/applications/audio/puddletag/default.nix
+++ b/pkgs/applications/audio/puddletag/default.nix
@@ -1,20 +1,19 @@
{ stdenv, fetchFromGitHub, python2Packages, makeWrapper, chromaprint }:
-let
- pname = "puddletag";
-
-in python2Packages.buildPythonApplication rec {
- name = "${pname}-${version}";
+python2Packages.buildPythonApplication rec {
+ name = "puddletag-${version}";
version = "1.2.0";
src = fetchFromGitHub {
- owner = "keithgg";
- repo = pname;
- rev = "v${version}";
+ owner = "keithgg";
+ repo = "puddletag";
+ rev = "v${version}";
sha256 = "1g6wa91awy17z5b704yi9kfynnvfm9lkrvpfvwccscr1h8s3qmiz";
};
- sourceRoot = "${pname}-v${version}-src/source";
+ setSourceRoot = ''
+ sourceRoot=$(echo */source)
+ '';
disabled = python2Packages.isPy3k; # work to support python 3 has not begun
@@ -29,17 +28,21 @@ in python2Packages.buildPythonApplication rec {
dontStrip = true; # we are not generating any binaries
installPhase = ''
+ runHook preInstall
+
siteDir=$(toPythonPath $out)
mkdir -p $siteDir
PYTHONPATH=$PYTHONPATH:$siteDir
${python2Packages.python.interpreter} setup.py install --prefix $out
+
+ runHook postInstall
'';
meta = with stdenv.lib; {
- homepage = https://puddletag.net;
+ homepage = https://puddletag.net;
description = "An audio tag editor similar to the Windows program, Mp3tag";
- license = licenses.gpl3;
- platforms = platforms.linux;
+ license = licenses.gpl3;
maintainers = with maintainers; [ peterhoeg ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/audio/qmidiroute/default.nix b/pkgs/applications/audio/qmidiroute/default.nix
index badac0887a1a..1e76e769937b 100644
--- a/pkgs/applications/audio/qmidiroute/default.nix
+++ b/pkgs/applications/audio/qmidiroute/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "11bfjz14z37v6hk2xyg4vrw423b5h3qgcbviv07g00ws1fgjygm2";
};
- buildInputs = [ pkgconfig qt4 alsaLib ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ qt4 alsaLib ];
meta = with stdenv.lib; {
description = "MIDI event processor and router";
diff --git a/pkgs/applications/audio/qsampler/default.nix b/pkgs/applications/audio/qsampler/default.nix
index 692938884b63..1211570f9bc5 100644
--- a/pkgs/applications/audio/qsampler/default.nix
+++ b/pkgs/applications/audio/qsampler/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "17w3vgpgfmvl11wsd5ndk9zdggl3gbzv3wbd45dyf2al4i0miqnx";
};
- buildInputs = [ autoconf automake liblscp libtool pkgconfig qt4 ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ autoconf automake liblscp libtool qt4 ];
preConfigure = "make -f Makefile.svn";
diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix
index 77c0ba9b2d45..49d9e80be117 100644
--- a/pkgs/applications/audio/qsynth/default.nix
+++ b/pkgs/applications/audio/qsynth/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Fluidsynth GUI";
- homepage = http://sourceforge.net/projects/qsynth;
+ homepage = https://sourceforge.net/projects/qsynth;
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.goibhniu ];
diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix
index 2e6d61b693de..fd328669846f 100644
--- a/pkgs/applications/audio/quodlibet/default.nix
+++ b/pkgs/applications/audio/quodlibet/default.nix
@@ -1,64 +1,44 @@
-{ stdenv, fetchurl, python2Packages, intltool
-, gst-python, withGstPlugins ? false, gst-plugins-base ? null
-, gst-plugins-good ? null, gst-plugins-ugly ? null, gst-plugins-bad ? null }:
+{ stdenv, fetchurl, python2Packages, wrapGAppsHook, gettext, intltool, libsoup, gnome3,
+ tag ? "",
+ gst_all_1, withGstPlugins ? true,
+ xineBackend ? false, xineLib,
+ withDbusPython ? false, withPyInotify ? false, withMusicBrainzNgs ? false, withPahoMqtt ? false,
+ webkitgtk ? null,
+ keybinder3 ? null, gtksourceview ? null, libmodplug ? null, kakasi ? null, libappindicator-gtk3 ? null }:
-assert withGstPlugins -> gst-plugins-base != null
- || gst-plugins-good != null
- || gst-plugins-ugly != null
- || gst-plugins-bad != null;
-
-let
- version = "2.6.3";
- inherit (python2Packages) buildPythonApplication python mutagen pygtk pygobject2 dbus-python;
-in buildPythonApplication {
- # call the package quodlibet and just quodlibet
- name = "quodlibet${stdenv.lib.optionalString (!withGstPlugins) "-without-gst-plugins"}-${version}";
+let optionals = stdenv.lib.optionals; in
+python2Packages.buildPythonApplication rec {
+ name = "quodlibet${tag}-${version}";
+ version = "3.9.1";
# XXX, tests fail
doCheck = false;
- srcs = [
- (fetchurl {
- url = "https://bitbucket.org/lazka/quodlibet-files/raw/default/releases/quodlibet-${version}.tar.gz";
- sha256 = "0ilasi4b0ay8r6v6ba209wsm80fq2nmzigzc5kvphrk71jwypx6z";
- })
- (fetchurl {
- url = "https://bitbucket.org/lazka/quodlibet-files/raw/default/releases/quodlibet-plugins-${version}.tar.gz";
- sha256 = "1rv08rhdjad8sjhplqsspcf4vkazgkxyshsqmbfbrrk5kvv57ybc";
- })
- ];
+ src = fetchurl {
+ url = "https://github.com/quodlibet/quodlibet/releases/download/release-${version}/quodlibet-${version}.tar.gz";
+ sha256 = "d2b42df5d439213973dc97149fddc779a6c90cec389c24baf1c0bdcc39ffe591";
+ };
- preConfigure = ''
- # TODO: for now don't a apply gdist overrides, will be needed for shipping icons, gtk, etc
- sed -i /distclass/d setup.py
- '';
+ nativeBuildInputs = [ wrapGAppsHook gettext intltool ];
+ # ++ (with python2Packages; [ pytest pyflakes pycodestyle polib ]); # test deps
- sourceRoot = "quodlibet-${version}";
+ buildInputs = [ gnome3.defaultIconTheme libsoup webkitgtk keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi ]
+ ++ (if xineBackend then [ xineLib ] else with gst_all_1;
+ [ gstreamer gst-plugins-base ] ++ optionals withGstPlugins [ gst-plugins-good gst-plugins-ugly gst-plugins-bad ]);
- postUnpack = ''
- # the patch searches for plugins in directory ../plugins
- # so link the appropriate directory there
- ln -sf quodlibet-plugins-${version} plugins
- '';
+ propagatedBuildInputs = with python2Packages;
+ [ pygobject3 pycairo mutagen pygtk gst-python feedparser faulthandler futures ]
+ ++ optionals withDbusPython [ dbus-python ]
+ ++ optionals withPyInotify [ pyinotify ]
+ ++ optionals withMusicBrainzNgs [ musicbrainzngs ]
+ ++ optionals stdenv.isDarwin [ pyobjc ]
+ ++ optionals withPahoMqtt [ paho-mqtt ];
- patches = [ ./quodlibet-package-plugins.patch ];
-
- buildInputs = stdenv.lib.optionals withGstPlugins [
- gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad
- ];
-
- propagatedBuildInputs = [
- mutagen pygtk pygobject2 dbus-python gst-python intltool
- ];
-
- postInstall = stdenv.lib.optionalString withGstPlugins ''
- # Wrap quodlibet so it finds the GStreamer plug-ins
- wrapProgram "$out/bin/quodlibet" --prefix \
- GST_PLUGIN_SYSTEM_PATH ":" "$GST_PLUGIN_SYSTEM_PATH" \
- '';
+ makeWrapperArgs = optionals (kakasi != null) [ "--prefix PATH : ${kakasi}/bin" ];
meta = {
description = "GTK+-based audio player written in Python, using the Mutagen tagging library";
+ license = stdenv.lib.licenses.gpl2;
longDescription = ''
Quod Libet is a GTK+-based audio player written in Python, using
@@ -74,7 +54,7 @@ in buildPythonApplication {
& internet radio, and all major audio formats.
'';
- maintainers = [ stdenv.lib.maintainers.coroa ];
+ maintainers = with stdenv.lib.maintainers; [ coroa sauyon ];
homepage = https://quodlibet.readthedocs.io/en/latest/;
};
}
diff --git a/pkgs/applications/audio/quodlibet/quodlibet-package-plugins.patch b/pkgs/applications/audio/quodlibet/quodlibet-package-plugins.patch
deleted file mode 100644
index d518f857cf10..000000000000
--- a/pkgs/applications/audio/quodlibet/quodlibet-package-plugins.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naur quodlibet-2.5.orig/setup.py quodlibet-2.5.new/setup.py
---- quodlibet-2.5.orig/setup.py 2012-12-19 08:47:41.000000000 +0000
-+++ quodlibet-2.5.new/setup.py 2013-04-22 19:27:07.152631051 +0000
-@@ -337,5 +338,14 @@
- }
- }
- })
-+ else:
-+ from os.path import join
-+
-+ data_files = []
-+ for type in ["playorder", "songsmenu", "editing", "events", "gstreamer"]:
-+ data_files.append((join('quodlibet', 'plugins', type),
-+ glob.glob(join('..', 'plugins', type, '*.py'))))
-+ setup_kwargs.update({ 'data_files': data_files });
-+
- setup(**setup_kwargs)
-
diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix
new file mode 100644
index 000000000000..4bc9371dd17b
--- /dev/null
+++ b/pkgs/applications/audio/radiotray-ng/default.nix
@@ -0,0 +1,96 @@
+{ stdenv, fetchFromGitHub, fetchpatch
+, cmake, pkgconfig
+# Transport
+, curl
+# Libraries
+, boost
+, jsoncpp
+, libbsd
+, pcre
+# GUI/Desktop
+, dbus
+, glibmm
+, gnome3
+, hicolor_icon_theme
+, libappindicator-gtk3
+, libnotify
+, libxdg_basedir
+# GStreamer
+, gst_all_1
+# User-agent info
+, lsb-release
+# rt2rtng
+, python2
+# Testing
+, gmock
+# Fixup
+, wrapGAppsHook
+, makeWrapper
+}:
+
+let
+ gstInputs = with gst_all_1; [
+ gstreamer gst-plugins-base
+ gst-plugins-good gst-plugins-bad gst-plugins-ugly
+ gst-libav
+ ];
+ # For the rt2rtng utility for converting bookmark file to -ng format
+ pythonInputs = with python2.pkgs; [ python2 lxml ];
+in
+stdenv.mkDerivation rec {
+ name = "radiotray-ng-${version}";
+ version = "0.1.7";
+
+ src = fetchFromGitHub {
+ owner = "ebruck";
+ repo = "radiotray-ng";
+ rev = "v${version}";
+ sha256 = "1m853gzh9r249crn0xyrq22x154r005j58b0kq3nsrgi5cps2zdv";
+ };
+
+ nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook makeWrapper ];
+
+ buildInputs = [
+ curl
+ boost jsoncpp libbsd pcre
+ glibmm hicolor_icon_theme gnome3.gsettings_desktop_schemas libappindicator-gtk3 libnotify
+ libxdg_basedir
+ lsb-release
+ ] ++ stdenv.lib.optional doCheck gmock
+ ++ gstInputs
+ ++ pythonInputs;
+
+ prePatch = ''
+ substituteInPlace debian/CMakeLists.txt \
+ --replace /usr $out
+ substituteInPlace include/radiotray-ng/common.hpp \
+ --replace /usr $out
+ '';
+
+ patches = [
+ (fetchpatch {
+ # Fix menu separators and minor touchup to 'version'
+ url = "https://github.com/ebruck/radiotray-ng/commit/827e9f1baaa03ab4d8a5fb3aab043e72950eb965.patch";
+ sha256 = "1aykl6lq4pga34xg5r9mc616gxnd63q6gr8qzg57w6874cj3csrr";
+ })
+ ];
+
+ enableParallelBuilding = true;
+
+ doCheck = true;
+
+ checkPhase = "ctest";
+
+ preFixup = ''
+ gappsWrapperArgs+=(--suffix PATH : ${stdenv.lib.makeBinPath [ dbus ]})
+ wrapProgram $out/bin/rt2rtng --prefix PYTHONPATH : $PYTHONPATH
+ '';
+
+ meta = with stdenv.lib; {
+ description = "An internet radio player for linux";
+ homepage = https://github.com/ebruck/radiotray-ng;
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ dtzWill ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix
index e8bea3ec71c0..534fd2f0edb1 100644
--- a/pkgs/applications/audio/rhythmbox/default.nix
+++ b/pkgs/applications/audio/rhythmbox/default.nix
@@ -26,9 +26,8 @@ in stdenv.mkDerivation rec {
sha256 = "0f3radhlji7rxl760yl2vm49fvfslympxrpm8497acbmbd7wlhxz";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig
-
python3
perl
perlPackages.XMLParser
diff --git a/pkgs/applications/audio/rkrlv2/default.nix b/pkgs/applications/audio/rkrlv2/default.nix
index 40ff47b9ee18..3ebdce2b4820 100644
--- a/pkgs/applications/audio/rkrlv2/default.nix
+++ b/pkgs/applications/audio/rkrlv2/default.nix
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
sha256 = "0kr3rvq7n1bh47qryyarcpiibms601qd8l1vypmm61969l4d4bn8";
};
- buildInputs = with xorg; [ automake pkgconfig lv2 fftw cmake libXpm libjack2 libsamplerate libsndfile libXft ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = with xorg; [ automake lv2 fftw cmake libXpm libjack2 libsamplerate libsndfile libXft ];
meta = {
description = "Rakarrak effects ported to LV2";
diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix
index 4fec0d0c37b4..5966d4253f51 100644
--- a/pkgs/applications/audio/rosegarden/default.nix
+++ b/pkgs/applications/audio/rosegarden/default.nix
@@ -1,23 +1,35 @@
-{ stdenv, fetchurl, cmake, qt4, pkgconfig, ladspaPlugins, ladspaH,
- dssi, liblo, liblrdf, fftwSinglePrec, libsndfile,
- libsamplerate, perl, makedepend, libjack2,
- withLirc ? false, lirc ? null } :
+{ stdenv, fetchurl, cmake, makedepend, perl, pkgconfig, qttools
+, dssi, fftwSinglePrec, ladspaH, ladspaPlugins, libjack2
+, liblo, liblrdf, libsamplerate, libsndfile, lirc ? null, qtbase }:
stdenv.mkDerivation (rec {
version = "17.04";
name = "rosegarden-${version}";
src = fetchurl {
- url = "mirror://sourceforge/rosegarden/${name}.tar.bz2";
+ url = "mirror://sourceforge/rosegarden/${name}.tar.bz2";
sha256 = "1khfcj22asdhjh0jvhkqsz200wgmigkhsrcz09ffia5hqm0n32lq";
};
- QTDIR = qt4;
+ patchPhase = ''
+ substituteInPlace src/CMakeLists.txt --replace svnheader svnversion
+ '';
+
+ nativeBuildInputs = [ cmake makedepend perl pkgconfig qttools ];
buildInputs = [
- cmake qt4 pkgconfig ladspaPlugins ladspaH dssi liblo liblrdf fftwSinglePrec
- libsndfile libsamplerate perl makedepend libjack2
- ] ++ stdenv.lib.optional withLirc [ lirc ];
+ dssi
+ fftwSinglePrec
+ ladspaH
+ ladspaPlugins
+ libjack2
+ liblo
+ liblrdf
+ libsamplerate
+ libsndfile
+ lirc
+ qtbase
+ ];
enableParallelBuilding = true;
@@ -25,11 +37,15 @@ stdenv.mkDerivation (rec {
homepage = http://www.rosegardenmusic.com/;
description = "Music composition and editing environment";
longDescription = ''
- Rosegarden is a music composition and editing environment based around a MIDI sequencer that features a rich understanding of music notation and includes basic support for digital audio.
- Rosegarden is an easy-to-learn, attractive application that runs on Linux, ideal for composers, musicians, music students, and small studio or home recording environments.
- '';
+ Rosegarden is a music composition and editing environment based around
+ a MIDI sequencer that features a rich understanding of music notation
+ and includes basic support for digital audio.
- maintainers = [ maintainers.lebastr ];
+ Rosegarden is an easy-to-learn, attractive application that runs on Linux,
+ ideal for composers, musicians, music students, and small studio or home
+ recording environments.
+ '';
+ maintainers = with maintainers; [ lebastr ];
license = licenses.lgpl2Plus;
platforms = platforms.linux;
};
diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/applications/audio/setbfree/default.nix
index 2a534047ae38..0eaa9bde14f6 100644
--- a/pkgs/applications/audio/setbfree/default.nix
+++ b/pkgs/applications/audio/setbfree/default.nix
@@ -17,8 +17,9 @@ stdenv.mkDerivation rec {
-i b_synth/Makefile
'';
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- alsaLib freetype ftgl libjack2 libX11 lv2 mesa pkgconfig
+ alsaLib freetype ftgl libjack2 libX11 lv2 mesa
ttf_bitstream_vera
];
diff --git a/pkgs/applications/audio/sisco.lv2/default.nix b/pkgs/applications/audio/sisco.lv2/default.nix
index 8ac7a9115ca8..a60c3bef0daa 100644
--- a/pkgs/applications/audio/sisco.lv2/default.nix
+++ b/pkgs/applications/audio/sisco.lv2/default.nix
@@ -27,7 +27,8 @@ stdenv.mkDerivation rec {
srcs = [ src robtkSrc ];
sourceRoot = src.name;
- buildInputs = [ pkgconfig lv2 pango cairo libjack2 mesa ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ lv2 pango cairo libjack2 mesa ];
postUnpack = "chmod u+w -R ${robtkName}-src; mv ${robtkName}-src/* ${sourceRoot}/robtk";
sisco_VERSION = version;
diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix
index da76d7f16db1..1932ec3d93bc 100644
--- a/pkgs/applications/audio/snd/default.nix
+++ b/pkgs/applications/audio/snd/default.nix
@@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
- name = "snd-16.9";
+ name = "snd-17.8";
src = fetchurl {
url = "mirror://sourceforge/snd/${name}.tar.gz";
- sha256 = "1rw9wrj1f0g413ya32s9mwhvv3c6iasjza22irzf6xlv49b9s5dp";
+ sha256 = "161bx2xgz692iqmsmhv9yi8rvd7y31si4rniizwirwz7q4y4vwvf";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix
index 9f8ad3e649b6..e91c08c30b77 100644
--- a/pkgs/applications/audio/sonata/default.nix
+++ b/pkgs/applications/audio/sonata/default.nix
@@ -16,8 +16,9 @@ in buildPythonApplication rec {
disabled = !isPy3k;
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig intltool wrapGAppsHook
+ intltool wrapGAppsHook
gnome3.gnome_themes_standard gnome3.defaultIconTheme
gnome3.gsettings_desktop_schemas
];
diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix
index 3c7be51554d8..d1c48ce44ed8 100644
--- a/pkgs/applications/audio/sonic-pi/default.nix
+++ b/pkgs/applications/audio/sonic-pi/default.nix
@@ -1,24 +1,33 @@
{ stdenv
, fetchFromGitHub
-, qscintilla
-, supercollider
+, fftwSinglePrec
, ruby
+, libffi
+, aubio
, cmake
, pkgconfig
-, qt48Full
+, qt5
+, libsForQt5
+, boost
, bash
, makeWrapper
+, jack2Full
}:
-stdenv.mkDerivation rec {
- version = "2.9.0";
+let
+ supercollider = libsForQt5.callPackage ../../../development/interpreters/supercollider {
+ fftw = fftwSinglePrec;
+ };
+
+in stdenv.mkDerivation rec {
+ version = "3.0.1";
name = "sonic-pi-${version}";
src = fetchFromGitHub {
owner = "samaaron";
repo = "sonic-pi";
rev = "v${version}";
- sha256 = "19db5dxrf6h1v2w3frds5g90nb6izd9ppp7cs2xi6i0m67l6jrwb";
+ sha256 = "1l1892hijp1dj2h799sfjr699q6xp660n0siibab5kv238521a81";
};
buildInputs = [
@@ -26,24 +35,18 @@ stdenv.mkDerivation rec {
cmake
makeWrapper
pkgconfig
- qscintilla
- qt48Full
+ qt5.qtbase
+ libsForQt5.qscintilla
+ libsForQt5.qwt
ruby
+ libffi
+ aubio
supercollider
+ boost
];
- meta = {
- homepage = http://sonic-pi.net/;
- description = "Free live coding synth for everyone originally designed to support computing and music lessons within schools";
- license = stdenv.lib.licenses.mit;
- maintainers = [ stdenv.lib.maintainers.Phlogistique ];
- platforms = stdenv.lib.platforms.linux;
- };
-
dontUseCmakeConfigure = true;
- patches = [ ./fixed-prefixes.patch ];
-
preConfigure = ''
patchShebangs .
substituteInPlace app/gui/qt/mainwindow.cpp \
@@ -52,18 +55,45 @@ stdenv.mkDerivation rec {
'';
buildPhase = ''
+ export SONIC_PI_HOME=$TMPDIR
+ export AUBIO_LIB=${aubio}/lib/libaubio.so
+
pushd app/server/bin
./compile-extensions.rb
+ ./i18n-tool.rb -t
popd
pushd app/gui/qt
- ./rp-build-app
+ cp -f ruby_help.tmpl ruby_help.h
+ ../../server/bin/qt-doc.rb -o ruby_help.h
+
+ substituteInPlace SonicPi.pro \
+ --replace "LIBS += -lrt -lqt5scintilla2" \
+ "LIBS += -lrt -lqscintilla2 -lqwt"
+
+ lrelease SonicPi.pro
+ qmake SonicPi.pro
+
+ make
popd
'';
installPhase = ''
+ runHook preInstall
+
cp -r . $out
- wrapProgram $out/bin/sonic-pi --prefix PATH : \
- ${ruby}/bin:${bash}/bin
+ wrapProgram $out/bin/sonic-pi \
+ --prefix PATH : ${ruby}/bin:${bash}/bin:${supercollider}/bin:${jack2Full}/bin \
+ --set AUBIO_LIB "${aubio}/lib/libaubio.so"
+
+ runHook postInstall
'';
+
+ meta = {
+ homepage = http://sonic-pi.net/;
+ description = "Free live coding synth for everyone originally designed to support computing and music lessons within schools";
+ license = stdenv.lib.licenses.mit;
+ maintainers = with stdenv.lib.maintainers; [ Phlogistique kamilchm ];
+ platforms = stdenv.lib.platforms.linux;
+ };
}
diff --git a/pkgs/applications/audio/sonic-pi/fixed-prefixes.patch b/pkgs/applications/audio/sonic-pi/fixed-prefixes.patch
deleted file mode 100644
index 7b045a41cba1..000000000000
--- a/pkgs/applications/audio/sonic-pi/fixed-prefixes.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/app/gui/qt/mainwindow.cpp b/app/gui/qt/mainwindow.cpp
-index 0af6cf7..97c17ad 100644
---- a/app/gui/qt/mainwindow.cpp
-+++ b/app/gui/qt/mainwindow.cpp
-@@ -677,28 +677,9 @@ void MainWindow::startServer(){
-
- serverProcess = new QProcess();
-
-- QString root = rootPath();
--
-- #if defined(Q_OS_WIN)
-- QString prg_path = root + "/app/server/native/windows/ruby/bin/ruby.exe";
-- QString prg_arg = root + "/app/server/bin/sonic-pi-server.rb";
-- sample_path = root + "/etc/samples";
-- #elif defined(Q_OS_MAC)
-- QString prg_path = root + "/server/native/osx/ruby/bin/ruby";
-- QString prg_arg = root + "/server/bin/sonic-pi-server.rb";
-- sample_path = root + "/etc/samples";
-- #else
-- //assuming Raspberry Pi
-- QString prg_path = root + "/app/server/native/raspberry/ruby/bin/ruby";
-- QFile file(prg_path);
-- if(!file.exists()) {
-- // use system ruby if bundled ruby doesn't exist
-- prg_path = "/usr/bin/ruby";
-- }
--
-- QString prg_arg = root + "/app/server/bin/sonic-pi-server.rb";
-- sample_path = root + "/etc/samples";
-- #endif
-+ QString prg_path = "@ruby@";
-+ QString prg_arg = "@out@/app/server/bin/sonic-pi-server.rb";
-+ sample_path = "@out@/etc/samples";
-
- prg_path = QDir::toNativeSeparators(prg_path);
- prg_arg = QDir::toNativeSeparators(prg_arg);
diff --git a/pkgs/applications/audio/sorcer/default.nix b/pkgs/applications/audio/sorcer/default.nix
index 979f15d4006b..cf0b5db81f62 100644
--- a/pkgs/applications/audio/sorcer/default.nix
+++ b/pkgs/applications/audio/sorcer/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "1x7pi77nal10717l02qpnhrx6d7w5nqrljkn9zx5w7gpb8fpb3vp";
};
- buildInputs = [ boost cairomm cmake libsndfile lv2 ntk pkgconfig python ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ boost cairomm cmake libsndfile lv2 ntk python ];
installPhase = ''
make install
diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix
index ba550580cba5..cbcdc0ecccd7 100644
--- a/pkgs/applications/audio/sound-juicer/default.nix
+++ b/pkgs/applications/audio/sound-juicer/default.nix
@@ -15,7 +15,8 @@ in stdenv.mkDerivation rec {
sha256 = "0mx6n901vb97hsv0cwaafjffj75s1kcp8jsqay90dy3099849dyz";
};
- buildInputs = [ pkgconfig gtk3 intltool itstool libxml2 brasero libcanberra_gtk3
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk3 intltool itstool libxml2 brasero libcanberra_gtk3
gnome3.gsettings_desktop_schemas libmusicbrainz5 libdiscid isocodes
makeWrapper (stdenv.lib.getLib gnome3.dconf)
gst_all_1.gstreamer gst_all_1.gst-plugins-base
diff --git a/pkgs/applications/audio/soundscape-renderer/default.nix b/pkgs/applications/audio/soundscape-renderer/default.nix
index c6609814ea0b..7daae31a468b 100644
--- a/pkgs/applications/audio/soundscape-renderer/default.nix
+++ b/pkgs/applications/audio/soundscape-renderer/default.nix
@@ -30,7 +30,8 @@ stdenv.mkDerivation rec {
LC_ALL = "en_US.UTF-8";
- buildInputs = [ autoreconfHook boost boost.dev ecasound mesa help2man pkgconfig libsndfile fftwFloat libjack2 libxml2 qt4 glibcLocales ];
+ nativeBuildInputs = [ autoreconfHook pkgconfig ];
+ buildInputs = [ boost boost.dev ecasound mesa help2man libsndfile fftwFloat libjack2 libxml2 qt4 glibcLocales ];
# 1) Fix detecting version. https://github.com/SoundScapeRenderer/ssr/pull/53
# 2) Make it find ecasound headers
diff --git a/pkgs/applications/audio/spectrojack/default.nix b/pkgs/applications/audio/spectrojack/default.nix
index 83848671a3e5..86eefc395569 100644
--- a/pkgs/applications/audio/spectrojack/default.nix
+++ b/pkgs/applications/audio/spectrojack/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
url = "http://sed.free.fr/spectrojack/${name}.tar.gz";
sha256 = "0p5aa55hnazv5djw0431mza068h7mjkb9pnglxfpqkx5z0czisdx";
};
- buildInputs = [ pkgconfig libjack2 fftwFloat gtk2 ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libjack2 fftwFloat gtk2 ];
configurePhase= ''
sed -i 's/.*home.*/#&/' ./Makefile
substituteInPlace ./Makefile \
diff --git a/pkgs/applications/audio/spek/default.nix b/pkgs/applications/audio/spek/default.nix
index 32aac686043c..8af7888f74bb 100644
--- a/pkgs/applications/audio/spek/default.nix
+++ b/pkgs/applications/audio/spek/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "0y4hlhswpqkqpsglrhg5xbfy1a6f9fvasgdf336vhwcjqsc3k2xv";
};
- buildInputs = [ autoconf automake intltool pkgconfig ffmpeg wxGTK ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ autoconf automake intltool ffmpeg wxGTK ];
preConfigure = ''
./autogen.sh
diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index ad0f7ee14c5a..249bbe0d8fb7 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -9,7 +9,7 @@ let
# Latest version number can be found at:
# http://repository-origin.spotify.com/pool/non-free/s/spotify-client/
# Be careful not to pick the testing version.
- version = "1.0.49.125.g72ee7853-111";
+ version = "1.0.64.407.g9bd02c2d-26";
deps = [
alsaLib
@@ -54,7 +54,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb";
- sha256 = "0l008x06d257vcw6gq3q90hvv93cq6mxpj11by1np6bzzg61qv8x";
+ sha256 = "0zc8vclf1wx60yllc1jgzhqyv5lkwz95qmmy5f79zkj6vrdak5wc";
};
buildInputs = [ dpkg makeWrapper ];
diff --git a/pkgs/applications/audio/streamripper/default.nix b/pkgs/applications/audio/streamripper/default.nix
index 2df1e1e3b3b5..0fb1b77e7081 100644
--- a/pkgs/applications/audio/streamripper/default.nix
+++ b/pkgs/applications/audio/streamripper/default.nix
@@ -9,13 +9,14 @@ stdenv.mkDerivation rec {
sha256 = "0hnyv3206r0rfprn3k7k6a0j959kagsfyrmyjm3gsf3vkhp5zmy1";
};
- buildInputs = [ pkgconfig glib libogg libvorbis ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ glib libogg libvorbis ];
meta = with stdenv.lib; {
homepage = http://streamripper.sourceforge.net/;
description = "Application that lets you record streaming mp3 to your hard drive";
license = licenses.gpl2;
- platforms = platforms.unix;
+ platforms = platforms.linux;
maintainers = with maintainers; [ the-kenny ];
};
}
diff --git a/pkgs/applications/audio/swh-lv2/default.nix b/pkgs/applications/audio/swh-lv2/default.nix
index faa895e2e309..26ea46149203 100644
--- a/pkgs/applications/audio/swh-lv2/default.nix
+++ b/pkgs/applications/audio/swh-lv2/default.nix
@@ -14,7 +14,8 @@ stdenv.mkDerivation rec {
sed -e "s#PREFIX = /usr/local#PREFIX = $out#" -i Makefile
'';
- buildInputs = [ fftwSinglePrec lv2 pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ fftwSinglePrec lv2 ];
installPhase = "make install-system";
diff --git a/pkgs/applications/audio/timemachine/default.nix b/pkgs/applications/audio/timemachine/default.nix
index 55e95c0fc156..8837566b13d0 100644
--- a/pkgs/applications/audio/timemachine/default.nix
+++ b/pkgs/applications/audio/timemachine/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
sha256 = "0w5alysixnvlkfl79wf7vs5wsw2vgxl3gqxxcm0zbmhjdpmjpcal";
};
- buildInputs = [ autoconf automake pkgconfig gtk2 libjack2
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ autoconf automake gtk2 libjack2
libsndfile
];
diff --git a/pkgs/applications/audio/tomahawk/default.nix b/pkgs/applications/audio/tomahawk/default.nix
index 2787c65fc547..364949b22416 100644
--- a/pkgs/applications/audio/tomahawk/default.nix
+++ b/pkgs/applications/audio/tomahawk/default.nix
@@ -25,8 +25,9 @@ stdenv.mkDerivation rec {
"-DLUCENEPP_LIBRARY_DIR=${lucenepp}/lib"
];
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- cmake pkgconfig attica boost gnutls libechonest liblastfm lucenepp phonon
+ cmake attica boost gnutls libechonest liblastfm lucenepp phonon
qca2 qjson qt4 qtkeychain quazip sparsehash taglib websocketpp
makeWrapper
] ++ stdenv.lib.optional enableXMPP libjreen
diff --git a/pkgs/applications/audio/uade123/default.nix b/pkgs/applications/audio/uade123/default.nix
index 0a07e97270c4..de39c8ecc1cb 100644
--- a/pkgs/applications/audio/uade123/default.nix
+++ b/pkgs/applications/audio/uade123/default.nix
@@ -8,7 +8,8 @@ in stdenv.mkDerivation rec {
url = "http://zakalwe.fi/uade/uade2/uade-${version}.tar.bz2";
sha256 = "04nn5li7xy4g5ysyjjngmv5d3ibxppkbb86m10vrvadzxdd4w69v";
};
- buildInputs = [ which libao pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ which libao ];
meta = with stdenv.lib; {
description = "Plays old Amiga tunes through UAE emulation and cloned m68k-assembler Eagleplayer API";
diff --git a/pkgs/applications/audio/vimpc/default.nix b/pkgs/applications/audio/vimpc/default.nix
index 25292a4408f9..37ccbb1425ff 100644
--- a/pkgs/applications/audio/vimpc/default.nix
+++ b/pkgs/applications/audio/vimpc/default.nix
@@ -2,17 +2,20 @@
, taglib }:
stdenv.mkDerivation rec {
- version = "0.09.0";
+ version = "0.09.1";
name = "vimpc-${version}";
src = fetchFromGitHub {
owner = "boysetsfrog";
repo = "vimpc";
- rev = "v${version}";
- sha256 = "1z9yx2pz84lyng1ig9y4z6pdalwxb80ig7nnzhqfy3pl36hq6shi";
+ # Using commit-hash as there is not tag available
+ # https://github.com/boysetsfrog/vimpc/issues/70
+ rev = "63556da6b94ab27d7e3f542399f5e0975a5812ba";
+ sha256 = "1495a702df4nja8mlxq98mkbic2zv88sjiinimf9qddrfb38jxk6";
};
- buildInputs = [ autoreconfHook mpd_clientlib ncurses pcre pkgconfig taglib ];
+ nativeBuildInputs = [ autoreconfHook pkgconfig ];
+ buildInputs = [ mpd_clientlib ncurses pcre taglib ];
postInstall = ''
mkdir -p $out/etc
diff --git a/pkgs/applications/audio/vorbis-tools/default.nix b/pkgs/applications/audio/vorbis-tools/default.nix
index 1f85f4423548..6b9af119859e 100644
--- a/pkgs/applications/audio/vorbis-tools/default.nix
+++ b/pkgs/applications/audio/vorbis-tools/default.nix
@@ -20,7 +20,8 @@ stdenv.mkDerivation {
done
'';
- buildInputs = [ libogg libvorbis libao pkgconfig curl speex flac ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libogg libvorbis libao curl speex flac ];
meta = with stdenv.lib; {
description = "Extra tools for Ogg-Vorbis audio codec";
diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix
index 75368c6633be..0c151697e897 100644
--- a/pkgs/applications/audio/x42-plugins/default.nix
+++ b/pkgs/applications/audio/x42-plugins/default.nix
@@ -11,7 +11,16 @@ stdenv.mkDerivation rec {
sha256 = "0yi82rak2277x4nzzr5zwbsnha5pi61w975c8src2iwar2b6m0xg";
};
- buildInputs = [ mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 gtk2 cairo pango fftwFloat pkgconfig zita-convolver];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 gtk2 cairo pango fftwFloat zita-convolver ];
+
+ # Don't remove this. The default fails with 'do not know how to unpack source archive'
+ # every now and then on Hydra. No idea why.
+ unpackPhase = ''
+ tar xf $src
+ sourceRoot=$(echo x42-plugins-*)
+ chmod -R u+w $sourceRoot
+ '';
makeFlags = [ "PREFIX=$(out)" "FONTFILE=${freefont_ttf}/share/fonts/truetype/FreeSansBold.ttf" ];
diff --git a/pkgs/applications/audio/xmp/default.nix b/pkgs/applications/audio/xmp/default.nix
index 10b5bc0c117d..9aa24738c379 100644
--- a/pkgs/applications/audio/xmp/default.nix
+++ b/pkgs/applications/audio/xmp/default.nix
@@ -15,5 +15,6 @@ stdenv.mkDerivation rec {
sha256 = "0gjylvvmq7ha0nhcjg56qfp0xxpsrcsj7y5r914svd5x1ppmzm5n";
};
- buildInputs = [ pkgconfig alsaLib libxmp ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ alsaLib libxmp ];
}
diff --git a/pkgs/applications/audio/ympd/default.nix b/pkgs/applications/audio/ympd/default.nix
index 672237a8462f..c3e8efae7fe9 100644
--- a/pkgs/applications/audio/ympd/default.nix
+++ b/pkgs/applications/audio/ympd/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "1nvb19jd556v2h2bi7w4dcl507p3p8xvjkqfzrcsy7ccy3502brq";
};
- buildInputs = [ cmake pkgconfig mpd_clientlib openssl ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ cmake mpd_clientlib openssl ];
meta = {
homepage = http://www.ympd.org;
diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix
index ecb7d9bceec6..f81aad4e2af1 100644
--- a/pkgs/applications/audio/zam-plugins/default.nix
+++ b/pkgs/applications/audio/zam-plugins/default.nix
@@ -2,16 +2,17 @@
stdenv.mkDerivation rec {
name = "zam-plugins-${version}";
- version = "3.8";
+ version = "3.9";
src = fetchgit {
url = "https://github.com/zamaudio/zam-plugins.git";
deepClone = true;
- rev = "830ab2e9dd1db8cf56d12c71057157e5d8e9fd74";
- sha256 = "1hyly5inis59cvh0r7lyi203h8v5jh84ca9jpaljm53cvw6d93px";
+ rev = "4976cf204074c1dfaf344821e83e8d896b35107d";
+ sha256 = "1xgwl51sf2hgc5ikcnycyxaw9vy82lrcswn07b6av6i67qclm8f8";
};
- buildInputs = [ boost libX11 mesa liblo libjack2 ladspaH lv2 pkgconfig rubberband libsndfile ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ boost libX11 mesa liblo libjack2 ladspaH lv2 rubberband libsndfile ];
patchPhase = ''
patchShebangs ./dpf/utils/generate-ttl.sh
diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix
new file mode 100644
index 000000000000..c330aeb0092c
--- /dev/null
+++ b/pkgs/applications/backup/deja-dup/default.nix
@@ -0,0 +1,83 @@
+{ stdenv, fetchurl, meson, ninja, pkgconfig, vala_0_38, gettext
+, gnome3, libnotify, intltool, itstool, glib, gtk3, libxml2
+, coreutils, libsecret, pcre, libxkbcommon, wrapGAppsHook
+, libpthreadstubs, libXdmcp, epoxy, at_spi2_core, dbus, libgpgerror
+, appstream-glib, desktop_file_utils, atk, pango, duplicity
+}:
+
+stdenv.mkDerivation rec {
+ name = "deja-dup-${version}";
+ version = "36.3";
+
+ src = fetchurl {
+ url = "https://launchpad.net/deja-dup/36/${version}/+download/deja-dup-${version}.tar.xz";
+ sha256 = "08pwybzp7ynfcf0vqxfc3p8ir4gnzcv4v4cq5bwidbff9crklhrc";
+ };
+
+ patches = [
+ ./fix-paths.patch
+ ];
+
+ postPatch = ''
+ substituteInPlace libdeja/tools/duplicity/DuplicityInstance.vala --replace \
+ "/bin/rm" \
+ "${coreutils}/bin/rm"
+ '';
+
+ # couldn't find gio/gdesktopappinfo.h
+ NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
+
+ nativeBuildInputs = [
+ meson ninja pkgconfig vala_0_38 gettext intltool itstool
+ appstream-glib desktop_file_utils libxml2 wrapGAppsHook
+ ];
+
+ buildInputs = [
+ libnotify gnome3.libpeas glib gtk3 libsecret
+ pcre libxkbcommon libpthreadstubs libXdmcp epoxy gnome3.nautilus
+ at_spi2_core dbus gnome3.gnome_online_accounts libgpgerror
+ ];
+
+ propagatedUserEnvPkgs = [ duplicity ];
+
+ postInstall = ''
+ glib-compile-schemas $out/share/glib-2.0/schemas
+ '';
+
+ # Manual rpath definition until https://github.com/mesonbuild/meson/issues/314 is fixed
+ postFixup =
+ let
+ rpath = stdenv.lib.makeLibraryPath [
+ glib
+ gtk3
+ gnome3.gnome_online_accounts
+ gnome3.libpeas
+ gnome3.nautilus
+ libgpgerror
+ libsecret
+ # Transitive
+ atk
+ pango
+ ];
+ in ''
+ # Unwrap accidentally wrapped library
+ mv $out/libexec/deja-dup/tools/.libduplicity.so-wrapped $out/libexec/deja-dup/tools/libduplicity.so
+
+ for elf in "$out"/bin/.*-wrapped "$out"/libexec/deja-dup/.deja-dup-monitor-wrapped "$out"/libexec/deja-dup/tools/*.so "$out"/lib/deja-dup/*.so "$out"/lib/nautilus/extensions-3.0/*.so; do
+ patchelf --set-rpath '${rpath}':"$out/lib/deja-dup" "$elf"
+ done
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A simple backup tool";
+ longDescription = ''
+ Déjà Dup is a simple backup tool. It hides the complexity \
+ of backing up the Right Way (encrypted, off-site, and regular) \
+ and uses duplicity as the backend.
+ '';
+ homepage = https://launchpad.net/deja-dup;
+ license = with licenses; gpl3;
+ maintainers = with maintainers; [ jtojnar joncojonathan ];
+ platforms = with platforms; linux;
+ };
+}
diff --git a/pkgs/applications/backup/deja-dup/fix-paths.patch b/pkgs/applications/backup/deja-dup/fix-paths.patch
new file mode 100644
index 000000000000..1cc57e6a54a2
--- /dev/null
+++ b/pkgs/applications/backup/deja-dup/fix-paths.patch
@@ -0,0 +1,12 @@
+diff --git a/deja-dup/nautilus/meson.build b/deja-dup/nautilus/meson.build
+index 04b136f3..ed8f7cba 100644
+--- a/deja-dup/nautilus/meson.build
++++ b/deja-dup/nautilus/meson.build
+@@ -31,6 +31,6 @@ shared_module('deja-dup', ['NautilusExtension.c'],
+ link_with: [dirhandling],
+ dependencies: [nautilus_dep],
+ install: true,
+- install_dir: nautilus_dep.get_pkgconfig_variable('extensiondir'))
++ install_dir: join_paths(get_option('libdir'), 'nautilus', 'extensions-3.0'))
+
+ endif
diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
index 235d4d16a405..9dd7eb2a2994 100644
--- a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
+++ b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
@@ -26,7 +26,8 @@ stdenv.mkDerivation rec {
})
];
- buildInputs = [ pkgconfig lightdm intltool makeWrapper ]
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ lightdm intltool makeWrapper ]
++ (if useGTK2 then [ gtk2 ] else [ gtk3 ]);
configureFlags = [
diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix
index 452cb38f126a..e82d4c69def6 100644
--- a/pkgs/applications/display-managers/lightdm/default.nix
+++ b/pkgs/applications/display-managers/lightdm/default.nix
@@ -7,15 +7,15 @@
with stdenv.lib;
let
- ver_branch = "1.22";
- version = "1.22.0";
+ ver_branch = "1.24";
+ version = "1.24.0";
in
stdenv.mkDerivation rec {
name = "lightdm-${version}";
src = fetchurl {
url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.xz";
- sha256 = "0a5bvfl2h7r873al6q7c819h0kg564k9fh51rl6489z6lyvazfg4";
+ sha256 = "18j33bm54i8k7ncxcs69zqi4105s62n58jrydqn3ikrb71s9nl6d";
};
nativeBuildInputs = [ pkgconfig intltool ];
diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
index 97f05f6a433c..86a963bdac48 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -1,11 +1,11 @@
-{ mkDerivation, lib, copyPathsToStore, fetchFromGitHub, fetchpatch
+{ mkDerivation, lib, fetchFromGitHub, fetchpatch
, cmake, extra-cmake-modules, pkgconfig, libxcb, libpthreadstubs, lndir
, libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd
}:
let
- version = "0.15.0";
+ version = "0.16.0";
in mkDerivation rec {
name = "sddm-${version}";
@@ -14,11 +14,10 @@ in mkDerivation rec {
owner = "sddm";
repo = "sddm";
rev = "v${version}";
- sha256 = "1wissgl7wd7fblq8ghz8n2fr6wqip7h88p9fiarfpvi1918fgng8";
+ sha256 = "1j0rc8nk8bz7sxa0bc6lx9v7r3zlcfyicngfjqb894ni9k71kzsb";
};
- patches =
- copyPathsToStore (lib.readPathsFromFile ./. ./series);
+ patches = [ ./sddm-ignore-config-mtime.patch ];
postPatch =
# Module Qt5::Test must be included in `find_package` before it is used.
@@ -50,12 +49,16 @@ in mkDerivation rec {
postInstall = ''
# remove empty scripts
rm "$out/share/sddm/scripts/Xsetup" "$out/share/sddm/scripts/Xstop"
+ for f in $out/share/sddm/themes/**/theme.conf ; do
+ substituteInPlace $f \
+ --replace 'background=' "background=$(dirname $f)/"
+ done
'';
meta = with lib; {
description = "QML based X11 display manager";
- homepage = https://github.com/sddm/sddm;
- platforms = platforms.linux;
+ homepage = https://github.com/sddm/sddm;
maintainers = with maintainers; [ abbradar ttuegel ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/display-managers/sddm/sddm-ignore-config-mtime.patch b/pkgs/applications/display-managers/sddm/sddm-ignore-config-mtime.patch
index 836df2de292d..aac09dfe876b 100644
--- a/pkgs/applications/display-managers/sddm/sddm-ignore-config-mtime.patch
+++ b/pkgs/applications/display-managers/sddm/sddm-ignore-config-mtime.patch
@@ -1,28 +1,43 @@
-From e9d82bfbc49993a5be2c93f6b72a969630587f26 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel
-Date: Mon, 23 Nov 2015 06:56:28 -0600
-Subject: [PATCH 1/2] ignore config mtime
-
----
- src/common/ConfigReader.cpp | 5 -----
- 1 file changed, 5 deletions(-)
-
diff --git a/src/common/ConfigReader.cpp b/src/common/ConfigReader.cpp
-index cfc9940..5bf5a6a 100644
+index 4b5983c..911c511 100644
--- a/src/common/ConfigReader.cpp
+++ b/src/common/ConfigReader.cpp
-@@ -138,11 +138,6 @@ namespace SDDM {
- QString currentSection = QStringLiteral(IMPLICIT_SECTION);
+@@ -147,16 +147,13 @@ namespace SDDM {
+ // * m_path (classic fallback /etc/sddm.conf)
- QFile in(m_path);
-- QDateTime modificationTime = QFileInfo(in).lastModified();
-- if (modificationTime <= m_fileModificationTime) {
+ QStringList files;
+- QDateTime latestModificationTime = QFileInfo(m_path).lastModified();
+
+ if (!m_sysConfigDir.isEmpty()) {
+ //include the configDir in modification time so we also reload on any files added/removed
+ QDir dir(m_sysConfigDir);
+ if (dir.exists()) {
+- latestModificationTime = std::max(latestModificationTime, QFileInfo(m_sysConfigDir).lastModified());
+ foreach (const QFileInfo &file, dir.entryInfoList(QDir::Files | QDir::NoDotAndDotDot, QDir::LocaleAware)) {
+ files << (file.absoluteFilePath());
+- latestModificationTime = std::max(latestModificationTime, file.lastModified());
+ }
+ }
+ }
+@@ -164,21 +161,14 @@ namespace SDDM {
+ //include the configDir in modification time so we also reload on any files added/removed
+ QDir dir(m_configDir);
+ if (dir.exists()) {
+- latestModificationTime = std::max(latestModificationTime, QFileInfo(m_configDir).lastModified());
+ foreach (const QFileInfo &file, dir.entryInfoList(QDir::Files | QDir::NoDotAndDotDot, QDir::LocaleAware)) {
+ files << (file.absoluteFilePath());
+- latestModificationTime = std::max(latestModificationTime, file.lastModified());
+ }
+ }
+ }
+
+ files << m_path;
+
+- if (latestModificationTime <= m_fileModificationTime) {
- return;
- }
-- m_fileModificationTime = modificationTime;
-
- in.open(QIODevice::ReadOnly);
- while (!in.atEnd()) {
---
-2.6.3
-
+- m_fileModificationTime = latestModificationTime;
+-
+ foreach (const QString &filepath, files) {
+ loadInternal(filepath);
+ }
diff --git a/pkgs/applications/display-managers/sddm/series b/pkgs/applications/display-managers/sddm/series
deleted file mode 100644
index cb6ea65fedb1..000000000000
--- a/pkgs/applications/display-managers/sddm/series
+++ /dev/null
@@ -1 +0,0 @@
-sddm-ignore-config-mtime.patch
\ No newline at end of file
diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix
index c75a8976b3fa..5d06c2221b34 100644
--- a/pkgs/applications/display-managers/slim/default.nix
+++ b/pkgs/applications/display-managers/slim/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_LINK = "-lXmu";
meta = {
- homepage = http://sourceforge.net/projects/slim.berlios/; # berlios shut down; I found no replacement yet
+ homepage = https://sourceforge.net/projects/slim.berlios/; # berlios shut down; I found no replacement yet
platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/applications/editors/android-studio/packages.nix b/pkgs/applications/editors/android-studio/packages.nix
index 6d7ed2e489b6..6f8440f7b1fe 100644
--- a/pkgs/applications/editors/android-studio/packages.nix
+++ b/pkgs/applications/editors/android-studio/packages.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, fetchurl, makeFontsConf }:
+{ stdenv, callPackage, fetchurl, makeFontsConf }:
let
mkStudio = opts: callPackage (import ./common.nix opts) {
fontsConf = makeFontsConf {
@@ -6,11 +6,11 @@ let
};
};
in rec {
- stable = mkStudio rec {
+ stable = mkStudio {
pname = "android-studio";
- version = "2.3.3.0";
- build = "162.4069837";
- sha256Hash = "0zzis9m2xp44xwkj0zvcqw5rh3iyd3finyi5nqhgira1fkacz0qk";
+ version = "3.0.0.18"; # "Android Studio 3.0"
+ build = "171.4408382";
+ sha256Hash = "18npm7ckdybj6vc2vndr0wd50da19m9z2j7wld2mdidnl5ggk4br";
meta = with stdenv.lib; {
description = "The Official IDE for Android (stable version)";
@@ -25,16 +25,16 @@ in rec {
};
};
- preview = mkStudio rec {
+ preview = mkStudio {
pname = "android-studio-preview";
- version = "3.0.0.14"; # "Android Studio 3.0 Beta 6"
- build = "171.4333198";
- sha256Hash = "071a3j0bnsspvhvhh10h9ygay3bi66glriiy8gl8vrwx1dnv55zk";
+ version = "3.1.0.0"; # "Android Studio 3.1 Canary 1"
+ build = "171.4415322";
+ sha256Hash = "08xgwv6mg2zxys9dqjfz66h60g640ni3snyb89ij0fkmd28rbxgj";
meta = stable.meta // {
description = "The Official IDE for Android (preview version)";
homepage = https://developer.android.com/studio/preview/index.html;
- maintainers = with stdenv.lib.maintainers; [ primeos tomsmeets ];
+ maintainers = with stdenv.lib.maintainers; [ primeos ];
};
};
}
diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix
index 9a0d1bb5e72c..39be7f534060 100644
--- a/pkgs/applications/editors/aseprite/default.nix
+++ b/pkgs/applications/editors/aseprite/default.nix
@@ -11,7 +11,7 @@
stdenv.mkDerivation rec {
name = "aseprite-${version}";
- version = if unfree then "1.2-beta12" else "1.1.7";
+ version = if unfree then "1.2.2" else "1.1.7";
src = fetchFromGitHub {
owner = "aseprite";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
rev = "v${version}";
fetchSubmodules = true;
sha256 = if unfree
- then "1zgsr03d4vwdj2qyiwfwfqsbqngp85n13i3xwbkfkbja036c5yhc"
+ then "1ldi7zikl1g6rq3g9lkypx5wqzza5j0054j1r8bh7lyvb0szicig"
else "0gd49lns2bpzbkwax5jf9x1xmg1j8ij997kcxr2596cwiswnw4di";
};
@@ -30,6 +30,10 @@ stdenv.mkDerivation rec {
libX11 libXext libXcursor libXxf86vm
] ++ lib.optionals unfree [ cmark ];
+ postPatch = ''
+ sed -i src/config.h -e "s-\\(#define VERSION\\) .*-\\1 \"$version\"-"
+ '';
+
cmakeFlags = [
"-DENABLE_UPDATER=OFF"
"-DUSE_SHARED_CURL=ON"
diff --git a/pkgs/applications/editors/atom/beta.nix b/pkgs/applications/editors/atom/beta.nix
index 41a68656d007..391d098625c5 100644
--- a/pkgs/applications/editors/atom/beta.nix
+++ b/pkgs/applications/editors/atom/beta.nix
@@ -1,12 +1,12 @@
{ stdenv, pkgs, fetchurl, lib, makeWrapper, gvfs, atomEnv}:
stdenv.mkDerivation rec {
- name = "atom-${version}";
- version = "1.21.0-beta0";
+ name = "atom-beta-${version}";
+ version = "1.22.0-beta1";
src = fetchurl {
url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
- sha256 = "1syxlyb62vp9hmjdiazhmvq8w52b90l8mvf502xkdav4vi3yxzfz";
+ sha256 = "0qggj0j0cnkzqwgvzw2fb1z10rvvx9jh0ymhdy1aca18hms44p3d";
name = "${name}.deb";
};
diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index 65df31aaa226..6ab881f22753 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "atom-${version}";
- version = "1.20.0";
+ version = "1.21.2";
src = fetchurl {
url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
- sha256 = "1jzpa44ny78djdxc8d2w4jz1m68xmi8bzq87q3wmdffa4g9z4aa0";
+ sha256 = "0snhhp8rjmk750snyzkqzwvi7f915pbc6qpa3vf0f57syf47m7vl";
name = "${name}.deb";
};
@@ -32,8 +32,8 @@ 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
+ rm -f $out/share/atom/resources/app.asar.unpacked/node_modules/dugite/git/bin/git
+ ln -s ${pkgs.git}/bin/git $out/share/atom/resources/app.asar.unpacked/node_modules/dugite/git/bin/git
find $out/share/atom -name "*.node" -exec patchelf --set-rpath "${atomEnv.libPath}:$out/share/atom" {} \;
diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index b039bd168d87..5ef29081cf01 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -8,6 +8,9 @@
assert stdenv ? glibc;
+# http://download.eclipse.org/eclipse/downloads/ is the main place to
+# find the downloads needed for new versions
+
rec {
buildEclipse = import ./build-eclipse.nix {
@@ -111,16 +114,16 @@ rec {
};
eclipse-platform-47 = buildEclipse {
- name = "eclipse-platform-4.7";
+ name = "eclipse-platform-4.7.1a";
description = "Eclipse Platform Oxygen";
sources = {
"x86_64-linux" = fetchurl {
- url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7-201706120950/eclipse-platform-4.7-linux-gtk-x86_64.tar.gz;
- sha256 = "0hrgijydxvd2zz1npv5qw8d79f48a6lsdw3qy1wqf7k59aqyg2fq";
+ url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.1a-201710090410/eclipse-platform-4.7.1a-linux-gtk-x86_64.tar.gz;
+ sha256 = "13gyrnhyhdpsrbi5nl0fhpwrqz3gdyqq3r0m1f2z3y6yr75sgw33";
};
"i686-linux" = fetchurl {
- url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7-201706120950/eclipse-platform-4.7-linux-gtk.tar.gz;
- sha256 = "00m89j26m8nj190q144wx8d88mldx1z6i797p8isg3rhbz3x5dbc";
+ url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.1a-201710090410/eclipse-platform-4.7.1a-linux-gtk.tar.gz;
+ sha256 = "013dfk23wa4jy177ywrkkr16wdjf6jxzjcz6mkl4ygki47yj9c5s";
};
};
};
@@ -165,16 +168,16 @@ rec {
};
eclipse-sdk-47 = buildEclipse {
- name = "eclipse-sdk-4.7";
+ name = "eclipse-sdk-4.7.1a";
description = "Eclipse Oxygen Classic";
sources = {
"x86_64-linux" = fetchurl {
- url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7-201706120950/eclipse-SDK-4.7-linux-gtk-x86_64.tar.gz;
- sha256 = "1nz0hl0gg4a8iffnaggbhdw0ra8a7wljlimvijbbybh0nhvfd9n3";
+ url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.1a-201710090410/eclipse-SDK-4.7.1a-linux-gtk-x86_64.tar.gz;
+ sha256 = "05xpdbig170rw7k5dx33dlyz187wv62mma8s5wxrqi7f4117sx4y";
};
"i686-linux" = fetchurl {
- url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7-201706120950/eclipse-SDK-4.7-linux-gtk.tar.gz;
- sha256 = "0dar69v7d7bkl18si45bccvil809a85ghb7k88m1q2cq1kd2r8z5";
+ url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.1a-201710090410/eclipse-SDK-4.7.1a-linux-gtk.tar.gz;
+ sha256 = "09c9m88k1cm9bhd900p5yf2q9pijrymgjcbhmagz0fcwhldrv0ys";
};
};
};
diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index a3b4193edc6f..8d96a79b3c3d 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -24,9 +24,7 @@ rec {
buildEclipsePluginBase (attrs // {
srcs = [ srcFeature srcPlugin ];
- phases = [ "installPhase" ];
-
- installPhase = ''
+ buildCommand = ''
dropinDir="$out/eclipse/dropins/${name}"
mkdir -p $dropinDir/features
@@ -35,7 +33,6 @@ rec {
mkdir -p $dropinDir/plugins
cp -v ${srcPlugin} $dropinDir/plugins/${name}.jar
'';
-
});
# Helper for the case where the build directory has the layout of an
@@ -44,7 +41,8 @@ rec {
# directories will be installed.
buildEclipseUpdateSite = { name, ... } @ attrs:
buildEclipsePluginBase (attrs // {
- phases = [ "unpackPhase" "installPhase" ];
+ dontBuild = true;
+ doCheck = false;
installPhase = ''
dropinDir="$out/eclipse/dropins/${name}"
@@ -106,16 +104,16 @@ rec {
anyedittools = buildEclipsePlugin rec {
name = "anyedit-${version}";
- version = "2.7.0.201705171641";
+ version = "2.7.1.201709201439";
srcFeature = fetchurl {
url = "http://andrei.gmxhome.de/eclipse/features/AnyEditTools_${version}.jar";
- sha256 = "07k029nw5ibxpjc0siy06ihylbqrxllf59yz8c544gra8lc079c9";
+ sha256 = "1wqzl7wq85m9gil8rnvly45ps0a2m0svw613pg6djs5i7amhnayh";
};
srcPlugin = fetchurl {
- url = "https://github.com/iloveeclipse/anyedittools/releases/download/2.7.0/de.loskutov.anyedit.AnyEditTools_${version}.jar";
- sha256 = "0wbm8zfjh7gxrw5sy9m3siddiazh5czgxp7zyzxwzkdqyqzqs70h";
+ url = "https://github.com/iloveeclipse/anyedittools/releases/download/2.7.1/de.loskutov.anyedit.AnyEditTools_${version}.jar";
+ sha256 = "03iyb6j2srq74iigmg7dk098c2svyv0ygdfql5jqr44a32n07k8q";
};
meta = with stdenv.lib; {
@@ -152,16 +150,16 @@ rec {
bytecode-outline = buildEclipsePlugin rec {
name = "bytecode-outline-${version}";
- version = "2.4.3";
+ version = "2.5.0.201711011753-5a57fdf";
srcFeature = fetchurl {
url = "http://andrei.gmxhome.de/eclipse/features/de.loskutov.BytecodeOutline.feature_${version}.jar";
- sha256 = "0imhwp73gxy1y5d5gpjgd05ywn0xg3vqc5980wcx3fd51g4ifc67";
+ sha256 = "0yciqhcq0n5i326mwy57r4ywmkz2c2jky7r4pcmznmhvks3z65ps";
};
srcPlugin = fetchurl {
url = "http://dl.bintray.com/iloveeclipse/plugins/de.loskutov.BytecodeOutline_${version}.jar";
- sha256 = "0230i88mvvxhn11m9c5mv3494zhh1xkxyfyva9qahck0wbqwpzkw";
+ sha256 = "1vmsqv32jfl7anvdkw0vir342miv5sr9df7vd1w44lf1yf97vxlw";
};
meta = with stdenv.lib; {
@@ -364,12 +362,12 @@ rec {
jdt = buildEclipseUpdateSite rec {
name = "jdt-${version}";
- version = "4.7";
+ version = "4.7.1a";
src = fetchzip {
stripRoot = false;
- url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7-201706120950/org.eclipse.jdt-4.7.zip";
- sha256 = "0y17shnlh90gg9226lraknvdnp2i71ck91dnxbbzvxl8b64v8v1p";
+ url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.1a-201710090410/org.eclipse.jdt-4.7.1a.zip;
+ sha256 = "1hpvpj8ghfk8aqbzfrpcxw3wxrczq6zd3bpx4sxjrsi926jsjaf4";
};
meta = with stdenv.lib; {
@@ -394,7 +392,7 @@ rec {
sha256 = "1xfj4j27d1h4bdf2v7f78zi8lz4zkkj7s9kskmsqx5jcs2d459yp";
extraPostFetch =
''
- mv "$out/${repo}-${rev}/releases/local-repo"/* "$out/"
+ mv "$out/${repo}-${rev}/releases/local-repo/"* "$out/"
'';
};
@@ -424,6 +422,29 @@ rec {
};
};
+ spotbugs = buildEclipsePlugin rec {
+ name = "spotbugs-${version}";
+ version = "3.1.0.r201710241414-11c9895";
+
+ srcFeature = fetchurl {
+ url = "https://spotbugs.github.io/eclipse/features/com.github.spotbugs.plugin.eclipse_${version}.jar";
+ sha256 = "084dj2bid5issh28j32hi5w9vx5xs829h7d5lbz5hqj1fyn9h6bs";
+ };
+
+ srcPlugin = fetchurl {
+ url = "https://spotbugs.github.io/eclipse/plugins/com.github.spotbugs.plugin.eclipse_${version}.jar";
+ sha256 = "1mqpl3gx06f54w13jm01qd8fbniab3x989mi3lysx078vrp23jas";
+ };
+
+ meta = with stdenv.lib; {
+ homepage = https://spotbugs.github.io/;
+ description = "Plugin that uses static analysis to look for bugs in Java code";
+ license = licenses.lgpl21;
+ platforms = platforms.all;
+ maintainers = [ maintainers.rycee ];
+ };
+ };
+
testng = buildEclipsePlugin rec {
name = "testng-${version}";
version = "6.9.13.201609291640";
@@ -447,6 +468,28 @@ rec {
};
};
+ vrapper = buildEclipseUpdateSite rec {
+ name = "vrapper-${version}";
+ version = "0.72.0";
+ owner = "vrapper";
+ repo = "vrapper";
+ date = "20170311";
+
+ src = fetchzip {
+ stripRoot = false;
+ url = "https://github.com/${owner}/${repo}/releases/download/${version}/vrapper_${version}_${date}.zip";
+ sha256 = "0nyirf6km97q211cxfy01kidxac20m8ba3kk9xj73ykrhsk3cxjp";
+ };
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/vrapper/vrapper";
+ description = "A wrapper to provide a Vim-like input scheme for moving around and editing text";
+ license = licenses.gpl3;
+ platforms = platforms.all;
+ maintainers = [ maintainers.stumoss ];
+ };
+ };
+
yedit = buildEclipsePlugin rec {
name = "yedit-${version}";
version = "1.0.20.201509041456";
diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index 7cd57642aadf..f0c4ca87aa23 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -28,10 +28,10 @@
ada-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, wisi }:
elpaBuild {
pname = "ada-mode";
- version = "5.2.2";
+ version = "5.3.1";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/ada-mode-5.2.2.tar";
- sha256 = "0c0lrj4vgsbawyshqbfb7gvndf0yb97wybqb0b34z7kan7q0xgvd";
+ url = "https://elpa.gnu.org/packages/ada-mode-5.3.1.tar";
+ sha256 = "0srna7w3y2nq0y80a01bcx8mg6gvind7nzvsbk9bd7rrr05njrd9";
};
packageRequires = [ cl-lib emacs wisi ];
meta = {
@@ -95,10 +95,10 @@
ahungry-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "ahungry-theme";
- version = "1.4.0";
+ version = "1.8.0";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/ahungry-theme-1.4.0.tar";
- sha256 = "1n8k12mfn01f20j0pyd7ycj77x0y3a008xc94frklaaqjc0v26s4";
+ url = "https://elpa.gnu.org/packages/ahungry-theme-1.8.0.tar";
+ sha256 = "14dhnrlbjzrxk5ligf0z2im5bgnxpjqqzqcrmqg5355xrgpbpb7v";
};
packageRequires = [ emacs ];
meta = {
@@ -149,10 +149,10 @@
ascii-art-to-unicode = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "ascii-art-to-unicode";
- version = "1.9";
+ version = "1.11";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/ascii-art-to-unicode-1.9.el";
- sha256 = "0lfgfkx81s4dd318xcxsl7hdgpi0dc1fv3d00m3xg8smyxcf3adv";
+ url = "https://elpa.gnu.org/packages/ascii-art-to-unicode-1.11.el";
+ sha256 = "1z1vjpskvhynja41cv5z6xrz3rmpdzz51avv2gzrpxxa4k6iaz8s";
};
packageRequires = [];
meta = {
@@ -201,10 +201,10 @@
}) {};
auto-correct = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "auto-correct";
- version = "1.1";
+ version = "1.1.3";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/auto-correct-1.1.el";
- sha256 = "19i84dqqnxc5v36lsmj9zj8wbmg267c50jvq2i9bb66i9pzd0s53";
+ url = "https://elpa.gnu.org/packages/auto-correct-1.1.3.el";
+ sha256 = "09r58p8na1ai2v9zllb92lvsjlq2jfzwvj0ipck1py0i4xfsm7aq";
};
packageRequires = [];
meta = {
@@ -241,10 +241,10 @@
}) {};
beacon = callPackage ({ elpaBuild, fetchurl, lib, seq }: elpaBuild {
pname = "beacon";
- version = "1.3.2";
+ version = "1.3.3";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/beacon-1.3.2.el";
- sha256 = "0ldja8xrrninm588f27bhxvp0b12cngazyz688lkxvwx28cpqb7n";
+ url = "https://elpa.gnu.org/packages/beacon-1.3.3.el";
+ sha256 = "10r4fpf8pcf1qn5ncpm5g7skzba749mrc1ggykq92jlha3q98s02";
};
packageRequires = [ seq ];
meta = {
@@ -281,10 +281,10 @@
}) {};
captain = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "captain";
- version = "1.0.1";
+ version = "1.0.3";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/captain-1.0.1.el";
- sha256 = "1jqbgzcgq4kxpcsma9ia6w6rjy9sdn51lz2f4rfjjy3qgy4fqjx5";
+ url = "https://elpa.gnu.org/packages/captain-1.0.3.el";
+ sha256 = "02b4s4pfnwfwc3xgh4g96wrqll37m35dc2x09pjwkdjxglki7045";
};
packageRequires = [];
meta = {
@@ -700,10 +700,10 @@
ebdb = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, seq }:
elpaBuild {
pname = "ebdb";
- version = "0.3.1";
+ version = "0.4.1";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/ebdb-0.3.1.tar";
- sha256 = "1g8chkw302nhjj8n6v7j3xfcw24wpn43pcp8f3bh4s4haw1l75q3";
+ url = "https://elpa.gnu.org/packages/ebdb-0.4.1.tar";
+ sha256 = "0gv1q1xkhjab0l77c92znn6x0dfdbnj6hc48axmrx6a7zwbm3g2r";
};
packageRequires = [ cl-lib emacs seq ];
meta = {
@@ -728,10 +728,10 @@
ebdb-i18n-chn = callPackage ({ ebdb, elpaBuild, fetchurl, lib, pyim }:
elpaBuild {
pname = "ebdb-i18n-chn";
- version = "1.1";
+ version = "1.2";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/ebdb-i18n-chn-1.1.el";
- sha256 = "0pf7qp15z9wp41dazvi4bhdz7y13h9k5nnghhsb0nvknn6if0k4m";
+ url = "https://elpa.gnu.org/packages/ebdb-i18n-chn-1.2.el";
+ sha256 = "1qgrlk625mhfd6n1mc0kqfzbisnb61kx3vrrl3bzlz4viq3kcc10";
};
packageRequires = [ ebdb pyim ];
meta = {
@@ -945,10 +945,10 @@
gnorb = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "gnorb";
- version = "1.2.4";
+ version = "1.3.1";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/gnorb-1.2.4.tar";
- sha256 = "013sdzpix9mc7d99mmpqv0r80zr50l1c7jld09p6767f86j6vahi";
+ url = "https://elpa.gnu.org/packages/gnorb-1.3.1.tar";
+ sha256 = "1g6xldkc6l6zlzd1slqizbbd5b9k4pbr66nrf5svidgiy7mlifw5";
};
packageRequires = [ cl-lib ];
meta = {
@@ -1464,10 +1464,10 @@
}) {};
nlinum = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "nlinum";
- version = "1.7";
+ version = "1.8";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/nlinum-1.7.el";
- sha256 = "0ql1dbad29sdv3wmv65985g8ibl2176m2hqhjfrppgg34h3w51lz";
+ url = "https://elpa.gnu.org/packages/nlinum-1.8.el";
+ sha256 = "0bb1c8a68fzv59q2ri7ppbx8cm7sa8n4hxxvxv73db2dcgwrgwga";
};
packageRequires = [];
meta = {
@@ -1556,10 +1556,10 @@
}) {};
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org";
- version = "20170911";
+ version = "20171030";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/org-20170911.tar";
- sha256 = "0w91f5lx64klwbpym0b73z919dagzakykkmx6g13iscsh7fflx06";
+ url = "https://elpa.gnu.org/packages/org-20171030.tar";
+ sha256 = "1lszws6b5s4r7w871cyigs433dflf6w0y33fj6rzrq8240d5092i";
};
packageRequires = [];
meta = {
@@ -2068,10 +2068,10 @@
}) {};
tramp-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
pname = "tramp-theme";
- version = "0.1.1";
+ version = "0.2";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/tramp-theme-0.1.1.el";
- sha256 = "0l8i625h9sc6h59qfj847blmfwfhf9bvfsbmwfb56qzs535fby3y";
+ url = "https://elpa.gnu.org/packages/tramp-theme-0.2.el";
+ sha256 = "1q1j0vcdyv5gnfbnfl08rnwd5j4ayc1gi1vpinr99ny70wsv7gbf";
};
packageRequires = [ emacs ];
meta = {
@@ -2293,10 +2293,10 @@
wisi = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "wisi";
- version = "1.1.5";
+ version = "1.1.6";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/wisi-1.1.5.tar";
- sha256 = "1q0dbykh9gvh0355vc1lwpriwlqq07jaydqx8zdrs6s0zyffx3a4";
+ url = "https://elpa.gnu.org/packages/wisi-1.1.6.tar";
+ sha256 = "0p7hm9l4gbp50rmpqna6jnc1pss2axdd6m6hk9ik4afbz0knzwnk";
};
packageRequires = [ cl-lib emacs ];
meta = {
diff --git a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
index b4fb8d1937df..634c654d58fc 100644
--- a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
+++ b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
sha256 = "1lmcj8rf83w13q8q68hh7sa1abc2m6j2zmfska92xdp7hslhdgc5";
};
- buildInputs = [ emacs w3m texinfo autoreconfHook ];
+ nativeBuildInputs = [ autoreconfHook ];
+ buildInputs = [ emacs w3m texinfo ];
# XXX: Should we do the same for xpdf/evince, gv, gs, etc.?
patchPhase = ''
diff --git a/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix b/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix
new file mode 100644
index 000000000000..ce4010c98811
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix
@@ -0,0 +1,23 @@
+{ fetchurl, stdenv, melpaBuild }:
+
+melpaBuild {
+ pname = "font-lock-plus";
+ version = "20170222.1755";
+
+ src = fetchurl {
+ url = "https://www.emacswiki.org/emacs/download/font-lock+.el";
+ sha256 = "0iajkgh0n3pbrwwxx9rmrrwz8dw2m7jsp4mggnhq7zsb20ighs30";
+ name = "font-lock+.el";
+ };
+
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/font-lock+";
+ sha256 = "1wn99cb53ykds87lg9mrlfpalrmjj177nwskrnp9wglyqs65lk4g";
+ name = "font-lock-plus";
+ };
+
+ meta = with stdenv.lib; {
+ homepage = "https://melpa.org/#/font-lock+";
+ license = lib.licenses.gpl2Plus;
+ };
+}
diff --git a/pkgs/applications/editors/emacs-modes/gn/default.nix b/pkgs/applications/editors/emacs-modes/gn/default.nix
new file mode 100644
index 000000000000..39e7d1abf386
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/gn/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchgit, emacs }:
+
+stdenv.mkDerivation {
+ name = "gn-mode-2017-09-21";
+ src = fetchgit {
+ url = "https://chromium.googlesource.com/chromium/src/tools/gn";
+ rev = "34f2780efb3fe14fe361ec161ad58440de5a6b36";
+ sha256 = "10cisqz3l6ny3471yi7y1z8v622lpl65zh0liqr6absvmy63g866";
+ };
+ buildInputs = [ emacs ];
+
+ buildPhase = ''
+ emacs --batch -f batch-byte-compile misc/emacs/gn-mode.el
+ '';
+
+ installPhase = ''
+ mkdir -p $out/share/emacs/site-lisp/
+ cp misc/emacs/gn-mode.el* $out/share/emacs/site-lisp/
+ '';
+}
diff --git a/pkgs/applications/editors/emacs-modes/icicles/default.nix b/pkgs/applications/editors/emacs-modes/icicles/default.nix
index 11ccff3df016..f0d120dd8030 100644
--- a/pkgs/applications/editors/emacs-modes/icicles/default.nix
+++ b/pkgs/applications/editors/emacs-modes/icicles/default.nix
@@ -2,27 +2,28 @@
let
modules = [
- { name = "icicles.el"; sha256 = "175g8w620vy73pp3zyasfjspgljk6g0lki71kdnvw5z88w3s9d1n"; }
- { name = "icicles-chg.el"; sha256 = "1bx5xdhirvnrjqk4pk0sjp9bpj1syymsjnckklsw04gv6y0x8zik"; }
- { name = "icicles-cmd1.el"; sha256 = "1ff0mndin9zxrswwwq3a7b1s879rr6gy8rzxanr7kxg1ppciafad"; }
- { name = "icicles-cmd2.el"; sha256 = "1a44l86jacp9nsy4z260azz6y672drjw3w5a0jsc8w26fgsrnx1k"; }
- { name = "icicles-doc1.el"; sha256 = "0s3r4z3y06hd1nxp18wd0b8b88z2a7ryy0j8sx5fzibbmp58ars1"; }
- { name = "icicles-doc2.el"; sha256 = "0c10jg91qxyrg1zwiyi4m57dbw3yf43jdrpi4nnby3pkzh6i37ic"; }
- { name = "icicles-face.el"; sha256 = "0n0vcbhwgd2lyj7anq1zpwja28xry018qxbm8sprxkh6y3vlw8d2"; }
- { name = "icicles-fn.el"; sha256 = "1i10593a7hp465bxd86h7h7gwrdyqxx0d13in53z4jnab8icp3d4"; }
- { name = "icicles-mac.el"; sha256 = "1piq0jk8nz0hz9wwci7dkxnfxscdpygjzpj5zg3310vs22l7rrsz"; }
- { name = "icicles-mcmd.el"; sha256 = "0c4325yp84i46605nlxmjm6n0f4fh69shsihvd0wb9ryg0a8qa65"; }
- { name = "icicles-mode.el"; sha256 = "069wx5clqpsq2c9aavgd9xihvlad3g00iwwrc3cpl47v64dvlipq"; }
- { name = "icicles-opt.el"; sha256 = "16487l3361ca8l6il2c0z892843sc5l9v4gr7lx5fxbmrlsswvvn"; }
- { name = "icicles-var.el"; sha256 = "1a9cwxpi10x44fngxa7qnrg8hqfvdjb8s8k47gnn1rbh63blkkry"; }
+ { name = "icicles.el"; sha256 = "10w1lghh9jqxxm5cszi2qyk24vnvazfywmyyz1v7zf6cyiwbndrz"; }
+ { name = "icicles-chg.el"; sha256 = "020yg4hv120mcy7qvn76j85q6hl7mfcfv66w55c6izc9lbrvvnv8"; }
+ { name = "icicles-cmd1.el"; sha256 = "1715x1vkiax93890gfjbzslxsn4swsv37spvyx7chy4s1mym9kfw"; }
+ { name = "icicles-cmd2.el"; sha256 = "187k0gmn34fn6w1dw9hjf4i788y01vk47z7ac11ar4bddwh97ddx"; }
+ { name = "icicles-doc1.el"; sha256 = "1bw5dkymn2xdrfrp80am0gqi0szs0xihny4qmgzgx6hfbng351qh"; }
+ { name = "icicles-doc2.el"; sha256 = "0zd94m1a8mwwbrbcrahxxx8q34w8cg5lna4yww4m1gliyklww86s"; }
+ { name = "icicles-face.el"; sha256 = "1mlz8dq7bgzp2cf5j37i25yw90ry657d2m8r93rdj67h7l4wyxhj"; }
+ { name = "icicles-fn.el"; sha256 = "1cdghvgsr0b7pdq4lmnfm6kwwcqbk4wqf168kf2sjajbpa24ix96"; }
+ { name = "icicles-mac.el"; sha256 = "1w5sgzbp8hyjzrmqd8bwivszaayzh8dkyqa0d751adiwjfs9sq9m"; }
+ { name = "icicles-mcmd.el"; sha256 = "1lf2galn3g52hfz61avlr4ifyn5b42dfbmyq78cpzlq7hzc928v2"; }
+ { name = "icicles-mode.el"; sha256 = "0gci04j6vx0vqsh4skarznklam1xibj7pjvy67kaip8b6a4zx9ip"; }
+ { name = "icicles-opt.el"; sha256 = "17g35ancml0mvywagzhjrgmlr4rhm1wgb5wg3fsqhhldib9qlz56"; }
+ { name = "icicles-var.el"; sha256 = "0ydixg41h09yncp8g2nv8zsyv8avg1hj2f3mgrmd2kf0n27bw2nv"; }
];
forAll = f: map f modules;
in
-stdenv.mkDerivation {
- name = "icicles-2014-11-06";
+stdenv.mkDerivation rec {
+ version = "2017-10-28";
+ name = "icicles-${version}";
- srcs = forAll ({name, sha256}: fetchurl { url = "http://www.emacswiki.org/emacs-en/download/${name}"; inherit sha256; });
+ srcs = forAll ({name, sha256}: fetchurl { url = "http://www.emacswiki.org/emacs/download/${name}"; inherit sha256; });
buildInputs = [ emacs ];
@@ -30,11 +31,13 @@ stdenv.mkDerivation {
buildPhase = "emacs --batch -L . -f batch-byte-compile *.el";
- installPhase = "mkdir -p $out/share/emacs/site-lisp; cp *.el *.elc $out/share/emacs/site-lisp/";
+ installPhase = "mkdir -p $out/share/emacs/site-lisp/emacswiki/${name}/; cp *.el *.elc $out/share/emacs/site-lisp/emacswiki/${name}/";
meta = {
homepage = http://www.emacswiki.org/emacs/Icicles;
description = "Enhance Emacs minibuffer input with cycling and powerful completion";
license = stdenv.lib.licenses.gpl2Plus;
+ platforms = emacs.meta.platforms;
+ maintainers = with stdenv.lib.maintainers; [ scolobb ];
};
}
diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index b0449cc7c424..3db74fa9d4f4 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -127,12 +127,12 @@
abc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "abc-mode";
- version = "20140225.944";
+ version = "20171020.319";
src = fetchFromGitHub {
owner = "mkjunker";
repo = "abc-mode";
- rev = "1dd6e1217136a6f986917a3e5f41c1007bac908d";
- sha256 = "1h4gwp2gyd4jhbkb8ai1zbzhhmlhmihbwzr0wsxg5yq074n72ifs";
+ rev = "238deedeb6c90df168045552eb463cfae9e1f88f";
+ sha256 = "1wkjdvsav2x9zsl25h87iyfl6r0md86i2gmxqhvf63acxqgrgb2q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/aaee9dc5de06747374f311d86a550d3cc15beed1/recipes/abc-mode";
@@ -355,25 +355,6 @@
license = lib.licenses.free;
};
}) {};
- ac-dabbrev = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "ac-dabbrev";
- version = "20130905.2218";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/ac-dabbrev.el?revision=9";
- sha256 = "0q0lbhdng5s5hqa342yyvg02hf2bfbwq513lj1rlaqz4ykvpd7fh";
- name = "ac-dabbrev.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/ac-dabbrev";
- sha256 = "03lndw7y55bzz4rckl80j0kh66qa82xxxhfakzs1dh1h9f1f0azh";
- name = "ac-dabbrev";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/ac-dabbrev";
- license = lib.licenses.free;
- };
- }) {};
ac-dcd = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, flycheck-dmd-dub, lib, melpaBuild }:
melpaBuild {
pname = "ac-dcd";
@@ -398,12 +379,12 @@
ac-emacs-eclim = callPackage ({ auto-complete, eclim, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ac-emacs-eclim";
- version = "20170104.743";
+ version = "20170924.1339";
src = fetchFromGitHub {
owner = "emacs-eclim";
repo = "emacs-eclim";
- rev = "ebb844d1ebdd7eb347e89063a9b6e9f890a1ff57";
- sha256 = "18q4blnxf7p2kvgh1rhr7pizga06z97hv1lxjgzv0dc2dll2zwmd";
+ rev = "14596d3a1c0e7f18be6b88eddebaf7f36eeca859";
+ sha256 = "04vmq8d68na8pxwd18lxf87v0nzf3cxxdvw8cqzj28his7g37bym";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/ac-emacs-eclim";
@@ -759,8 +740,8 @@
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
- rev = "9e9c126397c3d2c7160e38eb72b9317c515678f3";
- sha256 = "14qnbfxm9k870qi53krg6lmmfzcbhnv0yslhv66p40rwh9wjslwd";
+ rev = "317ad1d023db6b2fe67444a2c075e656c35f5094";
+ sha256 = "1wyf93faq6z6wgcs3lxc6gv75bmxchg6kd98dza61zdyc0rj60wa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
@@ -776,12 +757,12 @@
ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }:
melpaBuild {
pname = "ac-php-core";
- version = "20170831.802";
+ version = "20171022.808";
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
- rev = "9e9c126397c3d2c7160e38eb72b9317c515678f3";
- sha256 = "14qnbfxm9k870qi53krg6lmmfzcbhnv0yslhv66p40rwh9wjslwd";
+ rev = "317ad1d023db6b2fe67444a2c075e656c35f5094";
+ sha256 = "1wyf93faq6z6wgcs3lxc6gv75bmxchg6kd98dza61zdyc0rj60wa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@@ -822,8 +803,8 @@
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "2af4d6a32e8194f8fbcc23fd94395e3d595a3c25";
- sha256 = "0091w529lvbjlw1fdb3qjgb8fd5fcwxhqyr4ps5cvxl5bqnwlw39";
+ rev = "7fa54d513fc716b2dc1055636b4728ab29dfdd3e";
+ sha256 = "1i0php9nnpgsmb4l1sc7qgxvdgg4hyviq68f4k41b9bcwab2hbl8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags";
@@ -860,12 +841,12 @@
ac-slime = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }:
melpaBuild {
pname = "ac-slime";
- version = "20150729.2035";
+ version = "20171027.1400";
src = fetchFromGitHub {
owner = "purcell";
repo = "ac-slime";
- rev = "fafc6f75c90b2dbf124edd3e2887860ce052081e";
- sha256 = "0dix8giqbc9la5mycrjgq287j03s44nhrg9b1drsca2sc58cnach";
+ rev = "6c80cb602ddad46486288f94ad7546396c6e4b1a";
+ sha256 = "11w1z653klghi6inv9n92cigz8m3c67j3r18mdk39inc3izwplkj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/ac-slime";
@@ -944,12 +925,12 @@
ace-jump-buffer = callPackage ({ avy, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ace-jump-buffer";
- version = "20170828.2153";
+ version = "20171031.850";
src = fetchFromGitHub {
owner = "waymondo";
repo = "ace-jump-buffer";
- rev = "02797c22c10a817dbbdfbd8fddceeba6c4f0499a";
- sha256 = "13wq92ia18q9vyhmvnz1grl1l18hxnaisb7hv13dhfc06alcsrw2";
+ rev = "ae5be0415c823f7bb66833aa4af2180d4cf99cef";
+ sha256 = "0zg4x5faxkp0gnjq7209hn74qkzmk8k7wbr7k8wxpssjbnmxkvd1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/31100b5b899e942de7796bcbf6365625d1b62574/recipes/ace-jump-buffer";
@@ -1028,12 +1009,12 @@
ace-link = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ace-link";
- version = "20170904.340";
+ version = "20170925.723";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "ace-link";
- rev = "34eefe3c94042a20abf4d340fdae71955a087926";
- sha256 = "02lh4kmjwf8d67b33ha4shwkkfvy9igvg88v5xq7282wxp6y3lx7";
+ rev = "eee81e6f75b078a207a547e0e8cff8c3d4f0b07c";
+ sha256 = "03p8cdakbx5pz9f8s01chd0bzmgsz50zi433k6gh0vw553y8vcmi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/68032f40c0ce4170a22db535be4bfa7099f61f85/recipes/ace-link";
@@ -1216,12 +1197,12 @@
add-node-modules-path = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "add-node-modules-path";
- version = "20170501.151";
+ version = "20170914.1912";
src = fetchFromGitHub {
owner = "codesuki";
repo = "add-node-modules-path";
- rev = "8eef7fa6765af1716fc21db08f19f3d3e9b68998";
- sha256 = "1dm2gdhs9zy5jqhbqipdgzfj24mrzxz064ax9l2dg0lqylk1dc0q";
+ rev = "eb09f4743af210a8e27f21889b4e0fef33208e4a";
+ sha256 = "064gzcyx6nkq9wdrf6sd64fs8biwfrn25qj9vv7gznlrl5rg31x9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/63e99d8fc0678d7b1831cae8940e9e6547780861/recipes/add-node-modules-path";
@@ -1279,12 +1260,12 @@
aes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "aes";
- version = "20170607.157";
+ version = "20171028.2323";
src = fetchFromGitHub {
owner = "Sauermann";
repo = "emacs-aes";
- rev = "8d9ddaa7d13875745241f0f98758b1d72dd3be92";
- sha256 = "1d998xyfnzgci62h0wv1n9a7hlk23ngcbl83k04ahz61g7haqnh2";
+ rev = "b7d5da89c3443292e4f0b1c9d254d459933cf5af";
+ sha256 = "0nz1lf77qr3vm90rm02d4inw8glav722rxsiqds76m4xsjrq02m7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/33ca3106852f82624b36c7e3f03f5c0c620f304f/recipes/aes";
@@ -1321,12 +1302,12 @@
ag = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "ag";
- version = "20170712.1549";
+ version = "20170915.1249";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "ag.el";
- rev = "74d00c48a98211001c844ab4386d00420ccc850a";
- sha256 = "1mjgl1pwaf0wl8hmzcwxq1g58mbi63ajbvhxljlysyfdkw15lvlq";
+ rev = "3b567902ccbec4ed9b8c5f5cd369be833e485e79";
+ sha256 = "1ihhmz4ww6iqbjbv1cvssixn01bkd2cl8pij7p32dxyyd8jdwlkq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/67f410ac3a58a038e194bcf174bc0a8ceceafb9a/recipes/ag";
@@ -1346,8 +1327,8 @@
src = fetchFromGitHub {
owner = "davidshepherd7";
repo = "aggressive-fill-paragraph-mode";
- rev = "c5185ad673c01e5103ab4a078095c3e2ce7ab039";
- sha256 = "11dppmpdv26m9l5cnnnylihiss2a09zyyb7kqdrk3djdqvqplqb4";
+ rev = "bcbc63d1c93cd8dc5bf2fc6eb4988fa76375c631";
+ sha256 = "042xvhfc7h571rdriixdf2s2aai8qz4w1wddbbbsq3ir0n814zp3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/982f5936f2d83222263df2886ca0b629076366bb/recipes/aggressive-fill-paragraph";
@@ -1363,12 +1344,12 @@
aggressive-indent = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "aggressive-indent";
- version = "20170627.1223";
+ version = "20171012.1107";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "aggressive-indent-mode";
- rev = "d6778ae89cd2d40949aa076a43e327f7acff59c3";
- sha256 = "0xya19w1bwpqrrqvmms0lfhqb168iv7j6kvnn49zbynnf9dhgr9w";
+ rev = "1d7185d27020c3e91a7da21800716079297938ac";
+ sha256 = "0397kfy0lmgdic4jc8fqhsgpv8r4lrqcfanqbfbchfxwfswbqb8p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/aggressive-indent";
@@ -1383,11 +1364,11 @@
}) {};
ahg = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "ahg";
- version = "20161110.455";
+ version = "20171003.39";
src = fetchhg {
url = "https://bitbucket.com/agriggio/ahg";
- rev = "0e1d1b4142e7";
- sha256 = "09606q8b9qhz1szshv8aapc7450j085rjf2fv769vbivr3kshqvh";
+ rev = "6a4cc7a7eee6";
+ sha256 = "09c3rawxqxxbl648bq1akawmgwiwppzd9g2sspza0k52adsb3rps";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/ahg";
@@ -1424,12 +1405,12 @@
ahungry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ahungry-theme";
- version = "20170702.2226";
+ version = "20171029.2107";
src = fetchFromGitHub {
owner = "ahungry";
repo = "color-theme-ahungry";
- rev = "e3d7e22cb10582a443b0e245be68aca936cd6abf";
- sha256 = "0fsip64bxs55kkqmpfcg4nr391b6wsd8hiq4fxvwww7n52lwsn5s";
+ rev = "6b078bf41f59ea0158b01742cae428ed61c4bc35";
+ sha256 = "0c61wsvb82r2ygiyk3na559y0jhba266igampa43g4qdphkjzfqy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/520295978fd7de3f4266dd69cc30d0b4fdf09db0/recipes/ahungry-theme";
@@ -1487,12 +1468,12 @@
alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }:
melpaBuild {
pname = "alchemist";
- version = "20170803.414";
+ version = "20171029.2307";
src = fetchFromGitHub {
owner = "tonini";
repo = "alchemist.el";
- rev = "8ea2db4781e367c1cf8ce2eec4222daa7d1b7b57";
- sha256 = "0gq4l95krvirv2rb4l52gka39588k817g4kl483hj2ii9il32gd0";
+ rev = "4beb4c9ceee0534a36f7669aa35fcbdfd6bef7b7";
+ sha256 = "0k1k5rb95nyndzhin47r4nzap4fp3dr57gv557wzy3a6jpl88fgz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6616dc61d17c5bd89bc4d226baab24a1f8e49b3e/recipes/alchemist";
@@ -1508,12 +1489,12 @@
alda-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "alda-mode";
- version = "20170803.1852";
+ version = "20171030.1008";
src = fetchFromGitHub {
owner = "jgkamat";
repo = "alda-mode";
- rev = "08556b3050c0bfc2d8f0a6d918610dbb2b85958f";
- sha256 = "1f2m7pz3l62gk5ndfh49hm87ihz0lfk28izps9j3i68h4zclk3ls";
+ rev = "3a08f8349a1ebe8e0ae8622f5bf6ed93491dd785";
+ sha256 = "1lrgxawhsaziwvvs16n0339xn0m1333028q0gj3md23bpgrjqa5p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode";
@@ -1550,12 +1531,12 @@
alert = callPackage ({ fetchFromGitHub, fetchurl, gntp, lib, log4e, melpaBuild }:
melpaBuild {
pname = "alert";
- version = "20170824.1140";
+ version = "20171024.1907";
src = fetchFromGitHub {
owner = "jwiegley";
repo = "alert";
- rev = "08f42ced409b6edd70e4b13ed648f16240dc1ec1";
- sha256 = "13my3m81binijaz9r113k1xll6p86qrcxacppzm20r71gpa1iifb";
+ rev = "206d7095c93a25bb41af17cd26fd3967ddd57e00";
+ sha256 = "1lyvq0zkamlyv3z23x8hb8dirjd45bihqhmwdgilnw3y139vhm4l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/113953825ac4ff98d90a5375eb48d8b7bfa224e7/recipes/alert";
@@ -1613,12 +1594,12 @@
all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild, memoize }:
melpaBuild {
pname = "all-the-icons";
- version = "20170817.642";
+ version = "20171011.324";
src = fetchFromGitHub {
owner = "domtronn";
repo = "all-the-icons.el";
- rev = "d3550f8e0f8df6509e7f29a1ffbffc0f17144704";
- sha256 = "09y1g4dphkhzrxym1bwxgx5f3hzvh1v4shbrr59bvdqymv93dagl";
+ rev = "b93707e3a3a7a4968b3e212b890edfe265dcd57d";
+ sha256 = "09hyg0fs3qgyc6dbn23pw8p7w2m9xvkf5cz8v0f18a7fkvq2j2f9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons";
@@ -1790,12 +1771,12 @@
amx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "amx";
- version = "20170810.1842";
+ version = "20170923.835";
src = fetchFromGitHub {
owner = "DarwinAwardWinner";
repo = "amx";
- rev = "ba09f5ecf451d278a6cf5721b6942ad8d81ab911";
- sha256 = "0xilab0v5qzvz6g8n10jdb9vz2pmlhgz6pc9cc3qsgg54r3igsv2";
+ rev = "88ab7ccb2a88b5cd3ecc4d703ae9373df3e4971c";
+ sha256 = "1n1zsrlj272scl4xcbys86d6gxnaq08vp5frd96i47c1an75p0xw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c55bfad05343b2b0f3150fd2b4adb07a1768c1c0/recipes/amx";
@@ -1811,12 +1792,12 @@
anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }:
melpaBuild {
pname = "anaconda-mode";
- version = "20170405.301";
+ version = "20170924.704";
src = fetchFromGitHub {
owner = "proofit404";
repo = "anaconda-mode";
- rev = "0f9576791b86e0b315447e6823b3a7db131cd826";
- sha256 = "1qqh1gg4sanh0vi624gys9wdncmvc92kly4zlwl6a9jhi3sr7w3s";
+ rev = "89fc16d50b889a17521084347b28f3011b84e113";
+ sha256 = "08wdci57vig88iy5kk57k5qjkzphbbzy8g7b87hxakfgdmcwpg3g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode";
@@ -1850,26 +1831,6 @@
license = lib.licenses.free;
};
}) {};
- anchored-transpose = callPackage ({ fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "anchored-transpose";
- version = "20080904.2254";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/anchored-transpose.el?revision=8";
- sha256 = "1hklypbp79pgaf1yklbm3qx4skm3xlml0cm1r9b9js3dbqyha651";
- name = "anchored-transpose.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/993271c9931170c3352daa3c1c0a8bcfa6915d9a/recipes/anchored-transpose";
- sha256 = "19dgj1605qxc2znvzj0cj6x29zyrh00qnzk2rlwpn9hvzypg9v7w";
- name = "anchored-transpose";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/anchored-transpose";
- license = lib.licenses.free;
- };
- }) {};
android-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "android-mode";
@@ -2041,12 +2002,12 @@
ansible = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "ansible";
- version = "20161218.1707";
+ version = "20170926.1951";
src = fetchFromGitHub {
owner = "k1LoW";
repo = "emacs-ansible";
- rev = "a712d9b48809c975525cb059ea278cbe8a839f5a";
- sha256 = "1jfksnk5fvr4h8mqb0mr2czyxnjmcdlrqdylvj0k0ks6xnskza91";
+ rev = "9da54a2a426dca259ec9c2a8a60fb58e954be5bc";
+ sha256 = "16z286gqy18s6bff1njkjpy0swrkfyarvb5xvik49pigd8hzh495";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8e45bf58b980ff542a5e887707a6361eb5ac0492/recipes/ansible";
@@ -2415,25 +2376,6 @@
license = lib.licenses.free;
};
}) {};
- aok = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "aok";
- version = "20130824.427";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/aok.el?revision=13";
- sha256 = "10vdmxzifxx3fkpyg76ngnj79k3d2pq0f322rd8ssc66alxhkz3g";
- name = "aok.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/38eee4f0f7ad25d9b1de9011e63b82400177cdd5/recipes/aok";
- sha256 = "1nkkbfwqp5r44wjwl902gm0xc8p3d2qj5mk1cchilr2rib52zd46";
- name = "aok";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/aok";
- license = lib.licenses.free;
- };
- }) {};
aozora-view = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "aozora-view";
@@ -2521,12 +2463,12 @@
apiwrap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "apiwrap";
- version = "20170908.1740";
+ version = "20171022.2203";
src = fetchFromGitHub {
owner = "vermiculus";
repo = "apiwrap.el";
- rev = "db7a2abbbb74719dfd0867612a9a3bde4c574cc7";
- sha256 = "133mgzks4ig2z67bk63gligg45zj82mra99m9qdz7d3qpx7c9027";
+ rev = "79422b610f2c3d9f52fb35449485a2fc541bc5a0";
+ sha256 = "0i2k975szdgzmrbwkvcnhrk73ndvk0q215fn68sb5m4zf43ifwxz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap";
@@ -2602,35 +2544,15 @@
license = lib.licenses.free;
};
}) {};
- apropos-fn-plus-var = callPackage ({ fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "apropos-fn-plus-var";
- version = "20170221.748";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/apropos-fn+var.el";
- sha256 = "0aa8d92ibbi1ix60j73nhvy16l8dkb3njn9d9z256jixmvzab7gr";
- name = "apropos-fn+var.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/cd66a7c1a54ede8a279effeee5326be392058d1c/recipes/apropos-fn+var";
- sha256 = "1s5gnsipsj7dhc8ca806grg32i6vlwm78hcxhrbs830vx9k84g5x";
- name = "apropos-fn-plus-var";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/apropos-fn+var";
- license = lib.licenses.free;
- };
- }) {};
apropospriate-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "apropospriate-theme";
- version = "20170829.754";
+ version = "20171010.1420";
src = fetchFromGitHub {
owner = "waymondo";
repo = "apropospriate-theme";
- rev = "68145a891348cb74db5209548c74dbc8a80e6902";
- sha256 = "1r46810dn99cnbv3railbw79k42sz1pmhx2fbx60c4g80w2kcjy6";
+ rev = "b4d5a2fedec176d3562943668609766fab0b23ff";
+ sha256 = "0y31zx6npv03ygjywy23pvrpvjwi1fh1qhs1qzxsi25pbbk1hkq0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1da33013f15825ab656260ce7453b8127e0286f4/recipes/apropospriate-theme";
@@ -2643,22 +2565,23 @@
license = lib.licenses.free;
};
}) {};
- apu = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "apu";
- version = "20170221.750";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/apu.el?revision=27";
- sha256 = "15mq2b0df4hx53hqvgl3hcrbf9ww370byg90cail6rm50wamyik6";
- name = "apu.el";
+ apt-sources-list = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "apt-sources-list";
+ version = "20171004.1143";
+ src = fetchgit {
+ url = "https://git.korewanetadesu.com/apt-sources-list.git";
+ rev = "842c3896f660295e4c16938aa1fd195e5d377460";
+ sha256 = "1d1v2h91vabqdrjcrdnzqj4xzmm7gbad4mxcphrj5yfnc4rrfc12";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/ad04078221946c9d6b758809ec03ff88efce7322/recipes/apu";
- sha256 = "0399rmjwcs7fykj10s9m0lm2wb1cr2bzw2bkgm5rp4n3va0rzaa2";
- name = "apu";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/141a22e593415302d64cf8ebd2635a1baf35eb38/recipes/apt-sources-list";
+ sha256 = "1gnl6zqv6imk2qpv4lj7qyjgf1ldxib3k14gsmwqm0c1zwjsid3j";
+ name = "apt-sources-list";
};
- packageRequires = [];
+ packageRequires = [ emacs ];
meta = {
- homepage = "https://melpa.org/#/apu";
+ homepage = "https://melpa.org/#/apt-sources-list";
license = lib.licenses.free;
};
}) {};
@@ -2704,6 +2627,27 @@
license = lib.licenses.free;
};
}) {};
+ archive-rpm = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "archive-rpm";
+ version = "20171016.112";
+ src = fetchFromGitHub {
+ owner = "legoscia";
+ repo = "archive-rpm";
+ rev = "e2fac6c018c19001f1f28e7c80721724684f8941";
+ sha256 = "1qq0z5mmbhd0ma8v8bxy53n6ynqz5qf9n3h7566dylmdncyyv7hw";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e5f5653e62afdc022eac30bda3d21bd2d2625d2e/recipes/archive-rpm";
+ sha256 = "0s53zbn71lb008gw3f0b5w4q0pw0vgiqbffgnyib24sh03ijl7z7";
+ name = "archive-rpm";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/archive-rpm";
+ license = lib.licenses.free;
+ };
+ }) {};
arduino-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "arduino-mode";
@@ -2830,25 +2774,6 @@
license = lib.licenses.free;
};
}) {};
- ascii = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "ascii";
- version = "20130824.500";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/ascii.el?revision=10";
- sha256 = "05fjsj5nmc05cmsi0qj914dqdwk8rll1d4dwhn0crw36p2ivql75";
- name = "ascii.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ascii";
- sha256 = "0f90anxrpnb8k1lqmz0iim4yp20riy19palwmdyl840hz69m98cd";
- name = "ascii";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/ascii";
- license = lib.licenses.free;
- };
- }) {};
asilea = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "asilea";
@@ -2915,12 +2840,12 @@
async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "async";
- version = "20170823.2116";
+ version = "20171015.2239";
src = fetchFromGitHub {
owner = "jwiegley";
repo = "emacs-async";
- rev = "5863eefbcd445f0fe917646f1326a9c86f067865";
- sha256 = "16m1ykbjawia3nh6qkmp38yrdg58pc7k3vpfq364gf31qpsq6rwg";
+ rev = "424ecd8a28cd59fe7d2de3cb4b37a4224e34c123";
+ sha256 = "0zmbg3r6sykmchy8hhbw8glzl8xvki030rzg9r55v4g61k8qy13r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/async";
@@ -3020,12 +2945,12 @@
atomic-chrome = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, websocket }:
melpaBuild {
pname = "atomic-chrome";
- version = "20161213.730";
+ version = "20171022.107";
src = fetchFromGitHub {
owner = "alpha22jp";
repo = "atomic-chrome";
- rev = "1b96d563c5d435baf8dfa9cdae5ef38ce34629b9";
- sha256 = "0caiv0snjxj0f1p0rx18r1w4nbsk8shrin2dr2ddg54mpxzf8r98";
+ rev = "1bd79fc940d2be82eaec20aca2069677e156a697";
+ sha256 = "1j5brpmbahnrp8kxphq10g0l703czdalqa731y3s2p3m3gida54x";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/35785773942a5510e2317ded5bdf872ffe434e8c/recipes/atomic-chrome";
@@ -3125,12 +3050,12 @@
auth-password-store = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, seq }:
melpaBuild {
pname = "auth-password-store";
- version = "20170123.107";
+ version = "20171026.537";
src = fetchFromGitHub {
owner = "DamienCassou";
repo = "auth-password-store";
- rev = "b9fb3ef8d4ebe7bef939a3cf574f9caa833347c9";
- sha256 = "1rzqz560zqsymdpv84n1z17jyf7k75797y4bkzhk5grd3ry77x9j";
+ rev = "79e297e9f2c2bccb545994ddda356f958889b4ac";
+ sha256 = "11nc3hicp8n21rmj00svzh0kfhyb92w37ipk6nkl1fd3jk1xzr7d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0f4d2a28373ba93da5b280ebf40c5a3fa758ea11/recipes/auth-password-store";
@@ -3185,25 +3110,6 @@
license = lib.licenses.free;
};
}) {};
- auto-capitalize = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "auto-capitalize";
- version = "20160415.1403";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/auto-capitalize.el?revision=19";
- sha256 = "0xywyfpsi64g9lihm5ncmjrj06iq9s6pp9fmsgj1hdf9y0z65lg0";
- name = "auto-capitalize.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/d4edbba637a27a641f53f8a51861b176cabaa286/recipes/auto-capitalize";
- sha256 = "18fygc71n9bc0vrpymz2f7sw9hzkpqxzfglh53shmbm1zns3wkw0";
- name = "auto-capitalize";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/auto-capitalize";
- license = lib.licenses.free;
- };
- }) {};
auto-compile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }:
melpaBuild {
pname = "auto-compile";
@@ -3501,12 +3407,12 @@
auto-dim-other-buffers = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "auto-dim-other-buffers";
- version = "20170911.307";
+ version = "20170925.1208";
src = fetchFromGitHub {
owner = "mina86";
repo = "auto-dim-other-buffers.el";
- rev = "90f6a6f0fba8dac1cfd5e4140638eceebc88bfab";
- sha256 = "1z1d7gzfv573rw1kr3bb6viybj63zbfwad15gvgha9fld2jhmakz";
+ rev = "d1ee176652d7f5a77608e54175b7e67c31d41381";
+ sha256 = "1qqb051b16z2ay1xqx2ncy2p07cs29dv6wdy1x3n3w85yw9kh0mx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/auto-dim-other-buffers";
@@ -3561,34 +3467,15 @@
license = lib.licenses.free;
};
}) {};
- auto-install = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "auto-install";
- version = "20150418.1702";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/auto-install.el?revision=82";
- sha256 = "043pb2wk7jh0jgxphdl4848rjyabna26gj0vlhpiyd8zc361pg9d";
- name = "auto-install.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad02a591b981518abd147475195f9484e4012fc/recipes/auto-install";
- sha256 = "1gaxc2ya4r903k0jf3319wg7wg5kzq7k8rfy8ac9b0wfzv247ixk";
- name = "auto-install";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/auto-install";
- license = lib.licenses.free;
- };
- }) {};
auto-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "auto-minor-mode";
- version = "20170716.717";
+ version = "20170917.1437";
src = fetchFromGitHub {
owner = "joewreschnig";
repo = "auto-minor-mode";
- rev = "06fa6975a9fb171b91a8b8234d65ef72374d64e2";
- sha256 = "19r71hdgz367f6cgyqfdpilwlmhrjw5drmijpq8m0fxgysnmz2qd";
+ rev = "07ea9df59c5364d1938beef3dfbba24afd46c230";
+ sha256 = "007w6j6zhjv2647njh80vfbrhjzhmb8rx9yi9rf94fhf17z8pmk3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b3ab5f048034777551e344101d8415cac92362c8/recipes/auto-minor-mode";
@@ -3751,12 +3638,12 @@
auto-virtualenvwrapper = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s, virtualenvwrapper }:
melpaBuild {
pname = "auto-virtualenvwrapper";
- version = "20170618.52";
+ version = "20170916.1304";
src = fetchFromGitHub {
owner = "robert-zaremba";
repo = "auto-virtualenvwrapper.el";
- rev = "516cb0406a98fd5a41d389f37544f11b28b1d027";
- sha256 = "0y82n8354nri2qpz7bn58rbhpjkqiaf82q9izhl6jy12g63g416l";
+ rev = "0f2cc8ea8f211c7b88f852ae6ffe677914652b92";
+ sha256 = "1vm2nf7i9v56v57r7ckz8i1y3fk5s302bcfglywqysm4b8k36mp8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/02a209ae8f9fc68feb3bb64d32d129fedef2b80b/recipes/auto-virtualenvwrapper";
@@ -3793,12 +3680,12 @@
autobookmarks = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "autobookmarks";
- version = "20170417.1407";
+ version = "20171021.1532";
src = fetchFromGitHub {
owner = "Fuco1";
repo = "autobookmarks";
- rev = "cd19e15b8951a7af55d67a5bb4e0948e62b0a119";
- sha256 = "1xv73ls9mhvgjxa9lpw3brmzdd8739zyn9nqb1lrnvx468bz4kry";
+ rev = "b40c69f2d1c419adad516bee81b07b99110e5cc3";
+ sha256 = "0dailajx26dixlibqps5wfh224ps7azm453lmzxjc2d10mgapi5v";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e40e6ebeb30b3f23ad37a695e011431a48c5a62e/recipes/autobookmarks";
@@ -3853,26 +3740,6 @@
license = lib.licenses.free;
};
}) {};
- autofit-frame = callPackage ({ fetchurl, fit-frame, lib, melpaBuild }:
- melpaBuild {
- pname = "autofit-frame";
- version = "20170221.752";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/autofit-frame.el?revision=48";
- sha256 = "0c2b0d743w1c58iicg9r194zq2l5xxa08zyxj0nljw2dz9lhacwm";
- name = "autofit-frame.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/autofit-frame";
- sha256 = "0p24qqnfa1vfn5pgnpvbxwi11zjkd6f3cv5igwg6h0pr5s7spnvw";
- name = "autofit-frame";
- };
- packageRequires = [ fit-frame ];
- meta = {
- homepage = "https://melpa.org/#/autofit-frame";
- license = lib.licenses.free;
- };
- }) {};
automargin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "automargin";
@@ -4020,15 +3887,36 @@
license = lib.licenses.free;
};
}) {};
+ avk-emacs-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "avk-emacs-themes";
+ version = "20171001.235";
+ src = fetchFromGitHub {
+ owner = "avkoval";
+ repo = "avk-emacs-themes";
+ rev = "bf781eec7d46cce829ac5bdb114e728a110366e7";
+ sha256 = "0bj51ii8vsd2gwyykxp1hvkp4r9kbc0b7ajskf8i5vb8qvpvkali";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ef362a76a3881c7596dcc2639df588227b3713c0/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 = "20170819.1039";
+ version = "20171014.20";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "avy";
- rev = "245b5d62feb6f276971be53e63311de4a243bfbc";
- sha256 = "0r2p01hnflaa7dc0xfrrd5hgwgx530m4cxzpw3p1nmdajlk4mbyy";
+ rev = "36f768d9e320d300b81799e0fcc097cb89aad780";
+ sha256 = "05jx71v5shdynia21wkrc1012r0wajdn0km1rclpyvf3ck34rh8q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/77fac7a702d4086fb860514e377037acedc60412/recipes/avy";
@@ -4086,12 +3974,12 @@
avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }:
melpaBuild {
pname = "avy-migemo";
- version = "20170907.955";
+ version = "20171031.915";
src = fetchFromGitHub {
owner = "momomo5717";
repo = "avy-migemo";
- rev = "0074b70fda731169888571013b4b618a6f0914e7";
- sha256 = "153xv2k0v86k8c2w7cm68d6vs3xbrbhc660ka1dywprr7q1l3jrk";
+ rev = "5598fd25e483d8521e6d5f691802fa125947d7cf";
+ sha256 = "1gkn1qbywv8as3csp5s1fwmrp89bmbqgyl7av0c1v9ggx7gkhd5f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6a02db29eb3e4b76b4a9cdbc966df5a1bd35dec0/recipes/avy-migemo";
@@ -4125,25 +4013,6 @@
license = lib.licenses.free;
};
}) {};
- awk-it = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "awk-it";
- version = "20130917.1148";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/awk-it.el?revision=10";
- sha256 = "1r1vbi1r3rdbkyb2naciqwja7hxigjhqfxsfcinnygabsi7fw9aw";
- name = "awk-it.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/awk-it";
- sha256 = "0qic9m7c31sq4xgx7hnkhj0j0mfy26smghg266lrp5jii833qlz3";
- name = "awk-it";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/awk-it";
- license = lib.licenses.free;
- };
- }) {};
aws-ec2 = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, tblui }:
melpaBuild {
pname = "aws-ec2";
@@ -4165,26 +4034,6 @@
license = lib.licenses.free;
};
}) {};
- axiom-environment = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "axiom-environment";
- version = "20161120.1200";
- src = fetchhg {
- url = "https://bitbucket.com/pdo/axiom-environment";
- rev = "110e20a7a86c";
- sha256 = "0s18bbfw4kcv9iij1016pamq394rg8xr7016qp6cxyklp9hivcdm";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/axiom-environment";
- sha256 = "1d3h1fn5zfbh7kpm2i02kza3bq9s6if4yd2vvfjdhgrykvl86h66";
- name = "axiom-environment";
- };
- packageRequires = [ emacs ];
- meta = {
- homepage = "https://melpa.org/#/axiom-environment";
- license = lib.licenses.free;
- };
- }) {};
babel = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "babel";
@@ -4255,25 +4104,6 @@
license = lib.licenses.free;
};
}) {};
- backup-each-save = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "backup-each-save";
- version = "20130704.732";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/backup-each-save.el?revision=2";
- sha256 = "0b9vvi2m0fdv36wj8mvawl951gjmg3pypg08a8n6rzn3rwg0fwz7";
- name = "backup-each-save.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/88fd979eb479701303e65e68c581f8f847887842/recipes/backup-each-save";
- sha256 = "1fv9sf6vkjyv93vil4l9hjm2fg73zlxbnif0xfm3kpmva9xin337";
- name = "backup-each-save";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/backup-each-save";
- license = lib.licenses.free;
- };
- }) {};
backup-walker = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "backup-walker";
@@ -4358,27 +4188,6 @@
license = lib.licenses.free;
};
}) {};
- baidu-life = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "baidu-life";
- version = "20160426.519";
- src = fetchFromGitHub {
- owner = "lujun9972";
- repo = "el-baidu-life";
- rev = "5c4b3dbc016a2656cc2febaa2ac2268c05725b5c";
- sha256 = "024gpdjr1lbqjg6md526g4wz2shpgfpdrrd2m1bn4fissbzj70i1";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/101ae6ea151df8d423f00cb6ac391374d0f7f3c8/recipes/baidu-life";
- sha256 = "0rib50hja33qk8dmw5i62gaxhx7mscj2y0n25jmnds7k88ms8z19";
- name = "baidu-life";
- };
- packageRequires = [ cl-lib ];
- meta = {
- homepage = "https://melpa.org/#/baidu-life";
- license = lib.licenses.free;
- };
- }) {};
bar-cursor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bar-cursor";
@@ -4403,12 +4212,12 @@
base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "base16-theme";
- version = "20170824.1656";
+ version = "20171025.1545";
src = fetchFromGitHub {
owner = "belak";
repo = "base16-emacs";
- rev = "bb4f204f51439fcf8ae45429d150861523d1f1d0";
- sha256 = "1vkv5kqs9crbk2j4jynyrx2fzijhimnhm2fvgwcxsb6hx3g257id";
+ rev = "1578c6cd8f76a664bda7fc9b2515ee8106552cb2";
+ sha256 = "0wp2vfk7hpvagdiad9g4wj5992f1fv4v77x387v1sz5w1zn195aj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme";
@@ -4424,12 +4233,12 @@
bash-completion = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bash-completion";
- version = "20170909.650";
+ version = "20170924.1021";
src = fetchFromGitHub {
owner = "szermatt";
repo = "emacs-bash-completion";
- rev = "a789093cd32b2007cb64943de30aca51d5b3106b";
- sha256 = "1fqkslxjdfqcwq1dj4fhw80naq58gpz3d50xar4wrxn76z7vkbcz";
+ rev = "31bc1c1c21691668c6cc16a46361490d5bec303a";
+ sha256 = "0iq9q0isaynrjhzgkm5hvw26162m52vbzwf12vic5nr9frxbxkv5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/bash-completion";
@@ -4449,8 +4258,8 @@
src = fetchFromGitHub {
owner = "nick96";
repo = "basic-c-compile";
- rev = "335e96e19647ad7245fb68cf7e68cf86c5023d23";
- sha256 = "1sq6mmg5361z30psn6x2ylpr8yxsbg3d47qai9px7p889p63384l";
+ rev = "0129786aeee50d7bb0020d9fc2b7508875d403e8";
+ sha256 = "0q6scyva1psyam7jzygqcr1wayf70vrp237hm01q5i9cin8j4j1z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/basic-c-compile";
@@ -4463,6 +4272,27 @@
license = lib.licenses.free;
};
}) {};
+ basic-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
+ melpaBuild {
+ pname = "basic-mode";
+ version = "20171027.1114";
+ src = fetchFromGitHub {
+ owner = "dykstrom";
+ repo = "basic-mode";
+ rev = "7a76ec2d45f6bc1e4b5a4c8996c4bf27a31741e6";
+ sha256 = "02q9sxx9g8pqyiknbzy48qbmnvgl1pmcgsppbk7rybb68kq5zlqd";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/71801bdc0720f150edeab6796487c753c6e7c3f5/recipes/basic-mode";
+ sha256 = "1l0ylzww7jg6l804fdrklhay4is0wx1drfi9l9wn7gcdjh76mr6g";
+ name = "basic-mode";
+ };
+ packageRequires = [ emacs seq ];
+ meta = {
+ homepage = "https://melpa.org/#/basic-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
basic-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "basic-theme";
@@ -4484,25 +4314,6 @@
license = lib.licenses.free;
};
}) {};
- batch-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "batch-mode";
- version = "20140807.1350";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/batch-mode.el?revision=14";
- sha256 = "1aa611jrzw4svmxvw1ghgh53x4nry0sl7mxmp4kxiaybqqvz6a1p";
- name = "batch-mode.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/7fb675b865b8fa1497cdd33764bad051b2fd4d7e/recipes/batch-mode";
- sha256 = "1p0rh5r8w00jag64sbjy8xb9g6lqhm2fz476v201kbrj9ggp643x";
- name = "batch-mode";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/batch-mode";
- license = lib.licenses.free;
- };
- }) {};
bats-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bats-mode";
@@ -4547,11 +4358,11 @@
}) {};
bbdb = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "bbdb";
- version = "20170725.300";
+ version = "20171017.817";
src = fetchgit {
url = "https://git.savannah.nongnu.org/git/bbdb.git";
- rev = "c951e15cd01d84193937ae5e347143321c3a2da9";
- sha256 = "1m19f74zkyh0zyigv807rlznvf2l72kdg6gfizf8pan85qvk949l";
+ rev = "339aa15f20e1f542db97a3f3d2d65a61ce5c0e93";
+ sha256 = "00782y1vas8rd9g30jqhnc24bsqsy5c31qn85ipi1vc8lrbyfcg1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/bbdb";
@@ -4672,12 +4483,12 @@
bbyac = callPackage ({ browse-kill-ring, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bbyac";
- version = "20170815.28";
+ version = "20171007.722";
src = fetchFromGitHub {
owner = "baohaojun";
repo = "bbyac";
- rev = "e748e07bd77ef93f3c3110b5cde4e68f50b04efb";
- sha256 = "1030gs02hb6kjd4w5iw0li8k7lcpklya37ybl62mkqhrzfri61bh";
+ rev = "584af0efa4809252bb37cf165df029410198327e";
+ sha256 = "17cmlc49y26j2salkmcsck9618s1p7y49phiy7hvzkipa13qmj9w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/92c10c13a1bd19c8bdbca128852d1c91b76f7002/recipes/bbyac";
@@ -4714,12 +4525,12 @@
beacon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
melpaBuild {
pname = "beacon";
- version = "20170404.906";
+ version = "20171017.1540";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "beacon";
- rev = "f1a3ff5ea8fecf9bf250205de66aedf0bf49c35b";
- sha256 = "0wr2ffwbi5w23a7hbdmn5ijfy5gmizrmy75zj6m1bz4mbw23ccvn";
+ rev = "729338b02a0e331a4faf475da9f54771a3470106";
+ sha256 = "0mypzfasclq7bmw0i8hfyp8c1ycd3kdgd5h1faygzh9r0phh7ciy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d09cfab21be800831644218e9c8c4433087951c0/recipes/beacon";
@@ -4756,12 +4567,12 @@
beginend = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "beginend";
- version = "20170810.624";
+ version = "20171003.548";
src = fetchFromGitHub {
owner = "DamienCassou";
repo = "beginend";
- rev = "bc608ef0735e5b7e34b320b899fd2b3ce2156d1b";
- sha256 = "1vb9505lkzkl9ipczs3q0vmf70mzf9l1wk703g9b5aiss81r5w4i";
+ rev = "2762796b54c7fd8613b02c041b2b9afeb13eb9fa";
+ sha256 = "1g1mml0npypfk0vhicy4s7fa5df76xqpb80llxcfbnl2si9fzyfb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/31c1157d4fd9e47a780bbd91075252acdc7899dd/recipes/beginend";
@@ -4795,6 +4606,27 @@
license = lib.licenses.free;
};
}) {};
+ benchstat = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "benchstat";
+ version = "20171013.2012";
+ src = fetchFromGitHub {
+ owner = "Quasilyte";
+ repo = "benchstat.el";
+ rev = "a5b67cf7972ca2bbc9f5bc6a0f521ab02b76d4f0";
+ sha256 = "02v5l9qvzcr58qr973phgj1c846pqp3cj16khn4h9v3f3gb180n1";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d9180fbedf95f9b1f5810bbf4929dfee513f89e3/recipes/benchstat";
+ sha256 = "0h2zi4gh23bas1zfj7j2x994lwgd3xyys96ipg1vq7z2b06572k9";
+ name = "benchstat";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/benchstat";
+ license = lib.licenses.free;
+ };
+ }) {};
bert = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bert";
@@ -4837,25 +4669,6 @@
license = lib.licenses.free;
};
}) {};
- better-registers = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "better-registers";
- version = "20140813.119";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/better-registers.el?revision=23";
- sha256 = "05dlhhvd1m9q642gqqj6klif13shbinqi6bi72fldidi1z6wcqlh";
- name = "better-registers.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/2667829dfc72e848ab939be0602cbec1105671b0/recipes/better-registers";
- sha256 = "01i0qjrwsc5way2h9z3pmsgccsbdifsq1dh6zhka4h6qfgrmn3bx";
- name = "better-registers";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/better-registers";
- license = lib.licenses.free;
- };
- }) {};
better-shell = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "better-shell";
@@ -5027,12 +4840,12 @@
bifocal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bifocal";
- version = "20170906.1948";
+ version = "20171004.1124";
src = fetchFromGitHub {
owner = "riscy";
repo = "bifocal-mode";
- rev = "5e89ad1a9a47e890ce080a79fd32c71eb128d1c4";
- sha256 = "1rwxw1wniws31gbmpxgglxbc2g4jag19dvsjrym0f43yy4w2mbpw";
+ rev = "a8b222b069a6bd64531b4780905989797bad8abe";
+ sha256 = "0c6vzh35lj3pg9wd4v2fy6xdmcg9kq3n5br6rp4lx257gxglzpwh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/79e71995bd8452bad2e717884f148ec74c9735fc/recipes/bifocal";
@@ -5094,8 +4907,8 @@
src = fetchFromGitHub {
owner = "jwiegley";
repo = "use-package";
- rev = "360df30683a711c443f87e495ba14cdd125a505d";
- sha256 = "0nz0gk6gf9060hbyqr5vgzwr620k6l5sk9n6jbhfyrwmcscnmilc";
+ rev = "82d15961a0f2dc7842a98030d6daee0061ef63dc";
+ sha256 = "0i9cqms0bm6vfn8mzkzv40dql2mzmp2jma1na6m8bf1z2ciszy6l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key";
@@ -5297,25 +5110,6 @@
license = lib.licenses.free;
};
}) {};
- blank-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "blank-mode";
- version = "20130824.459";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/blank-mode.el?revision=40";
- sha256 = "1wdplnmdllbydwr9gyyq4fbkxl5xjh7220vd4iajyv74pg2jkkkv";
- name = "blank-mode.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/7e687f3d3945bdff0e8e36bcff1f629d8ad921fc/recipes/blank-mode";
- sha256 = "1pyx5xwflnni9my5aqpgf8xz4q4rvmj67pwb4zxx1lghrca97z87";
- name = "blank-mode";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/blank-mode";
- license = lib.licenses.free;
- };
- }) {};
blgrep = callPackage ({ clmemo, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "blgrep";
@@ -5403,12 +5197,12 @@
blog-admin = callPackage ({ cl-lib ? null, ctable, f, fetchFromGitHub, fetchurl, lib, melpaBuild, names, s }:
melpaBuild {
pname = "blog-admin";
- version = "20170430.721";
+ version = "20170923.709";
src = fetchFromGitHub {
owner = "CodeFalling";
repo = "blog-admin";
- rev = "98e397c4014f7c81c42722028778726cbf9baf8c";
- sha256 = "0fj0yri8hayqb6fwgj5i6bw7yx4jsdq7jh9aqd5zdpmyfc6lshzr";
+ rev = "b5f2e1dad7d68ec903619f7280bb0bcb7e398a1e";
+ sha256 = "0fgzmmjxhl8i9yqx1bvb7hgkk9w4ylx73xy990qf1bl7fg21v636";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/blog-admin";
@@ -5529,12 +5323,12 @@
bonjourmadame = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bonjourmadame";
- version = "20160112.156";
+ version = "20170919.434";
src = fetchFromGitHub {
owner = "pierre-lecocq";
repo = "bonjourmadame";
- rev = "4b4baaec19d8893268a2c93b3c35ac2581d02ba4";
- sha256 = "06cpbjbv8ysz81szwgglgy5r1aay8rrzw5k86wyqg9jdzwpmilpn";
+ rev = "d3df185fce78aefa689fded8e56a654f0fde4ac0";
+ sha256 = "1acn63hd7s2z8viy52hmhncdic7m86rcqczxnz9aivikqy4hfnsi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/34c4cfd7bbf5b442a9304598ba0a23ba9b8dfae4/recipes/bonjourmadame";
@@ -5550,12 +5344,12 @@
boogie-friends = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "boogie-friends";
- version = "20170907.922";
+ version = "20171024.1955";
src = fetchFromGitHub {
owner = "boogie-org";
repo = "boogie-friends";
- rev = "c30b229fb765b42d059c15e76029379ed3fc7202";
- sha256 = "1cdl0sxa4rwr162cg8qhlwhvav4i0pv0njkfca7dg6xwfjkq6g8l";
+ rev = "ff9903783013f3598b6f44c99d47b25c5cdbed00";
+ sha256 = "0vc1pym7x6aafd88rrmm8yibq5y9wrx6b1pbgsfr7spcdq0hwwvg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5bdd06b82d002677c046876642efe1dc01bc3e77/recipes/boogie-friends";
@@ -5568,25 +5362,6 @@
license = lib.licenses.free;
};
}) {};
- bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "bookmark-plus";
- version = "20170731.1658";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/bookmark+.el";
- sha256 = "0iqvlwqilwpqlymj8iynw2miifl28h1g7z10q08rly2430fnmi37";
- name = "bookmark+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/bookmark+";
- sha256 = "0121xx7dp2pakk9g7sg6par4mkxd9ky746yk4wh2wrhprc9dqzni";
- name = "bookmark-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/bookmark+";
- license = lib.licenses.free;
- };
- }) {};
bool-flip = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bool-flip";
@@ -5716,12 +5491,12 @@
bpr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bpr";
- version = "20170823.1636";
+ version = "20170930.642";
src = fetchFromGitHub {
owner = "ilya-babanov";
repo = "emacs-bpr";
- rev = "392de473664fbf319e3585a15f7f8abd34b3dbb6";
- sha256 = "1ngz76j9mf9a1gvmwdy1r1jqxl8g4d3md95lqxq5dqbwz9076im2";
+ rev = "314b0d6f69ff5a9c2d25a1ce5a2109d67d4d9bb3";
+ sha256 = "02qj8gnhxv39y8kvlw491cbiaknll3hg03pk4xx15rffl7dyrbds";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/bpr";
@@ -5821,12 +5596,12 @@
browse-kill-ring = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "browse-kill-ring";
- version = "20160125.9";
+ version = "20171016.1312";
src = fetchFromGitHub {
owner = "browse-kill-ring";
repo = "browse-kill-ring";
- rev = "c7df6c8f5fe1e82d17b23da6d43a038784721d10";
- sha256 = "0sndzhza9k4vcf70fzxsyzrfryaz92lm1y7bbb0dx10m65qljpbi";
+ rev = "b746d01c888262e81d76f8949869cf9e02759b6a";
+ sha256 = "177vbziv65jb3xla713iblng04m0f7hdq5d4hf0jaxn7pzm61n0d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/294dc32a672e6b6b0ebfc46cdf0ff9ceacf73e89/recipes/browse-kill-ring";
@@ -5839,26 +5614,6 @@
license = lib.licenses.free;
};
}) {};
- browse-kill-ring-plus = callPackage ({ browse-kill-ring, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "browse-kill-ring-plus";
- version = "20170221.757";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/browse-kill-ring+.el";
- sha256 = "01cnh9i09b7i97aqjh8m7s18js85wm7cs25dxlkcrhy112pjb1nq";
- name = "browse-kill-ring+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/e700f4066e67991dd67f6476c783e0a5134723db/recipes/browse-kill-ring+";
- sha256 = "1flw7vmqgsjjvr2zlgz2909gvpq9mhz8qkg6hvsrzwg95f4l548w";
- name = "browse-kill-ring-plus";
- };
- packageRequires = [ browse-kill-ring ];
- meta = {
- homepage = "https://melpa.org/#/browse-kill-ring+";
- license = lib.licenses.free;
- };
- }) {};
browse-url-dwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, string-utils }:
melpaBuild {
pname = "browse-url-dwim";
@@ -5880,25 +5635,6 @@
license = lib.licenses.free;
};
}) {};
- bs-ext = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "bs-ext";
- version = "20130824.459";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/bs-ext.el?revision=8";
- sha256 = "1yslzlx54n17330sf6b2pynz01y6ifnkhipz4hggn1i55bz8hvrw";
- name = "bs-ext.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/74c4861e76bb806ec4c4fd3482162bf0d95530a8/recipes/bs-ext";
- sha256 = "0dddligqr71qdakgfkx0r45k9py85qlym7y5f204bxppyw5jmwb6";
- name = "bs-ext";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/bs-ext";
- license = lib.licenses.free;
- };
- }) {};
bshell = callPackage ({ buffer-manage, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bshell";
@@ -6049,12 +5785,12 @@
buffer-manage = callPackage ({ choice-program, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "buffer-manage";
- version = "20170912.1621";
+ version = "20170916.957";
src = fetchFromGitHub {
owner = "plandes";
repo = "buffer-manage";
- rev = "7a37c2ffa3d8ff446fe9cb5adc693095696b8341";
- sha256 = "0shxy0apdmyajlhssxkgpzcch02c1ffbpgajddbr68m8npilq6p5";
+ rev = "4a0d526ca45264971796efe67c6e41d8aa659e4c";
+ sha256 = "15p089qfz8ra6f2lhny492hiricgs39w7w5iak2zlqm6k88cl1j8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/28f8f376df810e6ebebba9fb2c93eabbe3526cc9/recipes/buffer-manage";
@@ -6108,25 +5844,6 @@
license = lib.licenses.free;
};
}) {};
- buffer-stack = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "buffer-stack";
- version = "20101223.220";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/buffer-stack.el?revision=2";
- sha256 = "0d87cl7a4rcd6plbjyf26vaar7imwd18z24xdi4dz734m9zbkg6r";
- name = "buffer-stack.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/buffer-stack";
- sha256 = "0lnd5mh20b4isa6m930dzibw3v4jyzp1ryvmz8irca28xfn0hjln";
- name = "buffer-stack";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/buffer-stack";
- license = lib.licenses.free;
- };
- }) {};
buffer-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "buffer-utils";
@@ -6256,12 +5973,12 @@
build-status = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "build-status";
- version = "20170323.1621";
+ version = "20171031.611";
src = fetchFromGitHub {
owner = "sshaw";
repo = "build-status";
- rev = "01bb9cc1776e8eaab68147175aee9879d9541c4b";
- sha256 = "1c6q6rk6rvip5xv2zdpqamprx9kqh0c6v3r939fn7m4fnyyz15fn";
+ rev = "c29a0146c5d0be274f5e17921e01698f572c23a1";
+ sha256 = "03f0h7sp0sr9kjyhvcx7i34lvc26f5x8nikfidihgzhrqpprv2b6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/23bbe012f313cf0cf4c45a66eb0bee9361ced564/recipes/build-status";
@@ -6403,12 +6120,12 @@
buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "buttercup";
- version = "20170901.422";
+ version = "20171029.1011";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "emacs-buttercup";
- rev = "11d7fdce9f46eec62ed86f4f9617e04d2c204b3a";
- sha256 = "0vaq5dgajilysn720sgd294rhzvxbr7q2nyf71m74gf42pxf791d";
+ rev = "bbbf6924ff214b518718687ead96ceec92bdbaba";
+ sha256 = "0z05rr85mf9as2byj3k1ai9x5ci45a7g425svv0ywgz1lgv2vsi4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup";
@@ -6466,12 +6183,12 @@
c-eldoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "c-eldoc";
- version = "20170618.845";
+ version = "20170917.1502";
src = fetchFromGitHub {
owner = "nflath";
repo = "c-eldoc";
- rev = "0899f497e98e285d7d2e9cf897e305587b4b0790";
- sha256 = "0yw59pm25a5xrcdl6mv30i08wnhljy6gndvnlpi09vp2dln37kbq";
+ rev = "79d09769362228058246f5e6fa183d121f7fb322";
+ sha256 = "1398lfd18zn2xym36p71yavgggqbb15xz9m7gah4w4k2bk15aczk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/c-eldoc";
@@ -6841,17 +6558,19 @@
license = lib.licenses.free;
};
}) {};
- caml = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild }: melpaBuild {
+ caml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
pname = "caml";
- version = "20151009.845";
- src = fetchsvn {
- url = "https://caml.inria.fr/svn/ocaml/trunk/emacs/";
- rev = "16561";
- sha256 = "16qw82m87i1fcnsccqcvr9l6p2cy0jdhljsgaivq0q10hdmbgqdw";
+ version = "20171020.1013";
+ src = fetchFromGitHub {
+ owner = "ocaml";
+ repo = "ocaml";
+ rev = "65252925f597008101cdb68b6dd119227106f0e2";
+ sha256 = "0627mksg7hmmz1hzalyrklsnwpz2k3jzl41dyllk5b7xpap5s9q5";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/caml";
- sha256 = "1s05s3dqxlz2qhvjr3j9akb56finpmpbnsjb5pmjnzflhc4y01cf";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml";
+ sha256 = "1ixs0626nsg1ilqdwj5rd8kicjy7mprswwy0kprppmpmc8y7xf7c";
name = "caml";
};
packageRequires = [];
@@ -6884,12 +6603,12 @@
cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }:
melpaBuild {
pname = "cargo";
- version = "20170807.607";
+ version = "20171026.13";
src = fetchFromGitHub {
owner = "kwrooijen";
repo = "cargo.el";
- rev = "61f4673b2b4d76ed6404f2c905e5de57c41ccc97";
- sha256 = "0nkrqmylyv2c7zrfy12p7j161mkg91zm9fb1gjjyq0k7ixad677q";
+ rev = "3ecf0b89b3d36874a301a7e2fb429fc026c73f35";
+ sha256 = "1mv1a0z379mr7y8by5s1lnkvp1kamch01j0yn1aqgxjry3z789dd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo";
@@ -6947,12 +6666,12 @@
cask = callPackage ({ cl-lib ? null, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build, s, shut-up }:
melpaBuild {
pname = "cask";
- version = "20161024.1205";
+ version = "20170917.1107";
src = fetchFromGitHub {
owner = "cask";
repo = "cask";
- rev = "07d8c963a4d349d856c51a471c60689734ebeda0";
- sha256 = "15fyfzd0ssjyq8n77s8h8n0by33j5q0m4hs0v5k7m8zb3ca0w7mc";
+ rev = "bf52c3ecb1356657cae12fe3229c0827181c1ed9";
+ sha256 = "0g4vnvbfvr9c2rjf0fbbvzw1ipvwgsp11sn0rjrpx5cwszghvy0w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/cask";
@@ -6989,12 +6708,12 @@
cask-package-toolset = callPackage ({ ansi, cl-lib ? null, commander, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
melpaBuild {
pname = "cask-package-toolset";
- version = "20170411.1430";
+ version = "20170921.1556";
src = fetchFromGitHub {
owner = "AdrieanKhisbe";
repo = "cask-package-toolset.el";
- rev = "aed1f12b6072a2467e0efa23c3265aaa9f414425";
- sha256 = "1as3fxs1h4gq6mv7gdsjqa59prrgzzs22c9qky8q47dr20sc9q6s";
+ rev = "2c74cd827e88c7f8360581a841e45f0b794510e7";
+ sha256 = "1hk5q6p1j7cqg5srr3v21xfyy7aas4hfj1a66h21c2xvfjra3hxw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ed71e45389626e700b93b29d5e2659b6706274d8/recipes/cask-package-toolset";
@@ -7216,26 +6935,6 @@
license = lib.licenses.free;
};
}) {};
- centered-cursor-mode = callPackage ({ fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "centered-cursor-mode";
- version = "20151001.634";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/centered-cursor-mode.el?revision=30";
- sha256 = "15psyizjz8wf9wfxwwcdmg1bxf8jbv0qy40rskz7si7vxin8hhxl";
- name = "centered-cursor-mode.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/centered-cursor-mode";
- sha256 = "1sq0hfvnm8sbqyxzr0znq0lwrhbqm961wi13yywjcwxd3x0ar3z0";
- name = "centered-cursor-mode";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/centered-cursor-mode";
- license = lib.licenses.free;
- };
- }) {};
centered-window-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "centered-window-mode";
@@ -7243,8 +6942,8 @@
src = fetchFromGitHub {
owner = "anler";
repo = "centered-window-mode";
- rev = "c46af782ada0d4062d7de5cbbdc7c7471fdd0d15";
- sha256 = "1xbfmanimq0ql61lzxx74jf4kj1g9imzgwiy1498mhbdbw295fg0";
+ rev = "6f9e873f5a98f356cee41367f2eaf1f5f5cd96fc";
+ sha256 = "0ih41g9haypr2ifi26kihwx2zfnzjh8n2898w2ljn7xzbd0nkx8c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/centered-window-mode";
@@ -7327,8 +7026,8 @@
src = fetchFromGitHub {
owner = "cfengine";
repo = "core";
- rev = "83fd2b5014d2eb5d685941bed1ee64bf750e4f94";
- sha256 = "1ffdscvp624gh8vgb01nsdbafynw7b2r83mr1nqf356jpn43ah7a";
+ rev = "b0979047d55db2aefda4adc40cd266c693a57b70";
+ sha256 = "15giw6kacnj1fa3w794gnaqjpywrdrz96rgq1igsygj1rjacrgi7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
@@ -7386,12 +7085,12 @@
cframe = callPackage ({ buffer-manage, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cframe";
- version = "20170828.919";
+ version = "20170917.1509";
src = fetchFromGitHub {
owner = "plandes";
repo = "cframe";
- rev = "8b60c482a5888464caf6d05b2a0079340bdd7be8";
- sha256 = "0skms8cwniddpns1fmpqjnhyrn1fjvv6zknzjfganpv0h10gypgk";
+ rev = "bb99672502046e87c8f029ce98c637f762a4fc54";
+ sha256 = "088px3wlvr4km913y7hajrjqnxnv6n325rk6353bkbah2d75vxq4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6e39555b2538cc8a955766c5533871396e8fe712/recipes/cframe";
@@ -7425,17 +7124,19 @@
license = lib.licenses.free;
};
}) {};
- cg = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild }: melpaBuild {
+ cg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
pname = "cg";
version = "20170911.610";
- src = fetchsvn {
- url = "https://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
- rev = "12362";
+ src = fetchFromGitHub {
+ owner = "emacsorphanage";
+ repo = "cg";
+ rev = "f5d74973d2cf19fd31db485ee6bfaaebcf96af2d";
sha256 = "0bmydpv3slv5fvy1admgsm1qlkfp4sdsd0caik48dn7bnghifggz";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/cg";
- sha256 = "0xj4yqjg0r9m9cvwgs60lsid6qm1fi8lmb068dj6xaga11n70si5";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/cg";
+ sha256 = "0yl2w48953vym4gxcxvjfaq3jgsv5jlya9vq3iwlfxqpapd3r3k9";
name = "cg";
};
packageRequires = [];
@@ -7447,12 +7148,12 @@
challenger-deep-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "challenger-deep-theme";
- version = "20170623.311";
+ version = "20171007.300";
src = fetchFromGitHub {
owner = "MaxSt";
repo = "challenger-deep";
- rev = "22022667437e94c2309c7c77a14268970de16146";
- sha256 = "1prvdrc8wjb7dy8dqj5gvjzzdiz6hqv252inlwcyjrqiq4apipxz";
+ rev = "b4cd8550dd6a26c4efd226156dff33e261e7a8cc";
+ sha256 = "1m0ackx5wvwff0qpy9204rmpq7yr6hd3bfkwahjy6kwfrjavkfbv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7942f539d025c1e2b059d49e1984716cbbc90a67/recipes/challenger-deep-theme";
@@ -7825,12 +7526,12 @@
chinese-yasdcv = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, pyim }:
melpaBuild {
pname = "chinese-yasdcv";
- version = "20170827.1650";
+ version = "20171014.1844";
src = fetchFromGitHub {
owner = "tumashu";
repo = "chinese-yasdcv";
- rev = "fe14df025491530680529c98df3e3239ff44f57f";
- sha256 = "0vcm381i2zvpjcq8jcxldk7dn2c7pbszmb8j3qwrw038hx0lbi3i";
+ rev = "5ab830daf1273d5a5cddcb94b56a9737f12d996f";
+ sha256 = "1mv1n6m73aamxj18i851ww53q7p4ydiqgaapxyvjbm6sx8ddz9ak";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b6d727c30d2ec0f885a927a16a442fe220a740d5/recipes/chinese-yasdcv";
@@ -7843,34 +7544,15 @@
license = lib.licenses.free;
};
}) {};
- chm-view = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "chm-view";
- version = "20110616.1019";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/chm-view.el?revision=5";
- sha256 = "1r274pf0xrcdml4sy2nhhp3v5pr3y3s4lvk45hd3pmw1i4pw2fd8";
- name = "chm-view.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/8688cd57fca1974403c0e36d6289845059adac5c/recipes/chm-view";
- sha256 = "1acz0fvl3inn7g4himq680yf64bgm7n61hsv2zpm1k6smrdl78nz";
- name = "chm-view";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/chm-view";
- license = lib.licenses.free;
- };
- }) {};
choice-program = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "choice-program";
- version = "20170828.616";
+ version = "20171004.931";
src = fetchFromGitHub {
owner = "plandes";
repo = "choice-program";
- rev = "5a803216d1d7a7ac6fd0f89f04ba4c126182a852";
- sha256 = "0iah71kcrzi22mi1jvyyaiflsx0ry24hqb0wd2w0nbgzc8s5ycqb";
+ rev = "27607ec1fe241c58fbc1f861454a8e2ec1fd7b15";
+ sha256 = "0q8krgsydrc2xc29y60qljifdvxfmxnvbncxsh64xhrzsnrgwmq5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6e39555b2538cc8a955766c5533871396e8fe712/recipes/choice-program";
@@ -7928,12 +7610,12 @@
cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
melpaBuild {
pname = "cider";
- version = "20170913.434";
+ version = "20171001.112";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "cider";
- rev = "8a9eab32646abcaaf31fe83b2d897c01971b98f1";
- sha256 = "0ddkm87l9ann05a6j57r0x59qqgfavwrvlzhkc5xhak1nmk5556h";
+ rev = "946a9d44e0d3806f1e06ab68fd832f24dd152086";
+ sha256 = "0fifp2cjspfqvwmy9l9sxm8na7jj3wxbiz0mpq0pj3jm4aa7v6cl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
@@ -8114,15 +7796,36 @@
license = lib.licenses.free;
};
}) {};
+ circadian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "circadian";
+ version = "20171022.724";
+ src = fetchFromGitHub {
+ owner = "GuidoSchmidt";
+ repo = "circadian.el";
+ rev = "feec308591b43e7869d7a018d5c6fc7e943d53ee";
+ sha256 = "0j8an9ny3jk9nmlpi360n064m20nhah9p8rj6wb9xbvnfrri5zjk";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3440905a20bc91bb2637a87c04ff8410379f150d/recipes/circadian";
+ sha256 = "13797y1w1636bibisz5i5p2xp0smd3apnhc1nx8ijm75smx679id";
+ name = "circadian";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/circadian";
+ license = lib.licenses.free;
+ };
+ }) {};
circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "circe";
- version = "20170728.638";
+ version = "20170929.1635";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "circe";
- rev = "452dfb407b640ba6eb288ff25a9de27446a409c4";
- sha256 = "1yqnpvk5ib754bkb8gcd8skf0d3rqxkqwcsbibr052ilrp5ampcl";
+ rev = "6b110d4c2c6447c4ed65cfa5b7e8676620081ee2";
+ sha256 = "01llr34y9mvgpbz3y10l7gmp40qvislwhm6jb2fvcb7vdn9k9gmz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe";
@@ -8138,12 +7841,12 @@
circe-notifications = callPackage ({ alert, circe, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "circe-notifications";
- version = "20160902.42";
+ version = "20171001.2258";
src = fetchFromGitHub {
owner = "eqyiel";
repo = "circe-notifications";
- rev = "80c44441ecd3ae04ae63760aa20afa837c1ed05b";
- sha256 = "0s0iw5vclciziga78f1lvj6sdg84a132in39k4vz0pj598ypin1w";
+ rev = "4b93112b715714fc7b0ac2637df93adb90f35b40";
+ sha256 = "1hfic3qrlskcf0zmd3w76sl1qgrd6myf6mwg06mnc9jy76backqk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/76c0408423c4e0728789de7b356b2971d6c446c7/recipes/circe-notifications";
@@ -8198,18 +7901,19 @@
license = lib.licenses.free;
};
}) {};
- clang-format = callPackage ({ cl-lib ? null, fetchsvn, fetchurl, lib, melpaBuild }:
+ clang-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "clang-format";
version = "20170120.137";
- src = fetchsvn {
- url = "https://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
- rev = "313143";
- sha256 = "0zldh5nk5i3y41q70kwlhf576xmv0baim3q4jam01d41p4p040mq";
+ src = fetchFromGitHub {
+ owner = "emacsorphanage";
+ repo = "clang-format";
+ rev = "6e6114fac0e4e600f1ffed7b2ce978f7adb001cd";
+ sha256 = "07zabj31bgckppkqgg5if515093k0lx2xyf3adh90ymmssvvgary";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/clang-format";
- sha256 = "1s7xbq1xczzz24gi6wlv9ihzs7cbsn3g16rrhdpxwaadagbasgk7";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/clang-format";
+ sha256 = "1w2w8hhyxp73s1ziyd0n7f1yi0x46v93630xxpjnf9bgr1psfk5f";
name = "clang-format";
};
packageRequires = [ cl-lib ];
@@ -8221,12 +7925,12 @@
clean-aindent-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "clean-aindent-mode";
- version = "20150816.2029";
+ version = "20171017.1343";
src = fetchFromGitHub {
owner = "pmarinov";
repo = "clean-aindent-mode";
- rev = "9ae15997cd75c5625a4f759a3aff39bf202fc36f";
- sha256 = "1h6k6kzim1zb87y1kzpqjzk3ip9bmfxyg54kdh2sfp4xy0g5h3p0";
+ rev = "a97bcae8f43a9ff64e95473e4ef0d8bafe829211";
+ sha256 = "07dgx09j6nn5dl9vpqfcs5yqm79kza3h3r1lb7r09wpkmrg0c2cr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ee9dac7c10e652f026643620418dfea9237a0d23/recipes/clean-aindent-mode";
@@ -8590,12 +8294,12 @@
clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "clojure-mode";
- version = "20170819.2159";
+ version = "20171031.357";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "clojure-mode";
- rev = "a6f0592e9cabeb4e039e654bd30890a20208950e";
- sha256 = "0sr34679371b89qz93z88b6l0ii4lfh8lm91clpl6in4lp4daj93";
+ rev = "061431d86f05a5a25d2e00fc5f317b22cb9d8a79";
+ sha256 = "09cv517p42nrzj435b1ma8lfl1k4izdv1dj1q9hi5y61q1q1zhp9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode";
@@ -8615,8 +8319,8 @@
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "clojure-mode";
- rev = "a6f0592e9cabeb4e039e654bd30890a20208950e";
- sha256 = "0sr34679371b89qz93z88b6l0ii4lfh8lm91clpl6in4lp4daj93";
+ rev = "061431d86f05a5a25d2e00fc5f317b22cb9d8a79";
+ sha256 = "09cv517p42nrzj435b1ma8lfl1k4izdv1dj1q9hi5y61q1q1zhp9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking";
@@ -8695,12 +8399,12 @@
closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "closql";
- version = "20170629.921";
+ version = "20170919.455";
src = fetchFromGitHub {
owner = "emacscollective";
repo = "closql";
- rev = "73e68bcfbe076e152beed1b8e5f894ca438f9770";
- sha256 = "0vj18784x6cdl39sbfpsksmxln5yj31ah250q5n7ivh54vk2hvjl";
+ rev = "66597831248bbe14ebc7bbf24b24cafebb5fd362";
+ sha256 = "0jxf7k95l2j6rjyafq3zj6bxaa2xn4zmi4zg1n04sachcdrcgh3l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/closql";
@@ -8821,12 +8525,12 @@
cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, s, seq }:
melpaBuild {
pname = "cmake-ide";
- version = "20170818.907";
+ version = "20171101.236";
src = fetchFromGitHub {
owner = "atilaneves";
repo = "cmake-ide";
- rev = "6489aabba8d124445ba72f55db9ef3bb2212b1b0";
- sha256 = "0wh0z28nfb5kpm3jlkkgkxbhzyc8akyc6hs1fm8i7bxrslrj6ll0";
+ rev = "114e2df27f79816f023a07e3e8024c7ab73603f0";
+ sha256 = "1n7zv325kjvmz694r11sbz6650b8y22kv2mbx4yrdha9r6y2m1f7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide";
@@ -8846,8 +8550,8 @@
src = fetchFromGitHub {
owner = "Kitware";
repo = "CMake";
- rev = "a763cffd6b65bbe5572527e39969981bf31d5aca";
- sha256 = "1jrvsqcb123z1r84c074qz1z6ljz6psc7ysabzsxkrkcs3f66v58";
+ rev = "a57bad6c3d0dbc885bb71dfe465d09a380c35960";
+ sha256 = "1igyb96zbdr94sxry8irffhmhcz1wi0d4a65cf98j4vvnxz36b9w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -8902,25 +8606,6 @@
license = lib.licenses.free;
};
}) {};
- cmds-menu = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "cmds-menu";
- version = "20170221.1557";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/cmds-menu.el?revision=10";
- sha256 = "0ladkkydypf08mn3j749fv46blpzyvh45kx52qdzhwxjiz7nlmfs";
- name = "cmds-menu.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/de6366e4b3e72a5e68b960d6bf4bab2683ad6800/recipes/cmds-menu";
- sha256 = "12s75y9d75cxqgg3hj0s4w0d10zy8y230b5gy09685ab5lcajfks";
- name = "cmds-menu";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/cmds-menu";
- license = lib.licenses.free;
- };
- }) {};
cmm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cmm-mode";
@@ -8942,27 +8627,6 @@
license = lib.licenses.free;
};
}) {};
- cn-outline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "cn-outline";
- version = "20100321.914";
- src = fetchFromGitHub {
- owner = "mori-dev";
- repo = "cn-outline";
- rev = "47d33a99b7ae26b1cd456441970b4bab2173d981";
- sha256 = "1635k51ppivq6v2702fihq8dvi33445smds9zhqm0drnpv9rv5cr";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/bf843cbcfc5806d9089000f08c72433dc8c12e17/recipes/cn-outline";
- sha256 = "0cw1rr56hdngvhmx59j76hvkfzgybasn0fwhd6vwm709jqiiiwiz";
- name = "cn-outline";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/cn-outline";
- license = lib.licenses.free;
- };
- }) {};
cnfonts = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cnfonts";
@@ -9152,35 +8816,15 @@
license = lib.licenses.free;
};
}) {};
- col-highlight = callPackage ({ fetchurl, lib, melpaBuild, vline }:
- melpaBuild {
- pname = "col-highlight";
- version = "20170510.1541";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/col-highlight.el?revision=31";
- sha256 = "0wi4xz8n5ib65spyrgqsp8l6zafnvxdiw3hy918fs0xjj7ziy6qc";
- name = "col-highlight.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/2a16dca0068d9d4f25ad6b699ec8cb8da6ba17e5/recipes/col-highlight";
- sha256 = "1kycjdlrg7a5x37b0pzqhg56yn7kaisryrk303qx1084kwq9464i";
- name = "col-highlight";
- };
- packageRequires = [ vline ];
- meta = {
- homepage = "https://melpa.org/#/col-highlight";
- license = lib.licenses.free;
- };
- }) {};
colemak-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "colemak-evil";
- version = "20170401.1626";
+ version = "20171015.1607";
src = fetchFromGitHub {
owner = "patbl";
repo = "colemak-evil";
- rev = "b01296a50ee225d0e21e81f99c3c01432f89a7c7";
- sha256 = "09ipxdwvi1bsicl67fbpd5aq5g9ws9frim9q24y7h6srynj4awa7";
+ rev = "192c779281ae1fbf2405dcdb55b3c5b2a1d0b3d1";
+ sha256 = "1clnvr7n6mx5b8pq1c6zchq7n1g8ip8hwgzc61ywrmiyv0v8rnc6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0f0750a3f9537782ee61d6e56c51ce7b86def12e/recipes/colemak-evil";
@@ -9256,18 +8900,19 @@
license = lib.licenses.free;
};
}) {};
- color-theme = callPackage ({ fetchbzr, fetchurl, lib, melpaBuild }:
+ color-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "color-theme";
- version = "20080305.34";
- src = fetchbzr {
- url = "https://bzr.savannah.gnu.org/r/color-theme/trunk";
- rev = "57";
+ version = "20070910.1007";
+ src = fetchFromGitHub {
+ owner = "emacsorphanage";
+ repo = "color-theme";
+ rev = "eeb07560b30aaf7934dfd21f5c2518a479905cd9";
sha256 = "17bidzq9kiz250gal1fn9mg8gf8l749nz69z0awpc4x2222wxxiz";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/color-theme";
- sha256 = "1ds098v50p4g6ji0zy7m5nyj2kadm3l3v0pnb01wkjjx6anh3qsy";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/color-theme";
+ sha256 = "1c1n0m4hhj2sxi08vjvayypf9g5i2hyng53ry950yfdqgzq7nk8i";
name = "color-theme";
};
packageRequires = [];
@@ -9363,12 +9008,12 @@
color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "color-theme-sanityinc-tomorrow";
- version = "20170908.216";
+ version = "20171030.1358";
src = fetchFromGitHub {
owner = "purcell";
repo = "color-theme-sanityinc-tomorrow";
- rev = "6c9b01bb5268f00d0e65fb8351a7ad87abbfb127";
- sha256 = "1gr1iab6dyyx47v2fbx7g1lf8x1hm9vppra9ypf8957fxzi99l2n";
+ rev = "e7f5d175916df20c411713e49be8b58aac36f7ed";
+ sha256 = "11n5ly2n8l4b7xph81w57av42zv43fk2vc6b6mjhxvvn86l97ma7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow";
@@ -9384,12 +9029,12 @@
color-theme-solarized = callPackage ({ color-theme, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "color-theme-solarized";
- version = "20160626.743";
+ version = "20171024.825";
src = fetchFromGitHub {
owner = "sellout";
repo = "emacs-color-theme-solarized";
- rev = "797229d0d3c9a2233fd8c69c0c2d9948be1d0685";
- sha256 = "1mx4948qdbwg93261bxr0k5cjx05ws7c3cmhrv6znvjzp6gqxlcl";
+ rev = "f3ca8902ea056fb8e46cb09f09c96294e31cd4ee";
+ sha256 = "16d7adqi07lzzr0qipl1fbag9l8kiyr3xrqxi528pimcisbg85d3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/17096b452740bf6b7afa38e62df8e623494aa6b2/recipes/color-theme-solarized";
@@ -9423,15 +9068,36 @@
license = lib.licenses.free;
};
}) {};
+ colormaps = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "colormaps";
+ version = "20171008.1524";
+ src = fetchFromGitHub {
+ owner = "lepisma";
+ repo = "colormaps.el";
+ rev = "19fbb64a6288d505b9cf45c9b5a3eed0bfb135e2";
+ sha256 = "0kbhy8bpxqdr1kjczz2vm7chfpjprx2frpbh1gh9i1gwwx5k4myp";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/f4c795d9e323b08bc8354a6933a061644705a2ec/recipes/colormaps";
+ sha256 = "16plhgpfz1wb58p6h8wxjhplhgv0mbj3f2xj34p6vydh44l8w8q2";
+ name = "colormaps";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/colormaps";
+ license = lib.licenses.free;
+ };
+ }) {};
column-enforce-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "column-enforce-mode";
- version = "20170103.1231";
+ version = "20171030.1200";
src = fetchFromGitHub {
owner = "jordonbiondo";
repo = "column-enforce-mode";
- rev = "379366fe0a5bcb333db2d55cddcf18d6e76ab3fc";
- sha256 = "1vqydf174rydclwmcq6j8xpr16k9w049x9rilg1lvyjc67p7pyaf";
+ rev = "2341a2b6a33d4b8b74c35062ec9cfe1bffd61944";
+ sha256 = "0rcxb7daxxrp5f1i5cbv25viwawbbsn4ij1mnlclp5wz7ilcy2rs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/91bebef8e97665a5d076c557d559367911a25ea2/recipes/column-enforce-mode";
@@ -9444,25 +9110,6 @@
license = lib.licenses.free;
};
}) {};
- column-marker = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "column-marker";
- version = "20121128.43";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/column-marker.el?revision=13";
- sha256 = "05bv198zhqw5hqq6cr11mhz02dpca74hhp1ycwq369m0yb2naxy9";
- name = "column-marker.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/5f629b6b44fae3191f58e007c39b75bbb880d517/recipes/column-marker";
- sha256 = "1xgfsiw46aib2vb9bbjlgnhcgfnlfhdcxd0cl0jqj4fjfxzbz0bq";
- name = "column-marker";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/column-marker";
- license = lib.licenses.free;
- };
- }) {};
comint-intercept = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "comint-intercept";
@@ -9568,6 +9215,27 @@
license = lib.licenses.free;
};
}) {};
+ comment-tags = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "comment-tags";
+ version = "20170910.1035";
+ src = fetchFromGitHub {
+ owner = "vincekd";
+ repo = "comment-tags";
+ rev = "7d914097f0a03484af71e621db533737fc692f58";
+ sha256 = "0s86a7078arck9z4gzkp2hnxyklprl0zh5hsw7nkyyscjydly80i";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6ac71f4ffc19bce4f571001f9270d5be855dfc3c/recipes/comment-tags";
+ sha256 = "13slv150zch0b7zpxa2dbqjzpqh0iy559m6rc0zs0dwdagzryp3i";
+ name = "comment-tags";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/comment-tags";
+ license = lib.licenses.free;
+ };
+ }) {};
commenter = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
melpaBuild {
pname = "commenter";
@@ -9613,12 +9281,12 @@
common-lisp-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "common-lisp-snippets";
- version = "20170522.2147";
+ version = "20170918.356";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "common-lisp-snippets";
- rev = "46f1de08c8d86b72b474c2f8e1c1b313ac70f23d";
- sha256 = "148ach1p3iqch3a6r1y8wkr1avyprg47jjz3a31vjvqgcwgs3ynw";
+ rev = "cd46223fbc6ee99372a25ba455ffec4354895e45";
+ sha256 = "0xii63fw3gx1hhx57yh8gr9mhkgb2vjkfs2sl5z9010myi9504is";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/48d0166ccd3dcdd3df4719349778c6c5ab6872ca/recipes/common-lisp-snippets";
@@ -9634,12 +9302,12 @@
company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "company";
- version = "20170828.414";
+ version = "20171017.1638";
src = fetchFromGitHub {
owner = "company-mode";
repo = "company-mode";
- rev = "c0098afab0719c633ea9984e62a240f542ab8c49";
- sha256 = "0vm4rl7xkqpbi1dh2ds45smbyk25x16w0x99ri1nzvfbana5w7j5";
+ rev = "66e43a3a3388c3af3dd851ba0a1f48dcb6efb1ae";
+ sha256 = "0wm1qrwmhzs3vphk6hbi288rvc66gznis5kfj25d86ilq4fvawsf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company";
@@ -9789,12 +9457,12 @@
company-cabal = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "company-cabal";
- version = "20151216.720";
+ version = "20170917.617";
src = fetchFromGitHub {
owner = "iquiw";
repo = "company-cabal";
- rev = "05886d6f2621b019fafb40cff4d2567e5d8045b4";
- sha256 = "1yxp6l8a16d6g2sfwrpfx97ds7nfrgk2akwydal1dzr2bjq02pc6";
+ rev = "62112a7259e24bd6c08885629a185afe512b7d3d";
+ sha256 = "1gf45xwjzdm8i4q6c6khk4dbg1mmp2r0awz2sjr4dcr2dbd1n7mg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ee888b1ba57b6af3a3330607898810cd248862db/recipes/company-cabal";
@@ -9926,8 +9594,8 @@
src = fetchFromGitHub {
owner = "emacs-eclim";
repo = "emacs-eclim";
- rev = "ebb844d1ebdd7eb347e89063a9b6e9f890a1ff57";
- sha256 = "18q4blnxf7p2kvgh1rhr7pizga06z97hv1lxjgzv0dc2dll2zwmd";
+ rev = "14596d3a1c0e7f18be6b88eddebaf7f36eeca859";
+ sha256 = "04vmq8d68na8pxwd18lxf87v0nzf3cxxdvw8cqzj28his7g37bym";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/company-emacs-eclim";
@@ -10027,12 +9695,12 @@
company-ghc = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, ghc, lib, melpaBuild }:
melpaBuild {
pname = "company-ghc";
- version = "20160315.710";
+ version = "20170918.133";
src = fetchFromGitHub {
owner = "iquiw";
repo = "company-ghc";
- rev = "ff2205c0b309467eea763521d30220e7849c75b0";
- sha256 = "1a93q5q91xjyvfxbf5q57ndjarqdm9av11bb3dmc72v9bmwgpi7s";
+ rev = "dab111cb5067c545ccdc6b2d0ba70c1c4bbce060";
+ sha256 = "0ygw3dhlz247qzmcsbnkkdry2w2ni60j1rbyqprnzp8sd5yk97r1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/28f6a983444f796c81df7e5ee94d74c480b21298/recipes/company-ghc";
@@ -10066,6 +9734,27 @@
license = lib.licenses.free;
};
}) {};
+ company-glsl = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, glsl-mode, lib, melpaBuild }:
+ melpaBuild {
+ pname = "company-glsl";
+ version = "20171015.1049";
+ src = fetchFromGitHub {
+ owner = "GuidoSchmidt";
+ repo = "company-glsl";
+ rev = "a262c12c3bcd0807718c4edcaf2b054e30ef0e26";
+ sha256 = "0338bym8ifvkgpbc4vyzf3nmlp6rc8lihyxcbym5m08612ln78mk";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/abab3b5a9762639812e2aabf9d288ed367dcdc22/recipes/company-glsl";
+ sha256 = "0lzy3xln5780yjwhhcz6vnc2j0k0rc7jfvqc8bv0xfabikgadmkn";
+ name = "company-glsl";
+ };
+ packageRequires = [ company emacs glsl-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/company-glsl";
+ license = lib.licenses.free;
+ };
+ }) {};
company-go = callPackage ({ company, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
melpaBuild {
pname = "company-go";
@@ -10073,8 +9762,8 @@
src = fetchFromGitHub {
owner = "nsf";
repo = "gocode";
- rev = "c7fddb39ecbc9ebd1ebe7d2a3af473ed0fffffa1";
- sha256 = "0qx8pq38faig41xkl1a4hrgp3ziyjyn6g53vn5wj7cdgm5kk67nb";
+ rev = "e990796e68a2ebfc099afed20b99e26d6b64061a";
+ sha256 = "1s2jpqy599fr5qzfvba5njrwx1n48vqjg20vibssn2kyyc3l42d3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go";
@@ -10171,6 +9860,48 @@
license = lib.licenses.free;
};
}) {};
+ company-lean = callPackage ({ company, dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lean-mode, lib, melpaBuild, s }:
+ melpaBuild {
+ pname = "company-lean";
+ version = "20170920.708";
+ src = fetchFromGitHub {
+ owner = "leanprover";
+ repo = "lean-mode";
+ rev = "2f73061c886bae07bc51e4d9eb545ed8027c0442";
+ sha256 = "17bqx7bkfzv4w7cf0l139xwg1shns680rq74hrqgicammb453kz7";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde/recipes/company-lean";
+ sha256 = "1hqkn7w5dyznf7i3r3132q8x31r74q188jsm5kdrjqgbwak2p91a";
+ name = "company-lean";
+ };
+ packageRequires = [ company dash dash-functional emacs f lean-mode s ];
+ meta = {
+ homepage = "https://melpa.org/#/company-lean";
+ license = lib.licenses.free;
+ };
+ }) {};
+ company-lsp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }:
+ melpaBuild {
+ pname = "company-lsp";
+ version = "20171031.1844";
+ src = fetchFromGitHub {
+ owner = "tigersoldier";
+ repo = "company-lsp";
+ rev = "5fc50b6ad5c4ee71625bddf348646be44e69f396";
+ sha256 = "1gkabm9iaimv4s7v723aflvxa7z902py46m5mz0szpdcrrh36495";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/5125f53307c1af3d9ccf2bae3c25e7d23dfe1932/recipes/company-lsp";
+ sha256 = "09nbi6vxw8l26gfgsc1k3bx4m8i1px1b0jxaywszky5bv4fdy03l";
+ name = "company-lsp";
+ };
+ packageRequires = [ company emacs lsp-mode s ];
+ meta = {
+ homepage = "https://melpa.org/#/company-lsp";
+ license = lib.licenses.free;
+ };
+ }) {};
company-lua = callPackage ({ company, f, fetchFromGitHub, fetchurl, lib, lua-mode, melpaBuild, s }:
melpaBuild {
pname = "company-lua";
@@ -10178,8 +9909,8 @@
src = fetchFromGitHub {
owner = "ptrv";
repo = "company-lua";
- rev = "0be8122f3adf57ad27953bf4b03545d6298d3da4";
- sha256 = "1d9i165apgmwns7b2fd5wcpjpkah3dyj20v5sb8ynvz6qhhr5r9c";
+ rev = "6a542ba16d7fa47865879b5a99dedd121a84a880";
+ sha256 = "10wy9s29sbzaz61p62vda6cqwjk6rpa6ia8zm4n3d6xvpv2wqa70";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c8191ab2aaa72041be46091e363d216cf1b73fde/recipes/company-lua";
@@ -10195,12 +9926,12 @@
company-math = callPackage ({ company, fetchFromGitHub, fetchurl, lib, math-symbol-lists, melpaBuild }:
melpaBuild {
pname = "company-math";
- version = "20170804.1202";
+ version = "20171016.814";
src = fetchFromGitHub {
owner = "vspinu";
repo = "company-math";
- rev = "7e7f8c71f57b12f9bcbbf01f2bbcc59343ad76d4";
- sha256 = "0akqhhjvzsg0lbqx4bbkfkzijidwgi3bb32sxl3yxz7zfm9pbhn2";
+ rev = "3481f03ebb6a613ff85b71ca8edd2d5842c49012";
+ sha256 = "0nbnqgl2jly1n5nx20hr2i84r2shxjb3axv2p597b5kw2bdbsva5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fadff01600d57f5b9ea9c0c47ed109e058114998/recipes/company-math";
@@ -10262,8 +9993,8 @@
src = fetchFromGitHub {
owner = "travisbhartwell";
repo = "nix-emacs";
- rev = "ace629f7645d12778c96ff7b5cf4b1e41a98af29";
- sha256 = "11infdrdjc30kxvfg5rh1zn4idvkhf9s0c6v60qn441m1d5bnavq";
+ rev = "7007363e773a419203a69798fb0e0731b2eb0f73";
+ sha256 = "00hv8fhyahkdh1vfy1qkahqvsik6d81c7mqh4gjiqxrmb2l1vbcb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6846c7d86e70a9dd8300b89b61435aa7e146be96/recipes/company-nixos-options";
@@ -10283,8 +10014,8 @@
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
- rev = "9e9c126397c3d2c7160e38eb72b9317c515678f3";
- sha256 = "14qnbfxm9k870qi53krg6lmmfzcbhnv0yslhv66p40rwh9wjslwd";
+ rev = "317ad1d023db6b2fe67444a2c075e656c35f5094";
+ sha256 = "1wyf93faq6z6wgcs3lxc6gv75bmxchg6kd98dza61zdyc0rj60wa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@@ -10297,6 +10028,27 @@
license = lib.licenses.free;
};
}) {};
+ company-plsense = callPackage ({ cl-lib ? null, company, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+ melpaBuild {
+ pname = "company-plsense";
+ version = "20171016.1013";
+ src = fetchFromGitHub {
+ owner = "CeleritasCelery";
+ repo = "company-plsense";
+ rev = "68dd1ca0a0837990a2e6c2e36f6b10fdf4a9bb6d";
+ sha256 = "07bqm1bg91r3vchy2q2pk3npngqfb73fh0b7mp1g9fj11h25mjfr";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/9cf9d671d81e07c704676c557a9f0d686067ce5c/recipes/company-plsense";
+ sha256 = "0k8k2vpkknd4nyxzwdj7698lgm5d85byxd49x7w5nrxmh2h1w3c7";
+ name = "company-plsense";
+ };
+ packageRequires = [ cl-lib company dash emacs s ];
+ meta = {
+ homepage = "https://melpa.org/#/company-plsense";
+ license = lib.licenses.free;
+ };
+ }) {};
company-pollen = callPackage ({ company, fetchFromGitHub, fetchurl, lib, melpaBuild, pollen-mode }:
melpaBuild {
pname = "company-pollen";
@@ -10388,8 +10140,8 @@
src = fetchFromGitHub {
owner = "iquiw";
repo = "company-restclient";
- rev = "7b41cd58ffdf965480f1cf52d58d718009ba6fe7";
- sha256 = "0j6b9jqs4i05rxx6fs7rvim1snf33fi1l6dkm9lskchbykzz4adq";
+ rev = "ef67ba2f613ce3d61b70011c9d0a303a754ffc5b";
+ sha256 = "0af1h6n1rgyni686hrrakmmbgymjg8dc1i9g2jc27dxkxz0nk454";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dd063bc3789772fdcc6a8555817588962e60825/recipes/company-restclient";
@@ -10411,12 +10163,12 @@
company-rtags = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }:
melpaBuild {
pname = "company-rtags";
- version = "20170829.2022";
+ version = "20170924.2244";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "2af4d6a32e8194f8fbcc23fd94395e3d595a3c25";
- sha256 = "0091w529lvbjlw1fdb3qjgb8fd5fcwxhqyr4ps5cvxl5bqnwlw39";
+ rev = "7fa54d513fc716b2dc1055636b4728ab29dfdd3e";
+ sha256 = "1i0php9nnpgsmb4l1sc7qgxvdgg4hyviq68f4k41b9bcwab2hbl8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags";
@@ -10600,12 +10352,12 @@
company-ycmd = callPackage ({ company, dash, deferred, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s, ycmd }:
melpaBuild {
pname = "company-ycmd";
- version = "20170622.146";
+ version = "20171010.2258";
src = fetchFromGitHub {
owner = "abingham";
repo = "emacs-ycmd";
- rev = "fd037efae08628e41480e9dad705dcc1f64e498d";
- sha256 = "06scz0d3jzgbr919lkjjfq9x1dyr5nqkhblvfpyk5bdp8l6j06d6";
+ rev = "d951afd8c1c2f25a5cbeef3acfcec5f72acfd6e4";
+ sha256 = "0k6z82a3xkk71lbnw3sxqmr8ixafglivmsb5y35q1jichzz6hail";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-ycmd";
@@ -10684,12 +10436,12 @@
conda = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }:
melpaBuild {
pname = "conda";
- version = "20170608.756";
+ version = "20171028.617";
src = fetchFromGitHub {
owner = "necaris";
repo = "conda.el";
- rev = "468a9090f3a41e4c14d23a3b7987defd27ccd799";
- sha256 = "0bcjvqs3m5vwmixm745mp19sy0fkdpv080issqf97jqxh3arqh1k";
+ rev = "526be691824f4a32299f560a883913697bc4d847";
+ sha256 = "1jix3md6b02fypjm4y05av7acjkqryd1vqqz9wgxyinydlagrvh7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fcf762e34837975f5440a1d81a7f09699778123e/recipes/conda";
@@ -10705,12 +10457,12 @@
config-general-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "config-general-mode";
- version = "20170719.446";
+ version = "20171024.1140";
src = fetchFromGitHub {
owner = "tlinden";
repo = "config-general-mode";
- rev = "8927fd1c359275dc4236c5f48fea0e3ce8349bed";
- sha256 = "04f6608ndhan6xmipzylzwzx2asx0bsqx8a9rnxfab3bza756c99";
+ rev = "b4a8e6ba0bb027a77e4a0f701409f3e57bb2e4c0";
+ sha256 = "115sk0h6i1bfnxw1v11719926cvnq7gyisjcysvkam40hp3d5fx5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6c06831528e4bbc44aae1cc5cd6bec60150ae087/recipes/config-general-mode";
@@ -10744,18 +10496,19 @@
license = lib.licenses.free;
};
}) {};
- confluence = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild, xml-rpc }:
+ confluence = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }:
melpaBuild {
pname = "confluence";
version = "20151020.1828";
- src = fetchsvn {
- url = "https://svn.code.sf.net/p/confluence-el/code/trunk/";
- rev = "173";
- sha256 = "18859zi60s2y79add998vxh084znbdxxq31m12flg7makxlamyh7";
+ src = fetchFromGitHub {
+ owner = "emacsorphanage";
+ repo = "confluence";
+ rev = "4518d270a07760644c4204985c83d234ece4738b";
+ sha256 = "1lrq23cxlp2vkyv7g56r06bp7chhw10kii3ymkydf24y4pyn1zpg";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/cf9110cd142ece0a8d63815bf00a89574b947bb4/recipes/confluence";
- sha256 = "0hplpqaxjg34pf75p9sf97wlbq4rz9f8qvn4cfpjxf16if078ls3";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/confluence";
+ sha256 = "0xa2g168mm31kh5h7smhx35cjsk1js88nzs19yakjljf56b1khlf";
name = "confluence";
};
packageRequires = [ xml-rpc ];
@@ -10914,12 +10667,12 @@
copy-file-on-save = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "copy-file-on-save";
- version = "20170817.2319";
+ version = "20171019.347";
src = fetchFromGitHub {
owner = "emacs-php";
repo = "emacs-auto-deployment";
- rev = "7b8e13cd3dcc12b247089a4530e08fd0ab3bc487";
- sha256 = "0nx9qlp1jl7hmwf19ifac8r0955vkdkscf0nmm92hdqbj83jdmv9";
+ rev = "fe78b4c9fdc261ce22a771765702ebe4d9437c84";
+ sha256 = "0vf6qp7fxqvgd02vfsbmm38vc8n2wvrfwv4wnsr15gd8y8zldlgs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/copy-file-on-save";
@@ -11016,15 +10769,36 @@
license = lib.licenses.free;
};
}) {};
+ cosmo = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "cosmo";
+ version = "20170922.44";
+ src = fetchFromGitLab {
+ owner = "montanari";
+ repo = "cosmo-el";
+ rev = "dd83b09a49a2843606b28279b674b2207040b36b";
+ sha256 = "0phcg81g3dy67s1hfymvj0lkcpwygwql8iixf940nv31qllgzvd7";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3ab914dfefcddf6ecd65261bc11bd3eb12929c79/recipes/cosmo";
+ sha256 = "1pk34d0kv1jm2fq72qa5lj0y39x1yf2nbkjjg8jcj8ari28h9vfk";
+ name = "cosmo";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/cosmo";
+ license = lib.licenses.free;
+ };
+ }) {};
counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
melpaBuild {
pname = "counsel";
- version = "20170911.1121";
+ version = "20171031.1234";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "0a1d361b926291874124f8c63a653d83ead64a36";
- sha256 = "0ssbsllpv0lyr7dhnipwd7zgpxvfm36rldr7vkxh5maajdkamls7";
+ rev = "96663b77945ab21e4e1b0aab690fc2e926f01f9c";
+ sha256 = "0r691dzs77zdkvjzb787kjg8zvvba8gdj2da9zjb14m4nyjmg9d9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -11040,12 +10814,12 @@
counsel-bbdb = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "counsel-bbdb";
- version = "20161105.350";
+ version = "20171016.1545";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "counsel-bbdb";
- rev = "297d0c7e6e1eaafcd5e188724fea8e8f26b95555";
- sha256 = "14gw4d855v2nvqh06vs9rzs816pn1hp4rhfikb0wzg1ay6gdrwi7";
+ rev = "298b48cb9e1186347fbcaf1ba354efa5fe2d7556";
+ sha256 = "137iv77j9a7mxsfrjxk4fpbaxw964pk4yj15609wijfcwgdjprwd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0ed9bcdb1f25a6dd743c1dac2bb6cda73a5a5dc2/recipes/counsel-bbdb";
@@ -11079,6 +10853,27 @@
license = lib.licenses.free;
};
}) {};
+ counsel-etags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "counsel-etags";
+ version = "20171026.435";
+ src = fetchFromGitHub {
+ owner = "redguardtoo";
+ repo = "counsel-etags";
+ rev = "19757e5d79a7a504760a1e7a7095779b48ec995f";
+ sha256 = "1qacqjl1x01r3ss1a9qwy0651gamnkp59nzl9i6krnrdfksc6gjz";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags";
+ sha256 = "1h3dlczm1m21d4h41vz9ngg5fi02g6f95qalfxdnsvz0d4w4yxk0";
+ name = "counsel-etags";
+ };
+ packageRequires = [ counsel emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/counsel-etags";
+ license = lib.licenses.free;
+ };
+ }) {};
counsel-gtags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "counsel-gtags";
@@ -11124,12 +10919,12 @@
counsel-projectile = callPackage ({ counsel, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
melpaBuild {
pname = "counsel-projectile";
- version = "20170911.1304";
+ version = "20171001.641";
src = fetchFromGitHub {
owner = "ericdanan";
repo = "counsel-projectile";
- rev = "20557b47a963cc5304ac2bc3ea4800c3a7da7feb";
- sha256 = "0cszbczgpsm6l2pwh8pci3md0aranilqw6j0519vr6aaj5j6g15p";
+ rev = "88a16cb75301ae95f21a71e8838a49590d011e73";
+ sha256 = "155yvmyyg99znxnb3viagmd3hmii44fww68g857l7msw4q9ki1gy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/389f16f886a385b02f466540f042a16eea8ba792/recipes/counsel-projectile";
@@ -11142,6 +10937,27 @@
license = lib.licenses.free;
};
}) {};
+ counsel-pydoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
+ melpaBuild {
+ pname = "counsel-pydoc";
+ version = "20171018.1342";
+ src = fetchFromGitHub {
+ owner = "co-dh";
+ repo = "pydoc_utils";
+ rev = "1d8ff8ca3b9d69453cde423b1887fbb490a95c9e";
+ sha256 = "06kf93y8wb9nwvs70xi4lkd5x4g6sl8f83diy2wl7ha657dwx3m8";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/110939c12b4e042a486e97be4c2a2426c5978ca6/recipes/counsel-pydoc";
+ sha256 = "1a3vwh4jf5y03z95bd4blk75n6wjd24l6yw6vpr3991bi4qrxclz";
+ name = "counsel-pydoc";
+ };
+ packageRequires = [ emacs ivy ];
+ meta = {
+ homepage = "https://melpa.org/#/counsel-pydoc";
+ license = lib.licenses.free;
+ };
+ }) {};
counsel-spotify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "counsel-spotify";
@@ -11457,26 +11273,6 @@
license = lib.licenses.free;
};
}) {};
- crosshairs = callPackage ({ col-highlight, fetchurl, hl-line-plus, lib, melpaBuild, vline }:
- melpaBuild {
- pname = "crosshairs";
- version = "20170626.1548";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/crosshairs.el?revision=40";
- sha256 = "1dcynm83a3ixdccw3cqy533d9xwzswyi67cydaqmv35q88dg2nqw";
- name = "crosshairs.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/crosshairs";
- sha256 = "0s7gh5zrb46hzybmpydb0pad7jinvcwds7i03ndhzwx89rxg3019";
- name = "crosshairs";
- };
- packageRequires = [ col-highlight hl-line-plus vline ];
- meta = {
- homepage = "https://melpa.org/#/crosshairs";
- license = lib.licenses.free;
- };
- }) {};
crux = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
melpaBuild {
pname = "crux";
@@ -11540,6 +11336,27 @@
license = lib.licenses.free;
};
}) {};
+ crystal-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "crystal-mode";
+ version = "20171023.212";
+ src = fetchFromGitHub {
+ owner = "crystal-lang-tools";
+ repo = "emacs-crystal-mode";
+ rev = "1e8061c049766c25f1c06d43e703d3133426f7c0";
+ sha256 = "0w11s1vmp9b4dlq9kvnxi63j69c94bqpg3fn9w4jasnpz4w9nkcf";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b9b47d7deecf0cf24a42b26d50021cb1219a69/recipes/crystal-mode";
+ sha256 = "1fgpz7zab6nc6kvjzjsbvrbg8shf4by0f20cvjvyky8kym72q0hk";
+ name = "crystal-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/crystal-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
csgo-conf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "csgo-conf-mode";
@@ -11564,12 +11381,12 @@
csharp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "csharp-mode";
- version = "20170502.158";
+ version = "20170927.816";
src = fetchFromGitHub {
owner = "josteink";
repo = "csharp-mode";
- rev = "628a4e2afa0e9c4672e8654c86240cb7f7bdf444";
- sha256 = "0gnl7nddgy7b83p70ybr41s3f6ybs383hdbzhp9jvxb21g665hn6";
+ rev = "331b45df9c6e84601cea323638f82ce5e4a68b03";
+ sha256 = "00i53c5a85n1i48jyxg78ab2yicx8maybfc6mzxw8s12j9hbw75i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/736716bbcfd9c9fb1d10ce290cb4f66fe1c68f44/recipes/csharp-mode";
@@ -11585,12 +11402,12 @@
csound-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi, shut-up }:
melpaBuild {
pname = "csound-mode";
- version = "20170911.1412";
+ version = "20171025.401";
src = fetchFromGitHub {
owner = "hlolli";
repo = "csound-mode";
- rev = "c5243852d20e54e43a4a7fc19c58bbd10fa8570b";
- sha256 = "1wa4356xykkfmfp8pkk72r2s18l9vhv9mdhrq827fh6cgz64p4s8";
+ rev = "5680a266a32c62e8d7ebd987bf6e5fd40033bbeb";
+ sha256 = "1zlb7bwx82rayzphf4q5f1w6yhm3r267fzgn74xmckh50jyq917y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c940d29de11e43b4abf2901c466c94d426a21818/recipes/csound-mode";
@@ -11687,34 +11504,15 @@
license = lib.licenses.free;
};
}) {};
- csv-nav = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "csv-nav";
- version = "20130407.1120";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/csv-nav.el?revision=7";
- sha256 = "15rfg3326xcs3zj3siy9rn7yff101vfch1srskdi2650c3l3krva";
- name = "csv-nav.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/csv-nav";
- sha256 = "0626vsm2f5zc2wi5pyx4xrwcr4ai8w9a3l7gi9883smvayr619sj";
- name = "csv-nav";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/csv-nav";
- license = lib.licenses.free;
- };
- }) {};
ctable = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ctable";
- version = "20140304.1659";
+ version = "20171005.1711";
src = fetchFromGitHub {
owner = "kiwanami";
repo = "emacs-ctable";
- rev = "cd673a09a80ce4e9e102ffe2e3d7e6bfb9d652b0";
- sha256 = "07vasdlai49qs0nsmq2cz1kcq1adqyarv8199imgwwcbh4vn7dqb";
+ rev = "b8830d1ca95abb100a81bc32011bd17d5ecba000";
+ sha256 = "0pg303pnqscrsbx9579hc815angszsgf9vpd2z2f8p4f4ka6a00h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc29a8d518ce7a584277089bd4654f52ac0f358/recipes/ctable";
@@ -11797,8 +11595,8 @@
src = fetchFromGitHub {
owner = "mortberg";
repo = "cubicaltt";
- rev = "c920475b9f9b50559d81d39ad177dbe22b258a35";
- sha256 = "0s7az1j0dpi306j01wzw5ldy6cvpz56fk0x4jhb7bsnq01lkm7jy";
+ rev = "0cdd084498c3f5de53a26ae756e4a9f33625fa1f";
+ sha256 = "1zgdc4lm6dyh57fim52ynxx0jfs9hsdgbj739firblmin6cdvm32";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt";
@@ -11811,6 +11609,27 @@
license = lib.licenses.free;
};
}) {};
+ cubicle-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "cubicle-mode";
+ version = "20171009.1257";
+ src = fetchFromGitHub {
+ owner = "cubicle-model-checker";
+ repo = "cubicle";
+ rev = "9d108b900e0123236b4991c2d06b5061f34feee8";
+ sha256 = "1n3x6m19swkq07zah4hh0ni6gx864bq1w0km06nq33x8189zczrr";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/81c29c912b83cbb536d30ba04130b39c0e5e5969/recipes/cubicle-mode";
+ sha256 = "0xcmd0s6dfryl1ihfaqq0pfqc906yzzwk3d3nv8g6b6w78pv1lzv";
+ name = "cubicle-mode";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/cubicle-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
cucumber-goto-step = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pcre2el }:
melpaBuild {
pname = "cucumber-goto-step";
@@ -11853,25 +11672,6 @@
license = lib.licenses.free;
};
}) {};
- cursor-chg = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "cursor-chg";
- version = "20170221.1610";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/cursor-chg.el?revision=21";
- sha256 = "026x1mbjrf68xrv970jbf131d26rj0nmzi1x0c8r6qdr02pw2jy1";
- name = "cursor-chg.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cursor-chg";
- sha256 = "1yam5hz1v16g2v19j3dmgbj7n2rj8dsqyr5hwfyc031s6q7f649x";
- name = "cursor-chg";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/cursor-chg";
- license = lib.licenses.free;
- };
- }) {};
cursor-test = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cursor-test";
@@ -11893,22 +11693,24 @@
license = lib.licenses.free;
};
}) {};
- cus-edit-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "cus-edit-plus";
- version = "20170604.1000";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/cus-edit+.el";
- sha256 = "0awn3m16cyamb4h9i4iq9fzbwzl6qrkpbcr4v3dr7iwlcz7lw7jl";
- name = "cus-edit+.el";
+ cwl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }:
+ melpaBuild {
+ pname = "cwl-mode";
+ version = "20171030.230";
+ src = fetchFromGitHub {
+ owner = "tom-tan";
+ repo = "cwl-mode";
+ rev = "c5110c1e035535a1133a7107c0d2d55e5fe3c5b9";
+ sha256 = "088998r78bpy77pb2rhbr6a2fks5mcy3qyvyzlqwwl0v2gnscl59";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/57370fc617f4f10cc67e9d3c6dc113ff0a18cace/recipes/cus-edit+";
- sha256 = "1kazcdfajcnrzvhsgsmwwx96rkry0dglprrc02hbd7ky1fppp4sz";
- name = "cus-edit-plus";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/2309764cd56d9631dd97981a78b50b9fe793a280/recipes/cwl-mode";
+ sha256 = "0x8akxxmphpgsc2m78h6b0fs6vvcfvmi1q2jrz8hwlmai8f7zi9j";
+ name = "cwl-mode";
};
- packageRequires = [];
+ packageRequires = [ emacs yaml-mode ];
meta = {
- homepage = "https://melpa.org/#/cus-edit+";
+ homepage = "https://melpa.org/#/cwl-mode";
license = lib.licenses.free;
};
}) {};
@@ -11996,25 +11798,6 @@
license = lib.licenses.free;
};
}) {};
- cygwin-mount = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "cygwin-mount";
- version = "20131111.1346";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/cygwin-mount.el?revision=17";
- sha256 = "09my4gj3qm9rdpk8lg6n6ki8ywj7kwzwd4hhgwascfnfi1hzwdvw";
- name = "cygwin-mount.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/f94fb69a954275ee4098c96495b8566d6ce7cbb9/recipes/cygwin-mount";
- sha256 = "0ik2c8ab9bsx58mgcv511p50h45cpv7455n4b0kri83sx9xf5abb";
- name = "cygwin-mount";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/cygwin-mount";
- license = lib.licenses.free;
- };
- }) {};
cyphejor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cyphejor";
@@ -12064,8 +11847,8 @@
src = fetchFromGitHub {
owner = "cython";
repo = "cython";
- rev = "e6315294395ad44e667a804710938ee799575296";
- sha256 = "07lgc3g66w8ggmnhqn7vrck3vl9jcvwmg67mlb772kz9d5v4kn5x";
+ rev = "ed44d37a80ef91ccb059a8ae056439a889eb6973";
+ sha256 = "08hk3lah5mx3aii4d6d4xb7dbz1d0m2ch0c2hf13pw2d7irqvfzp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -12144,12 +11927,12 @@
dad-joke = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dad-joke";
- version = "20170814.824";
+ version = "20170927.2358";
src = fetchFromGitHub {
owner = "davep";
repo = "dad-joke.el";
- rev = "92641503c7e93309db12380d5228f99dbe64a53c";
- sha256 = "063cz5k264qbkb5g87xr6z68fjjnw3j1hpckdn6nqy8cin4qhagc";
+ rev = "bee47e7b746b403228fa7d7361cb095de19ac9ba";
+ sha256 = "14snnnjs28jg6k8x6g90m3dbcx10306ipcd256d3l6czk9p17vpd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/484d571b2737f7c613816333afdde6460c64e635/recipes/dad-joke";
@@ -12207,12 +11990,12 @@
danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "danneskjold-theme";
- version = "20170702.1007";
+ version = "20171101.339";
src = fetchFromGitHub {
owner = "rails-to-cosmos";
repo = "danneskjold-theme";
- rev = "f4de0fa84bec756ea31419f8db0b900fd1603c83";
- sha256 = "1wzwiahab6r8y772mg6268sh7l3b1fw4hxl10d38qv2khy641vlv";
+ rev = "8d36d6dcddf36f89f06a3f848e69edbda28435eb";
+ sha256 = "1hsfqkf3xfql3h4dprrrzrpp5fansv8ckfii5dnx55a6gl6y3sdi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme";
@@ -12228,12 +12011,12 @@
dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild, s }:
melpaBuild {
pname = "dante";
- version = "20170901.525";
+ version = "20171021.1009";
src = fetchFromGitHub {
owner = "jyp";
repo = "dante";
- rev = "203dcd8b748d485d1c78d04d81db22fd00cb71d7";
- sha256 = "1ywx46mm1zrj0hnx2zwyxlxlq7ysg46hsy5vi6hmfppwbrfmkyzv";
+ rev = "cdea9409920ed8e4739af39b9a6f4e6dd8e8c50f";
+ sha256 = "1ncbrq38ivybqlwm57aqcqjhz8bs99i9aa28012v1s6l5qbnxgks";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante";
@@ -12246,15 +12029,36 @@
license = lib.licenses.free;
};
}) {};
+ darcsum = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "darcsum";
+ version = "20140315.2110";
+ src = fetchFromGitHub {
+ owner = "emacsorphanage";
+ repo = "darcsum";
+ rev = "00c252b51cb24c25fb74f529960ebd631514a4c1";
+ sha256 = "1vbfdmc56ma2ycxhza681ninhdxgvxm9j5xb9374xiqmb6g0vykq";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/darcsum";
+ sha256 = "0p3hwmwjjqwgkjws5b7gkad4yxh0gs2hr03ar18y43yahwgihvnv";
+ name = "darcsum";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/darcsum";
+ license = lib.licenses.free;
+ };
+ }) {};
darcula-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "darcula-theme";
- version = "20170905.941";
+ version = "20171016.149";
src = fetchFromGitLab {
owner = "fommil";
repo = "emacs-darcula-theme";
- rev = "da9852867ac115a54ee350a750d4dae182706117";
- sha256 = "03059ydiw73a7kdvgn3namfqz87pqm2xfrnf87irkiv5pl9h482s";
+ rev = "25f179b9fb72c1b95a3907aa4b4a44f8d261e45a";
+ sha256 = "0x1amh0ycjvk218d6cyqizkak47b6r1wczakbfkvnbr0khgkgmr7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/23c8f10205187babb17e3abc3dc40eb1938e6640/recipes/darcula-theme";
@@ -12396,12 +12200,12 @@
darktooth-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "darktooth-theme";
- version = "20170715.1624";
+ version = "20171010.2057";
src = fetchFromGitHub {
owner = "emacsfodder";
repo = "emacs-theme-darktooth";
- rev = "257b0674a5c4ec510b51febba0c7a18e0f10a1bf";
- sha256 = "1ww12h19scda90r4rkgiynk3zvhkhk44gwfqj2m49pr89y7j8lap";
+ rev = "e7c13abeeb18f50658482c7df32701ae4ec375a0";
+ sha256 = "09smbgql9ibgn9l729ylas747xj48ipm6as61l6a5pbch376qriw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme";
@@ -12414,22 +12218,22 @@
license = lib.licenses.free;
};
}) {};
- dart-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+ dart-mode = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }:
melpaBuild {
pname = "dart-mode";
- version = "20170525.1236";
+ version = "20171024.2137";
src = fetchFromGitHub {
owner = "nex3";
repo = "dart-mode";
- rev = "9b11e8fb63549ee3700fb53e92e4ce2cb302c971";
- sha256 = "1cp0qmnhnp57vihn343jz14kxm1rwn5b004q9yjlbv1am389rr12";
+ rev = "adef2a5b672d503ae3e92b30bb80095879b030d0";
+ sha256 = "0bb790rpijlv4cjdcwgqzb249rnz6br557lnn74rb9g52wpabl69";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dart-mode";
sha256 = "00zvgxfxgk5jair796l6appyq5hc7hs2s2wglv1j4l7g50b05cla";
name = "dart-mode";
};
- packageRequires = [ cl-lib dash flycheck ];
+ packageRequires = [ cl-lib dash emacs flycheck s ];
meta = {
homepage = "https://melpa.org/#/dart-mode";
license = lib.licenses.free;
@@ -12438,12 +12242,12 @@
dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dash";
- version = "20170810.137";
+ version = "20171028.854";
src = fetchFromGitHub {
owner = "magnars";
repo = "dash.el";
- rev = "dcb0ec1623517e54551b801846a272dd07fd55b2";
- sha256 = "1wfky9gq0qw4x8i8wnssh2zn18i953pypw23j35ra03rfknha1zc";
+ rev = "91d8cb01e62bab0d6267d3d4dbcabd6da6fdea78";
+ sha256 = "1q0nnn3j3fv6y3n14kql7gdf2vc038lbmnz542pma8q0yfksbkid";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash";
@@ -12480,12 +12284,12 @@
dash-functional = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dash-functional";
- version = "20160615.1351";
+ version = "20171028.804";
src = fetchFromGitHub {
owner = "magnars";
repo = "dash.el";
- rev = "dcb0ec1623517e54551b801846a272dd07fd55b2";
- sha256 = "1wfky9gq0qw4x8i8wnssh2zn18i953pypw23j35ra03rfknha1zc";
+ rev = "91d8cb01e62bab0d6267d3d4dbcabd6da6fdea78";
+ sha256 = "1q0nnn3j3fv6y3n14kql7gdf2vc038lbmnz542pma8q0yfksbkid";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional";
@@ -12501,12 +12305,12 @@
dashboard = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, page-break-lines }:
melpaBuild {
pname = "dashboard";
- version = "20170901.2";
+ version = "20170923.719";
src = fetchFromGitHub {
owner = "rakanalh";
repo = "emacs-dashboard";
- rev = "8a555de891a83a9cd080c940dde183a8806479a9";
- sha256 = "1w7f2fvnhqzcr6az4fkgb11k8qjzg81vwzx96qhym8d70sabahzh";
+ rev = "8594c4f55448148b720eda5b72d51667fb7a8a39";
+ sha256 = "1hhh1kfsz87qfmh45wjf2r93rz79rq0vbyxlfrsl02092zjbl1zr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e9a79341ccaa82a8c065e71c02fe6aee22007c66/recipes/dashboard";
@@ -12564,12 +12368,12 @@
datetime = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "datetime";
- version = "20170318.254";
+ version = "20170928.815";
src = fetchFromGitHub {
owner = "doublep";
repo = "datetime";
- rev = "3ecf9985250ecd441e91614b44cf12323af907c0";
- sha256 = "1x8kj6d9p42lffk15m0c955ibwxxvfxhihij43alwq5xab2l16bv";
+ rev = "082d2c7b0e38c26a8c46af9c9956a2e100d88e71";
+ sha256 = "0fdswqi53qx924lib7nd9dazn0916xf1ybrh3bcn3f8cn6b8ikg5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fff9f0748b0ef76130b24e85ed109325256f956e/recipes/datetime";
@@ -12879,12 +12683,12 @@
define-word = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "define-word";
- version = "20150709.1223";
+ version = "20171001.1616";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "define-word";
- rev = "64d98b7748686c51261fe6e8d42078c6284feb13";
- sha256 = "02i621yq2ih0zp7mna8iykj41prv77hvcadz7rx8c942zyvjzxqd";
+ rev = "a425ffe44d62622b86477a622c6188a56bc2bd9a";
+ sha256 = "02v9yzvinapr6m7pjxr4kcgqnlm7j21ygh1dhkabarz83v43awh3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e318b30d8b2b89981f4b89d78e5a46e77d3de412/recipes/define-word";
@@ -12921,12 +12725,12 @@
deft = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "deft";
- version = "20160610.1739";
+ version = "20171031.530";
src = fetchFromGitHub {
owner = "jrblevin";
repo = "deft";
- rev = "86825cd420985112d9dd38060e0edb72b08c6dab";
- sha256 = "0jz8ikh143n9byidh675jyd76bymbwijs0xi2y141982s69r2n0l";
+ rev = "c7413a390ac22331ad5226a8c8c007bd08759bc8";
+ sha256 = "1rdjffw8vw71ay93zlr2klbr8q4q1sjnw03gsfdyll1q4idbarg1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/deft";
@@ -12963,12 +12767,12 @@
demangle-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "demangle-mode";
- version = "20170526.1508";
+ version = "20170923.1501";
src = fetchFromGitHub {
owner = "liblit";
repo = "demangle-mode";
- rev = "d3fce31974b1c9f659da427f3c69c2e6168df508";
- sha256 = "0k4pacjjgxagsa8kgzvynvmvczhbb73waq3l6gld7v3h38js163a";
+ rev = "79231b05f97da147d66120f947656f856a3a64fb";
+ sha256 = "0whr18qwi5bmz39n8x836sjgky20qhw59qha59c11dvly1qs5nnq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6ced9f4ffb051a8474d3f72695156416cf2dd8be/recipes/demangle-mode";
@@ -13107,18 +12911,40 @@
license = lib.licenses.free;
};
}) {};
- dic-lookup-w3m = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild, stem, w3m }:
+ dhall-mode = callPackage ({ ansi-color ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "dhall-mode";
+ version = "20171006.1233";
+ src = fetchFromGitHub {
+ owner = "psibi";
+ repo = "dhall-mode";
+ rev = "181e5b0df73ce729cf4b711fa76bb43c2581d29d";
+ sha256 = "1jw4is9jxx60hsaqjkmravrkxdfn7ni6zl9wx9i7r2y2r5mmwx88";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/c7ab435077b2f47d75ddc0ff10c64ee2b46044e2/recipes/dhall-mode";
+ sha256 = "1zkspjwllcw9k4nlnif6jdwzl08ki39vmx90apw029n87xhvx7mp";
+ name = "dhall-mode";
+ };
+ packageRequires = [ ansi-color emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/dhall-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
+ dic-lookup-w3m = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, stem, w3m }:
melpaBuild {
pname = "dic-lookup-w3m";
version = "20170803.354";
- src = fetchsvn {
- url = "https://svn.osdn.jp/svnroot/dic-lookup-w3m/";
- rev = "99";
+ src = fetchFromGitHub {
+ owner = "emacsorphanage";
+ repo = "dic-lookup-w3m";
+ rev = "79aca5eb9c78e67cb85a386060d48113caad5ec3";
sha256 = "18l2s37bnnzbgw22mivgw5isxck2y0n3nk7735r4ir5y5wqx88mr";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/dic-lookup-w3m";
- sha256 = "1siqrarpyqjh1h350dsyca993fy6qin4apgyjm4vpp6awip8xfp0";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/dic-lookup-w3m";
+ sha256 = "1kwbmzzf8sj4bn5kicmlp2hzv8ydcikwmdy7s40ggkgf1mk9zvqr";
name = "dic-lookup-w3m";
};
packageRequires = [ stem w3m ];
@@ -13322,8 +13148,8 @@
src = fetchFromGitHub {
owner = "myrjola";
repo = "diminish.el";
- rev = "d5c61a14e1a5590a65f83c099a5bd42fcadff24d";
- sha256 = "0c0p4b3nfnczmkjx64qz2w9dk0b7srfnhrnd902qn9z55k4n0wg8";
+ rev = "565a983a39d2e2cffab5df13b34f3b6116723208";
+ sha256 = "173lzj9l7a4wcfvdq6akvfyyyriy5c30b4vhhv51hs051dmn02d0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1bfb4acb381cada46458cf60eae9b88d007294d5/recipes/diminish";
@@ -13406,8 +13232,8 @@
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "325e2c5300b9acccf786c0cc46637c18d39790e7";
- sha256 = "1p6m02d4j2wrnx7nlj5zqzc5q34d62ffc56hjhiw4r01vvvzm65j";
+ rev = "26bf9b86e67883de3813518b2356f466dc2bb727";
+ sha256 = "0vkpf5w3bklgvz9v0fy1icdq6rf9w19399d0kphsb1a1vql575y1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-avfs";
@@ -13423,12 +13249,12 @@
dired-collapse = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dired-collapse";
- version = "20170910.1522";
+ version = "20171026.159";
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "325e2c5300b9acccf786c0cc46637c18d39790e7";
- sha256 = "1p6m02d4j2wrnx7nlj5zqzc5q34d62ffc56hjhiw4r01vvvzm65j";
+ rev = "26bf9b86e67883de3813518b2356f466dc2bb727";
+ sha256 = "0vkpf5w3bklgvz9v0fy1icdq6rf9w19399d0kphsb1a1vql575y1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6aab23df1451682ff18d9ad02c35cb7ec612bc38/recipes/dired-collapse";
@@ -13441,45 +13267,6 @@
license = lib.licenses.free;
};
}) {};
- dired-details = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "dired-details";
- version = "20130824.458";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/dired-details.el?revision=15";
- sha256 = "1ddrhj1kw0wl7jbs9jn067vfffsvqhz4izfw9f7ihxz34fdl2iza";
- name = "dired-details.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dired-details";
- sha256 = "0kmcnx9zvfdwvq100nazgypkfwlgxgrbimprc5pysid8rrxyzws7";
- name = "dired-details";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/dired-details";
- license = lib.licenses.free;
- };
- }) {};
- dired-details-plus = callPackage ({ dired-details, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "dired-details-plus";
- version = "20170903.1237";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/dired-details+.el";
- sha256 = "03r7afjp376d0c34r1nj5hz914lbrk9y5ripar1w697bqk8kaxy3";
- name = "dired-details+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dired-details+";
- sha256 = "0b4y01hk839z6m7fx5bwa80gwylvkp15niri8vrjak4vgj5g5cg9";
- name = "dired-details-plus";
- };
- packageRequires = [ dired-details ];
- meta = {
- homepage = "https://melpa.org/#/dired-details+";
- license = lib.licenses.free;
- };
- }) {};
dired-dups = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dired-dups";
@@ -13588,12 +13375,12 @@
dired-filter = callPackage ({ cl-lib ? null, dash, dired-hacks-utils, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dired-filter";
- version = "20170718.1145";
+ version = "20171010.204";
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "325e2c5300b9acccf786c0cc46637c18d39790e7";
- sha256 = "1p6m02d4j2wrnx7nlj5zqzc5q34d62ffc56hjhiw4r01vvvzm65j";
+ rev = "26bf9b86e67883de3813518b2356f466dc2bb727";
+ sha256 = "0vkpf5w3bklgvz9v0fy1icdq6rf9w19399d0kphsb1a1vql575y1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-filter";
@@ -13613,8 +13400,8 @@
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "325e2c5300b9acccf786c0cc46637c18d39790e7";
- sha256 = "1p6m02d4j2wrnx7nlj5zqzc5q34d62ffc56hjhiw4r01vvvzm65j";
+ rev = "26bf9b86e67883de3813518b2356f466dc2bb727";
+ sha256 = "0vkpf5w3bklgvz9v0fy1icdq6rf9w19399d0kphsb1a1vql575y1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-hacks-utils";
@@ -13714,12 +13501,12 @@
dired-launch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dired-launch";
- version = "20170409.1923";
+ version = "20171004.1027";
src = fetchFromGitHub {
owner = "thomp";
repo = "dired-launch";
- rev = "75745f2e40d060cae909f9e6f6ca2e5f725180b8";
- sha256 = "1amsqbbjzjw07s40v8c63iw59qf5r1x7rqq2iq1jiybwsrp9s7v0";
+ rev = "f71826804221bafc4f9f2f75a800400a72c24b8b";
+ sha256 = "1cyg1bbn2jj101wz2jjzk832mfk5yhnc4a9m817lnalf73j0nkrs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/31c9a4945d65aa6afc371c447a572284d38d4d71/recipes/dired-launch";
@@ -13739,8 +13526,8 @@
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "325e2c5300b9acccf786c0cc46637c18d39790e7";
- sha256 = "1p6m02d4j2wrnx7nlj5zqzc5q34d62ffc56hjhiw4r01vvvzm65j";
+ rev = "26bf9b86e67883de3813518b2356f466dc2bb727";
+ sha256 = "0vkpf5w3bklgvz9v0fy1icdq6rf9w19399d0kphsb1a1vql575y1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8994330f90a925df17ae425ccdc87865df8e19cd/recipes/dired-narrow";
@@ -13760,8 +13547,8 @@
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "325e2c5300b9acccf786c0cc46637c18d39790e7";
- sha256 = "1p6m02d4j2wrnx7nlj5zqzc5q34d62ffc56hjhiw4r01vvvzm65j";
+ rev = "26bf9b86e67883de3813518b2356f466dc2bb727";
+ sha256 = "0vkpf5w3bklgvz9v0fy1icdq6rf9w19399d0kphsb1a1vql575y1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-open";
@@ -13774,25 +13561,6 @@
license = lib.licenses.free;
};
}) {};
- dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "dired-plus";
- version = "20170818.1411";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/dired+.el";
- sha256 = "04yr4gwg5y6qjbjx2klharzf7s9n1akx2n14yddjrv7hr6rkxlrs";
- name = "dired+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/dired+";
- sha256 = "1dmp6wcynran03nsa0fd26b9q0zj9wp8ngaafx1i1ybwn2gx32g5";
- name = "dired-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/dired+";
- license = lib.licenses.free;
- };
- }) {};
dired-quick-sort = callPackage ({ fetchFromGitLab, fetchurl, hydra, lib, melpaBuild }:
melpaBuild {
pname = "dired-quick-sort";
@@ -13817,12 +13585,12 @@
dired-rainbow = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dired-rainbow";
- version = "20170531.816";
+ version = "20170922.817";
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "325e2c5300b9acccf786c0cc46637c18d39790e7";
- sha256 = "1p6m02d4j2wrnx7nlj5zqzc5q34d62ffc56hjhiw4r01vvvzm65j";
+ rev = "26bf9b86e67883de3813518b2356f466dc2bb727";
+ sha256 = "0vkpf5w3bklgvz9v0fy1icdq6rf9w19399d0kphsb1a1vql575y1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-rainbow";
@@ -13842,8 +13610,8 @@
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "325e2c5300b9acccf786c0cc46637c18d39790e7";
- sha256 = "1p6m02d4j2wrnx7nlj5zqzc5q34d62ffc56hjhiw4r01vvvzm65j";
+ rev = "26bf9b86e67883de3813518b2356f466dc2bb727";
+ sha256 = "0vkpf5w3bklgvz9v0fy1icdq6rf9w19399d0kphsb1a1vql575y1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c03f6f8c779c8784f52adb20b266404cb537113a/recipes/dired-ranger";
@@ -13863,8 +13631,8 @@
src = fetchFromGitHub {
owner = "jojojames";
repo = "dired-sidebar";
- rev = "9ac42bb6663e6c0c5e4e3dd2258b63e24cf33c90";
- sha256 = "0x6gmpjm1rv38h6w5zv98vk86d7s0qvsa3pl5sab268dbhw0l9w2";
+ rev = "35e43797f037fc298b6478817d51be3ceff5b568";
+ sha256 = "1rizajqh96im8ygbfzrhn0ysh3r9qlk7njgn2rayk6a5krj6gn16";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/30e15c8361b01195f198197e704828fbcac0e8d6/recipes/dired-sidebar";
@@ -13898,64 +13666,6 @@
license = lib.licenses.free;
};
}) {};
- dired-sort = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "dired-sort";
- version = "20090208.2038";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/dired-sort.el?revision=1";
- sha256 = "1dpxkxxfs14sdm3hwxv0j26lq0qzx4gryw42vrcdi680aj24962z";
- name = "dired-sort.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/f1e4cd8274cdec74a9867060f72ec2025ed0150d/recipes/dired-sort";
- sha256 = "1dzy2601yikmmbfqivf9s5xi4vd1f5g3c53f8rc74kfnxr1qn59x";
- name = "dired-sort";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/dired-sort";
- license = lib.licenses.free;
- };
- }) {};
- dired-sort-menu = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "dired-sort-menu";
- version = "20130824.507";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/dired-sort-menu.el?revision=9";
- sha256 = "1i42r7j1c8677qf79ig33bia24d2yvcj26y92migfvrlbi03w4qi";
- name = "dired-sort-menu.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/dired-sort-menu";
- sha256 = "0n7zh8s3vdw3pcax8wkas9rykf917wn2dzikdlyrl5bbil9ijblb";
- name = "dired-sort-menu";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/dired-sort-menu";
- license = lib.licenses.free;
- };
- }) {};
- dired-sort-menu-plus = callPackage ({ dired-sort-menu, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "dired-sort-menu-plus";
- version = "20170221.1630";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/dired-sort-menu+.el";
- sha256 = "0f2z0nj51i27qqj0ws644k61dj9bp3hagi9phj9d41fcsqzzja4h";
- name = "dired-sort-menu+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/dired-sort-menu+";
- sha256 = "19ah8qgbfdvyhfszdr6hlw8l01lbdb84vf5snldw8qh3x6lw8cfq";
- name = "dired-sort-menu-plus";
- };
- packageRequires = [ dired-sort-menu ];
- meta = {
- homepage = "https://melpa.org/#/dired-sort-menu+";
- license = lib.licenses.free;
- };
- }) {};
dired-subtree = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dired-subtree";
@@ -13963,8 +13673,8 @@
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "325e2c5300b9acccf786c0cc46637c18d39790e7";
- sha256 = "1p6m02d4j2wrnx7nlj5zqzc5q34d62ffc56hjhiw4r01vvvzm65j";
+ rev = "26bf9b86e67883de3813518b2356f466dc2bb727";
+ sha256 = "0vkpf5w3bklgvz9v0fy1icdq6rf9w19399d0kphsb1a1vql575y1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d6a947ac9476f10b95a3c153ec784d2a8330dd4c/recipes/dired-subtree";
@@ -14019,6 +13729,27 @@
license = lib.licenses.free;
};
}) {};
+ diredfl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "diredfl";
+ version = "20171014.1402";
+ src = fetchFromGitHub {
+ owner = "purcell";
+ repo = "diredfl";
+ rev = "085eabf2e70590ec8e31c1e66931d652d8eab432";
+ sha256 = "19gjs90ai6fv4q7rhssrgc45d9g4frg680p1jgmbxzrd9jdy013w";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3da86e18d423198766455929da1dcb3a9a3be381/recipes/diredfl";
+ sha256 = "0cybq15yq07x2mnrnwapy020d598yymcy8y9wwf1m7f59p3h9hvn";
+ name = "diredfl";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/diredfl";
+ license = lib.licenses.free;
+ };
+ }) {};
diredful = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "diredful";
@@ -14148,12 +13879,12 @@
disable-mouse = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "disable-mouse";
- version = "20160630.1903";
+ version = "20170929.1353";
src = fetchFromGitHub {
owner = "purcell";
repo = "disable-mouse";
- rev = "f7d6f70a3c0a751a946613f997330fbc95a38c3e";
- sha256 = "0d2hmaiz8v8kzkbdi281hyf3yfjwr03ngxr2qphgm7xk9298351v";
+ rev = "81639930bcaeedadbcc19728e91719afcac84613";
+ sha256 = "0l6mai68ns3qw3rlvjvzsnqwdy7bxqiy0vdwflq0l1plxb1vazyc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dbbc396373212fdf731e135cde391f27708ff015/recipes/disable-mouse";
@@ -14169,12 +13900,12 @@
disaster = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "disaster";
- version = "20170507.1626";
+ version = "20171016.1452";
src = fetchFromGitHub {
owner = "jart";
repo = "disaster";
- rev = "3bab3c0db29c6d5484ab8aacbf29490e3aa2d713";
- sha256 = "15brdrcq2i3rckdh2ml5m1fvf7asgqij9swc1p9fgp1fk2i05sfn";
+ rev = "10a785facc60d89d78e0d5177985ab1af1741bb4";
+ sha256 = "0iz43jdkh5qdllqdchliys84gn9bpj6688rpc4jnycp64141m6cx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a4654b3646b96f967e2c75440e664a417cd0f517/recipes/disaster";
@@ -14292,25 +14023,6 @@
license = lib.licenses.free;
};
}) {};
- disk = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "disk";
- version = "20081128.706";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/disk.el?revision=9";
- sha256 = "1c0pgqvl1z2f5hprszln53pn2v2pqy110r3wx3g84v71w6378bbv";
- name = "disk.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/edcafb4c459cf51fecc7c43a3e4dcbe377d68b46/recipes/disk";
- sha256 = "0bij9gr4zv6jmc6dwsy3lb06vsxvmyzl8xrm8wzasxisk1qd2l6n";
- name = "disk";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/disk";
- license = lib.licenses.free;
- };
- }) {};
dispass = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dispass";
@@ -14737,8 +14449,8 @@
src = fetchFromGitHub {
owner = "Silex";
repo = "docker.el";
- rev = "8070936871e0fbb20fb04c28630288ebe314b8b9";
- sha256 = "0gk4ykvsv8wgfiym0z635a3n3jaw4wnvfmf78ppfinrzybg85r76";
+ rev = "4df5f94c78817a1f3755a7c9b1358349bf287270";
+ sha256 = "05ggavxq61w55n6b8g76xpqasfka3rbf3326jwxjrd1p6wzs1d3d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker";
@@ -14783,12 +14495,12 @@
docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }:
melpaBuild {
pname = "docker-compose-mode";
- version = "20170910.1034";
+ version = "20170916.1438";
src = fetchFromGitHub {
owner = "meqif";
repo = "docker-compose-mode";
- rev = "372df2f0de34a4bd44d4a7274b9ab85117ac7392";
- sha256 = "14vgjhy2j60xhf38zm5nlkr4d3r455kw6paw0wff4mqmdjcg3pds";
+ rev = "f3c06a43d69dfe80041a82a9365281bd5c65a105";
+ sha256 = "1fzz950wb95lp15ak8q4vzls21w9fc3qxqs5hlf50najdw36w52h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/37dd4c1fc11d22598c6faf03ccc860503a68b950/recipes/docker-compose-mode";
@@ -14930,12 +14642,12 @@
doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "doom-themes";
- version = "20170912.726";
+ version = "20171017.1649";
src = fetchFromGitHub {
owner = "hlissner";
repo = "emacs-doom-themes";
- rev = "f7185cf7536e1f96e7cede2ce81c2b51205df850";
- sha256 = "1wqa5b9ni8rci4h8m78h7cb3387gi45v1w6z5dbya4zvaw1gwx8p";
+ rev = "d91f72b83ec22f1620372574582e163f921e6796";
+ sha256 = "1ykl835k0s5nkb6343yk4gyk7hdx4l96jnfa84vdq74x2asidfs1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes";
@@ -14948,84 +14660,6 @@
license = lib.licenses.free;
};
}) {};
- doremi = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "doremi";
- version = "20170221.1634";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/doremi.el?revision=42";
- sha256 = "03alkj4mxajsgmghw935hm3c95a12222zq1ig6kwmfrla5kg3b7q";
- name = "doremi.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/doremi";
- sha256 = "11i4cdxgrspx44p44zz5py89ypji5li6p5w77wy0b07i8a5gq2gb";
- name = "doremi";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/doremi";
- license = lib.licenses.free;
- };
- }) {};
- doremi-cmd = callPackage ({ doremi, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "doremi-cmd";
- version = "20170221.1631";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/doremi-cmd.el?revision=47";
- sha256 = "09iizx079y43qk3jd66n8i8ifm2s7jnc9g7831nv5f3c26rgl0w6";
- name = "doremi-cmd.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/doremi-cmd";
- sha256 = "1qzspirn1abqps0dn5z8w6ymffc6b02dyki5hr8v74wfs8fhzx05";
- name = "doremi-cmd";
- };
- packageRequires = [ doremi ];
- meta = {
- homepage = "https://melpa.org/#/doremi-cmd";
- license = lib.licenses.free;
- };
- }) {};
- doremi-frm = callPackage ({ doremi, faces-plus, fetchurl, frame-fns, hexrgb, lib, melpaBuild }:
- melpaBuild {
- pname = "doremi-frm";
- version = "20170221.1632";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/doremi-frm.el?revision=74";
- sha256 = "0f9vwajgdm37krz55sv5c8ijfqhy5gsxj1zyxg8zbs6l33giynxd";
- name = "doremi-frm.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/doremi-frm";
- sha256 = "1rj3p665q32acsxxwygv1j5nbmjqrhi0b4glzrk88xki4lyz0ihz";
- name = "doremi-frm";
- };
- packageRequires = [ doremi faces-plus frame-fns hexrgb ];
- meta = {
- homepage = "https://melpa.org/#/doremi-frm";
- license = lib.licenses.free;
- };
- }) {};
- doremi-mac = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "doremi-mac";
- version = "20170221.1633";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/doremi-mac.el?revision=30";
- sha256 = "002jhqk26ywiyci1r91aqbq0zhbxy6rsyw3h74ck04rxjfc49rxl";
- name = "doremi-mac.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/doremi-mac";
- sha256 = "0n9fffgxnpqc7cch7aci5kxbwzk36iljdz2r8gcp5y5n1p7aamls";
- name = "doremi-mac";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/doremi-mac";
- license = lib.licenses.free;
- };
- }) {};
dot-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dot-mode";
@@ -15320,34 +14954,15 @@
license = lib.licenses.free;
};
}) {};
- dropdown-list = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "dropdown-list";
- version = "20120329.936";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/dropdown-list.el?revision=5";
- sha256 = "1szy46sk3nvlbb3yzk1s983281kkf507xr3fkclkki3d3x31n08a";
- name = "dropdown-list.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dropdown-list";
- sha256 = "1zqqa4872r96fp377bcz6pd1djz59ami5k09abb62dw854sc5xfj";
- name = "dropdown-list";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/dropdown-list";
- license = lib.licenses.free;
- };
- }) {};
drupal-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode }:
melpaBuild {
pname = "drupal-mode";
- version = "20170112.1136";
+ version = "20170926.38";
src = fetchFromGitHub {
owner = "arnested";
repo = "drupal-mode";
- rev = "9d5808972f344a09dcf665d5113ae81e39ac1051";
- sha256 = "0vz41jfkfir7ymyl5y0v836zclqfihrjdiyz3vnb081x0gara8l0";
+ rev = "b0ca2c39650136f7e5672461e64397b9add30b92";
+ sha256 = "1l2xc24y037b3z62yxmq2bx1x3qqv56d15bf3qmb3mpgm4gh85j6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/13e16af340868048eb1f51f9865dfc707e57abe8/recipes/drupal-mode";
@@ -15381,17 +14996,19 @@
license = lib.licenses.free;
};
}) {};
- dsvn = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild }: melpaBuild {
+ dsvn = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
pname = "dsvn";
version = "20130120.1257";
- src = fetchsvn {
- url = "https://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
- rev = "1808231";
- sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
+ src = fetchFromGitHub {
+ owner = "emacsorphanage";
+ repo = "dsvn";
+ rev = "17bce692e9bd5a43373d5cb1d66da50e1acb903b";
+ sha256 = "1bv4ivv9j5r0ax4vay1kmwv753y44qj6qprr38yh7ky0fpsml34c";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dsvn";
- sha256 = "1y55s187q2xiab31vs95jjjp1a3qzwkdwn7p5man666scbjrdyl5";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/dsvn";
+ sha256 = "1kgc0b8as7w1h9dsknv2h7dzr6jcrs0j0p376050pshgzcm79nm6";
name = "dsvn";
};
packageRequires = [];
@@ -15424,12 +15041,12 @@
dtrt-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dtrt-indent";
- version = "20170825.847";
+ version = "20171001.1233";
src = fetchFromGitHub {
owner = "jscheid";
repo = "dtrt-indent";
- rev = "69d0c5e143453708dbf0ebec4e368bc26fff683c";
- sha256 = "154m53hhzjawmrg2vlqjcg9npgq1igw9f0fz6gh7vscmbxl5dnjq";
+ rev = "7fd55af3b0311ea24b68397054e705c835fa5ef1";
+ sha256 = "1sgmd1zqdwa1f6y8d6vaacyipkqn2ivvaim1xndbkihgmhyn4kf0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/61bcbcfa6c0f38a1d87f5b6913b8be6c50ef2994/recipes/dtrt-indent";
@@ -15484,15 +15101,36 @@
license = lib.licenses.free;
};
}) {};
+ dumb-diff = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "dumb-diff";
+ version = "20170924.2036";
+ src = fetchFromGitHub {
+ owner = "jacktasia";
+ repo = "dumb-diff";
+ rev = "205ea5fda371f296fd876e362c12a5b64c4724d9";
+ sha256 = "0gxrrhlhp1g679c1ygj8m0jy4pag55b957vyxm9845z4vx93wj1x";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/cf7fa0b4235247d82569ed078f92774f10afa45c/recipes/dumb-diff";
+ sha256 = "1h1dvxbj85kgi04lxh0bpx81f6sl1fd56lhjmq1cw9biwqw0sm0c";
+ name = "dumb-diff";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/dumb-diff";
+ license = lib.licenses.free;
+ };
+ }) {};
dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
melpaBuild {
pname = "dumb-jump";
- version = "20170911.1951";
+ version = "20171013.2105";
src = fetchFromGitHub {
owner = "jacktasia";
repo = "dumb-jump";
- rev = "67928ef6449318a8653812167540aa5919301260";
- sha256 = "0i7jyh0zzk4ifkqwi89bnnwgvaaphnf4n5z299mg0fj4walzx3rz";
+ rev = "e1140c3c27c0e434ecaaf748aa77f63e2289df41";
+ sha256 = "19r77cya0bi1isv46l26k3n6vnqxf0jclx6w75jbbiirivpy9nr1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump";
@@ -15571,11 +15209,11 @@
dyalog-mode = callPackage ({ cl-lib ? null, emacs, fetchhg, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dyalog-mode";
- version = "20170519.704";
+ version = "20171012.1339";
src = fetchhg {
url = "https://bitbucket.com/harsman/dyalog-mode";
- rev = "56fa34ea25d4";
- sha256 = "1hk7i557m0m42zdg59z278cylglnp49dr8wa3zbdwzk2xzdg0m00";
+ rev = "9e446540a794";
+ sha256 = "0gyip843fdqp6cwwaqcrnpngf5a3iqcbd9h7rl5lbvxpkqvm7shi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode";
@@ -15651,6 +15289,27 @@
license = lib.licenses.free;
};
}) {};
+ dynamic-spaces = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "dynamic-spaces";
+ version = "20171027.1151";
+ src = fetchFromGitHub {
+ owner = "Lindydancer";
+ repo = "dynamic-spaces";
+ rev = "97ae8480c257ba573ca3d06dbf602f9b23c41d38";
+ sha256 = "0qs7gqjl6ilwwmd21663345az6766j7h1pv7wvd2kyh24yfs1xkj";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e0b59ce66132cbe2b1f41b665dcb30bdd04bc48b/recipes/dynamic-spaces";
+ sha256 = "0l4hwqivzv51j7h5sgd91dxb5slylmrfrvf7r6w0k04bhld6ry0c";
+ name = "dynamic-spaces";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/dynamic-spaces";
+ license = lib.licenses.free;
+ };
+ }) {};
e2ansi = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "e2ansi";
@@ -15840,6 +15499,27 @@
license = lib.licenses.free;
};
}) {};
+ eacl = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
+ melpaBuild {
+ pname = "eacl";
+ version = "20171028.258";
+ src = fetchFromGitHub {
+ owner = "redguardtoo";
+ repo = "eacl";
+ rev = "94b0eb062899db25f2ef0e535bc6ecace4b5c4e8";
+ sha256 = "042va8ysvnyr7vgwrhd970ly65q1fczk04n6vd9zqxn02cqvk2yh";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/8223bec7eed97f0bad300af9caa4c8207322d39a/recipes/eacl";
+ sha256 = "16afsf3diz498jb63q85lm5ifvm487clfl838qzagl1l4aywhlwr";
+ name = "eacl";
+ };
+ packageRequires = [ emacs ivy ];
+ meta = {
+ homepage = "https://melpa.org/#/eacl";
+ license = lib.licenses.free;
+ };
+ }) {};
easy-after-load = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "easy-after-load";
@@ -15885,12 +15565,12 @@
easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "easy-hugo";
- version = "20170819.347";
+ version = "20171025.1516";
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-easy-hugo";
- rev = "108cc2347507ff8c92b10a817de0850e9eb99ab2";
- sha256 = "1fcq6693cjl0lx67gwsk53lm20zznq9cc9widb3rzpwifns4x8ac";
+ rev = "d55472bdb08850fb3b2b27a373630c68f6cd2ac0";
+ sha256 = "168wz1638arypqz6i0mzj1pw6mzgp6x10i2wz2vpgkw5p79zw46i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
@@ -16050,34 +15730,15 @@
license = lib.licenses.free;
};
}) {};
- echo-bell = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "echo-bell";
- version = "20170221.1635";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/echo-bell.el?revision=8";
- sha256 = "0000ya8y6v5xvl5qkrsamzwh1iikc3clhpdpdr2da6c4b9cznydh";
- name = "echo-bell.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a81e339e9c7cf1ae5fe91ab4442164336a6fbf13/recipes/echo-bell";
- sha256 = "0adhdfbcpmdhd9252rh0jik2z3v9bzf0brpzfvcjn5py2x6724ws";
- name = "echo-bell";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/echo-bell";
- license = lib.licenses.free;
- };
- }) {};
eclim = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, popup, s, yasnippet }:
melpaBuild {
pname = "eclim";
- version = "20170522.1354";
+ version = "20171024.1038";
src = fetchFromGitHub {
owner = "emacs-eclim";
repo = "emacs-eclim";
- rev = "ebb844d1ebdd7eb347e89063a9b6e9f890a1ff57";
- sha256 = "18q4blnxf7p2kvgh1rhr7pizga06z97hv1lxjgzv0dc2dll2zwmd";
+ rev = "14596d3a1c0e7f18be6b88eddebaf7f36eeca859";
+ sha256 = "04vmq8d68na8pxwd18lxf87v0nzf3cxxdvw8cqzj28his7g37bym";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/eclim";
@@ -16114,12 +15775,12 @@
ecukes = callPackage ({ ansi, commander, dash, espuds, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "ecukes";
- version = "20170810.305";
+ version = "20170922.656";
src = fetchFromGitHub {
owner = "ecukes";
repo = "ecukes";
- rev = "65f29ff764c3742cc1190371b1ac91f0812535f3";
- sha256 = "16dypiczds89kpwqj7p29n5qcqpc1d7faci2f4glw1m60gnkgvqq";
+ rev = "e16dcb430cf05a28065ad26eab2b32e2f7af8705";
+ sha256 = "1x085idsgcfzagqm6jqqhgqzy1xqjkq40zl2q7a20v013n3rkbd8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/14cf66e6929db2a0f377612e786aaed9eb12b799/recipes/ecukes";
@@ -16387,12 +16048,12 @@
edit-indirect = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "edit-indirect";
- version = "20170310.1002";
+ version = "20170928.430";
src = fetchFromGitHub {
owner = "Fanael";
repo = "edit-indirect";
- rev = "2fc8f382ee12fc8f7202288534258186bdf6068a";
- sha256 = "1m40zi6dkq7m9386adrys5n7w8h9973svfmxl1c3n9vk9kjibb9k";
+ rev = "032ac0ec690d4999d564fd882588c7a197efe8dd";
+ sha256 = "0by1x53pji39fjrj5bd446kz831nv0vdgw2jqasbym4pc1p2947r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/edit-indirect";
@@ -16492,12 +16153,12 @@
editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "editorconfig";
- version = "20170912.2223";
+ version = "20171005.2129";
src = fetchFromGitHub {
owner = "editorconfig";
repo = "editorconfig-emacs";
- rev = "f527731c0d24a094f6fc784366558e2bf3d0e201";
- sha256 = "0im24f2h2n4ijdmkjkkphngk2sgj1g2rg0ygppq03rbzmqg0r6sm";
+ rev = "99bb6882d8ac708a066a9977cc4fa23f86c6b8f6";
+ sha256 = "0372s9xp8gjz6y0ix095r9gy8718jw1vkjszd12kz6vnxn4z4rmi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig";
@@ -16597,12 +16258,12 @@
edts = callPackage ({ auto-complete, auto-highlight-symbol, dash, erlang, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
melpaBuild {
pname = "edts";
- version = "20170821.149";
+ version = "20171030.9";
src = fetchFromGitHub {
owner = "tjarvstrand";
repo = "edts";
- rev = "8a737e0601ab4a3fbe2f1252f8b1474ca39df94c";
- sha256 = "0dbha339yp7jd8nmz38g9igmj5bi03l9fz9gqy2z8j367br3afxs";
+ rev = "6ef4bdf571235ee1b078db321402270cabff7fda";
+ sha256 = "1nzf8wdv0hs4kp69cy3blwxh18c2bkxr4d4y6ggdp0vmwv41j3zi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/782db7fba2713bfa17d9305ae15b0a9e1985445b/recipes/edts";
@@ -16693,8 +16354,8 @@
src = fetchFromGitHub {
owner = "egisatoshi";
repo = "egison3";
- rev = "170be423c79e8e28b99e5745bf7135ce3bf2de52";
- sha256 = "1hi2ch08m48lpkhqz05ry736qj1mjva4krbqn2wkhcfdfrxpzhx6";
+ rev = "94d964066ed7cecaea2b31eda7703396032ea4ed";
+ sha256 = "0ln5dzbrbxzhlr797hphd5dmbrhh76cdfbm1fvgl3bi1fw59g8pq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode";
@@ -16771,12 +16432,12 @@
ein = callPackage ({ auto-complete, cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, request-deferred, s, skewer-mode, websocket }:
melpaBuild {
pname = "ein";
- version = "20170903.829";
+ version = "20171024.1043";
src = fetchFromGitHub {
owner = "millejoh";
repo = "emacs-ipython-notebook";
- rev = "213cea559e7a8fb50e303ea25e1626fefddaf4bd";
- sha256 = "18ysd78pfyymqd0f6ipma9p9x61pw21f0jwk118r5yi00wnry9za";
+ rev = "eaded1e01378c61be8bc454d111e8cc4951a0b5b";
+ sha256 = "0m0dkzr44bmgc5sxzgsp290hvsylvyrsnmfk6ki44qkvp4qg0bxr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
@@ -16844,12 +16505,12 @@
ejc-sql = callPackage ({ auto-complete, cider, clomacs, dash, direx, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }:
melpaBuild {
pname = "ejc-sql";
- version = "20170810.221";
+ version = "20171019.1304";
src = fetchFromGitHub {
owner = "kostafey";
repo = "ejc-sql";
- rev = "72adcdfb5d12d49429a1c655f0b02fe657445c4f";
- sha256 = "1y10xzvmxqj61r0sq3hcd6zq6x2ird1z54draaa0wpafgq8610g9";
+ rev = "bd5e3f334044c8b33e2a0a2e0d8767aa6f0e03b8";
+ sha256 = "1pyvpsi4krbmdx2739nnw5g71x3y209xwjl5a7xqbczy9qqxs18n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql";
@@ -16978,12 +16639,12 @@
el-patch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "el-patch";
- version = "20170729.1712";
+ version = "20171016.1743";
src = fetchFromGitHub {
owner = "raxod502";
repo = "el-patch";
- rev = "f598a7537710f929c6f7592d8c543768361ba0de";
- sha256 = "1ijnj8ldqhcv3bq22gw1knaasj08yk9vm0nyvnfca3p6w3zv65cm";
+ rev = "32f7a12c2eaacd60d48ed5e5482121154a507fb8";
+ sha256 = "0m1v3gjds2j16kpy05zipdh30fbsb2zrgjny156kgjjxy6fnrnki";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch";
@@ -16996,6 +16657,27 @@
license = lib.licenses.free;
};
}) {};
+ el-pocket = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, web }:
+ melpaBuild {
+ pname = "el-pocket";
+ version = "20170922.549";
+ src = fetchFromGitHub {
+ owner = "pterygota";
+ repo = "el-pocket";
+ rev = "a80abfb67efe68ada1d7d0a73aecee57e763baaa";
+ sha256 = "0q4nsgqpjmmxml5pcb6im1askk6q7c3ykzv6fgf1w8jgkvdifa6f";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ef362a76a3881c7596dcc2639df588227b3713c0/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";
@@ -17080,25 +16762,6 @@
license = lib.licenses.free;
};
}) {};
- el-swank-fuzzy = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "el-swank-fuzzy";
- version = "20130824.457";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/el-swank-fuzzy.el?revision=3";
- sha256 = "1g2jhm9m5qcj6a231n5ch6b8bqwzq3kj275nd4s89p89v1252qhn";
- name = "el-swank-fuzzy.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/2aecf6d476c7898478e6e5dcfc77d91935f07039/recipes/el-swank-fuzzy";
- sha256 = "1m7y4c0r1w8ndmr1wgc2llrbfawbbxnvcvgjpsckb3704s87yxr1";
- name = "el-swank-fuzzy";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/el-swank-fuzzy";
- license = lib.licenses.free;
- };
- }) {};
el-x = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "el-x";
@@ -17183,25 +16846,6 @@
license = lib.licenses.free;
};
}) {};
- eldoc-extension = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "eldoc-extension";
- version = "20140306.645";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/eldoc-extension.el?revision=10";
- sha256 = "13ncpp3hrwk0h030c5nnm2zfiingilr5b876jsf2wxmylg57nbch";
- name = "eldoc-extension.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/2c59866b554def3f6cef997cc23254a560f3eb33/recipes/eldoc-extension";
- sha256 = "0azkdx4ncjhb7qyhyg1a5pxgqqf2z1wq9iz802j0nxxnjzh9ny24";
- name = "eldoc-extension";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/eldoc-extension";
- license = lib.licenses.free;
- };
- }) {};
eldoc-overlay-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, inline-docs, lib, melpaBuild, quick-peek }:
melpaBuild {
pname = "eldoc-overlay-mode";
@@ -17247,12 +16891,12 @@
electric-operator = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }:
melpaBuild {
pname = "electric-operator";
- version = "20170311.533";
+ version = "20171022.625";
src = fetchFromGitHub {
owner = "davidshepherd7";
repo = "electric-operator";
- rev = "9aa71d7b6b780242e4659fedfdb186d4ee422366";
- sha256 = "03py67msf3cshg60zs6bdk71ksswi3vjf0nl88jhlgnzb3kjg4wm";
+ rev = "278086fcffa1a4607392ca2b0ad57522e492b52c";
+ sha256 = "1kf1281igi6pzg04fsiqwhwrlqv56c1fi56a4z6ch76wh5s63vj3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/906cdf8647524bb76f644373cf8b65397d9053a5/recipes/electric-operator";
@@ -17331,12 +16975,12 @@
elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "elfeed";
- version = "20170910.1453";
+ version = "20171001.1900";
src = fetchFromGitHub {
owner = "skeeto";
repo = "elfeed";
- rev = "b62a2d0040f1a8ad0a23a48e3843d2ed5cbc2a8c";
- sha256 = "1fxxcdrm7138pb06wxk9k519kag03jllkwf2fyxh755x6fnxlgin";
+ rev = "23cbeb803a312fd0e3801ef240e4322bf9965656";
+ sha256 = "0vi0vbd2k4frj6ij2v8imx57vikgcp47gwk11w4qh4k0na4cjbfs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed";
@@ -17405,8 +17049,8 @@
src = fetchFromGitHub {
owner = "skeeto";
repo = "elfeed";
- rev = "b62a2d0040f1a8ad0a23a48e3843d2ed5cbc2a8c";
- sha256 = "1fxxcdrm7138pb06wxk9k519kag03jllkwf2fyxh755x6fnxlgin";
+ rev = "23cbeb803a312fd0e3801ef240e4322bf9965656";
+ sha256 = "0vi0vbd2k4frj6ij2v8imx57vikgcp47gwk11w4qh4k0na4cjbfs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web";
@@ -17590,12 +17234,12 @@
elixir-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
melpaBuild {
pname = "elixir-mode";
- version = "20170102.942";
+ version = "20170918.2231";
src = fetchFromGitHub {
owner = "elixir-lang";
repo = "emacs-elixir";
- rev = "384d8daf8ad563ebf2cb3437c71d30241adbe099";
- sha256 = "0idgfjwd6116zaag0lmq2i9by2mr054nrqmpnsvyhk26hw71k3vn";
+ rev = "861788186f4dbd500209656dcf38a15b3efe74dd";
+ sha256 = "1py8slpda3vsw88v1wp1imnn3r17hz54621c6ks8xm75lnhn60ra";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6374ced0de38d83bf99147f702f30706615480ed/recipes/elixir-mode";
@@ -17632,12 +17276,12 @@
elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }:
melpaBuild {
pname = "elm-mode";
- version = "20170903.221";
+ version = "20171028.2337";
src = fetchFromGitHub {
owner = "jcollard";
repo = "elm-mode";
- rev = "ece63376b2a7a8f5e6d708bdb2061e13d6afb731";
- sha256 = "1109si17ph8w90jcmzz72i0ha5va8ylh2y5jinabvsc3qs667bgy";
+ rev = "6fa343ada4a74850840e21bbe787c14fe5a67155";
+ sha256 = "18yk029k12zd8xwgj4k0741lbxzl9djik0srvb5jn6bcbcp6hb9g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode";
@@ -17842,12 +17486,12 @@
elpa-mirror = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "elpa-mirror";
- version = "20170722.422";
+ version = "20171012.15";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "elpa-mirror";
- rev = "5c793f6df944b7f1a68893438696c12240f0b930";
- sha256 = "0p5q44p6jl306qns4xf7f03pq091zczvjnh9bjax6z6sx54yadsd";
+ rev = "f4a84f71368dc343d09093312d1b2c2e9a5a3987";
+ sha256 = "07j3bsv3vinpkxxbw4fyfgb5jb1kcd068821l59pk9yrw145kb96";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d64ce7042c45f29fb394be25ce415912182bac8b/recipes/elpa-mirror";
@@ -17860,15 +17504,15 @@
license = lib.licenses.free;
};
}) {};
- elpy = callPackage ({ cl-generic, company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }:
+ elpy = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }:
melpaBuild {
pname = "elpy";
- version = "20170903.143";
+ version = "20171029.955";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "elpy";
- rev = "d1cfe9c87031a9fd4c9754afdc4c4d0b3b3128a6";
- sha256 = "1zy24fp888i7xaplfnxznlw8hldfpcgh9ni0053m9sq8z28nld6j";
+ rev = "434f6799e103fcce7d896b3281eb59e15a760783";
+ sha256 = "1mpxzyssvp6n1y17xqxmmpymvljz7g6j60whn9mdp3njn0ijyn5k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy";
@@ -17876,8 +17520,8 @@
name = "elpy";
};
packageRequires = [
- cl-generic
company
+ emacs
find-file-in-project
highlight-indentation
pyvenv
@@ -18039,12 +17683,12 @@
elvish-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "elvish-mode";
- version = "20170815.625";
+ version = "20170913.1939";
src = fetchFromGitHub {
owner = "ALSchwalm";
repo = "elvish-mode";
- rev = "d78a560b0aeba76ae09fb0885ca0cff2ee5b0d0d";
- sha256 = "0fxmy0qfcapskbakin6p1hv9763yh4bxanlnak7p6dfmmw7mvz33";
+ rev = "9cf31b453ac79b011b84e83ca11c964c4e647649";
+ sha256 = "0ryg9c8pjw98a9l4hyjqwan7kcv492vzy0xxcrcfm69zn8vnw9k0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0fc724072702a565af471f9ae523a1e6e48e3f04/recipes/elvish-mode";
@@ -18396,12 +18040,12 @@
embrace = callPackage ({ cl-lib ? null, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "embrace";
- version = "20170615.1131";
+ version = "20171031.1133";
src = fetchFromGitHub {
owner = "cute-jumper";
repo = "embrace.el";
- rev = "394863dd7271e831cb9c257a1cd2249302ba962a";
- sha256 = "14qs180p5kv1h4p9qsv4jj61pq7d7bsrvwm0wm85lhgpx8v64q7i";
+ rev = "dd5da196e5bcc5e6d87e1937eca0c21da4334ef2";
+ sha256 = "1m0qyipkp5ydgcav8d0m58fbj1gilipbj7g8mg40iajr8wfqcjdc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e8f07e3b5ba4ec4b0b79fba5a2cca5a3986218b6/recipes/embrace";
@@ -18459,11 +18103,11 @@
emms = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "emms";
- version = "20170901.1328";
+ version = "20171020.1349";
src = fetchgit {
url = "https://git.savannah.gnu.org/git/emms.git";
- rev = "79793c0bb32620ad5b4db490c6e80ff8e5a20233";
- sha256 = "13mk66vbrnzsy8bcz2wahn4hcqyiia6j0srpfffxsg49x9bssvff";
+ rev = "88fecd0234da595843ce6be4d3f9f2b755ff612d";
+ sha256 = "0ycm2lggljhzrb10r3c322c7bb580gk125x9nvpvjrvsp74p8im0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms";
@@ -18563,12 +18207,12 @@
emms-player-mpv-jp-radios = callPackage ({ cl-lib ? null, emacs, emms, emms-player-simple-mpv, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "emms-player-mpv-jp-radios";
- version = "20170506.1024";
+ version = "20171002.723";
src = fetchFromGitHub {
owner = "momomo5717";
repo = "emms-player-mpv-jp-radios";
- rev = "43ef07db6e724847fdcff5f66d1806b3e8d315e4";
- sha256 = "15wfr6qs4k6anm16zing0rgawpbrnk9589vr06fc6qvkald7ib3v";
+ rev = "dcf79a7570ff4031373991f9fc838ddc5f598006";
+ sha256 = "0mq6k6qgqv08k421wjk69ma8m7m29yfmwh2bsphxj1pa2h1y6h2n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/09ba6da5057061f055d4a3212d167f9666618d4f/recipes/emms-player-mpv-jp-radios";
@@ -18584,12 +18228,12 @@
emms-player-simple-mpv = callPackage ({ cl-lib ? null, emacs, emms, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "emms-player-simple-mpv";
- version = "20160924.825";
+ version = "20170930.2216";
src = fetchFromGitHub {
owner = "momomo5717";
repo = "emms-player-simple-mpv";
- rev = "bcc056364df5f405716006a8b7bb90102a57f62f";
- sha256 = "0kz31qsn3nrpi8r31nlxlkkkah0qcdkq9a9i9ypv4ky7pvnzx6m5";
+ rev = "1af7838037c86872e897bea872d279ff080c28c6";
+ sha256 = "1xgkpw89pyn4p37l5rz9dw8yg065slzq8l5z69n6nam9hndcnjsh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/emms-player-simple-mpv";
@@ -18731,12 +18375,12 @@
emojify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, seq }:
melpaBuild {
pname = "emojify";
- version = "20170709.207";
+ version = "20171018.744";
src = fetchFromGitHub {
owner = "iqbalansari";
repo = "emacs-emojify";
- rev = "5bdf3ccc728ca2db734a686f9d4893c57ed59d90";
- sha256 = "0nxf35b8mblzl3yqq9h2lpr3q6r89pqljyglxm38aid2f5mjnlvx";
+ rev = "001c3adcc521223f6b53a2243635528b2cb7f7e8";
+ sha256 = "0hsrlzx8bslzhpipryxxqrdaiw66cgak14p8v47l0ylvwmxxqn13";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/488d2751b5fd3bf00f5a6f0545530f44563b86d7/recipes/emojify";
@@ -18873,8 +18517,8 @@
src = fetchFromGitHub {
owner = "zenspider";
repo = "enhanced-ruby-mode";
- rev = "c1462183573258edfd8134581417d3c95f1c9c4c";
- sha256 = "1xyg52qf8zpkrgifw1lxk8h91acrg1n7nw59mxmwq8f122lmllx7";
+ rev = "cc8e64baf7f7bcef2db5b7353ddda9d9733a11cc";
+ sha256 = "1bps5ld798av9nqkjsv7mnj8blnyp30dh809q0fk9qnwylpj74yy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cd1ac1ce69b77b11f34c4175611a852e7ec0806c/recipes/enh-ruby-mode";
@@ -18953,12 +18597,12 @@
ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }:
melpaBuild {
pname = "ensime";
- version = "20170817.2325";
+ version = "20171027.1433";
src = fetchFromGitHub {
owner = "ensime";
repo = "ensime-emacs";
- rev = "fe816d36bce96151f90b76887a69f44100bd12da";
- sha256 = "19id9s3wvwlqvcfngw32rd9fnq74nwyl5zlmyvr6i268rk4gm4lq";
+ rev = "483e94546d9b1de5841b8853882d5644cc419479";
+ sha256 = "0dd6agcjpncd3vkdx405ql03rpfacwda0njcz69f1cp7z8rc5cdz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime";
@@ -19066,12 +18710,12 @@
epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "epkg";
- version = "20170905.1210";
+ version = "20171024.651";
src = fetchFromGitHub {
owner = "emacscollective";
repo = "epkg";
- rev = "42528f4f1d3310361d84bb557c4b7270adb5fd5b";
- sha256 = "1d14160l1w65a3klhd71972a726kzhcn07bljp5q57y1qxbq648m";
+ rev = "6114b78b84cd8a96a117b7652d1e5138eee4b896";
+ sha256 = "1fmvy8h3ng2ykfmr2n0zms2h3csq24f23ldf5zdxyg34riag4nl2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg";
@@ -19548,12 +19192,12 @@
ergoemacs-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, undo-tree }:
melpaBuild {
pname = "ergoemacs-mode";
- version = "20170723.1921";
+ version = "20171030.738";
src = fetchFromGitHub {
owner = "ergoemacs";
repo = "ergoemacs-mode";
- rev = "7b0600620fc64cdb92bb9a69144c68eaa088db5b";
- sha256 = "05ihafhhjlq7b4zs58jaqssgqdha5kqv65hvk7946ba7l845fi83";
+ rev = "3ce23bba3cb50562693860f87f3528c471d603ba";
+ sha256 = "1s3b9bridl78hh1mxmdk9nqlmqhibbaxk0a1cixmsf23s06w8w6l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/02920517987c7fc698de9952cbb09dfd41517c40/recipes/ergoemacs-mode";
@@ -19590,12 +19234,12 @@
erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "erlang";
- version = "20170912.58";
+ version = "20170913.604";
src = fetchFromGitHub {
owner = "erlang";
repo = "otp";
- rev = "b36f0b6d381746a16c8d8c2bb3767d9ffb44c3f8";
- sha256 = "1i0aqq3vwy10jbky6ahka2vqk55iqanq1liqj81r76l5v55flcz6";
+ rev = "a51424af47f879e776b9344be813a03d2a4bcb5b";
+ sha256 = "18cyr3pmzwab6zqijl3c6h772wzkl1qh44j87p16hcn42sip9jz1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -19677,8 +19321,8 @@
version = "20161018.1217";
src = fetchgit {
url = "https://bitbucket.org/olanilsson/ert-junit";
- rev = "b8e23617bbd5228dfa37fdc00e7b5227fd6382df";
- sha256 = "1f5r1ns2h53q5qmrr31xbwrsinnk4ialh4a7siz2n513znq6dq8w";
+ rev = "c4cd27b60f9e7ccd05fd8a2097cde947eb250599";
+ sha256 = "0zm71kv4wxs6yf70qwrfavxc1845bg4aqqk36zypy17g1x40bms7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/27c627eacab54896a1363dbabc56250a65343dd8/recipes/ert-junit";
@@ -19757,12 +19401,12 @@
es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, spark }:
melpaBuild {
pname = "es-mode";
- version = "20170823.957";
+ version = "20170915.801";
src = fetchFromGitHub {
owner = "dakrone";
repo = "es-mode";
- rev = "82c9d0e47f7f224d1248e3455ee10c0adea327bf";
- sha256 = "1jb4b2cww6y3y0j3gf9n5v2hcmb9zsf1cz9rhr0x6vh169yvhjvr";
+ rev = "511eaf59123c2dc4f900cd31d3c30c5bf98599ea";
+ sha256 = "1ldyf39z7faizbg2nzh2myd5yld9iwxi9r5260sp1dv0ab2im4gy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9912193f73c4beae03b295822bf41cb2298756e2/recipes/es-mode";
@@ -19901,6 +19545,27 @@
license = lib.licenses.free;
};
}) {};
+ eshell-bookmark = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "eshell-bookmark";
+ version = "20170922.814";
+ src = fetchFromGitHub {
+ owner = "Fuco1";
+ repo = "eshell-bookmark";
+ rev = "deda4b848b2fb979dbe73ead2cb866610e3596ed";
+ sha256 = "14dmsnixf9vqdhsixw693sml0fn80zcf0b37z049fb40cmppqxdw";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e7bf4702a907727990fcc676980f2b219e22ab0c/recipes/eshell-bookmark";
+ sha256 = "1bybxlq1h5chrjxqjb23kq8dmgw2xrjwkrnvpbphblqzpdy5ck0s";
+ name = "eshell-bookmark";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/eshell-bookmark";
+ license = lib.licenses.free;
+ };
+ }) {};
eshell-did-you-mean = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eshell-did-you-mean";
@@ -19988,12 +19653,12 @@
eshell-prompt-extras = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eshell-prompt-extras";
- version = "20170713.11";
+ version = "20171020.2207";
src = fetchFromGitHub {
owner = "hiddenlotus";
repo = "eshell-prompt-extras";
- rev = "52a8ce66da2c5f419efd41f2a6b6d4af03f78acd";
- sha256 = "1biandbijdngalbjvbfv894qjzmj0fndypa31rmd75c0r5mg2mnf";
+ rev = "9b1a49853909c4fae95d32bb9a68cace471c161e";
+ sha256 = "03sr68mfi52ajqb6d9k3lpcrapjkqx9yynpfwin9y2328pmriaib";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/eshell-prompt-extras";
@@ -20118,8 +19783,8 @@
src = fetchFromGitHub {
owner = "ecukes";
repo = "espuds";
- rev = "31ffd83f6deccddfb8378fa2298d90d3fc5fdda1";
- sha256 = "1l8c8g050av0hi5snini7igfrjaq8q0nb3g114ai1i8frzsrxgzn";
+ rev = "444285cde99860b50b4c9a2e1c6a25e4db8d9adf";
+ sha256 = "0nwgh9nrr85n6ix60r6z58rw2078wkzkqqfszq2sr7wmad6kxspx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/14cf66e6929db2a0f377612e786aaed9eb12b799/recipes/espuds";
@@ -20177,12 +19842,12 @@
ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }:
melpaBuild {
pname = "ess";
- version = "20170911.149";
+ version = "20171030.820";
src = fetchFromGitHub {
owner = "emacs-ess";
repo = "ESS";
- rev = "23e6d3ef5b314223043c9f03301b3e7018141385";
- sha256 = "1fih6rphz5bsd2kvwblygaymp1mvz710xjvcqg52l9awlawgvbwb";
+ rev = "da48f2fff367191796b976100c72277bdfb504d2";
+ sha256 = "000rxx14fw1n4k3i6lsvy0bc249pdyx9m1pnpv3x02n0wvmfdq62";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess";
@@ -20282,12 +19947,12 @@
esup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "esup";
- version = "20170729.1742";
+ version = "20170923.1328";
src = fetchFromGitHub {
owner = "jschaf";
repo = "esup";
- rev = "94e0d2bef2bcdbd9477e702f63148cc2de75ecb3";
- sha256 = "0rz2a8ydr7jrsgz1mxgjk4wyf7rkz0w3qvx6jy8mygzhzhmniy24";
+ rev = "a589005a9a888537deef94d6fe38a9b8790c97c7";
+ sha256 = "04lxmd0h7mfjjl0qghrycgff0vcv950j1wqv0dbkr61jxp64n5fv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b9d2948a42da5d4864404d2d11a924a4f235fc3b/recipes/esup";
@@ -20307,8 +19972,8 @@
src = fetchFromGitHub {
owner = "tali713";
repo = "esxml";
- rev = "08fcc5d76abb90c194e181f267cf1d2a149b7a7c";
- sha256 = "034lxfqn5yh78hz7i568vw8kyv3hlb699z2d1dffjiigc1lblgip";
+ rev = "6d58e047b7c1e3e8cab87cf7ee15e039e8a22510";
+ sha256 = "0bkbp3bycb4vrk0y5n7013yqqzz7rjvfwkr9lppa6sixilhc8h66";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/db6556fe1b2403d1bcdade263986fd0faf0d9087/recipes/esxml";
@@ -20342,44 +20007,6 @@
license = lib.licenses.free;
};
}) {};
- etags-select = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "etags-select";
- version = "20130824.500";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/etags-select.el?revision=21";
- sha256 = "0gmlmxlwfsfk5axn3x5cfvqy9bx26ynpbg50mdxiljk7wzqs5dyb";
- name = "etags-select.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/5875d00419666388acbcb8a4f392308e7576da0b/recipes/etags-select";
- sha256 = "0j6mxj10n7jf087l7j86s3a8si5hzpwmvrpqisfvlnvn6a0rdy7h";
- name = "etags-select";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/etags-select";
- license = lib.licenses.free;
- };
- }) {};
- etags-table = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "etags-table";
- version = "20130824.457";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/etags-table.el?revision=4";
- sha256 = "0apm8as606bbkpa7i1hkwcbajzsmsyxn6cwfk9dkkll5bh4vglqf";
- name = "etags-table.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/c3efc1791df5658ca5bba4907f2a22c2cabfd3c8/recipes/etags-table";
- sha256 = "1jzij9jknab42jmx358g7f1c0d8lsp9baxbk3xsy7w4nl0l53d84";
- name = "etags-table";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/etags-table";
- license = lib.licenses.free;
- };
- }) {};
ethan-wspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ethan-wspace";
@@ -20551,12 +20178,12 @@
evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
melpaBuild {
pname = "evil";
- version = "20170904.1346";
+ version = "20171031.22";
src = fetchFromGitHub {
owner = "emacs-evil";
repo = "evil";
- rev = "485bf5399bbad17ff0cbb3787de67b9a5a5665dd";
- sha256 = "02zd9pk2x44lz9cb8cqy0apvdbb8vwlxgvrgfkfswvx34ww4rqmc";
+ rev = "3735da896e6fc2672ee06c68e77d11befb99c9c1";
+ sha256 = "01p450ap0dvnnv83cbmasb7avz6jv6xycjg4hczf8485xzq0nmcr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil";
@@ -20677,12 +20304,12 @@
evil-colemak-minimal = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-colemak-minimal";
- version = "20160922.226";
+ version = "20171006.617";
src = fetchFromGitHub {
owner = "bmallred";
repo = "evil-colemak-minimal";
- rev = "5f1db93959359d3efd57abb5a0d06e94dec92556";
- sha256 = "08dfmny7z03h6hbj21f344jv9kpzlzk31j5sd78w1c68mgx9hj6b";
+ rev = "6d98b6da60f414524a0d718f76024c26dce742b3";
+ sha256 = "0pd05jq4qkw5xx7xqzxzx62fsm77vjz0ry9ayaqgqw5831rbp553";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/828c744062069027f19fe5f2f233179f9149dc16/recipes/evil-colemak-minimal";
@@ -20803,12 +20430,12 @@
evil-escape = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-escape";
- version = "20170115.1343";
+ version = "20170913.618";
src = fetchFromGitHub {
owner = "syl20bnr";
repo = "evil-escape";
- rev = "b4d44fc5015341e484495fc86b73d09b2ac062ec";
- sha256 = "0s8lmmm25qabicwaj9jybpbd8mkc62yl7jnhk1lpablydjkv3w2i";
+ rev = "25920fb2f4ef48998eecea433c04096f8d124cfe";
+ sha256 = "1nbk0mlfrg8hbw119dpp2a1k2irgz811kcsrwmxv256gkx4pwmfk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-escape";
@@ -20908,12 +20535,12 @@
evil-goggles = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-goggles";
- version = "20170913.59";
+ version = "20171016.740";
src = fetchFromGitHub {
owner = "edkolev";
repo = "evil-goggles";
- rev = "221a5ed8ea0455e4274ef9ba14fe852cc512112d";
- sha256 = "0qjzkg1cms6ska213n1ldm511ivdawxwpvn8qzl8l75yf3whzw05";
+ rev = "4777cd784953f5e38d76edf458e050605de45bcc";
+ sha256 = "1mmkgpmb69c908yx9k7rgs4zvm1cf554bkqiqppkc92ml9gipfk2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/811b1261705b4c525e165fa9ee23ae191727a623/recipes/evil-goggles";
@@ -21097,12 +20724,12 @@
evil-magit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
melpaBuild {
pname = "evil-magit";
- version = "20170613.510";
+ version = "20171018.722";
src = fetchFromGitHub {
owner = "emacs-evil";
repo = "evil-magit";
- rev = "91c96e6ffdc6e7d5e49fd9b0ffb7df8794f0f2db";
- sha256 = "1nwibif8syk5dfygzcafsbh41gaxaps187zxdv75z2hbdbvqx1l3";
+ rev = "a24186be7cc2cdab24b56f6dcc4665eeb8349c1a";
+ sha256 = "12hr2w5r2hgagb3hqbi59v73rxpjml5prc3m7dw3wzsm0rf1rwh3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/50315ec837d2951bf5b2bb75809a35dd7ffc8fe8/recipes/evil-magit";
@@ -21307,12 +20934,12 @@
evil-org = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "evil-org";
- version = "20170911.1135";
+ version = "20170917.1447";
src = fetchFromGitHub {
owner = "Somelauw";
repo = "evil-org-mode";
- rev = "1b0cb009fcc593ba851d243d2e3291a8cfeb2fb0";
- sha256 = "0qnb5vbsrwxsn2zjl6dy6gvc1y77ac9c8nqrhpzyvjbkby2gkwzh";
+ rev = "52bbb105a6a7fa9ead68c56746740b4343ecd6e9";
+ sha256 = "1k0akcqbr67lsrj5gkpr9b3nhrf53zd3ksv4sfrapn9xhv13brbi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1768558ed0a0249421437b66fe45018dd768e637/recipes/evil-org";
@@ -21454,12 +21081,12 @@
evil-smartparens = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, smartparens }:
melpaBuild {
pname = "evil-smartparens";
- version = "20161010.322";
+ version = "20171101.13";
src = fetchFromGitHub {
owner = "expez";
repo = "evil-smartparens";
- rev = "7cde5544934930819e9dcaa1e0db2e3c58f0cd6f";
- sha256 = "0pmw98n32fyqr4qnpl52a7vax4rk8dfq98v66v8400b78j6d0n3q";
+ rev = "3a9c2bf24db73c9443d3e2e65ca662df85653f36";
+ sha256 = "05g6j5z63gmvi2j9h6iax3dklqk61ds28yq84mkiihp58swwmfpw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/850898fbfc8e0aeb779e8feae56476d989110e79/recipes/evil-smartparens";
@@ -21517,12 +21144,12 @@
evil-surround = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-surround";
- version = "20170910.1952";
+ version = "20171004.600";
src = fetchFromGitHub {
owner = "emacs-evil";
repo = "evil-surround";
- rev = "7839abe0e04740e2928a6b799557d1b16460fa5f";
- sha256 = "03lfn8clcbcmax5nzn6awzfd895inavzrn45n07hrq6abw98yjrd";
+ rev = "822a0f61c3fd7c55cda4e04c8590ae5144401c26";
+ sha256 = "0xd87whrznwk1hggb0jrx6n1m5sbj0014qv26qvvc3f11vrrda2x";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2c9dc47a4c837c44429a74fd998fe468c00639f2/recipes/evil-surround";
@@ -21601,12 +21228,12 @@
evil-test-helpers = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-test-helpers";
- version = "20170719.1445";
+ version = "20171002.135";
src = fetchFromGitHub {
owner = "emacs-evil";
repo = "evil";
- rev = "485bf5399bbad17ff0cbb3787de67b9a5a5665dd";
- sha256 = "02zd9pk2x44lz9cb8cqy0apvdbb8vwlxgvrgfkfswvx34ww4rqmc";
+ rev = "3735da896e6fc2672ee06c68e77d11befb99c9c1";
+ sha256 = "01p450ap0dvnnv83cbmasb7avz6jv6xycjg4hczf8485xzq0nmcr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/87da8c50f9167ad9c3844b23becb6904f809611d/recipes/evil-test-helpers";
@@ -21727,12 +21354,12 @@
evil-vimish-fold = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, vimish-fold }:
melpaBuild {
pname = "evil-vimish-fold";
- version = "20161103.333";
+ version = "20171030.451";
src = fetchFromGitHub {
owner = "alexmurray";
repo = "evil-vimish-fold";
- rev = "674a8a894e4ae7e7f4b2608b0c9f801a548c69eb";
- sha256 = "1v2yr5q9c239xf002ymgwndmp5yp617rj7shw2zvfl13d7x229sg";
+ rev = "4db872d12274fdddf7c6e9d01cf68cbad9cfcf15";
+ sha256 = "05phnswbk2r7hdwawzkw6anhkfss9ig8sy469s4vsrqf7cky4gmn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fcd51e24f88ebbbd3fddfc7c6f3b667d5104cf2b/recipes/evil-vimish-fold";
@@ -21769,12 +21396,12 @@
evil-visual-replace = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-visual-replace";
- version = "20170201.1920";
+ version = "20171015.2313";
src = fetchFromGitHub {
owner = "troyp";
repo = "evil-visual-replace";
- rev = "99559e1a6e813056a132f4be32b20f259470e9ed";
- sha256 = "053fqsl8cd2s0cyinvmihaglq4cv1l1ymxy7rcx9spknipcil1xp";
+ rev = "163fc827a1ffc106475da470c37fb26f4cc9b008";
+ sha256 = "1gfyrq7xfzmzh3x8k5f08n027dlbwi0pkkxf9c39fkxp4jngibsz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-visual-replace";
@@ -21832,12 +21459,12 @@
ewmctrl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ewmctrl";
- version = "20161104.1833";
+ version = "20170921.1917";
src = fetchFromGitHub {
owner = "flexibeast";
repo = "ewmctrl";
- rev = "ba1879cc803a63d5a4047ec6f2990e369ae5af3a";
- sha256 = "12h2fgabfmaq1cpr7y7ckyyfgy53ww3v25p2kk5fq77rn40zbniy";
+ rev = "3d0217c4d6cdb5c308b6cb4293574f470d4faacf";
+ sha256 = "0ilwvx0qryv3v6xf0gxqwnfm6pf96gxap8h9g3f6z6lk9ff4n1wi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b2a7679f0961b171bf23080e628ae80f50c446e4/recipes/ewmctrl";
@@ -21915,12 +21542,12 @@
exotica-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "exotica-theme";
- version = "20170828.357";
+ version = "20171031.426";
src = fetchFromGitHub {
owner = "jbharat";
repo = "exotica-theme";
- rev = "0fcb6f3e5ef7d97a4ec049867a8d703ec60a89f5";
- sha256 = "0i7pgdxrx2ijf67sy4x2xab416s458mgac261ng2522z87szddah";
+ rev = "478dddaae45a8e2373bf2b868aeece64f1288d91";
+ sha256 = "17646sa3pgmlzg2s4yic82hkq1bdiqh1spgp5x2lhqh4643fi62s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9182f92dd62e2f1775a76699a6c8f9c3e71e9030/recipes/exotica-theme";
@@ -22062,12 +21689,12 @@
exwm-x = callPackage ({ bind-key, cl-lib ? null, counsel, exwm, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, swiper, switch-window }:
melpaBuild {
pname = "exwm-x";
- version = "20170903.2138";
+ version = "20170916.2015";
src = fetchFromGitHub {
owner = "tumashu";
repo = "exwm-x";
- rev = "cee7cc0e6dd6d1c481480f1978b6487287b4f637";
- sha256 = "0kwrm2bz09i8dj0zz7pznpv0hy08pxl4kzl46c470abvs2dzrp67";
+ rev = "abb210ff56134cc6a285d91b875f3115bc951ad0";
+ sha256 = "1l7578jfn3va6bpkjfbazygsn8asxhc7cpss32mnsrzkm1ix6sz8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x";
@@ -22154,12 +21781,12 @@
eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eziam-theme";
- version = "20170906.821";
+ version = "20171007.939";
src = fetchFromGitHub {
owner = "thblt";
repo = "eziam-theme-emacs";
- rev = "63395a2367d1d48983a9363d2d0bf518177297bd";
- sha256 = "15vgv0z4vzdnc3vb98j2hy4bv5x83f4c1dzgx49r61vka7p5is0q";
+ rev = "909a84dc5959aac982d1c296e82d687d172d3ecd";
+ sha256 = "0mw9h55f708mv0ngixmdn7976yrhqjcnzac80f6mzddpwavgrhd6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme";
@@ -22256,72 +21883,15 @@
license = lib.licenses.free;
};
}) {};
- face-remap-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "face-remap-plus";
- version = "20170222.1742";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/face-remap+.el";
- sha256 = "1p42wjzl2brbqv3vh3g1rcgh5m9a7bix5q80pg7r6515as8kykad";
- name = "face-remap+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/face-remap+";
- sha256 = "0vq6xjrv3qic89pxzi6mx1s08k4ba27g8wqm1ap4fxh3l14wkg0y";
- name = "face-remap-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/face-remap+";
- license = lib.licenses.free;
- };
- }) {};
- facemenu-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "facemenu-plus";
- version = "20170222.1744";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/facemenu+.el";
- sha256 = "0nnaqmdsf6ksk6663924bpw3mrldybj6jjkgj0525nhpfjx7x4yq";
- name = "facemenu+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/facemenu+";
- sha256 = "0lbggalgkj59wj67z95949jmppmqrzrp63mdhw42r2x0fz1ir0iv";
- name = "facemenu-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/facemenu+";
- license = lib.licenses.free;
- };
- }) {};
- faces-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "faces-plus";
- version = "20170222.1745";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/faces+.el";
- sha256 = "0a80027a78zad0nxlkmv69b2zzbz4b29rsn4ivgb313r4c24igzx";
- name = "faces+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/faces+";
- sha256 = "0k3m434f3d3061pvir0dnykmv6r9jswl7pzybzja3afiy591hh92";
- name = "faces-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/faces+";
- license = lib.licenses.free;
- };
- }) {};
faceup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "faceup";
- version = "20170126.1305";
+ version = "20170925.1246";
src = fetchFromGitHub {
owner = "Lindydancer";
repo = "faceup";
- rev = "688b487ad0a78c8707c5aded50e1d85551270034";
- sha256 = "1wmmj69wgzgac5y7gnrz84dvwjzd45h3rr434vv4dxnam0j0lj40";
+ rev = "6c92dad56a133e14e7b27831e1bcf9b3a71ff154";
+ sha256 = "1yzmy7flrhrh0i10bdszx8idx6r8h6czm4vm4q0z6fp5fw94zwrx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a10bf2928b93c3908e89ca8ad9649bb468ebca05/recipes/faceup";
@@ -22442,12 +22012,12 @@
fancy-narrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fancy-narrow";
- version = "20160124.403";
+ version = "20171030.1716";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "fancy-narrow";
- rev = "4737d706d1f3e90885e6642ba782f1fa605414c6";
- sha256 = "0825hyz8b2biil0pd2bgjxqd2zm3gw9si7br5hnh51qasbaw9hid";
+ rev = "9f4a587f6a5a387271fb665e13f59d41fd42504c";
+ sha256 = "0dl0fc3i8g193adpkr4fb2k151lw9r6gd8p27q9xgmm9brf9jf17";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/fancy-narrow";
@@ -22571,8 +22141,8 @@
version = "20170908.658";
src = fetchgit {
url = "https://bitbucket.org/yassinphilip/faustine";
- rev = "feb938af3a5363e0e0210aa98a447e1896ceca47";
- sha256 = "1c0xc1nk9djjk39ksysszliphibnpm7c472p4lvgkmrsmg28i23k";
+ rev = "ae67cd9d1a2625d80726dace9dd83539e71d1b36";
+ sha256 = "1wvf37g2bb9xbxi0qxn1sfq0ygaqxfzsnzdbnail6f29qyl541al";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b298e399335efbbdbc6e9bb06ab915fc07909faa/recipes/faustine";
@@ -22588,12 +22158,12 @@
fcitx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fcitx";
- version = "20170812.1131";
+ version = "20170913.1900";
src = fetchFromGitHub {
owner = "cute-jumper";
repo = "fcitx.el";
- rev = "6d552ab44234ed78ce9a50f2412f56197266bc9f";
- sha256 = "08l859rw1lwj6hdxrlxqlxf1cfxv8yv9h1jsgs5zfis3hp7nq39j";
+ rev = "095332fbeb994c908c533fe2ad068c0728211c3d";
+ sha256 = "01sm50rqajylah2hx6n5ig0xmrrhxbamzs4bg97qzxzr4nlnjcaz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e8c40f09d9397b3ca32a7ed37203f490497dc984/recipes/fcitx";
@@ -22730,44 +22300,6 @@
license = lib.licenses.free;
};
}) {};
- files-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "files-plus";
- version = "20170222.1746";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/files+.el";
- sha256 = "1ch7k4gpfcb5k6z656rprdcvxp75wsfjhw5l6x8f05qbmm0cbimv";
- name = "files+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/files+";
- sha256 = "1m1pxf6knrnyc9ygmyr27gm709ydxf0kkh1xrfcza6n476frmwr8";
- name = "files-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/files+";
- license = lib.licenses.free;
- };
- }) {};
- filesets-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "filesets-plus";
- version = "20170222.1748";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/filesets+.el";
- sha256 = "0i9nc9zhpj208as9pynnh6xvr0qk53y7bpg2gw4gak9xr9xywbpg";
- name = "filesets+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/filesets+";
- sha256 = "06n8pw8c65bmrkxda2akvv57ndfijgbp95l40j7sjg8bjp385spn";
- name = "filesets-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/filesets+";
- license = lib.licenses.free;
- };
- }) {};
fill-column-indicator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fill-column-indicator";
@@ -22792,12 +22324,12 @@
fillcode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fillcode";
- version = "20150812.941";
+ version = "20171029.925";
src = fetchFromGitHub {
owner = "snarfed";
repo = "fillcode";
- rev = "1f64f0303a3157eabec355fd155571bb0c042489";
- sha256 = "0cgrswhbmzyfpkrp8iznsn1lxnb61dz2f0181pqd9gdf55qrk67m";
+ rev = "d0a9e20f5fcc24a786d09ea19bfb9237681ba823";
+ sha256 = "1mf2gfcjaqbw523vkfbzs2nl1y9bn9gbgmbvn2phbyj78gzq18za";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/85eb403503aa83799a6072bfe21bf66c8177ca73/recipes/fillcode";
@@ -22852,34 +22384,15 @@
license = lib.licenses.free;
};
}) {};
- find-dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "find-dired-plus";
- version = "20170409.1832";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/find-dired+.el";
- sha256 = "0zfqkw9vghbzvdh3iyqkkdq777bb1yhfgqk7p28dxz861z13cmfs";
- name = "find-dired+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/find-dired+";
- sha256 = "190cj41b6s1l6gk1m0rbwfsdciw4my39ncppdxf9pi7gzhcjpznr";
- name = "find-dired-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/find-dired+";
- license = lib.licenses.free;
- };
- }) {};
find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "find-file-in-project";
- version = "20170906.2011";
+ version = "20171025.1943";
src = fetchFromGitHub {
owner = "technomancy";
repo = "find-file-in-project";
- rev = "dcc0801c4781d76efd9ac0d86bab4084b4b93663";
- sha256 = "0axk4a4b3s0x8wn4a4mj1i89kix88cv94iclhw4wigsscndpr03v";
+ rev = "a3ecd28182ba3102fefdc080e807866464153edc";
+ sha256 = "08dk8jjg63rs15hq4rb32368nja2iwdsp8dxwb3isza96lsfkwmx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project";
@@ -22955,25 +22468,6 @@
license = lib.licenses.free;
};
}) {};
- finder-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "finder-plus";
- version = "20170222.1752";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/finder+.el";
- sha256 = "0h1jsgb7vivmbay35s9bx8dpl7l88zdh1f6ymdm16b0alpiv4p14";
- name = "finder+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/finder+";
- sha256 = "1ichxghp2vzx01n129fmjm6iwx4b98ay3xk1ja1i8vzyd2p0z8vh";
- name = "finder-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/finder+";
- license = lib.licenses.free;
- };
- }) {};
findr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "findr";
@@ -23142,25 +22636,6 @@
license = lib.licenses.free;
};
}) {};
- fit-frame = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "fit-frame";
- version = "20170222.1754";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/fit-frame.el?revision=63";
- sha256 = "1wm2jc7h5zhv695wf21l3n9gjn31ddgd0vybx8brj1nbvavifs0x";
- name = "fit-frame.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/e13c77f822db3c9eaeb3fd5fa95cc2dbe5133f2c/recipes/fit-frame";
- sha256 = "1xcq4n9gj0npjjl98vqacms0a0wnzw62a9iplyf7bgj7n77pgkjb";
- name = "fit-frame";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/fit-frame";
- license = lib.licenses.free;
- };
- }) {};
fix-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fix-input";
@@ -23255,12 +22730,12 @@
flappymacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "flappymacs";
- version = "20140715.901";
+ version = "20171023.304";
src = fetchFromGitHub {
owner = "taksatou";
repo = "flappymacs";
- rev = "bbc69405f62e1bc488533709d4ab0b5eba919dbd";
- sha256 = "07hv6l80ka10qszm16fpan8sas4b0qvl5s6qixxlz02fm7m0s7m5";
+ rev = "27f3e21acb22f786606481e3f4e5dc1edbaaaed4";
+ sha256 = "0zcwsbz93p1l2jb1fs6m4s5y9klcr5qg5nw10qg30j9l2bc1hda8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a63b22f357b2d08b12fb86c27261ab4d687c5f7f/recipes/flappymacs";
@@ -23399,6 +22874,27 @@
license = lib.licenses.free;
};
}) {};
+ flex-compile = callPackage ({ buffer-manage, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "flex-compile";
+ version = "20171031.2349";
+ src = fetchFromGitHub {
+ owner = "plandes";
+ repo = "flex-compile";
+ rev = "031f4612a07dc0ddb03424a2f986ea18e7064fe7";
+ sha256 = "1vwvhaxhpmpcyrmzdfbwxsxif3fx40548gks3y4n0nhprji7wjmg";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/259caeebc317e81ab9d532a371ea85656c2b1619/recipes/flex-compile";
+ sha256 = "1hlh4k7qgln87xajnjjhf1yyg6bgdwd0iczhlfw8gdwfj5xpjd38";
+ name = "flex-compile";
+ };
+ packageRequires = [ buffer-manage dash emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/flex-compile";
+ license = lib.licenses.free;
+ };
+ }) {};
flex-isearch = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "flex-isearch";
@@ -23461,25 +22957,6 @@
license = lib.licenses.free;
};
}) {};
- fliptext = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "fliptext";
- version = "20131113.1818";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/fliptext.el?revision=4";
- sha256 = "1viigj04kla20dk46xm913jzqrmx05rpjrpghnc0ylbqppqdwzpw";
- name = "fliptext.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/093046dfb39148d56681e9c8be8cccff23dd19cb/recipes/fliptext";
- sha256 = "0cmyan9hckjsv5wk1mvjzif9nrc07frhzkhhl6pkgm0j0f1q30ji";
- name = "fliptext";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/fliptext";
- license = lib.licenses.free;
- };
- }) {};
floobits = callPackage ({ fetchFromGitHub, fetchurl, highlight, json ? null, lib, melpaBuild }:
melpaBuild {
pname = "floobits";
@@ -23504,12 +22981,12 @@
flow-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "flow-minor-mode";
- version = "20170729.1008";
+ version = "20170916.312";
src = fetchFromGitHub {
owner = "an-sh";
repo = "flow-minor-mode";
- rev = "75067baceed7d699dda43944da49dc58d22baeff";
- sha256 = "0r1xs3vff3ng0h2w8nn7mxssdnipnrzwk9dh5f5v7prwk2q60byb";
+ rev = "93184633933b5aa62e6e92b7fe1311261012e591";
+ sha256 = "1laainsc5l4l4r5j17hblv7b1ppxrgfak73ama1qn7kb14y1jfrf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/66504f789069922ea56f268f4da90fac52b601ff/recipes/flow-minor-mode";
@@ -23609,12 +23086,12 @@
flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
melpaBuild {
pname = "flycheck";
- version = "20170911.127";
+ version = "20171026.610";
src = fetchFromGitHub {
owner = "flycheck";
repo = "flycheck";
- rev = "eeb915b51f2fe9f7afe125b1028737b8c2b44712";
- sha256 = "13dsjngb5lbhzrlcw3skk7v6j7c2k3vn596msin9f6ssjwmgc94k";
+ rev = "0d982b2860927a03e4cdf663750bd3b4c128918a";
+ sha256 = "0azjq7d3whlqwp0svj04drk1gxd1hm99d95lkqwj9pbag5hip3ly";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck";
@@ -23777,12 +23254,12 @@
flycheck-clang-tidy = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-clang-tidy";
- version = "20170621.202";
+ version = "20171024.108";
src = fetchFromGitHub {
owner = "ch1bo";
repo = "flycheck-clang-tidy";
- rev = "5b1c86477f7d1eaabd781bc83dd1bd105c79335c";
- sha256 = "1zd6rqbrpvjxa9sclkldffb91mgyljh1jcvlvvd2cdlajcv98ciw";
+ rev = "b8ebd49693f67e08e420ba847cc88f6721ef9e3e";
+ sha256 = "0fnn1baw64f7x1zjb95adryr3mfynbblwppcd6ywh7pk0sq18b80";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a289ac549a7735a12eec85521c32f915b9194b85/recipes/flycheck-clang-tidy";
@@ -23840,12 +23317,12 @@
flycheck-color-mode-line = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-color-mode-line";
- version = "20170512.1607";
+ version = "20171020.2128";
src = fetchFromGitHub {
owner = "flycheck";
repo = "flycheck-color-mode-line";
- rev = "b2b20727d133c05fd31eac7b9b5c0886bbca8f98";
- sha256 = "1dgm9i2b9irp454ag9pv96hbacz1j3gsapk96xr45wjh4hblgwa3";
+ rev = "157b1edd79b44c26ef18862160e0ab50db27352e";
+ sha256 = "0lrk2b6xa12zcv18z4j1lpl7b36sl7saz14warxc1fw3p7dr4hm4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/02b5b60b74581ff0d1815155223e0c6e94a851a1/recipes/flycheck-color-mode-line";
@@ -24176,12 +23653,12 @@
flycheck-flow = callPackage ({ fetchFromGitHub, fetchurl, flycheck, json ? null, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-flow";
- version = "20170604.811";
+ version = "20171018.327";
src = fetchFromGitHub {
owner = "lbolla";
repo = "emacs-flycheck-flow";
- rev = "a249e60803b1e423c67e40462229646cc77fcb68";
- sha256 = "04xghj1l4fnfhl139k3s6q7fhln946gx8ak7l6ys7rz23iizbx4q";
+ rev = "2e21ec3c4eacdc100b1a45e97884350f53b832d3";
+ sha256 = "0ijazydkz9lwxbnsvanpv3202k35a4knipp08inlw3pm3k16p3mj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4d18fb21d8ef9b33aa84bc26f5918e636c5771e5/recipes/flycheck-flow";
@@ -24239,12 +23716,12 @@
flycheck-haskell = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, let-alist, lib, melpaBuild, seq }:
melpaBuild {
pname = "flycheck-haskell";
- version = "20170815.44";
+ version = "20171022.958";
src = fetchFromGitHub {
owner = "flycheck";
repo = "flycheck-haskell";
- rev = "b313b62866b8a28cadc7331749e51eb32e4ddac2";
- sha256 = "1r94y0wj0ssmamyqfxv0gm0l5qbfrfka8qgsd5mbsaw1lzk5ikfb";
+ rev = "ab2e4f9b5ce4665a9b00c3e16dc8ecce30c99d01";
+ sha256 = "1508rd39zkvlwcakw708lpsahmkiq4pzagjd6j8zas0xn1gb6789";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6ca601613788ae830655e148a222625035195f55/recipes/flycheck-haskell";
@@ -24323,12 +23800,12 @@
flycheck-joker = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-joker";
- version = "20170415.2009";
+ version = "20171003.2222";
src = fetchFromGitHub {
owner = "candid82";
repo = "flycheck-joker";
- rev = "43a25fe17ba6ade96fc865bd8ec3fb3c131aa419";
- sha256 = "0m2msyyshbr6pgnjqybv8b1fj0axja3la0drbbbk0va1cn556wfs";
+ rev = "c34c3922a2e8bc918f250602e0ddf655cdcad456";
+ sha256 = "0fp7h0pmxk02x1kisqvnb9wkjjn9bl91capmnllrb7qmb24w6pd5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/599bf33a5d4a4a590b355001e532cab4e1ee9ef6/recipes/flycheck-joker";
@@ -24407,12 +23884,12 @@
flycheck-liquidhs = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-liquidhs";
- version = "20150618.1922";
+ version = "20170412.1626";
src = fetchFromGitHub {
owner = "ucsd-progsys";
repo = "flycheck-liquidhs.el";
- rev = "ee0d3bd0d5e07a872e541d02c112f1cc204db922";
- sha256 = "1wwn9dnzn4vrh747dgbcm944bp3z02gzxd32afjc9k2dsn32qvz2";
+ rev = "c27252ac24d77f4b6eec76a4ba9cd61761a3fba9";
+ sha256 = "1v5s252w2ai0rrci0rkq6wsx110pw8hp60n67990jg6l6lpvir2s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d5921fde4068ff1bb288f6f9e2fe03f4a7fdbbda/recipes/flycheck-liquidhs";
@@ -24509,15 +23986,36 @@
license = lib.licenses.free;
};
}) {};
+ flycheck-nimsuggest = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+ melpaBuild {
+ pname = "flycheck-nimsuggest";
+ version = "20171027.1508";
+ src = fetchFromGitHub {
+ owner = "yuutayamada";
+ repo = "flycheck-nimsuggest";
+ rev = "dc9a5de1cb3ee05db5794d824610959a1f603bc9";
+ sha256 = "1bf65hrz0s6f180kn2ir8l5qn7in789w8pyy96b9gqn21z50vb9d";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/cb4170f002dbcd1906e81836f3ce035b1e81c379/recipes/flycheck-nimsuggest";
+ sha256 = "099mlzramm6z66zyjb6ypn7qb0hpvwbbgk9ydsanj8sni0dd66hv";
+ name = "flycheck-nimsuggest";
+ };
+ packageRequires = [ emacs flycheck ];
+ meta = {
+ homepage = "https://melpa.org/#/flycheck-nimsuggest";
+ license = lib.licenses.free;
+ };
+ }) {};
flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-objc-clang";
- version = "20170417.1807";
+ version = "20171014.651";
src = fetchFromGitHub {
owner = "GyazSquare";
repo = "flycheck-objc-clang";
- rev = "b16b77f95e4e53a8951ebee6209a5de311748447";
- sha256 = "0lda99wscj89vhzg9wq7akm3dx1zlf90m91ifr627vcw2mzj4wkh";
+ rev = "29a9eb320d62400564360986f7ad400b74070d8e";
+ sha256 = "0b4vwbxzhds9vb4nknfdywvfpr1gkk86vsbbq6f5ds0pfk75x022";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang";
@@ -24617,12 +24115,12 @@
flycheck-plantuml = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, plantuml-mode }:
melpaBuild {
pname = "flycheck-plantuml";
- version = "20161122.219";
+ version = "20171017.1811";
src = fetchFromGitHub {
owner = "alexmurray";
repo = "flycheck-plantuml";
- rev = "f1628d589991c3d51965db0f14866b1202374eea";
- sha256 = "1j66y4qps1wjdagr36kgqgz1w8zcmwnpwcvgwn4gkif34n96s78l";
+ rev = "183be89e1dbba0b38237dd198dff600e0790309d";
+ sha256 = "1fbdbpwrlkvbgv693ndr3zamkf3gp28v94jg911fsav8bk08f6pq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/65f050860a0efda8cf472c2945b79a0a57651556/recipes/flycheck-plantuml";
@@ -24722,12 +24220,12 @@
flycheck-pycheckers = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-pycheckers";
- version = "20170810.1143";
+ version = "20171011.2136";
src = fetchFromGitHub {
owner = "msherry";
repo = "flycheck-pycheckers";
- rev = "220c551df591792d08fc9d149ab3329171743cb9";
- sha256 = "0q1sz28nlnamcm4l587q94b7cyak9d4wpgpr33a05m9lw4a6z74i";
+ rev = "0cc2d60ae31f7e2b4e5898091f0a9ba7bafdc854";
+ sha256 = "09a5x83qw5znxdrvrq71r0sgi77qjz901dhhwgzcfgf986si4rhp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/af36dca316b318d25d65c9e842f15f736e19ea63/recipes/flycheck-pycheckers";
@@ -24789,8 +24287,8 @@
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "2af4d6a32e8194f8fbcc23fd94395e3d595a3c25";
- sha256 = "0091w529lvbjlw1fdb3qjgb8fd5fcwxhqyr4ps5cvxl5bqnwlw39";
+ rev = "7fa54d513fc716b2dc1055636b4728ab29dfdd3e";
+ sha256 = "1i0php9nnpgsmb4l1sc7qgxvdgg4hyviq68f4k41b9bcwab2hbl8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags";
@@ -24848,12 +24346,12 @@
flycheck-status-emoji = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-status-emoji";
- version = "20170405.1600";
+ version = "20170923.1439";
src = fetchFromGitHub {
owner = "liblit";
repo = "flycheck-status-emoji";
- rev = "c4e891ad287c12b83b754ada27b4550fb763c07f";
- sha256 = "12nlzs4fha1bmq1xbfgf5j4wg9llacl2m3jr8fbk8144pyss3kg5";
+ rev = "e85072a04f4277a48d90364b8e48fcb26a650d38";
+ sha256 = "12k0nakwv7z90fprpzfrsnmha0w5zsvpq7qiv0md3k3h41b5mgfv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5abd6aaa8d2bf55ae75cd217820763531f91958b/recipes/flycheck-status-emoji";
@@ -24890,12 +24388,12 @@
flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-swift3";
- version = "20170409.25";
+ version = "20170926.317";
src = fetchFromGitHub {
owner = "GyazSquare";
repo = "flycheck-swift3";
- rev = "6b0b7c6fffc86809d0535afebd6b0972059992d5";
- sha256 = "0d411idv9ib1jhmdbjb8ycc8clmm1ygpwapaka3d50gkgrmfin4q";
+ rev = "756833425f51baa9eb0a2fa7493df6e68612c88d";
+ sha256 = "1hvrg717q0nlz4r8wby82gs3vdx8fdhf38rg4j77j3fqfmxdd3fi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3";
@@ -24911,12 +24409,12 @@
flycheck-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup }:
melpaBuild {
pname = "flycheck-tip";
- version = "20170729.1411";
+ version = "20171020.348";
src = fetchFromGitHub {
owner = "yuutayamada";
repo = "flycheck-tip";
- rev = "cbdff9a574fab1222ed50d7c1359ffb820f30934";
- sha256 = "0ic9cdsi30mx5ldrbzc2i9y4q69fpa9s19zrdk10i3wxs6mmgl8l";
+ rev = "9b0072d92e6b4a52834bf5a34120a0f5e1c8c2fd";
+ sha256 = "1adcxz2chy0qcv5z79hhj05gdzk4l0jijy5iy9nd3sg8sclxf6nq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/024f1e588e94014734fa252ee7bdb00b4991ede9/recipes/flycheck-tip";
@@ -24992,6 +24490,27 @@
license = lib.licenses.free;
};
}) {};
+ flycheck-yang = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yang-mode }:
+ melpaBuild {
+ pname = "flycheck-yang";
+ version = "20170915.1308";
+ src = fetchFromGitHub {
+ owner = "andaru";
+ repo = "flycheck-yang";
+ rev = "c5f65fe3f710f73d56e04d077868719afc1ebfaf";
+ sha256 = "00w91mif3wnxgj93qag51yyadnfcsyxik96vf91qlfvwh4wi6ii7";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e58b4f4294d11424918b399898c0044f5b76ab14/recipes/flycheck-yang";
+ sha256 = "0agfmirjwlz13aq1jh94agav0y1rxkyhj7mngdgys7mwjxy0ac9h";
+ name = "flycheck-yang";
+ };
+ packageRequires = [ flycheck yang-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/flycheck-yang";
+ license = lib.licenses.free;
+ };
+ }) {};
flycheck-ycmd = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, ycmd }:
melpaBuild {
pname = "flycheck-ycmd";
@@ -24999,8 +24518,8 @@
src = fetchFromGitHub {
owner = "abingham";
repo = "emacs-ycmd";
- rev = "fd037efae08628e41480e9dad705dcc1f64e498d";
- sha256 = "06scz0d3jzgbr919lkjjfq9x1dyr5nqkhblvfpyk5bdp8l6j06d6";
+ rev = "d951afd8c1c2f25a5cbeef3acfcec5f72acfd6e4";
+ sha256 = "0k6z82a3xkk71lbnw3sxqmr8ixafglivmsb5y35q1jichzz6hail";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-ycmd";
@@ -25982,12 +25501,12 @@
folding = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "folding";
- version = "20140401.3";
+ version = "20170925.838";
src = fetchFromGitHub {
owner = "jaalto";
repo = "project-emacs--folding-mode";
- rev = "f738e28cd90d794aff698bcd44bf4f5027c92839";
- sha256 = "1z2dkyzj1gq3gp9cc3lhi240f8f3yjpjnw520xszm0wvx1rp06ny";
+ rev = "3bf134fd1ecfa8767ab7020c25281ea5ce9968a2";
+ sha256 = "0kcm4k71syz778cbwqf68a63k4vmhygaib3ylwxbm5dq1dmr7iry";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1912296b7879019bea5ba8353d511496e3a9ca2d/recipes/folding";
@@ -26000,25 +25519,6 @@
license = lib.licenses.free;
};
}) {};
- font-lock-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "font-lock-plus";
- version = "20170222.1755";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/font-lock+.el";
- sha256 = "0iajkgh0n3pbrwwxx9rmrrwz8dw2m7jsp4mggnhq7zsb20ighs30";
- name = "font-lock+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/font-lock+";
- sha256 = "1wn99cb53ykds87lg9mrlfpalrmjj177nwskrnp9wglyqs65lk4g";
- name = "font-lock-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/font-lock+";
- license = lib.licenses.free;
- };
- }) {};
font-lock-profiler = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "font-lock-profiler";
@@ -26106,16 +25606,16 @@
forecast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "forecast";
- version = "20170618.1048";
+ version = "20170924.1440";
src = fetchFromGitHub {
owner = "cadadr";
- repo = "forecast.el";
- rev = "96e37ca81a42061f0e837cc3c4dec1844f682e91";
- sha256 = "0hbz2q9sm70r7sxk56dlnzwh71ckrww7w43xxy3ys1r3p7b3j3aq";
+ repo = "elisp";
+ rev = "b3d8b45c76134e2248448d719c840776e41b747a";
+ sha256 = "0fy0b04mf3brx86xjnidkwg4zs4nh123nc6pgrl4mp6d6552vv98";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/e6ff6a4ee29b96bccb2e4bc0644f2bd2e51971ee/recipes/forecast";
- sha256 = "0whag2n1120384w304g0w4bqr7svdxxncdhnz4rznfpxlgiw2rsc";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/a7ea18a56370348715dec91f75adc162c800dd10/recipes/forecast";
+ sha256 = "0zng8xdficpfccq484pghzg8yylihcy8aq0vpxd1w6l40m2qf6zn";
name = "forecast";
};
packageRequires = [ emacs ];
@@ -26334,45 +25834,6 @@
license = lib.licenses.free;
};
}) {};
- frame-cmds = callPackage ({ fetchurl, frame-fns, lib, melpaBuild }:
- melpaBuild {
- pname = "frame-cmds";
- version = "20170819.1358";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/frame-cmds.el?revision=95";
- sha256 = "169g11vs3d5gr8y1lwg7lgl21dpfca33m1c6w24mfmga4xr9042w";
- name = "frame-cmds.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/frame-cmds";
- sha256 = "0xwzp6sgcb5ap76hpzm8g4kl08a8cgq7i2x9w64njyfink7frwc0";
- name = "frame-cmds";
- };
- packageRequires = [ frame-fns ];
- meta = {
- homepage = "https://melpa.org/#/frame-cmds";
- license = lib.licenses.free;
- };
- }) {};
- frame-fns = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "frame-fns";
- version = "20170222.1759";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/frame-fns.el?revision=31";
- sha256 = "1yl51wnmlmbirrhcf07rnqix62q7ijymwfbahwjsz2s18g2zyj6n";
- name = "frame-fns.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/frame-fns";
- sha256 = "1wq8wva9q1hdzkvjk582a3fgig0lpqz9ch1p2jd6p29kb1i15f5p";
- name = "frame-fns";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/frame-fns";
- license = lib.licenses.free;
- };
- }) {};
frame-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "frame-mode";
@@ -26415,25 +25876,6 @@
license = lib.licenses.free;
};
}) {};
- framemove = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "framemove";
- version = "20130328.433";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/framemove.el?revision=4";
- sha256 = "03ll68d0j0b55rfxymzcirdigkmxcy8556d0i67ghdzmcqfwily7";
- name = "framemove.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/f075338369dbf0694205c1b2c35dc16821f6dc92/recipes/framemove";
- sha256 = "10qf017j0zfnzmcs1i56pznhbvgw7mv4232p8znqaaxphgh6r0ar";
- name = "framemove";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/framemove";
- license = lib.licenses.free;
- };
- }) {};
frames-only-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "frames-only-mode";
@@ -26441,8 +25883,8 @@
src = fetchFromGitHub {
owner = "davidshepherd7";
repo = "frames-only-mode";
- rev = "dbe2725846ab9d90b309fe0f5e303e600a7d1661";
- sha256 = "0c6xq2l9hzw2gavnwzwp5gg7nzvf7dl1x8qh7aabchd4a8c050rb";
+ rev = "d2e6a825e2079adb58012e9677c494d317494724";
+ sha256 = "1x8w2788yaqfi5ys541kp4wi3rcfa2lvbhnxgd8dwr9h0da332xa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e628416ad9420b3ac5bbfacf930a86d98958ac8/recipes/frames-only-mode";
@@ -26584,12 +26026,12 @@
fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, pos-tip, s }:
melpaBuild {
pname = "fsharp-mode";
- version = "20170617.1330";
+ version = "20171021.431";
src = fetchFromGitHub {
owner = "rneatherway";
repo = "emacs-fsharp-mode-bin";
- rev = "9766952bd7830cb0d319736961af8e42e67d42fe";
- sha256 = "1krncbzdhp6kpypaqdn6fhvxhhc1pvy2ayn4w4ljmsd7wx6zazyi";
+ rev = "5504550605354146842c8f5c34482ece778b7b31";
+ sha256 = "0hjqgyjch8fdz54akcpw5kmx2z1yvck6k8qyc0mzzmb54iiayf5a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dc45611e2b629d8bc5f74555368f964420b79541/recipes/fsharp-mode";
@@ -26613,12 +26055,12 @@
fstar-mode = callPackage ({ company, company-quickhelp, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, quick-peek, yasnippet }:
melpaBuild {
pname = "fstar-mode";
- version = "20170824.31";
+ version = "20171018.847";
src = fetchFromGitHub {
owner = "FStarLang";
repo = "fstar-mode.el";
- rev = "9ffad30f11e97aeec4c8dcd353da8e14f1d3a9f3";
- sha256 = "15ij1i4a0g7vmb312cdsq70i76accijrjha6lr8bq9a4r167axcr";
+ rev = "98647eb56be24e27cf6abd210dac8c6299cd977f";
+ sha256 = "1dhk9h7gf0hc8w9sdcgk89cbcjlxf4w7hn235rxd6iz7m4n28jzz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c58ace42342c3d3ff5a56d86a16206f2ecb45f77/recipes/fstar-mode";
@@ -26646,8 +26088,8 @@
src = fetchFromGitHub {
owner = "factor";
repo = "factor";
- rev = "705e7018c824e8160ecd8f0e81117dbebf6e90a0";
- sha256 = "16j855qg046q8p8dbsry1nr4ljfn90wk36yqrbcklb93m1g0f9ny";
+ rev = "d2f3977768f5588b9467cc73c12d9a1de204d9e8";
+ sha256 = "1cx1fyr372zhkf35mjvl46c3zim7whz8z2ax88dqavh67h92ai9h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/fuel";
@@ -26726,12 +26168,12 @@
function-args = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "function-args";
- version = "20170822.1002";
+ version = "20171031.1004";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "function-args";
- rev = "f4d2d1692f38f5acf6d209610371e008856357b5";
- sha256 = "1s5ajgig4na5mvymbxk4ncs6nfa8qirzgkp15x8rjx5kj1m22rxa";
+ rev = "609b25305670fff08d5e357298e7128e4f4e3497";
+ sha256 = "1xymwk42n2l7c7iaigz23i4l580qpjgq8nqhgr4mnw6invdsgg2c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/80688d85a34b77783140ad2b8a47ef60c762b084/recipes/function-args";
@@ -26768,12 +26210,12 @@
futhark-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "futhark-mode";
- version = "20170714.1430";
+ version = "20171026.722";
src = fetchFromGitHub {
owner = "HIPERFIT";
repo = "futhark";
- rev = "d4a741d1e87123c1691c3fcf9842895ba7d692f6";
- sha256 = "1zvk5mp1hk6lq0bmisl3nzmqclm00qjr74j3zl66q56sxn4sgxwf";
+ rev = "bfb9c4a565ac655322efe5c7bb1f77d255762846";
+ sha256 = "141q924pacsxxfsy3yngyh7a9saipjszpm529s0d4hqqws2glxvz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode";
@@ -26807,44 +26249,6 @@
license = lib.licenses.free;
};
}) {};
- fuzzy-format = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "fuzzy-format";
- version = "20130824.500";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/fuzzy-format.el?revision=6";
- sha256 = "1iv0x1cb12kknnxyq2gca7m3c3rg9s4cxz397sazkh1csrn0b2i7";
- name = "fuzzy-format.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/154cb0a10c81ce4907029f0eddc51108961c65ae/recipes/fuzzy-format";
- sha256 = "055b8710yxbi2sdqsqk6jqgnzky4nykv8jgqgwy8q2isgj6q98jb";
- name = "fuzzy-format";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/fuzzy-format";
- license = lib.licenses.free;
- };
- }) {};
- fuzzy-match = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "fuzzy-match";
- version = "20170222.1800";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/fuzzy-match.el?revision=23";
- sha256 = "1wxl900wikkzykzp95v84kcyw3m1d16hklhyqqhsmg58ph4i6r94";
- name = "fuzzy-match.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/fuzzy-match";
- sha256 = "0c1f4q985ag5qhv15iw2jhmpsyy09fbj87srp4k58lspjf40acdj";
- name = "fuzzy-match";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/fuzzy-match";
- license = lib.licenses.free;
- };
- }) {};
fvwm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fvwm-mode";
@@ -26932,12 +26336,12 @@
fzf = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fzf";
- version = "20170908.945";
+ version = "20171026.554";
src = fetchFromGitHub {
owner = "bling";
repo = "fzf.el";
- rev = "cbcc56c372ec2d907c690a05cb420a4bf643c355";
- sha256 = "046hwfnn787c7q5y2pvqxzs5a67my2zmbg5l5rnw1g9swhfh9rfw";
+ rev = "ef1dc851077913a327261a6b971fab5f5f657831";
+ sha256 = "12zbvr7806xiyx2q944nfnqqfnm43v9ziaihkb9n10s2sp6ippb7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1671e17c99ef1932c6a2e83fc4fa2e4eb6674bc8/recipes/fzf";
@@ -27098,12 +26502,12 @@
geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "geiser";
- version = "20170827.1755";
+ version = "20171010.1610";
src = fetchFromGitHub {
owner = "jaor";
repo = "geiser";
- rev = "9581e61f9d8839281fe42344dd5fe885ea7359ea";
- sha256 = "0nx86pzncab0b7700m8sc7k3nzml4v9frrq77lljjcjhw71gnvnn";
+ rev = "c266950549a7a0841bf21e092fba632a1e061187";
+ sha256 = "14axzczgnsvmwl32qvpw9p53iknwrya8jbqzhc4d2s4p9vrghk1z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser";
@@ -27116,22 +26520,22 @@
license = lib.licenses.free;
};
}) {};
- general = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ general = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "general";
- version = "20170708.104";
+ version = "20171031.1345";
src = fetchFromGitHub {
owner = "noctuid";
repo = "general.el";
- rev = "00efad765a3ace42a2833c65a169d96c7925623b";
- sha256 = "1jp0vp4g46pcxsyz9d8n9iqf1rsaw4lhsrilmdkayj7n3skg4ipj";
+ rev = "6828a859af771df5ec1bf50b67f0fcc7261b5a11";
+ sha256 = "13sm85dybjhnqqgkshc4n4m3vm6pd949ppxyb5li7f0znhq6l3ai";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d86383b443622d78f6d8ff7b8ac74c8d72879d26/recipes/general";
sha256 = "104ywsfylfymly64p1i3hsy9pnpz3dkpmcq1ygafnld8zjd08gpc";
name = "general";
};
- packageRequires = [ cl-lib ];
+ packageRequires = [ cl-lib emacs ];
meta = {
homepage = "https://melpa.org/#/general";
license = lib.licenses.free;
@@ -27224,12 +26628,12 @@
ggtags = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ggtags";
- version = "20170827.510";
+ version = "20170918.1838";
src = fetchFromGitHub {
owner = "leoliu";
repo = "ggtags";
- rev = "9d1ecf961dd964cbe8ea183eac23572bb4f8f4ee";
- sha256 = "1iy7n39kjl8n5qhs2vc9vszq3ff8h883zd380d3g7zs9nw0xx7jf";
+ rev = "6293c438a4a7aae08b8f5dd5fc0082d3da0aa530";
+ sha256 = "0rb293wjnc36gjy1vvvqsy605nn0vli1b1w210vvcjbg7zgcsak1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b158bb1bc2fbe3de61a6b21174eac7b1457edda2/recipes/ggtags";
@@ -27291,8 +26695,8 @@
src = fetchFromGitHub {
owner = "DanielG";
repo = "ghc-mod";
- rev = "0d13786a4cc413cf12de0ace9ba6f43ddd7a032b";
- sha256 = "1i6xjnkhkx406lia4f8qgyn27x20ridxkd4199wmdlf2w44fvpac";
+ rev = "06515c44830788254602af90118de07ae2effb12";
+ sha256 = "1ymjq9nsqzf8vhrzniwqzszwbdlq5y2nmr8pgbwhmh3bvfbpj7ff";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc";
@@ -27368,6 +26772,27 @@
license = lib.licenses.free;
};
}) {};
+ ghost-blog = callPackage ({ fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }:
+ melpaBuild {
+ pname = "ghost-blog";
+ version = "20171023.42";
+ src = fetchFromGitHub {
+ owner = "javaguirre";
+ repo = "ghost-blog-emacs";
+ rev = "71b358643cc9a2db1bf752281ff94aba9b59e4cc";
+ sha256 = "1fkh7zslkdi7a4x2xrk73acmigbi7yx9k6iaj75zbjfd49gyqj13";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/4a906d461bcb2aa07050b72669feb5787414d809/recipes/ghost-blog";
+ sha256 = "0c591cx5kkfmhhqh8jall470iicxdv01mm3m13irq5xhmp3i5kjy";
+ 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";
@@ -27413,12 +26838,12 @@
ghub-plus = callPackage ({ apiwrap, emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }:
melpaBuild {
pname = "ghub-plus";
- version = "20170819.1806";
+ version = "20171019.944";
src = fetchFromGitHub {
owner = "vermiculus";
repo = "ghub-plus";
- rev = "d6ee1158676f6fb62601fc20f02f4cbb7f090085";
- sha256 = "1r4zm1frbm2dwsnrfnsghfplxj81grwhhyjc421kjnfavkkflxnq";
+ rev = "e04050f81106029c342deb7adbfc67b2a888ec58";
+ sha256 = "0ydd6aiy8x878jlzp88gi30yslhkcin0rbdjirj2vjs88cfvcjq6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/03a412fd25218ff6f302734e078a699ff0234e36/recipes/ghub+";
@@ -27602,12 +27027,12 @@
git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
melpaBuild {
pname = "git-commit";
- version = "20170913.343";
+ version = "20171007.346";
src = fetchFromGitHub {
owner = "magit";
repo = "magit";
- rev = "ae72710292a94d9af92799d3ddeb86f365f34a56";
- sha256 = "1344dcngdk899xi9wjipvngq50xggbv06fb1w09zjzs8ckpsh8gf";
+ rev = "5c08d09cdaad506ca94616c59f39982f43f4c12f";
+ sha256 = "053ff7gr56chbfg3n6ysn5q13db2rjr5s7nkplkv72hzla381dys";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -27627,8 +27052,8 @@
src = fetchFromGitLab {
owner = "emacs-stuff";
repo = "git-commit-insert-issue";
- rev = "5f08c17bf93b17915415d435ee41923d924fe20b";
- sha256 = "11my5apnyhdqh0pmq9wdjd1iah415a5nw87sk586cb3vxnbn5qas";
+ rev = "8d2448959073646d652687355efec6ba7b1e1af8";
+ sha256 = "1ix2hbs3dfvjlpldpnb06j9al13zss6gmgl6l09dq2ic4warbag7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/git-commit-insert-issue";
@@ -28253,12 +27678,12 @@
glab = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "glab";
- version = "20160808.539";
+ version = "20170924.359";
src = fetchFromGitLab {
owner = "tarsius";
repo = "glab";
- rev = "5ced0214622450930bcea105b9aac785c594609d";
- sha256 = "100lz4dqn9ggvlvdrp909cy44br9hnlaa62pj0kp1vdqqxfxwfyn";
+ rev = "9848182275e0448390ccdd8dcd8e1e3a1853950c";
+ sha256 = "1fw1ck85y9r6z331g1wj7rix29fwy6gwbm7vqj3wff0lszy208ba";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9375cbae3ffe5bf4ba5606358860050f3005d9b7/recipes/glab";
@@ -28274,12 +27699,12 @@
glsl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "glsl-mode";
- version = "20160209.833";
+ version = "20170927.736";
src = fetchFromGitHub {
owner = "jimhourihan";
repo = "glsl-mode";
- rev = "b4709644bb01b522ba9c8afe16ed2394783c481f";
- sha256 = "14ziljq34k585scwn606hqbkcvy8h1iylsc4h2n1grfmm8ilf0ws";
+ rev = "384968506cf25c5c2df61b32fdfdbd041e3bf651";
+ sha256 = "0729s4w010vw4ajvh1zpni7szxv9rpm6jk2y9hp7qyi67zbgjjgc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c416822d54df436f29dcf9a5f26398685fdc17a2/recipes/glsl-mode";
@@ -28337,12 +27762,12 @@
gmpl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gmpl-mode";
- version = "20151116.1149";
+ version = "20171031.1354";
src = fetchFromGitHub {
owner = "cute-jumper";
repo = "gmpl-mode";
- rev = "a4481bcbd84f67cd87e7bc87456b6f5b3a95fcf6";
- sha256 = "0w9dfxpiwwfk1iy83a214xpvqf858k668xkcdr2n25bccg1i148y";
+ rev = "c5d362169819ee8b8e8954145daee7e260c54921";
+ sha256 = "00p2z6kbyc0bas21d1zygx7z49w6mf22y9kf1rcm9gqsnnadb4j9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c89a523f87db358c477e5840b0e043e9f253e640/recipes/gmpl-mode";
@@ -28463,12 +27888,12 @@
gnuplot-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gnuplot-mode";
- version = "20170727.1339";
+ version = "20171013.916";
src = fetchFromGitHub {
owner = "mkmcc";
repo = "gnuplot-mode";
- rev = "eafa9395771a5ceace503cf5922efac1df0f5ec5";
- sha256 = "03799c7gwblpwpinbahbp5l510lg6yi85cmpsahsncfvkwirp2rm";
+ rev = "601f6392986f0cba332c87678d31ae0d0a496ce7";
+ sha256 = "14f0yh1rjqc3337j4sbqzfb7pjim2c8a7wk1a73xkrdkmjn82vgb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d801a2e0ba5ae7c65b5d312fbf41261278a8b1ba/recipes/gnuplot-mode";
@@ -28505,12 +27930,12 @@
gnus-desktop-notify = callPackage ({ fetchFromGitHub, fetchurl, gnus ? null, lib, melpaBuild }:
melpaBuild {
pname = "gnus-desktop-notify";
- version = "20170305.1215";
+ version = "20171007.1235";
src = fetchFromGitHub {
owner = "wavexx";
repo = "gnus-desktop-notify.el";
- rev = "7d80d5e1894859e963584c55f570508fdf9c2ee0";
- sha256 = "1slj86f8c4pkl30xkv43vqwijd49nxya1bmhb8mqadncp3wapwr0";
+ rev = "52e5de0961ce0f6890d5e7f26bc05152b99d9979";
+ sha256 = "0r28hrlkji8z62nra71p0q6gvh21w90pyvmgskzjldmj78yjqbdj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/gnus-desktop-notify";
@@ -28544,25 +27969,6 @@
license = lib.licenses.free;
};
}) {};
- gnus-spotlight = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "gnus-spotlight";
- version = "20130901.735";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/gnus-spotlight.el?revision=2";
- sha256 = "1r6bck1hsvk39ccri1h128jj8zd0fh9bsrlp8ijb0v9f6x3cysw4";
- name = "gnus-spotlight.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/004d48a59063163bfe5fbc5311330893d1b3b41c/recipes/gnus-spotlight";
- sha256 = "065jcix6a4mxwq8wc8gkr0x9lxmn6hlvf0rqmhi8hb840km1syjx";
- name = "gnus-spotlight";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/gnus-spotlight";
- license = lib.licenses.free;
- };
- }) {};
gnus-summary-ext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gnus-summary-ext";
@@ -28654,8 +28060,8 @@
src = fetchFromGitHub {
owner = "nsf";
repo = "gocode";
- rev = "c7fddb39ecbc9ebd1ebe7d2a3af473ed0fffffa1";
- sha256 = "0qx8pq38faig41xkl1a4hrgp3ziyjyn6g53vn5wj7cdgm5kk67nb";
+ rev = "e990796e68a2ebfc099afed20b99e26d6b64061a";
+ sha256 = "1s2jpqy599fr5qzfvba5njrwx1n48vqjg20vibssn2kyyc3l42d3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete";
@@ -28773,6 +28179,27 @@
license = lib.licenses.free;
};
}) {};
+ go-gen-test = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+ melpaBuild {
+ pname = "go-gen-test";
+ version = "20171022.2058";
+ src = fetchFromGitHub {
+ owner = "s-kostyaev";
+ repo = "go-gen-test";
+ rev = "44c202ac97e728e93a35cee028a0ea8dd6e4292c";
+ sha256 = "1vi5xsf0xbcbvapi20hsjangwyp38cbgi8kiccpmingnq2kp8ghs";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0861c126161a2674f0e115eac6f948490b142b44/recipes/go-gen-test";
+ sha256 = "1pj8n8xj9ccq9ips4wy4v6hdxxgwv11pwi671l6jjrig38v13dzr";
+ name = "go-gen-test";
+ };
+ packageRequires = [ emacs s ];
+ meta = {
+ homepage = "https://melpa.org/#/go-gen-test";
+ license = lib.licenses.free;
+ };
+ }) {};
go-gopath = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "go-gopath";
@@ -28801,8 +28228,8 @@
src = fetchFromGitHub {
owner = "dominikh";
repo = "go-mode.el";
- rev = "99b06da201afb91e8db0c525c0f3c3590fd92fa6";
- sha256 = "0ss6fpjnz3h3g4d1rjv50sknzr112c2r5zwzy2aqp7sw24cz10r2";
+ rev = "7eb5b3dd0ac31d176e9d56da4172f66aef8fae47";
+ sha256 = "1gx8hpgj9pbhpqqg1n5lby03bkg0llbkvb6pnidnfayh338amiqp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-guru";
@@ -28843,8 +28270,8 @@
src = fetchFromGitHub {
owner = "dominikh";
repo = "go-mode.el";
- rev = "99b06da201afb91e8db0c525c0f3c3590fd92fa6";
- sha256 = "0ss6fpjnz3h3g4d1rjv50sknzr112c2r5zwzy2aqp7sw24cz10r2";
+ rev = "7eb5b3dd0ac31d176e9d56da4172f66aef8fae47";
+ sha256 = "1gx8hpgj9pbhpqqg1n5lby03bkg0llbkvb6pnidnfayh338amiqp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-mode";
@@ -28927,8 +28354,8 @@
src = fetchFromGitHub {
owner = "dominikh";
repo = "go-mode.el";
- rev = "99b06da201afb91e8db0c525c0f3c3590fd92fa6";
- sha256 = "0ss6fpjnz3h3g4d1rjv50sknzr112c2r5zwzy2aqp7sw24cz10r2";
+ rev = "7eb5b3dd0ac31d176e9d56da4172f66aef8fae47";
+ sha256 = "1gx8hpgj9pbhpqqg1n5lby03bkg0llbkvb6pnidnfayh338amiqp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d806abe90da9a8951fdb0c31e2167bde13183c5c/recipes/go-rename";
@@ -29137,8 +28564,8 @@
src = fetchFromGitHub {
owner = "golang";
repo = "lint";
- rev = "c5fb716d6688a859aae56d26d3e6070808df29f7";
- sha256 = "0bp9aarkinjr6m358qw9x4qxi3v9h06jvipyx1pg3pwsqh61vb12";
+ rev = "6aaf7c34af0f4c36a57e0c429bace4d706d8e931";
+ sha256 = "1z1j2l0j5175xvin5v56nsq7byg5nfpfvl9xgjszparchkyr8ndz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/34f22d829257456abbc020c006b92da9c7a7860e/recipes/golint";
@@ -29200,8 +28627,8 @@
src = fetchFromGitHub {
owner = "google";
repo = "styleguide";
- rev = "520cd9f88cc4bb6fa47345d566fffd8dd95c7450";
- sha256 = "1xghwnjl2wi78bcn4nhjdxhann18r1nczq47yia2rxl0yg61wwxk";
+ rev = "ec88ff999b47a5adcd1b09cc8b49c793af337964";
+ sha256 = "0bmbia1h85d8nsl2gk6wfi0fxij0d8ha56f2h9kk2swv3w5yg1d7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style";
@@ -29214,22 +28641,22 @@
license = lib.licenses.free;
};
}) {};
- google-contacts = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2 }:
+ google-contacts = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2 }:
melpaBuild {
pname = "google-contacts";
- version = "20170112.1022";
+ version = "20171027.1033";
src = fetchFromGitHub {
owner = "jd";
repo = "google-contacts.el";
- rev = "cf654c59b197a028eb8bf432d52776c2e0ad4135";
- sha256 = "1qrn9zqn25wpsrqbacamn3ixf90xmgxa8ifkday6cxn5ks0kgyj4";
+ rev = "a40389bae006ae094aeb1a39fae9891ca687c0fa";
+ sha256 = "06mfdmr3dlmk4gyq8fxqv78c5jyis8vxx4ih2azcr5c831pkayzi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/671afe0ff3889ae8c4b2d7b8617a3a25c16f3f0f/recipes/google-contacts";
sha256 = "0wgi244zy2am90alimgzazshk2z756bk1hchphssfa4j15n16jgn";
name = "google-contacts";
};
- packageRequires = [ oauth2 ];
+ packageRequires = [ cl-lib oauth2 ];
meta = {
homepage = "https://melpa.org/#/google-contacts";
license = lib.licenses.free;
@@ -29238,12 +28665,12 @@
google-maps = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "google-maps";
- version = "20161210.458";
+ version = "20171002.734";
src = fetchFromGitHub {
owner = "jd";
repo = "google-maps.el";
- rev = "956e6ad42bc3819bcaf4cc66a640f5079b385ed7";
- sha256 = "0dqcs9dl3170zddh4npsqm1ql0n0a0378gyqxk0vi0ibzch537vk";
+ rev = "c0e5dccfdc9f7f77ff8f29177547be47833d7156";
+ sha256 = "1agsfmbd2zbn1xs05kxlb32hhkmrri3hdmcrvf0w1fcsgc5a9085";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/671afe0ff3889ae8c4b2d7b8617a3a25c16f3f0f/recipes/google-maps";
@@ -29385,12 +28812,12 @@
gotham-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gotham-theme";
- version = "20170822.1030";
+ version = "20171013.1216";
src = fetchFromGitHub {
owner = "wasamasa";
repo = "gotham-theme";
- rev = "417d61978d139cb5d089c5365fc8d3166d76d3ac";
- sha256 = "0rc40cfj2mby1q7bk1pp1fxdi72nh9ip80spjdm1csvjjc4dbkwr";
+ rev = "5e97554d1f9639698faedb0660e63694be33bd84";
+ sha256 = "18x0b2qmyzf9sddsv9ps1059pi4ndzq44rm4yl87slq03y75nxi9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4b388de872be397864a1217a330ba80437c287c0/recipes/gotham-theme";
@@ -29403,17 +28830,19 @@
license = lib.licenses.free;
};
}) {};
- goto-chg = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+ goto-chg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
pname = "goto-chg";
- version = "20131228.659";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/goto-chg.el?revision=9";
- sha256 = "078d6p4br5vips7b9x4v6cy0wxf6m5ij9gpqd4g33bryn22gnpij";
- name = "goto-chg.el";
+ version = "20170917.1200";
+ src = fetchFromGitHub {
+ owner = "emacs-evil";
+ repo = "goto-chg";
+ rev = "81fca94d2592cf32bab451c39a9cd2d9b03fbd6b";
+ sha256 = "033msplvpahkva9ha09gsg9232fyz2bjihrdxaa2z9g4yzql8jkq";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/529897b0c076d9031e7ecd13c945d2104ce8c735/recipes/goto-chg";
- sha256 = "0fs0fc1mksbb1266sywasl6pppdn1f9a4q9dwycl9zycr588yjyv";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/cf1fc176430fe3ab55ce537a0efc59780bb812be/recipes/goto-chg";
+ sha256 = "1yd4jq4zql4av9nr1sdk4nsnnk54c3brgjhpczndy1ipiaxlnydy";
name = "goto-chg";
};
packageRequires = [];
@@ -29467,12 +28896,12 @@
govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }:
melpaBuild {
pname = "govc";
- version = "20170801.942";
+ version = "20170919.645";
src = fetchFromGitHub {
owner = "vmware";
repo = "govmomi";
- rev = "17b8c9ccb7f8c7b015d44c4ea39305c970a7bf31";
- sha256 = "0g1vd8g6kbmz5ni0hdqg4yjlisf1lcxnfhrzcnwim5pw8zj549k2";
+ rev = "b227a2582a9e5175fc778fc6a03b98aa14534927";
+ sha256 = "0ss8jqczipl557c9pipkpvz3h9x6lhzma15s799zw7jwyza6802y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -29597,8 +29026,8 @@
src = fetchFromGitHub {
owner = "Groovy-Emacs-Modes";
repo = "groovy-emacs-modes";
- rev = "36cd834c9fb1e438dfae4ad15a3580c963dba29f";
- sha256 = "0rkxchxjgpgbhng15knwxfv0bcysdbc6nlh61x8z793aj2m0whi9";
+ rev = "c1e4cf8378bdd7e0d8205b2bcdcb3ff3e05ad8d2";
+ sha256 = "0jk0a0n43jabyn8shv2i0fzqcy2aw16hanjqcsfzmrv5881hzyy1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode";
@@ -29790,15 +29219,36 @@
license = lib.licenses.free;
};
}) {};
+ grayscale-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "grayscale-theme";
+ version = "20171005.102";
+ src = fetchFromGitHub {
+ owner = "belak";
+ repo = "emacs-grayscale-theme";
+ rev = "53ad50e10e68f2f076ebfc96e10ecef7a932d38d";
+ sha256 = "034pa35cjl07bhqdyw3xrcl97xcdg7jg0jvgn034fs3hssmsyxgv";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/2993881c7285cfbfc590b4118db46bfd435817bc/recipes/grayscale-theme";
+ sha256 = "0jbzb1zxv5mg3pivii31d4kz75igm339nw4cmx9kgzia9zal5f1r";
+ name = "grayscale-theme";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/grayscale-theme";
+ license = lib.licenses.free;
+ };
+ }) {};
green-is-the-new-black-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "green-is-the-new-black-theme";
- version = "20170828.1056";
+ version = "20171005.1641";
src = fetchFromGitHub {
owner = "fredcamps";
repo = "green-is-the-new-black-emacs";
- rev = "2b1011836fc04940d542e9a783b99670a08b308b";
- sha256 = "16v7l4ynj4p1hq243rqckfgppmj8cvm0lyybjjqaqblqjd1ki90d";
+ rev = "b9cdecd04691311c30c94ad4ec81124e63b9b122";
+ sha256 = "124q733rirc8a2d9xfparphcjrrbxhp4wxf070l8hqp3p2764bka";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3e42528d5677fd90515cad47266c07ea3d4363fb/recipes/green-is-the-new-black-theme";
@@ -29874,25 +29324,6 @@
license = lib.licenses.free;
};
}) {};
- grep-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "grep-plus";
- version = "20170223.728";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/grep+.el";
- sha256 = "0jx2r21x8ndikvn8zvdnmwg8al56yi9gb0fcmplc3lnq4my6xcjr";
- name = "grep+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/grep+";
- sha256 = "1qj4f6d3l88bdcnq825pylnc76m22x2i15yxdhc2b6rv80df7zsx";
- name = "grep-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/grep+";
- license = lib.licenses.free;
- };
- }) {};
greymatters-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "greymatters-theme";
@@ -29978,12 +29409,12 @@
groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "groovy-mode";
- version = "20170828.1026";
+ version = "20171024.221";
src = fetchFromGitHub {
owner = "Groovy-Emacs-Modes";
repo = "groovy-emacs-modes";
- rev = "36cd834c9fb1e438dfae4ad15a3580c963dba29f";
- sha256 = "0rkxchxjgpgbhng15knwxfv0bcysdbc6nlh61x8z793aj2m0whi9";
+ rev = "c1e4cf8378bdd7e0d8205b2bcdcb3ff3e05ad8d2";
+ sha256 = "0jk0a0n43jabyn8shv2i0fzqcy2aw16hanjqcsfzmrv5881hzyy1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode";
@@ -30041,12 +29472,12 @@
gruvbox-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gruvbox-theme";
- version = "20170828.144";
+ version = "20170923.2008";
src = fetchFromGitHub {
owner = "Greduan";
repo = "emacs-theme-gruvbox";
- rev = "4e1c2616a31f33191daf20c0f9f744af5dd14468";
- sha256 = "1cgc8amxbj1839zx6vhpk96r1iag8mwnkdzd4wj6xabb59lvbjld";
+ rev = "4241935d9cc786d0b4a3a445830c395f2a9eeb90";
+ sha256 = "1x624xc2756pmb4h5ayls8r16zy33d9vxr0as4jm6q682h2swir6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme";
@@ -30083,12 +29514,12 @@
gscholar-bibtex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gscholar-bibtex";
- version = "20170713.1934";
+ version = "20170913.1457";
src = fetchFromGitHub {
owner = "cute-jumper";
repo = "gscholar-bibtex";
- rev = "655bccf0b12c9d95ec992ee4bfb5c7c9a4d0c99b";
- sha256 = "1ivdq3mgym14v5hpv938248vifw1xk9z16d2f38d9xj01icik522";
+ rev = "ba4ce159e385d695d8560e8b06b3cbe48424861c";
+ sha256 = "0idnfhk17avp0r4706grjqqkz0xl98gs0bx7wrkvwym3y2gadlz2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9fa546d3dce59b07a623ee83e3befe139dc10481/recipes/gscholar-bibtex";
@@ -30188,12 +29619,12 @@
guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }:
melpaBuild {
pname = "guix";
- version = "20170902.1128";
+ version = "20171031.1241";
src = fetchFromGitHub {
owner = "alezost";
repo = "guix.el";
- rev = "54bd174b514c5de11e82c4263ac2723addb0fe87";
- sha256 = "1i5kwzwlb6lx65rgixm8mbdi6x03n0hb4hbc7j76lar4j58ypwz2";
+ rev = "b11ddb65044468a1d1d7091ee9636aab7b13afed";
+ sha256 = "0jhmc2s1xbr5dnmckszx8j0i3kfj7n868xw1d6sqplm7i0r0wm8s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix";
@@ -30293,12 +29724,12 @@
habitica = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "habitica";
- version = "20170203.2122";
+ version = "20171022.1922";
src = fetchFromGitHub {
owner = "abrochard";
repo = "emacs-habitica";
- rev = "f3e326b7342953ffd5d3ced9266b46387b2bf9ce";
- sha256 = "0aixxlfp04vmipki7r7aqid2lsrzy7d38g09qc1hrjjdba7jrjlp";
+ rev = "e51ff7436fe1da10404e2c0872b15d6a7a926717";
+ sha256 = "1hiiqf82nagnpq2qdcdv6y2blfiqs6f8ia8k66a4zn5xgwpd13f4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cf9543db3564f4806440ed8c5c30fecbbc625fa1/recipes/habitica";
@@ -30356,12 +29787,12 @@
hackernews = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
melpaBuild {
pname = "hackernews";
- version = "20170829.1044";
+ version = "20170930.1313";
src = fetchFromGitHub {
owner = "clarete";
repo = "hackernews.el";
- rev = "62442f76a0936047b5f66457298811c4f724a4f5";
- sha256 = "0pz3w726485yqww674ydrc3ffd0wrm9w0dgan0qyg3ggjj1fvjvs";
+ rev = "520e8dca91b8c2bc1de852f577af46ed1b7cabcd";
+ sha256 = "0951vb08sjpxx28cpaa8njirjw6fml60m91wa146cnxpngd68w6b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c43a342e47e5ede468bcf51a60d4dea3926f51bd/recipes/hackernews";
@@ -30461,12 +29892,12 @@
haml-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "haml-mode";
- version = "20170624.2148";
+ version = "20170923.2153";
src = fetchFromGitHub {
owner = "nex3";
repo = "haml-mode";
- rev = "c7c96a269f9b1a0302ff81360e1b5e693d784774";
- sha256 = "0lh9m0598rmwx9qacb6wjd12hf6njx7r1srl25bw60fs1l5bnvqd";
+ rev = "1cbb2de8f0fc25f35448c5cad04642f28078f3bb";
+ sha256 = "1045bf7bq914d3577kg9xakm4yciwwsvlh5qwfk4wnsraf7rld0r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/haml-mode";
@@ -30692,12 +30123,12 @@
haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "haskell-mode";
- version = "20170907.903";
+ version = "20171022.26";
src = fetchFromGitHub {
owner = "haskell";
repo = "haskell-mode";
- rev = "9ced44c934e9d02dc41ab2f47686cc041f7ae5f5";
- sha256 = "1j10irax6h67wz76zlbhkylmmn4qnb9padwld9fk43n98cismbix";
+ rev = "9018ad5cac0b1b1b5e0a51586027fb0ca4076b1a";
+ sha256 = "0aj6mjv1i8m18klj9mp690fkmwc81wxh2q69cxjf78fdpgbrhcwl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode";
@@ -30775,12 +30206,12 @@
hasky-stack = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }:
melpaBuild {
pname = "hasky-stack";
- version = "20170901.154";
+ version = "20170928.359";
src = fetchFromGitHub {
owner = "hasky-mode";
repo = "hasky-stack";
- rev = "38a33e2ed02d57afb6b38bf36741f5bf7e38e45b";
- sha256 = "03zg58hrka2q7sqm3f14xgcs2mjxhlyybkf9w6pp8icr4wdsih4z";
+ rev = "a3f890fb8570369898ee9718b128d4e7123a6585";
+ sha256 = "0bc5i4s7aclwrsh8yrhfwwlfbcs5hdbzm31glikd487asv30jq9c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c3faf544872478c3bccf2fe7dc51d406031e4d80/recipes/hasky-stack";
@@ -30939,25 +30370,6 @@
license = lib.licenses.free;
};
}) {};
- header2 = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "header2";
- version = "20170223.729";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/header2.el?revision=69";
- sha256 = "0cv74cfihr13jrgyqbj4x0na659djfyrhflxni6jdbgbysi4zf6k";
- name = "header2.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/header2";
- sha256 = "1vvxb850njn921djvnf76q1p045sqr5hqk6v0p0amvjvih48v0zx";
- name = "header2";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/header2";
- license = lib.licenses.free;
- };
- }) {};
headlong = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "headlong";
@@ -30982,12 +30394,12 @@
helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
melpaBuild {
pname = "helm";
- version = "20170912.523";
+ version = "20171030.2225";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
- rev = "20fd1fdc80c05b1b2c03a9dd02f4a8358d2ed883";
- sha256 = "08rli1i3k1kvv7bavdb9s1y333cldxla9v0k3g7x72lyqncl25pr";
+ rev = "fe92240663f6b2314e79558f6eabbab955a797e3";
+ sha256 = "1ip2a9fh3k14s87h8zhw6flybkskcx6vrayyzj5929g97mr26a5k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -31213,12 +30625,12 @@
helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }:
melpaBuild {
pname = "helm-bibtex";
- version = "20170808.1124";
+ version = "20171022.220";
src = fetchFromGitHub {
owner = "tmalsburg";
repo = "helm-bibtex";
- rev = "8ed898fb5a68f18e9bb9973832a5c1f8abcfc463";
- sha256 = "14lyx0vbqr97p3anzrsp7m3q0kqclyjcdwplpraim403fcklzbnz";
+ rev = "54de08577f9c19354cc303ee52836263aef486fb";
+ sha256 = "0l98lmy0c9l64khnl9j87l5g9g5fiah5l64hxn97h4b438kjcjm0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex";
@@ -31612,12 +31024,12 @@
helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "helm-core";
- version = "20170906.141";
+ version = "20171029.2252";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
- rev = "20fd1fdc80c05b1b2c03a9dd02f4a8358d2ed883";
- sha256 = "08rli1i3k1kvv7bavdb9s1y333cldxla9v0k3g7x72lyqncl25pr";
+ rev = "fe92240663f6b2314e79558f6eabbab955a797e3";
+ sha256 = "1ip2a9fh3k14s87h8zhw6flybkskcx6vrayyzj5929g97mr26a5k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -31675,12 +31087,12 @@
helm-dash = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-dash";
- version = "20170913.345";
+ version = "20171017.342";
src = fetchFromGitHub {
owner = "areina";
repo = "helm-dash";
- rev = "3d215210191c61b775f7f63f3f5306ddfefc7e33";
- sha256 = "1vnkvlyg6br0a5a002il4fr0r819kl7nsff6l1zbiay75sgnj93d";
+ rev = "08961190b3982dcb8c359e633daba556a6d92ce3";
+ sha256 = "1vdrfykhcfnmm254gd3aqypk9hfl0fcml1nc0wxmdjlimlsxadc3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-dash";
@@ -31927,12 +31339,12 @@
helm-ext = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-ext";
- version = "20170411.1049";
+ version = "20170914.1348";
src = fetchFromGitHub {
owner = "cute-jumper";
repo = "helm-ext";
- rev = "fe50af14eebc9be72b026e823facfd0a80593248";
- sha256 = "1pz7i1byscfq2j73cfgcjqdx8s14h9qxnfmvs5g00m0y3g25hhc0";
+ rev = "c2de41c4694ed606b321bcf83493dee93ad5635a";
+ sha256 = "0bnnzf7pwg0qyx8hafgx6ckcc7n3pvf5j1qbipkzgnqmfqfli0n7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee74cb0aa3445bc9ae4226c2043ee4de3ac6cd3/recipes/helm-ext";
@@ -32704,12 +32116,12 @@
helm-lastpass = callPackage ({ csv, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
melpaBuild {
pname = "helm-lastpass";
- version = "20170808.511";
+ version = "20170914.142";
src = fetchFromGitHub {
owner = "xuchunyang";
repo = "helm-lastpass";
- rev = "3d07a1d68586980ae33dd7f84be00eaace31f7d2";
- sha256 = "1rn19hql62fgz1kiyxyw11h3h9m38nnhba9sghlrxj3wk11fm8gs";
+ rev = "ae5d1252d60450082a5c26af3ad2be43994201ec";
+ sha256 = "0qlcy8g9m3mfnr6p7kax6i1bq0dsxpz22vy5zjp24farx96mj5mi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a39f1b0a5b22e91eb9e298949def6c29e7bc5755/recipes/helm-lastpass";
@@ -32722,6 +32134,27 @@
license = lib.licenses.free;
};
}) {};
+ helm-lean = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, helm, lean-mode, lib, melpaBuild }:
+ melpaBuild {
+ pname = "helm-lean";
+ version = "20170919.934";
+ src = fetchFromGitHub {
+ owner = "leanprover";
+ repo = "lean-mode";
+ rev = "2f73061c886bae07bc51e4d9eb545ed8027c0442";
+ sha256 = "17bqx7bkfzv4w7cf0l139xwg1shns680rq74hrqgicammb453kz7";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde/recipes/helm-lean";
+ sha256 = "0j5ax14lhlyd9mpqk1jwh7nfp090kj71r045v2qjfaw2fa23b7si";
+ name = "helm-lean";
+ };
+ packageRequires = [ dash emacs helm lean-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/helm-lean";
+ license = lib.licenses.free;
+ };
+ }) {};
helm-lobsters = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-lobsters";
@@ -32785,18 +32218,19 @@
license = lib.licenses.free;
};
}) {};
- helm-ls-svn = callPackage ({ cl-lib ? null, emacs, fetchsvn, fetchurl, helm, lib, melpaBuild }:
+ helm-ls-svn = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-ls-svn";
version = "20150717.39";
- src = fetchsvn {
- url = "https://svn.macports.org/repository/macports/users/chunyang/helm-ls-svn.el";
- rev = "154482";
+ src = fetchFromGitHub {
+ owner = "emacsorphanage";
+ repo = "helm-ls-svn";
+ rev = "4d4dc1a272f27fba5fdd7cc47e5d309b53c63ae3";
sha256 = "0b7gah21rkfd43mb89lrwaqrrwq646abh7wi4q74sx796gmpz4dz";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/99cc183c09b97264d243b4fe036574ce9c6b9687/recipes/helm-ls-svn";
- sha256 = "08mwzi340akw4ar20by0q981mzmzvf0wz3mn738q4inn2kqgs60d";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/helm-ls-svn";
+ sha256 = "0rqsy6gk114khqr28bp2fi0ixaa8wbqd952yxph517p1pbfwxy66";
name = "helm-ls-svn";
};
packageRequires = [ cl-lib emacs helm ];
@@ -32808,12 +32242,12 @@
helm-make = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }:
melpaBuild {
pname = "helm-make";
- version = "20170430.1053";
+ version = "20171004.1018";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "helm-make";
- rev = "8bb531fa77fe1259cccdc2fa7629d65989684f16";
- sha256 = "1vvdk2f41aqhcb8hawk0x17ix1fyanvx3m2zd398lhv3r6mll0r4";
+ rev = "786104ac0c3cf4fe5b53f841eb9fe10bda2e4031";
+ sha256 = "0qdfk0p2j8jah7m0ngy2mm7775cn779m3a84yll86wqc74g331qs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0f25f066c60d4caff1fbf885bc944cac47515ec8/recipes/helm-make";
@@ -32892,12 +32326,12 @@
helm-mu = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-mu";
- version = "20161010.102";
+ version = "20171027.933";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm-mu";
- rev = "1f9a6b0f8217c0c6359f53b724d9da4c3c3f896c";
- sha256 = "0ch0zip9ldsza3vq66hs8kyczlhdywr2i9sqkza4inm8b938y1dv";
+ rev = "cda769ef48e1e11e3b21cdafa85adb8e36384d78";
+ sha256 = "0s7v2hdrsd3xmdw0iwd3zqpdj3zp3z0akcyyw3cicpmic7wrcc75";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/63ee2e2aa622c96993c1b705d0fd223d6b36fd0f/recipes/helm-mu";
@@ -32938,8 +32372,8 @@
src = fetchFromGitHub {
owner = "travisbhartwell";
repo = "nix-emacs";
- rev = "ace629f7645d12778c96ff7b5cf4b1e41a98af29";
- sha256 = "11infdrdjc30kxvfg5rh1zn4idvkhf9s0c6v60qn441m1d5bnavq";
+ rev = "7007363e773a419203a69798fb0e0731b2eb0f73";
+ sha256 = "00hv8fhyahkdh1vfy1qkahqvsik6d81c7mqh4gjiqxrmb2l1vbcb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6846c7d86e70a9dd8300b89b61435aa7e146be96/recipes/helm-nixos-options";
@@ -33207,12 +32641,12 @@
helm-projectile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }:
melpaBuild {
pname = "helm-projectile";
- version = "20170613.14";
+ version = "20170926.1123";
src = fetchFromGitHub {
owner = "bbatsov";
repo = "helm-projectile";
- rev = "0e9ba276b3fbc420b8cbdc1b99262ccd5c750db7";
- sha256 = "155df7jyhjgqdks3ba1ca1k8w8aqka9vv3nhzpkvgz7wj84c95pq";
+ rev = "4466adbcada8be19ec97b9dba52e12b8da3da849";
+ sha256 = "1a4s3vs2vh2dz31an7jjrbyli1dsqwl7qcd1r63ak87klzpqn98b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc4e3a5af7ba86d277c73a1966a91c87d3d855a/recipes/helm-projectile";
@@ -33505,8 +32939,8 @@
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "2af4d6a32e8194f8fbcc23fd94395e3d595a3c25";
- sha256 = "0091w529lvbjlw1fdb3qjgb8fd5fcwxhqyr4ps5cvxl5bqnwlw39";
+ rev = "7fa54d513fc716b2dc1055636b4728ab29dfdd3e";
+ sha256 = "1i0php9nnpgsmb4l1sc7qgxvdgg4hyviq68f4k41b9bcwab2hbl8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags";
@@ -33627,12 +33061,12 @@
helm-smex = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, smex }:
melpaBuild {
pname = "helm-smex";
- version = "20161202.1252";
+ version = "20171004.1308";
src = fetchFromGitHub {
owner = "ptrv";
repo = "helm-smex";
- rev = "7af4e4b44671f739b39584fc50c20084700701ac";
- sha256 = "1dhzglpd48mb47iyii8igb1dldvnr4alg18m7g8xb529dx8z9wni";
+ rev = "2269375dfa452b88b5170d1a5d5849ebb2c1e413";
+ sha256 = "0n2ki7g0hygsq4bi5zkhp3v772ld7niiajfznxmv11dgn949a52s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/85568bd732da952053148e07b95e53f7caf5f62c/recipes/helm-smex";
@@ -33732,12 +33166,12 @@
helm-swoop = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-swoop";
- version = "20160619.953";
+ version = "20170923.2127";
src = fetchFromGitHub {
owner = "ShingoFukuyama";
repo = "helm-swoop";
- rev = "6d3fdcfb6dea06242efc8ff4cafff9917e558bfc";
- sha256 = "1pjpzccviz95zgl86yw2xda7lhlsfdddf8la8di8rka8sz79nw72";
+ rev = "66a951700e0ef0621cc705791bdd6699488ab121";
+ sha256 = "1j1qmbj4g5z891i1xyz8p34mk63ckpl1j80pznbhvb9ffl9aw976";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-swoop";
@@ -33858,12 +33292,12 @@
helm-w3m = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, w3m }:
melpaBuild {
pname = "helm-w3m";
- version = "20170904.711";
+ version = "20170918.1017";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm-w3m";
- rev = "57b8b0d3cad39abd02fab569ddd1c96336bbbad5";
- sha256 = "059jlyljlp5g7jh6bjdjd157l35apnwvxal1r18pipwfk1fcscxq";
+ rev = "158f52abaa216cd64fc2c85f07722eceef508cec";
+ sha256 = "1kvvgrfjpifrph1fgn4jvrhsrq8qq9z3w0ag9wjx5lb595svn4vh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f683fc9c7990e9ecb8a94808a7d03eb90c5569b1/recipes/helm-w3m";
@@ -33897,27 +33331,6 @@
license = lib.licenses.free;
};
}) {};
- helm-words = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "helm-words";
- version = "20150413.1318";
- src = fetchFromGitHub {
- owner = "pronobis";
- repo = "helm-words";
- rev = "637aa3a7e9cfd34e0127472c5b1f993a4da26185";
- sha256 = "19l8vysjygscr1nsddjz2yv0fjhbsswfq40rdny8zsmaa6qhpj35";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/f8c5b91762d47a4d3024f1ed7f19666c6f2d5ce5/recipes/helm-words";
- sha256 = "0l9mb7g3xzasna1bw2p7vh2wdg1hmjkff40p8kpqvwwzszdm9v76";
- name = "helm-words";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/helm-words";
- license = lib.licenses.free;
- };
- }) {};
helm-xcdoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-xcdoc";
@@ -34002,72 +33415,15 @@
license = lib.licenses.free;
};
}) {};
- help-fns-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "help-fns-plus";
- version = "20170223.733";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/help-fns+.el";
- sha256 = "0n7sdzvplcb0zivpjq9x75kaid59yxr7sl85w7z99irx3kgpy9y4";
- name = "help-fns+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/help-fns+";
- sha256 = "10vz7w79k3barlcs3ph3pc7914xdhcygagdk2wj3bq0wmwxa1lia";
- name = "help-fns-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/help-fns+";
- license = lib.licenses.free;
- };
- }) {};
- help-mode-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "help-mode-plus";
- version = "20170223.737";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/help-mode+.el";
- sha256 = "00yx1rhp7akap63c3nqh766zkjvfarmvm0xvza40i167wc7xmydg";
- name = "help-mode+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/help-mode+";
- sha256 = "1pmb845bxa5kazjpdxm12rm2wcshmv2cmisigs3kyva1pmi1shra";
- name = "help-mode-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/help-mode+";
- license = lib.licenses.free;
- };
- }) {};
- help-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "help-plus";
- version = "20170223.731";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/help+.el";
- sha256 = "0zypqsj940cmb8szbk5acv47kaj3czg6yplx1lg5dynhvab3p29f";
- name = "help+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/help+";
- sha256 = "1jx0wa4md1mvdsvjyx2yvi4hhm5w061qqcafsrw4axsz7gjpd4yi";
- name = "help-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/help+";
- license = lib.licenses.free;
- };
- }) {};
helpful = callPackage ({ dash, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "helpful";
- version = "20170910.1046";
+ version = "20171016.1437";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "helpful";
- rev = "62ede4c121c0a0a9917682f28adf746e21bbfa45";
- sha256 = "1kp61f18l0ll9k1r72id2xgfdc857d5qhhh5pamp5ps6kjfpz6h6";
+ rev = "3e08b24e9eabbb17535d39b087895c04cbcd5c1f";
+ sha256 = "17i4q307rdpgpw76m6brf6vis1znfwfqzhfcb181zgf2gam620hb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful";
@@ -34080,6 +33436,27 @@
license = lib.licenses.free;
};
}) {};
+ hemera-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "hemera-theme";
+ version = "20170910.603";
+ src = fetchFromGitHub {
+ owner = "GuidoSchmidt";
+ repo = "emacs-hemera-theme";
+ rev = "354ae3b788c11ac08e6e2fe7c86adc621e2b16fd";
+ sha256 = "00cfi9gsn9fvjpgxkz931p02gs8dcgwwsaqz3anss9qadxxmi9xv";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3440905a20bc91bb2637a87c04ff8410379f150d/recipes/hemera-theme";
+ sha256 = "0lxm06gv5f75s86320m8wh3dirdcspb6zd5n1a6l0pnn585xqkrn";
+ name = "hemera-theme";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/hemera-theme";
+ license = lib.licenses.free;
+ };
+ }) {};
hemisu-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hemisu-theme";
@@ -34164,25 +33541,6 @@
license = lib.licenses.free;
};
}) {};
- hexrgb = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "hexrgb";
- version = "20170304.1213";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/hexrgb.el?revision=75";
- sha256 = "1aj1fsc3wr8174xs45j2wc2mm6f8v6zs40xn0r4qisdw0plmsbsy";
- name = "hexrgb.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hexrgb";
- sha256 = "0b8lzmyv91f5bg7n2wj50p1pv6hpd2wygjcrffg4wwa52lp24dzk";
- name = "hexrgb";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/hexrgb";
- license = lib.licenses.free;
- };
- }) {};
hfst-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hfst-mode";
@@ -34267,25 +33625,6 @@
license = lib.licenses.free;
};
}) {};
- hide-comnt = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "hide-comnt";
- version = "20170223.739";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/hide-comnt.el?revision=25";
- sha256 = "1shkq45vm60nh2kkvf284nck8jwxh7f7m4c5d53k66mxn214h53m";
- name = "hide-comnt.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hide-comnt";
- sha256 = "0l3qvklyyc6hfinlzif7vfspl8b91ql0qdiwhixcilglyvad8r80";
- name = "hide-comnt";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/hide-comnt";
- license = lib.licenses.free;
- };
- }) {};
hide-lines = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hide-lines";
@@ -34307,25 +33646,6 @@
license = lib.licenses.free;
};
}) {};
- hide-region = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "hide-region";
- version = "20140201.314";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/hide-region.el?revision=6";
- sha256 = "1zxrygpf47bzj6p808r3qhj3dfr3m8brp1xgxs33c7f88rinfval";
- name = "hide-region.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/c5fc294a4d0cfa74530c98d81149fd0501ea7efe/recipes/hide-region";
- sha256 = "0nsc6m3yza658xsxvjz8766vkp71rcm6vwnvcv225r2pr94mq7vm";
- name = "hide-region";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/hide-region";
- license = lib.licenses.free;
- };
- }) {};
hideshow-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hideshow-org";
@@ -34347,34 +33667,15 @@
license = lib.licenses.free;
};
}) {};
- hideshowvis = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "hideshowvis";
- version = "20170227.1250";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/hideshowvis.el?revision=10";
- sha256 = "02a6v2m54r5nfbi54h1502aqh7gnz827pfi1sq266qyzj3p6yz12";
- name = "hideshowvis.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/881fd07512c417c0b98021af2a2c26eac4268a5f/recipes/hideshowvis";
- sha256 = "1ajr71fch3v5g8brb83kwmlakcam5w21i3yr8df00c5j2pnc6v1f";
- name = "hideshowvis";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/hideshowvis";
- license = lib.licenses.free;
- };
- }) {};
hierarchy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hierarchy";
- version = "20170706.552";
+ version = "20171017.1103";
src = fetchFromGitHub {
owner = "DamienCassou";
repo = "hierarchy";
- rev = "98ba6d3d7744d536aee714e1284ffecfe8f590cc";
- sha256 = "1y8jj0xgj6hqqshcfr406216bpni5sj0bh9q52ds9mn5plmh4asa";
+ rev = "cd65d149b8910edfa5536eeda26988aabcfd511a";
+ sha256 = "0746wn62vwgnn4hg8ag0hq80hv7lwv929pjk5cccqqz4s0kp0c80";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7aea238a2d14e9f58c0474251984b6c617b6854d/recipes/hierarchy";
@@ -34387,25 +33688,6 @@
license = lib.licenses.free;
};
}) {};
- highlight = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "highlight";
- version = "20170702.732";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/highlight.el?revision=149";
- sha256 = "0kh72fmqsha25rz0g3ff983badh20clsig7blrhvl8c4bv3sqs56";
- name = "highlight.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/603e9fc90e6e6cf7fe903cb3c38155c1a4f45278/recipes/highlight";
- sha256 = "0clv4mzy9kllcvc0cgsbx3a9anw68dc2c7vzwbrv13sw5gh9skc0";
- name = "highlight";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/highlight";
- license = lib.licenses.free;
- };
- }) {};
highlight-blocks = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "highlight-blocks";
@@ -34427,44 +33709,6 @@
license = lib.licenses.free;
};
}) {};
- highlight-chars = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "highlight-chars";
- version = "20170223.740";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/highlight-chars.el?revision=18";
- sha256 = "00rna5bs0ilgsdi5168djjpb3hg89yq20pp17sx5r3jcksm2fm4f";
- name = "highlight-chars.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/highlight-chars";
- sha256 = "19jawbjvqx1hsjbynx0jgpziap3r64k8s1xfckajrx8aq8m4c6i0";
- name = "highlight-chars";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/highlight-chars";
- license = lib.licenses.free;
- };
- }) {};
- highlight-cl = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "highlight-cl";
- version = "20091012.1030";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/highlight-cl.el?revision=3";
- sha256 = "0r3kzs2fsi3kl5gqmsv75dc7lgfl4imrrqhg09ij6kq1ri8gjxjw";
- name = "highlight-cl.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/7dc85d7fd8e4d7381850f4a379140c64506f86e8/recipes/highlight-cl";
- sha256 = "164h3c3rzriahb7v5hk2pw4i0gk2vk5ak722bai6x4zx4l1xp20w";
- name = "highlight-cl";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/highlight-cl";
- license = lib.licenses.free;
- };
- }) {};
highlight-context-line = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "highlight-context-line";
@@ -34486,26 +33730,6 @@
license = lib.licenses.free;
};
}) {};
- highlight-current-line = callPackage ({ fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "highlight-current-line";
- version = "20051013.1056";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/highlight-current-line.el?revision=4";
- sha256 = "1aki7a7nnj9n7vh19k4fr0v7cqbwkrpc6b3f3yv95vcqj8a4y34c";
- name = "highlight-current-line.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/e2768ed5917ec2e2339412d8fbd146ca5a8a5042/recipes/highlight-current-line";
- sha256 = "01bga6is3frzlzfajpvpgz224vhl0jnc2bl2ipvlygdcmv4h8973";
- name = "highlight-current-line";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/highlight-current-line";
- license = lib.licenses.free;
- };
- }) {};
highlight-defined = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "highlight-defined";
@@ -34778,34 +34002,15 @@
license = lib.licenses.free;
};
}) {};
- highlight-tail = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "highlight-tail";
- version = "20140415.1841";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/highlight-tail.el?revision=5";
- sha256 = "1bbiyqddqkrp3c7xsg1m4143611bhg1kkakrwscqjb4cfmx29qqg";
- name = "highlight-tail.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/d033ff8cceb7e6d1e5a9f0ec7b706eb28bfe30f3/recipes/highlight-tail";
- sha256 = "187kv3n262l38jdapi9bwcafz8fh61pdq2zliwiz7m7xdspp2iws";
- name = "highlight-tail";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/highlight-tail";
- license = lib.licenses.free;
- };
- }) {};
highlight-thing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "highlight-thing";
- version = "20170207.2239";
+ version = "20170919.704";
src = fetchFromGitHub {
owner = "fgeller";
repo = "highlight-thing.el";
- rev = "c998172704ac4b96147d862a0eb4a0f97deb5e0a";
- sha256 = "0s441ya0fcw7sv1ah13dh0b0m2rcvf68a442knvnf06a07hpr5sr";
+ rev = "4eadd178175772fb04ae50e1199d797a6375ad4d";
+ sha256 = "1h2ka1fi0pdh0mx3z8sh4fvwyiyc18d56nl9wd4c96h3n93f7py0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/84b6cb403ff9a588771d051e472596f4e3cc974d/recipes/highlight-thing";
@@ -34888,8 +34093,8 @@
src = fetchFromGitHub {
owner = "chrisdone";
repo = "hindent";
- rev = "dde17a134ae99bd3c6e9b98ed04ad1740c2cd00b";
- sha256 = "1piyzinjz0khfpl96rgxg0f5yy4han16zqj7lcjd9xfzdx9rg4yg";
+ rev = "578d1256e466eb8bf40fd7e441172eb12e878637";
+ sha256 = "02dvnlg3r9pfk18664d5paqc90ll6a4sc05a9w2phafmi9kypwgr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent";
@@ -35091,25 +34296,6 @@
license = lib.licenses.free;
};
}) {};
- hl-defined = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "hl-defined";
- version = "20170223.744";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/hl-defined.el?revision=9";
- sha256 = "0sj1ypfawb1pxblm11zbfyy96f2mbpnmif972yqfrxzf5h20ra1y";
- name = "hl-defined.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/hl-defined";
- sha256 = "1y7vbhvpwxz70kja5hfm4i57mdd1cv43m4y9fr978y3nk265p8xx";
- name = "hl-defined";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/hl-defined";
- license = lib.licenses.free;
- };
- }) {};
hl-indent = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hl-indent";
@@ -35131,34 +34317,15 @@
license = lib.licenses.free;
};
}) {};
- hl-line-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "hl-line-plus";
- version = "20170621.734";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/hl-line+.el";
- sha256 = "03bgx651nrnwqbclbfaabkw4h2iaiswnndqgms0w6lp3jjfc10wc";
- name = "hl-line+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hl-line+";
- sha256 = "16wlvi97wfkj36rnkbhzsky7sib3b76r2ng0lizp7ncr8d0vvhfv";
- name = "hl-line-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/hl-line+";
- license = lib.licenses.free;
- };
- }) {};
hl-sentence = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hl-sentence";
- version = "20170812.646";
+ version = "20171018.819";
src = fetchFromGitHub {
owner = "milkypostman";
repo = "hl-sentence";
- rev = "1235ec94af083c3e43559ce0cac6db485aa938e0";
- sha256 = "1b58d79pkakfz2l31lg8nfkb1dfzrnbw4p5cs8mlxpfa5j4z13af";
+ rev = "86ae38d3103bd20da5485cbdd59dfbd396c45ee4";
+ sha256 = "1rzc74ckj06qs8kq2bd1cgqvgjd2qc3zxmk7bvgg6dy2m9nj52cm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/hl-sentence";
@@ -35192,25 +34359,6 @@
license = lib.licenses.free;
};
}) {};
- hl-spotlight = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "hl-spotlight";
- version = "20170223.746";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/hl-spotlight.el?revision=15";
- sha256 = "02x7p6hy1mkhbish55mzsdp6a1pnsdcfl4qi9cq48syg6cfm8fw3";
- name = "hl-spotlight.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/adb008d2da35dbd3fca63555f04dd8a0009380c6/recipes/hl-spotlight";
- sha256 = "1166g27fp2pj4j3a8904pzvp5idlq4l22i0w6lbk5c9zh5pqyyf3";
- name = "hl-spotlight";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/hl-spotlight";
- license = lib.licenses.free;
- };
- }) {};
hl-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hl-todo";
@@ -35235,12 +34383,12 @@
hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }:
melpaBuild {
pname = "hledger-mode";
- version = "20170807.1130";
+ version = "20171031.1157";
src = fetchFromGitHub {
owner = "narendraj9";
repo = "hledger-mode";
- rev = "fb314edbb193a1c640ae8f13c0373c7de26e2c8e";
- sha256 = "1gq6f1dhfwsm1xk5952nxv8j67bz230pnswf9s1zp21drxwgdk20";
+ rev = "7caae71ba87b592e08fb4caaaa1da8e9af80ec62";
+ sha256 = "17b5hg7fkm8fj2v477ir9z87kn7q07v75akga414k29xlfzmvdw3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hledger-mode";
@@ -35467,13 +34615,13 @@
pname = "howm";
version = "20160928.439";
src = fetchgit {
- url = "git://git.osdn.jp/gitroot/howm/howm.git";
+ url = "https://scm.osdn.net/gitroot/howm/howm.git";
rev = "e0237b07f60011a1926b36848c73340ae46cdb3e";
sha256 = "0ljsvrpbj7y690pq6llnqqkvm9mlrhksxihv9jpx06d1g4ghknpq";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/b4f66d7b6835d06b8e7451aec9e32bb9288a6020/recipes/howm";
- sha256 = "007r8mjn7m7m1mvsb1gaiqbizlwykh23k72g48nwan8bw556gfcr";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0099a1f9b0efb3fc3a1420cfe71a647ec6458998/recipes/howm";
+ sha256 = "07wx3wmc51vm42s81km5sdbm600ax2pv83xg0116xsyn05za3bfn";
name = "howm";
};
packageRequires = [ cl-lib ];
@@ -35485,12 +34633,12 @@
ht = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ht";
- version = "20161015.1945";
+ version = "20171024.1200";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "ht.el";
- rev = "8b9281611c49335e97f2b644e34aa07a47dc4b2a";
- sha256 = "1pnsrirbh901qzqals6p2bbf28g2xn2zminwzj2x02cj49vfyqsz";
+ rev = "a741bac82797d25ec0542764df7443e9e7241033";
+ sha256 = "1m1v31bfaw2g3jymcxsl2bi1z37pj0sfhmldljk8m9zgjll56g6c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6c7589bca1c1dfcc0fe76779f6847fda946ab981/recipes/ht";
@@ -35611,12 +34759,12 @@
htmlize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "htmlize";
- version = "20161211.1019";
+ version = "20171017.141";
src = fetchFromGitHub {
owner = "hniksic";
repo = "emacs-htmlize";
- rev = "88e2cb6588827893d7bc619529393887c264d15a";
- sha256 = "09xpv8dsc39a7w9s6xnilc5kh1krs2jw8cklizxzz4gp36hrsj2n";
+ rev = "a0b55cba65a225df8d9e17a3ac448ce9e8ec962d";
+ sha256 = "0k23xz34ksd6n9xa8anbpvx07fymflyxdggy2is2kp0vqg66pv5q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/075aa00a0757c6cd1ad392f0300bf5f1b937648d/recipes/htmlize";
@@ -35800,12 +34948,12 @@
hy-mode = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "hy-mode";
- version = "20170908.922";
+ version = "20171030.1023";
src = fetchFromGitHub {
owner = "hylang";
repo = "hy-mode";
- rev = "d44dce8475cd1e8d14a533c604c3c32fcdcd4a9f";
- sha256 = "19zv3xj4lzwv9vvlqsnn4nqxjhnq1hvl81qin1kr7z6bmhmidhns";
+ rev = "afb1610b0f78e059ee1a034048a876ece70118f1";
+ sha256 = "14b5dk7n9727dwyi9p80rcwm0f6i21y1x10rj05bal1s3lxq7frp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fc9ab5cf16b61bb27559cd8ec5cf665a5aab2154/recipes/hy-mode";
@@ -35884,12 +35032,12 @@
hydra = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hydra";
- version = "20170903.218";
+ version = "20170924.2259";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "hydra";
- rev = "b12d37ac00d4f677b7684ed1af7d04d996167dbb";
- sha256 = "1aw0zca0xrqig7pj5gqfsrz8cblplb4ljh7k3k1hqsl1wpxav9kg";
+ rev = "df3025f7e3cf3899168ae8ced1e9b734df2b32a0";
+ sha256 = "1sbj699956vxbzbdagw5hbx168sx9cfrc5vx6m6s89v2rkq8fw8k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a4375d8ae519290fd5018626b075c226016f951d/recipes/hydra";
@@ -35945,12 +35093,12 @@
iasm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "iasm-mode";
- version = "20131004.1644";
+ version = "20171023.722";
src = fetchFromGitHub {
owner = "RAttab";
repo = "iasm-mode";
- rev = "6b404ff94bbfe971b3614007c8e5dcd5757c5727";
- sha256 = "1gl21li9vqfjvls4ffjw8a4bicas2c7hmaa621k3hpllgpy6qdg5";
+ rev = "abbec7f308f9ce97beeb57e459fff35f559b4c18";
+ sha256 = "0hvpcckhlxab5f7w4s6iw5lhdbjrqn0l8gayg1w42rn6gssr3rap";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5c230ec10eb62d1b3f6df10c05c5dbc2e25d4507/recipes/iasm-mode";
@@ -36068,44 +35216,6 @@
license = lib.licenses.free;
};
}) {};
- icicles = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "icicles";
- version = "20170910.1711";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/icicles.el?revision=1089";
- sha256 = "10w1lghh9jqxxm5cszi2qyk24vnvazfywmyyz1v7zf6cyiwbndrz";
- name = "icicles.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/icicles";
- sha256 = "15h2511gm38q14avsd86j5mnxhsjvcdmwbnhj66ashj5p5nxhr92";
- name = "icicles";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/icicles";
- license = lib.licenses.free;
- };
- }) {};
- icomplete-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "icomplete-plus";
- version = "20170303.1456";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/icomplete+.el";
- sha256 = "00wy0jqk6jdfh9izdpqq4y6x2x8q1m38sy6nb4ygfg3055lbhkam";
- name = "icomplete+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/fade28733f33e52a8622479de201f451c9a31c11/recipes/icomplete+";
- sha256 = "0gxqkj4bjrxb046qisfz22wvanxx6bzl4hfv91rfwm78q3484slx";
- name = "icomplete-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/icomplete+";
- license = lib.licenses.free;
- };
- }) {};
id-manager = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "id-manager";
@@ -36277,12 +35387,12 @@
ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, s }:
melpaBuild {
pname = "ido-completing-read-plus";
- version = "20170819.1045";
+ version = "20170820.3";
src = fetchFromGitHub {
owner = "DarwinAwardWinner";
repo = "ido-completing-read-plus";
- rev = "02f21215ce5ef2234c0e58dac9ec181cfc0900c1";
- sha256 = "1hvimcd3wh5xbmj9awgv4imvmvjigpysrlgsbjxk6j848gll0ll3";
+ rev = "e2ea358725f03ae623ae03ed90715efb92a61030";
+ sha256 = "1bai04fz6ln4dbc3lgglv11g6mibg40wci5ylmc90wgd38iw9gkn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-completing-read+";
@@ -36589,22 +35699,22 @@
license = lib.licenses.free;
};
}) {};
- ido-ubiquitous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
+ ido-ubiquitous = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
melpaBuild {
pname = "ido-ubiquitous";
- version = "20170819.1045";
+ version = "20170923.842";
src = fetchFromGitHub {
owner = "DarwinAwardWinner";
repo = "ido-completing-read-plus";
- rev = "02f21215ce5ef2234c0e58dac9ec181cfc0900c1";
- sha256 = "1hvimcd3wh5xbmj9awgv4imvmvjigpysrlgsbjxk6j848gll0ll3";
+ rev = "e2ea358725f03ae623ae03ed90715efb92a61030";
+ sha256 = "1bai04fz6ln4dbc3lgglv11g6mibg40wci5ylmc90wgd38iw9gkn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-ubiquitous";
sha256 = "11sdk0ymsqnsw1gycvq2wj4j0g502fp23qk6q9d95lm98nz68frz";
name = "ido-ubiquitous";
};
- packageRequires = [ cl-lib emacs ido-completing-read-plus ];
+ packageRequires = [ cl-lib ido-completing-read-plus ];
meta = {
homepage = "https://melpa.org/#/ido-ubiquitous";
license = lib.licenses.free;
@@ -36718,12 +35828,12 @@
iedit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "iedit";
- version = "20170909.423";
+ version = "20170916.1024";
src = fetchFromGitHub {
owner = "victorhge";
repo = "iedit";
- rev = "796ee5298dd3f4b7c51fbbcd9510a8631c5cbb4b";
- sha256 = "0k70i4k8rrgcj3cl6k4nki3k55fsd4yz8fnwaazhckjr6pvrwz8w";
+ rev = "5b14cc9fcaef509c50f25cff872fba5d70b2c799";
+ sha256 = "1vlfqh616id2kh35diwig6jswq5q5z22zwrpbdxkginag3sq8732";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/iedit";
@@ -36799,25 +35909,6 @@
license = lib.licenses.free;
};
}) {};
- igrep = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "igrep";
- version = "20130824.507";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/igrep.el?revision=10";
- sha256 = "0qiv69v7ig38iizif7zg8aljdmpa1jk8bsfa0iyhqqqrkvsmhc29";
- name = "igrep.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/83c05578974289527082bb67338c35e70bbff8f2/recipes/igrep";
- sha256 = "1vyhrziy29q6w8w9vvanb7d29r1n7nfkznbcd62il991n48d08i3";
- name = "igrep";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/igrep";
- license = lib.licenses.free;
- };
- }) {};
igv = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "igv";
version = "20141210.427";
@@ -36921,6 +36012,27 @@
license = lib.licenses.free;
};
}) {};
+ imake = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "imake";
+ version = "20171006.450";
+ src = fetchFromGitHub {
+ owner = "tarsius";
+ repo = "imake";
+ rev = "edd2e59f7996c35450987cf8f137ecb54777e9ca";
+ sha256 = "12mq1ki001jgjdfr3fx43z1xz4jrki18rb0wkb7n956dvl34w0fg";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/28de8f7f5302b27c7c6600ad65a998119518be43/recipes/imake";
+ sha256 = "0j732fi6999n9990w4l28raw140fvqfbynyh4x65yilhw95r7c34";
+ name = "imake";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/imake";
+ license = lib.licenses.free;
+ };
+ }) {};
imapfilter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "imapfilter";
@@ -36984,25 +36096,6 @@
license = lib.licenses.free;
};
}) {};
- imenu-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "imenu-plus";
- version = "20170303.1457";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/imenu+.el";
- sha256 = "0dga9a61ckvd8w4nnz9z8z0iakaxminwn0lgmf8vfj2nwkd0m6hb";
- name = "imenu+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/imenu+";
- sha256 = "1v2h3xs5pnv7z5qphkn2y5pa1p8pivrknkw7xihm5yr4a4dqjv5d";
- name = "imenu-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/imenu+";
- license = lib.licenses.free;
- };
- }) {};
imenus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "imenus";
@@ -37093,8 +36186,8 @@
src = fetchFromGitHub {
owner = "netguy204";
repo = "imp.el";
- rev = "11600a8441a1c0339252b0c19f151ccac3ee96c7";
- sha256 = "1k251pidqgjn380xbs2h3j02r76lq1gcqkslwfpvq2g3l3ksqkkd";
+ rev = "48e6c4842b1fc2657a3c6c23029f89e35fafc859";
+ sha256 = "0srjgzcmdgvdi9fm127wlj7zsbq00wsmb3fkzzpy05nvmm2dgng5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bb1fbd03f17d2069a461260ad5e2ad4e5441919b/recipes/impatient-mode";
@@ -37110,12 +36203,12 @@
import-js = callPackage ({ emacs, fetchFromGitHub, fetchurl, grizzl, lib, melpaBuild }:
melpaBuild {
pname = "import-js";
- version = "20161220.508";
+ version = "20171026.1628";
src = fetchFromGitHub {
owner = "Galooshi";
repo = "emacs-import-js";
- rev = "15d395126f57408d770a72db2e5f43271f90fa52";
- sha256 = "1ipbfacjx9vqqhvsf9sgfci8vqx0plks510w1gsjj0xwrpqn1f6l";
+ rev = "0a1032894445062b87dbe4e2c8cdba35ac25c250";
+ sha256 = "0vx2k4k8ig1k74ifxaxvhbkmfmba683qza7f9pp08daa43mgr1r3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/import-js";
@@ -37233,30 +36326,22 @@
license = lib.licenses.free;
};
}) {};
- indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, memoize, seq, sourcemap, websocket }:
+ indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }:
melpaBuild {
pname = "indium";
- version = "20170829.637";
+ version = "20171027.914";
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "Indium";
- rev = "d98a9e0cd11d8230c4c3d0b59c4ac60520e34ebb";
- sha256 = "1q3yf45fmbjppv3ahb1gdb95pa3kyn18x5m23ihpxz1pziz3a074";
+ rev = "f7b46c9dd39dfc7ffefb52e35b0795450d3ea96f";
+ sha256 = "0qba8c4qr8v0881lc2pnw6lddspzkdj7hsapf6x0vk1mwqmnww4x";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium";
sha256 = "024ljx7v8xahmr8jm41fiy8i5jbg48ybqp5n67k4jwg819cz8wvl";
name = "indium";
};
- packageRequires = [
- company
- emacs
- js2-mode
- memoize
- seq
- sourcemap
- websocket
- ];
+ packageRequires = [ company emacs js2-mode seq websocket ];
meta = {
homepage = "https://melpa.org/#/indium";
license = lib.licenses.free;
@@ -37286,12 +36371,12 @@
inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "inf-clojure";
- version = "20170910.30";
+ version = "20171029.40";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "inf-clojure";
- rev = "864356a543cac50b24c67901d1d04c4e6160070a";
- sha256 = "07z131rxmwz3gwdy40qczz4is20jqdjylky7rsrxij5da3g017si";
+ rev = "b04f05d2c735795b68a10cc7e699b676a8acc811";
+ sha256 = "16xsrny70f5lr6hr4sipyrnry813cvbhy25jxfx90kp2f9kkak53";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure";
@@ -37409,25 +36494,6 @@
license = lib.licenses.free;
};
}) {};
- info-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "info-plus";
- version = "20170830.1104";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/info+.el";
- sha256 = "0zxcqcd53fr0rf1s2fhax2a8kymk2mvg7vf7k92g8afvm888jnzj";
- name = "info+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/e77aadd8195928eed022f1e00c088151e68aa280/recipes/info+";
- sha256 = "0flpmi8dsaalg14xd86xcr087j51899sm8ghsa150ag4g4acfggr";
- name = "info-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/info+";
- license = lib.licenses.free;
- };
- }) {};
inherit-local = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "inherit-local";
@@ -37561,8 +36627,8 @@
src = fetchFromGitHub {
owner = "ideasman42";
repo = "emacs-inkpot-theme";
- rev = "b992c0996b4a711f3d6ebb6730c6f57edbc75fc5";
- sha256 = "1ykbf5hhs7z33bca5j0vk8vdyrwghbiqgdjy064nccgxlqyysy0k";
+ rev = "7b2f19ebd01535f77da407e28ca970c2ce442493";
+ sha256 = "1d2vi919fz6kdya5gafhy9wwmlzid88j9klcbslzh8bjmamnbxcx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dd3e02aaf8865d8038b9c590c8545e7a1b21d620/recipes/inkpot-theme";
@@ -37703,12 +36769,12 @@
intellij-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "intellij-theme";
- version = "20170905.941";
+ version = "20171017.715";
src = fetchFromGitLab {
owner = "fommil";
repo = "emacs-intellij-theme";
- rev = "2bbabe3f2f87716b10ccdfcacbf51016ecc32d54";
- sha256 = "0b3615lbm8fv4svv3g72dz62h9rv18m68b656lwl2ba9sn465rsl";
+ rev = "1bbfff8e6742d18e9b77ed796f44da3b7bd10606";
+ sha256 = "0ml1gi2cn6h3xm5c78vxwv327r0rgimia1vqqi9jb09yb6lckbgj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cfe86071b2e84929476a771da99341f4a73cfd06/recipes/intellij-theme";
@@ -37745,12 +36811,12 @@
interleave = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "interleave";
- version = "20170630.22";
+ version = "20171003.2324";
src = fetchFromGitHub {
owner = "rudolfochrist";
repo = "interleave";
- rev = "2c0458038bf0440f271f6e000039027be411eba7";
- sha256 = "0rpw1ms80hr01s76av8cvid4gvkd3sapx0c3g3a05za0bq1jqacw";
+ rev = "87549df30cbc681baf86b238bd14c7cf7ec11fc4";
+ sha256 = "07430hsyq9q90rjzxq7ifq4mlfc8k8b7l6b31s7xk1xm2snbky6b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6c43d4aaaf4fca17f2bc0ee90a21c51071886ae2/recipes/interleave";
@@ -37766,12 +36832,12 @@
intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
melpaBuild {
pname = "intero";
- version = "20170912.648";
+ version = "20171023.1102";
src = fetchFromGitHub {
owner = "commercialhaskell";
repo = "intero";
- rev = "7176857391c064e1f16a4f9fd0a51775cfedd42b";
- sha256 = "10w2jgr4nq2iff9jlk2kjbjf3hpbhlwgjvnnpvxnrkz4y4ap0bdi";
+ rev = "5697c86fde2b6131629e8d1c69f9b2363dadc7ae";
+ sha256 = "1zwvmchk8rymxfciiip78zf69p3f8jpbr7fqqj43cxv0lq9w284s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -37934,12 +37000,12 @@
ipcalc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ipcalc";
- version = "20160927.220";
+ version = "20170926.105";
src = fetchFromGitHub {
owner = "dotemacs";
repo = "ipcalc.el";
- rev = "e92afd8b96592b6e2d65ba073bf87c9dd2408e91";
- sha256 = "1s17wpdbrbkbmkndbwm0byy11cmymhs6yn7w0v5lvw5l2cgicxjg";
+ rev = "2720f7e3e662e04e195f8338b81a499cf321296a";
+ sha256 = "1kmqbb9ca3sca59462ha21grbgxkl4wynz2lr4yqb4qk7cijgd6g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ipcalc";
@@ -38057,34 +37123,15 @@
license = lib.licenses.free;
};
}) {};
- irfc = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "irfc";
- version = "20130824.507";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/irfc.el?revision=45";
- sha256 = "197ybqwbj8qjh2p9pkf5mvqnrkpcgmv8c5s2gvl6msyrabk0mnca";
- name = "irfc.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/0b4f2dc79231b165bd3b03a728e2b872ed6c50c1/recipes/irfc";
- sha256 = "0186l6zk5l427vjvmjvi0xhwk8a4fjhsvw9kd0yw88q3ggpdl25i";
- name = "irfc";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/irfc";
- license = lib.licenses.free;
- };
- }) {};
irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
melpaBuild {
pname = "irony";
- version = "20170905.1316";
+ version = "20171018.1550";
src = fetchFromGitHub {
owner = "Sarcasm";
repo = "irony-mode";
- rev = "72e1e73f3c9da2ad04286e13bfc8fc401626b7a9";
- sha256 = "155wvzsmhb8vz30jcd3xj91z74268pq7szax7jwd725ndx6x7ny8";
+ rev = "78b06aa2df5251adaabb6c749febc1f1bd2ad605";
+ sha256 = "0nhjrnlmss535jbshjjd30vydbr8py21vkx4p294w6d8vg2rssf8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony";
@@ -38139,44 +37186,6 @@
license = lib.licenses.free;
};
}) {};
- isearch-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "isearch-plus";
- version = "20170723.1826";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/isearch+.el";
- sha256 = "0d7xsr71iadqzg81mv17dqyd0bdzkmljxlrpdlpycjyaf3z59aqr";
- name = "isearch+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/isearch+";
- sha256 = "0n9jh3bx2h6k4mvbwss16m34fxzlq6sb057rj16hgrlmbqknynhw";
- name = "isearch-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/isearch+";
- license = lib.licenses.free;
- };
- }) {};
- isearch-prop = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "isearch-prop";
- version = "20170303.1504";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/isearch-prop.el?revision=79";
- sha256 = "0q18i76gq2pfnkqlbxlx2hndpy9mhbag302dvr8irk1kjwgngz5r";
- name = "isearch-prop.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/isearch-prop";
- sha256 = "1z9y88b23m4ffil8p3wcq61q1fiyqjxphyd3wacs5fnc53mdzad9";
- name = "isearch-prop";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/isearch-prop";
- license = lib.licenses.free;
- };
- }) {};
isearch-symbol-at-point = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "isearch-symbol-at-point";
@@ -38324,6 +37333,27 @@
license = lib.licenses.free;
};
}) {};
+ iter2 = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "iter2";
+ version = "20171031.755";
+ src = fetchFromGitHub {
+ owner = "doublep";
+ repo = "iter2";
+ rev = "a0e41b2f55d50c08c59ffcc6e83a977c141bcc55";
+ sha256 = "0ccr9qjhc35wi07yckd9y26synihhsg8zwkxgqyzkx7avxkqfyhn";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d94316660051ee0ba0c12e380e6203986440368f/recipes/iter2";
+ sha256 = "0kl3z2wwpvk2ddsb3798g41pv0xycsf9dclhv00snpzsr61d9v65";
+ name = "iter2";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/iter2";
+ license = lib.licenses.free;
+ };
+ }) {};
iterator = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "iterator";
@@ -38390,12 +37420,12 @@
ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ivy";
- version = "20170911.1034";
+ version = "20171031.716";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "0a1d361b926291874124f8c63a653d83ead64a36";
- sha256 = "0ssbsllpv0lyr7dhnipwd7zgpxvfm36rldr7vkxh5maajdkamls7";
+ rev = "96663b77945ab21e4e1b0aab690fc2e926f01f9c";
+ sha256 = "0r691dzs77zdkvjzb787kjg8zvvba8gdj2da9zjb14m4nyjmg9d9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -38411,12 +37441,12 @@
ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }:
melpaBuild {
pname = "ivy-bibtex";
- version = "20170808.1124";
+ version = "20171022.220";
src = fetchFromGitHub {
owner = "tmalsburg";
repo = "helm-bibtex";
- rev = "8ed898fb5a68f18e9bb9973832a5c1f8abcfc463";
- sha256 = "14lyx0vbqr97p3anzrsp7m3q0kqclyjcdwplpraim403fcklzbnz";
+ rev = "54de08577f9c19354cc303ee52836263aef486fb";
+ sha256 = "0l98lmy0c9l64khnl9j87l5g9g5fiah5l64hxn97h4b438kjcjm0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex";
@@ -38520,8 +37550,8 @@
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "0a1d361b926291874124f8c63a653d83ead64a36";
- sha256 = "0ssbsllpv0lyr7dhnipwd7zgpxvfm36rldr7vkxh5maajdkamls7";
+ rev = "96663b77945ab21e4e1b0aab690fc2e926f01f9c";
+ sha256 = "0r691dzs77zdkvjzb787kjg8zvvba8gdj2da9zjb14m4nyjmg9d9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -38646,8 +37676,8 @@
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "2af4d6a32e8194f8fbcc23fd94395e3d595a3c25";
- sha256 = "0091w529lvbjlw1fdb3qjgb8fd5fcwxhqyr4ps5cvxl5bqnwlw39";
+ rev = "7fa54d513fc716b2dc1055636b4728ab29dfdd3e";
+ sha256 = "1i0php9nnpgsmb4l1sc7qgxvdgg4hyviq68f4k41b9bcwab2hbl8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags";
@@ -38768,12 +37798,12 @@
j-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "j-mode";
- version = "20170911.823";
+ version = "20171017.1813";
src = fetchFromGitHub {
owner = "zellio";
repo = "j-mode";
- rev = "cf27446120c779f90aeb0b14aae24d55d2a4fe36";
- sha256 = "1f61finp605k7bii7g0gm92vpjrl5q3w28nykc0w95lm36hmg7qv";
+ rev = "96154937120028f24ee4933904ce4240c87f387e";
+ sha256 = "0mni4wk9kn1iq9vyl7v7akjsb566sgm2vwwsc4sk2mf4x7g9m2rs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/410134ab2145adad3648b1024bfe4f6801df82c9/recipes/j-mode";
@@ -39018,12 +38048,12 @@
java-imports = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, s }:
melpaBuild {
pname = "java-imports";
- version = "20160311.1515";
+ version = "20170913.710";
src = fetchFromGitHub {
owner = "dakrone";
repo = "emacs-java-imports";
- rev = "f1631adacdd9fcb7a92ee4fdfb9e592a1a9c3b0b";
- sha256 = "1wk9i43b147bjcvhq27vcqxi6y1yl6w3n4i2sw3krk4vxcm1mwnm";
+ rev = "e96ff44ed48b362ab6227b8b802b84d84f78bcaa";
+ sha256 = "0nryawj8v6gj6hnb81yf6966kjnydcz49zsg2k355gldryqf4v5p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5f6f4e4c14c422c2066f2200bb9b8f35e2ecc896/recipes/java-imports";
@@ -39144,12 +38174,12 @@
jbeans-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "jbeans-theme";
- version = "20170816.754";
+ version = "20171011.927";
src = fetchFromGitHub {
owner = "synic";
repo = "jbeans-emacs";
- rev = "19a09bebc20fc981e77950e8495162de49c824ae";
- sha256 = "06my9qmj936f80gc9nn1akjr6fjal23125zkllz8csm1j83vqcvk";
+ rev = "d3cd21b794ba94680f0f3aa574b5029a749430e6";
+ sha256 = "1c3qb3f4dapvfwwrnbgx5sim515pr2i5lvmnid780wphymwjslsc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6dd4bd78795ec7509d8744fec1e80426ce0557ec/recipes/jbeans-theme";
@@ -39183,22 +38213,22 @@
license = lib.licenses.free;
};
}) {};
- jdee = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, memoize }:
+ jdee = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, memoize, s }:
melpaBuild {
pname = "jdee";
- version = "20170506.1514";
+ version = "20171007.835";
src = fetchFromGitHub {
owner = "jdee-emacs";
repo = "jdee";
- rev = "e572d4889604c0b4e1d9180b8a68f9c0f99b99d2";
- sha256 = "1vhwza7xak2im2xp7qzs8b6bmnf9yw2di86rav8wh5xapqr8x7mn";
+ rev = "ebe5d2e36a6a367376ed6cde590d5f805830ec9e";
+ sha256 = "0rq8vp3pmnyabqzzplc91dk2ka48k809is9v4q486xv7y43013jh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee";
sha256 = "15n76w0ygjmsa2bym59bkmbbh0kpqx6nacp4zz32hlg48kgz1dx4";
name = "jdee";
};
- packageRequires = [ dash emacs flycheck memoize ];
+ packageRequires = [ dash emacs flycheck memoize s ];
meta = {
homepage = "https://melpa.org/#/jdee";
license = lib.licenses.free;
@@ -39351,6 +38381,27 @@
license = lib.licenses.free;
};
}) {};
+ jetbrains = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "jetbrains";
+ version = "20171027.2055";
+ src = fetchFromGitHub {
+ owner = "emacs-php";
+ repo = "jetbrains.el";
+ rev = "38e136079f3f2ddbe0e8b7dec01cf6b515e897d8";
+ sha256 = "1ji64qip5raf0lbv7fv36rd4fwa33zn0xi7sa0zrgf0kcsr0qasb";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/00dd4626e261d9831fc62d866d50b7257ee418c4/recipes/jetbrains";
+ sha256 = "0254dkzf2x5dj3j549xjash0lsadkn0bdcyjkjlrv8hqvdr1f1m7";
+ name = "jetbrains";
+ };
+ packageRequires = [ cl-lib emacs f ];
+ meta = {
+ homepage = "https://melpa.org/#/jetbrains";
+ license = lib.licenses.free;
+ };
+ }) {};
jg-quicknav = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "jg-quicknav";
@@ -39393,25 +38444,6 @@
license = lib.licenses.free;
};
}) {};
- jira = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "jira";
- version = "20131210.1022";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/jira.el?revision=11";
- sha256 = "18b6hdqk59gnqh4ibq8lj59kbsg5gbyfb7vfcvpgmxjikpl3cgkz";
- name = "jira.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/jira";
- sha256 = "1zrywkwzqn5ffzzk3rmy01vj6afm2p9gm81rpc7s86cj3ywfy4wx";
- name = "jira";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/jira";
- license = lib.licenses.free;
- };
- }) {};
jira-markup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "jira-markup-mode";
@@ -39524,8 +38556,8 @@
src = fetchFromGitHub {
owner = "ljos";
repo = "jq-mode";
- rev = "f2dc70af890694828b8227b2727240e82780d7e5";
- sha256 = "18hprvhlwf110j7anyrrrjp4xjr3556yipz7n4jyqj69i0kvjw5c";
+ rev = "5c081859def7510dafc6b14449f5285916898f15";
+ sha256 = "14421p9k6b02syb8irprz527dcqbh1r4i2m86pi94sv6ffzbs0gg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/318705966e26e58f87b53c115c519db95874ac1c/recipes/jq-mode";
@@ -39580,6 +38612,48 @@
license = lib.licenses.free;
};
}) {};
+ js-auto-format-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "js-auto-format-mode";
+ version = "20171031.1819";
+ src = fetchFromGitHub {
+ owner = "ybiquitous";
+ repo = "js-auto-format-mode";
+ rev = "68c6c51320f124d84145643dda59619966bb29f4";
+ sha256 = "04slx5ipcf1lj9fvx537yfyvqmg324pfji02w5iafqnyvyhdjy9p";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/2d3be16771b5b5fde639da3ee97890620354ee7a/recipes/js-auto-format-mode";
+ sha256 = "1gxf7xz1j3ga2pk5w8cgny7l8kid59zap2a97lhb50w1qczfqqzs";
+ name = "js-auto-format-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/js-auto-format-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
+ js-codemod = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "js-codemod";
+ version = "20171017.1411";
+ src = fetchFromGitHub {
+ owner = "torgeir";
+ repo = "js-codemod.el";
+ rev = "cf0d0a47588cad640e4397f306fd17d2166a8f04";
+ sha256 = "04im9cs7hbs2bzx5ynibwgbypy91vvrz3jjy72hzfaamdglw7w8r";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/81670a2467fa846a3f0e6c81e870e8ae140dd54e/recipes/js-codemod";
+ sha256 = "1m5wbyx12sc5qwbrh948ikskck10p6j05ahrrvmmflvfb3q4vpcj";
+ name = "js-codemod";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/js-codemod";
+ license = lib.licenses.free;
+ };
+ }) {};
js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "js-comint";
@@ -39709,12 +38783,12 @@
js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "js2-mode";
- version = "20170815.1415";
+ version = "20171014.1229";
src = fetchFromGitHub {
owner = "mooz";
repo = "js2-mode";
- rev = "df51992a648c7fb3e441106defdbffa2ef2f020d";
- sha256 = "08k0szwbwsgx2q1qm356f88jif36yqz8lnpylib24jy2plx24j5s";
+ rev = "dd295e838d3878188b1797b82a86867e3e56d22c";
+ sha256 = "04axxxhy1jbn21bzsxwlirsv9mnzbrwcxbql28vzvw6572vkrb9x";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode";
@@ -39730,12 +38804,12 @@
js2-refactor = callPackage ({ dash, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, multiple-cursors, s, yasnippet }:
melpaBuild {
pname = "js2-refactor";
- version = "20170703.314";
+ version = "20171013.258";
src = fetchFromGitHub {
owner = "magnars";
repo = "js2-refactor.el";
- rev = "924936b42777f2513ec6893c68a41756bcfeba83";
- sha256 = "00p4yvlc0bcwrcr203my4i737fbsv42iz92pfgxwq6p47c42nq2a";
+ rev = "b9829059745fbedfeb8c48646056fb27ce23a33a";
+ sha256 = "1jwkly6srxx21ff6xnkvr7qqrlpsvis8i89v0z7vfz5f05yryscj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8935264dfea9bacc89fef312215624d1ad9fc437/recipes/js2-refactor";
@@ -39916,6 +38990,27 @@
license = lib.licenses.free;
};
}) {};
+ jsonnet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "jsonnet-mode";
+ version = "20171005.24";
+ src = fetchFromGitHub {
+ owner = "mgyucht";
+ repo = "jsonnet-mode";
+ rev = "efe768fdcff25d746674fbbf229b9e1a7efea4f1";
+ sha256 = "1a52266y83z9i3sg7hhc8sw7rhjy5i9wdy2bv7s2fv00lnngaj29";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ba17372732723f73e8eeb6e7c47abc0edeb20da4/recipes/jsonnet-mode";
+ sha256 = "1aadys887szlc924qr645lby9f8vzvxkwhq6byhppk1b01h911ia";
+ name = "jsonnet-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/jsonnet-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
jss = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, websocket }:
melpaBuild {
pname = "jss";
@@ -40001,12 +39096,12 @@
julia-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "julia-mode";
- version = "20170710.538";
+ version = "20170916.628";
src = fetchFromGitHub {
owner = "JuliaLang";
repo = "julia-emacs";
- rev = "edaaff2e971a527460f838bebc0ef679f9a571b0";
- sha256 = "1sm57dq58fjbjjprl1bf7vibrvp6v5m4ipiq7r73c2bdg8rmaapm";
+ rev = "115d4dc8a07445301772da8376b232fa8c7168f4";
+ sha256 = "1is4dcv6blslpzbjcg8l2jpxi8xj96q4cm0nxjxsyswpm8bw8ki0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8522d197cb1b2c139959e7189765001c5ee7e61a/recipes/julia-mode";
@@ -40022,12 +39117,12 @@
julia-repl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "julia-repl";
- version = "20170708.2324";
+ version = "20171018.443";
src = fetchFromGitHub {
owner = "tpapp";
repo = "julia-repl";
- rev = "93b9d515e6f5fbacd42069a2ae6da3bd80b7c4d0";
- sha256 = "1xpdr343b5qa1pb92d5nz0m9lswq2s8nzg46msjnb1dvihqyb27w";
+ rev = "b20cadb67d65e52ecb57bbb07369215d01c956e0";
+ sha256 = "048jf00lmyrsr815kk8h5y5hdvpmbd6zvchq8x5vyziqd2vpsdc3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9a2a494969a9caf2f4513b12504379c9685047dc/recipes/julia-repl";
@@ -40148,12 +39243,12 @@
jump-tree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "jump-tree";
- version = "20170819.2137";
+ version = "20171014.851";
src = fetchFromGitHub {
owner = "yangwen0228";
repo = "jump-tree";
- rev = "70db2bed56e6e3433ae1f57df4aaa128e644faa7";
- sha256 = "1w0a33mrg4dqkq7rfs182d57lg9r15ab48m7hzb9zm0i6c79aqzy";
+ rev = "282267dc6305889e31d46b405b7ad4dfe5923b66";
+ sha256 = "0r6cwpks4aylndvq5lcny3799fag05zm36gd11043wca7sgr90fz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fe6b08848929c83e3cdea623b331176c0f20cbe9/recipes/jump-tree";
@@ -40274,12 +39369,12 @@
kakapo-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "kakapo-mode";
- version = "20160727.2136";
+ version = "20171003.2151";
src = fetchFromGitHub {
owner = "listx";
repo = "kakapo-mode";
- rev = "bb6de027fb578df31652e58daa92522884ecc274";
- sha256 = "1y6ihk52jza07krz24l9axkwhi46fwi4h6bcjdck9q1qvdrcxw40";
+ rev = "67d516138172fd60782df94454b3d0bd247e84f3";
+ sha256 = "0r2n410arr48skcwm39c6mjhzsia117lb8xd7pc4854y0rbrvrvs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a43f0f1f6a0773240a51d379ec786c20a9389e7b/recipes/kakapo-mode";
@@ -40374,24 +39469,24 @@
license = lib.licenses.free;
};
}) {};
- kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
- pname = "kaolin-theme";
- version = "20170905.1243";
+ pname = "kaolin-themes";
+ version = "20171101.316";
src = fetchFromGitHub {
- owner = "0rdy";
- repo = "kaolin-theme";
- rev = "7bf265de58fe412d7f445ee84c460e6b90d7e0cf";
- sha256 = "1zd8vgg54hj8jycixh3vr34pf8grb02hhk10y1xh0ddpxw3mpb1s";
+ owner = "ogdenwebb";
+ repo = "emacs-kaolin-themes";
+ rev = "85d11341944ff91e7949306c588f237ebf8adc5e";
+ sha256 = "1cqmg3hksqb3vi2m77ysacx8znp6b94vqcxw7lm4psrdwb3ris8g";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/d2abf9d914cdc210bbd47ea92d0dac76683e21f0/recipes/kaolin-theme";
- sha256 = "1316sn1xpli9aqbhn8sldyvsc2fwk1ql9aw4l0rgkfbivvcklp7c";
- name = "kaolin-theme";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes";
+ sha256 = "1pd2v54d578f1wbwvqzplkdz1qvy8w8s6na511b0v5y9sksgm2xw";
+ name = "kaolin-themes";
};
- packageRequires = [ emacs ];
+ packageRequires = [ autothemer cl-lib emacs ];
meta = {
- homepage = "https://melpa.org/#/kaolin-theme";
+ homepage = "https://melpa.org/#/kaolin-themes";
license = lib.licenses.free;
};
}) {};
@@ -40885,8 +39980,8 @@
src = fetchFromGitHub {
owner = "kivy";
repo = "kivy";
- rev = "f32bb16e5b477f5b54f3dc23ff048b490e906590";
- sha256 = "05lr10wnwghzsi59y7spy8a2jps11dmpm7wndzaj62nkx0d09a73";
+ rev = "be946b5e33cc1fc734a29ba46ca734391803fbcd";
+ sha256 = "1ngpwjhilpg974xx4z8fiz6c2ycpdr6xbky1d3d24563hjp1a5kr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -40902,12 +39997,12 @@
kiwix = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "kiwix";
- version = "20170508.1802";
+ version = "20170927.120";
src = fetchFromGitHub {
owner = "stardiviner";
repo = "kiwix.el";
- rev = "a62f9e7c17ab34b183b36ae63408123a75689a5b";
- sha256 = "0v86haw2nfd7q4yylzd0ls6916l95960c15khjnv1cfyshhri5q7";
+ rev = "86dbead6c0017beefd92a0b64a0bb5f5d12c5b16";
+ sha256 = "142mm1wy8zvlkzairnc1rjdi1lsq1asfk4zdbs1aria1nxz1sx6x";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/kiwix";
@@ -40965,12 +40060,12 @@
kodi-remote = callPackage ({ elnode, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, melpaBuild, request }:
melpaBuild {
pname = "kodi-remote";
- version = "20170818.2206";
+ version = "20171008.2226";
src = fetchFromGitHub {
owner = "spiderbit";
repo = "kodi-remote.el";
- rev = "a032d13a3f39f260d7d00d62f32dce0f8a5927ab";
- sha256 = "0c883yprblda22jq3jjdz9nd6ha6dbwfn6n8y448qln8dzj9sd7p";
+ rev = "479075d96857696cf029cd1f482b9f2f31d82452";
+ sha256 = "0kvx43ny49j115kj6zpy1i5g87bjgiimfgj9xp2fn9830adymc24";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/08f06dd824e67250afafdecc25128ba794ca971f/recipes/kodi-remote";
@@ -41070,12 +40165,12 @@
kotlin-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "kotlin-mode";
- version = "20170522.1524";
+ version = "20171009.1301";
src = fetchFromGitHub {
owner = "Emacs-Kotlin-Mode-Maintainers";
repo = "kotlin-mode";
- rev = "1ed0c5589ef2d53242f767f6071dbea90c64e813";
- sha256 = "0nywyf0znaffkchca5hal1w6h7fis9pybiivz7vzrr85ppl0gzas";
+ rev = "ebcf6f3730f455894ebb7ed8e42950f66e8e1c1d";
+ sha256 = "1345ahc8i69sl2d9v03gdgrdcj7qkbzrl0pl957hjn3vbvmhrz00";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9f2560e913b215821221c96069a1385fe4e19c3e/recipes/kotlin-mode";
@@ -41091,12 +40186,12 @@
kpm-list = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "kpm-list";
- version = "20160310.1050";
+ version = "20170924.652";
src = fetchFromGitHub {
owner = "KMahoney";
repo = "kpm-list";
- rev = "6fb7db35f7dac7fb8f956c67ee2eea9d3fa54034";
- sha256 = "0hbzr5x9ykzrbwzfsf6rc4pbiw9m59ny3cgcx26nbi6ijbjl2fxj";
+ rev = "e0f5112e5ce8ec1b603f4428fa51681c68bb28f5";
+ sha256 = "1achcr3v0d85narnxqpbfxy9qfk537kl83wiq5lyfy3lwqqf7dmp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6b7065d016e2da49277b165edf565bef5819d483/recipes/kpm-list";
@@ -41193,6 +40288,27 @@
license = lib.licenses.free;
};
}) {};
+ kubernetes-tramp = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "kubernetes-tramp";
+ version = "20171026.922";
+ src = fetchFromGitHub {
+ owner = "gruggiero";
+ repo = "kubernetes-tramp";
+ rev = "9fa84df71f6e88bc23a756cdf2df393a35aec945";
+ sha256 = "1l1ibc97ahp3zwwypqfg3201qdxad4sdpdaq7nsfb87gh46vsbz8";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/8ea4b15e64a9dc33b9977650488693cacadd1ab1/recipes/kubernetes-tramp";
+ sha256 = "15nlx3w2v0gky0zgbx7n0w1mdr6yaj4dh028ay2k19wg8wbsckjq";
+ name = "kubernetes-tramp";
+ };
+ packageRequires = [ cl-lib emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/kubernetes-tramp";
+ license = lib.licenses.free;
+ };
+ }) {};
kurecolor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "kurecolor";
@@ -41277,25 +40393,6 @@
license = lib.licenses.free;
};
}) {};
- lacarte = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "lacarte";
- version = "20170307.837";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/lacarte.el?revision=41";
- sha256 = "0m3swrvxz0cy01pd4kag626fxqp4l2zzwpgr26yp5wpsfxl9avv8";
- name = "lacarte.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/lacarte";
- sha256 = "07rxgjax6ms0knjj5qplfy0hxzfhs6iqk4ny43566zzqv86n0bhi";
- name = "lacarte";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/lacarte";
- license = lib.licenses.free;
- };
- }) {};
lang-refactor-perl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "lang-refactor-perl";
@@ -41341,12 +40438,12 @@
langtool = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "langtool";
- version = "20170606.432";
+ version = "20170917.2154";
src = fetchFromGitHub {
owner = "mhayashi1120";
repo = "Emacs-langtool";
- rev = "d976e4f0cadb2309b798540429558936f8f45889";
- sha256 = "1qlgd5i8jngsq754jm44gb46p5y6j2cccacg72aklvwajay0adyh";
+ rev = "bae4bdd240583b2253b4ff03af5295146e285103";
+ sha256 = "0zwaddpmvkq7v5nnyzacmx0ql5zjlisvkqwa2knw3pihngr160cd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/503845e79e67c921f1fde31447f3dd4da2b6f993/recipes/langtool";
@@ -41631,6 +40728,27 @@
license = lib.licenses.free;
};
}) {};
+ lean-mode = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }:
+ melpaBuild {
+ pname = "lean-mode";
+ version = "20170920.755";
+ src = fetchFromGitHub {
+ owner = "leanprover";
+ repo = "lean-mode";
+ rev = "2f73061c886bae07bc51e4d9eb545ed8027c0442";
+ sha256 = "17bqx7bkfzv4w7cf0l139xwg1shns680rq74hrqgicammb453kz7";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde/recipes/lean-mode";
+ sha256 = "0rdraxsirkrzbinjwg4qam15iy3qiixqgwsckngzw8d9a4s9l6sj";
+ name = "lean-mode";
+ };
+ packageRequires = [ dash dash-functional emacs f flycheck s ];
+ meta = {
+ homepage = "https://melpa.org/#/lean-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
leanote = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pcache, request, s }:
melpaBuild {
pname = "leanote";
@@ -41865,12 +40983,12 @@
leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "leuven-theme";
- version = "20170907.413";
+ version = "20170919.252";
src = fetchFromGitHub {
owner = "fniessen";
repo = "emacs-leuven-theme";
- rev = "b6889c336fc4f046138334ed700c5c9a13e39992";
- sha256 = "0j8d6h61nvz2gpkbf73v246srjg6wm93giijc7f0rks9g0nlp1rc";
+ rev = "9d31a9d4ed763d6309e9d44985cd8b4a5a2fb500";
+ sha256 = "0vr535a32cgkna0h1z8ac9cb4al3jb01bybn956rz51qdbzm2d1h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b09451f4eb2be820e94d3fecbf4ec7cecd2cabdc/recipes/leuven-theme";
@@ -41932,8 +41050,8 @@
src = fetchFromGitHub {
owner = "rvirding";
repo = "lfe";
- rev = "71d8e5bafc59424bacd23c8af4b368d5a6db686c";
- sha256 = "1wdxi1fbhw6k4dyq91vg7j33hcxjbhb1ydb5qaq292iach525wrq";
+ rev = "2880c8a2a7fe998238b6490fe3e3c484b5c5985e";
+ sha256 = "1xcnh1hk815wizhp7h1mik3npm7zpbvg4554nwbj072gnbb9j1nx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode";
@@ -41946,25 +41064,6 @@
license = lib.licenses.free;
};
}) {};
- lib-requires = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "lib-requires";
- version = "20170307.855";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/lib-requires.el?revision=53";
- sha256 = "04lrkdjrhsgg7vgvw1mkr9a5m9xlyvjvnj2aj6w453bgmnp1mbvv";
- name = "lib-requires.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/lib-requires";
- sha256 = "1a69qf9dlsq5r7nm32hd0srzka7crd08gl82w8hjfvdhn43n2h0c";
- name = "lib-requires";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/lib-requires";
- license = lib.licenses.free;
- };
- }) {};
libmpdee = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "libmpdee";
@@ -42073,12 +41172,12 @@
link-hint = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "link-hint";
- version = "20170904.1442";
+ version = "20170923.855";
src = fetchFromGitHub {
owner = "noctuid";
repo = "link-hint.el";
- rev = "366bce32f8cb1aa5f0f1ce4eceb4d60cc802abd6";
- sha256 = "09k1cz3l2ql2fdn3kx43q3bjlwqcz67fw2as6m59951lyd8fnmxp";
+ rev = "0294df85aee10b47fcf6c2c9bfe7e1038660fa21";
+ sha256 = "0ixfrp6pfljgy5ja79cka0fa6a9ganwhh5myz6czqj4ykjzlyi2c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d24b48fe0bc127ae6ac4084be8059aacb8445afd/recipes/link-hint";
@@ -42225,34 +41324,15 @@
license = lib.licenses.free;
};
}) {};
- lispxmp = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "lispxmp";
- version = "20170110.1508";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/lispxmp.el?revision=17";
- sha256 = "120wgxvckrgryfg2lvyx60rkcayii0g4ny2cdk3aiwsrpqcyhlyr";
- name = "lispxmp.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/6fc8f86533402e4be8bac87ad66bc8d51c8d40f8/recipes/lispxmp";
- sha256 = "02gfbyng3dh2445jfkasxzjc9dlk02dafbfkjm40iwmb8h0fzji4";
- name = "lispxmp";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/lispxmp";
- license = lib.licenses.free;
- };
- }) {};
lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }:
melpaBuild {
pname = "lispy";
- version = "20170911.1138";
+ version = "20171017.1052";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "lispy";
- rev = "134d815c843813950cbffc4516cabafd8ae75ed4";
- sha256 = "1xw8j3hjahp6vl3qnfab0kyl20zxclnbfpy9x1zp344zic61n02m";
+ rev = "d70db0d6cfae3c030167389828219b9c9ac88248";
+ sha256 = "1jrcrlnn0k814wqw2dyzjhcc7q4k95pp7apcmfzv7zk5jwf5p0xk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
@@ -42349,26 +41429,6 @@
license = lib.licenses.free;
};
}) {};
- list-processes-plus = callPackage ({ fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "list-processes-plus";
- version = "20131117.1135";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/list-processes+.el";
- sha256 = "1bssvyjgk1h1wiaxxdi2m5gjy6a790a9rwvi0r22hin7iskg300a";
- name = "list-processes+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/d508d50d89c914c53211197afc758fc0e1154081/recipes/list-processes+";
- sha256 = "10x7hkba2bmryyl68w769fggw65dl4f3a9g0gqdzmkdj80rcipky";
- name = "list-processes-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/list-processes+";
- license = lib.licenses.free;
- };
- }) {};
list-register = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "list-register";
@@ -42460,8 +41520,8 @@
src = fetchFromGitHub {
owner = "Fuco1";
repo = "litable";
- rev = "4a57d7aeddca76448e4df2a46b42d49253e5e625";
- sha256 = "1zryrc0d2avb27w6a6yzqcc73rsr2rp795vi10qhb04ixda4a8w4";
+ rev = "90a2dca14a6da9b24fe332a65cff899ab4a90810";
+ sha256 = "1xaixgjfpnqnsdkhfia107fq5xaq2l0gdb0zp730z97958136mm3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/74f2190b653907985e49a96ded986ab11b4946d7/recipes/litable";
@@ -42582,12 +41642,12 @@
live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "live-py-mode";
- version = "20170906.2104";
+ version = "20171029.1522";
src = fetchFromGitHub {
owner = "donkirkby";
repo = "live-py-plugin";
- rev = "4d972a859e6a56d969b075688b425ac246b40962";
- sha256 = "0qzg5i9x9f5skp2bk5avxw30nhs44z4didk69prli6p6sfd4bgqg";
+ rev = "2ecd23457ac26f30f7218a5506142ca71dc602be";
+ sha256 = "17d6p7i2yi3iawc2k8w4fkx5lwnr0x5kax73cgwapv6ghmr9yy42";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@@ -42603,12 +41663,12 @@
lively = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "lively";
- version = "20170820.407";
+ version = "20171005.54";
src = fetchFromGitHub {
owner = "purcell";
repo = "lively";
- rev = "49cf43815c04f0b84d20b527f5d712544a13a4db";
- sha256 = "02in5dj50c82h2bb7l47b00w3hpn3c2788aiyq2bln06vpj1qq4n";
+ rev = "348675828c6a81bfa1ac311ca465aad813542c1b";
+ sha256 = "1j8w63hhk1wcxcfqz0wimqijp7p1m8a2n947gwqv8nk1wm40aqg3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3e4b01286dbc84f01b43955b693ca08e675ffa07/recipes/lively";
@@ -42690,8 +41750,8 @@
version = "20150910.644";
src = fetchgit {
url = "https://llvm.org/git/llvm";
- rev = "ae7945dc893db824632135ea16929e14ca185595";
- sha256 = "0vsj8i29qkfl2a6fsdplzdh2kb9vrc2rkbbh7hak81ngn19q41l8";
+ rev = "26acced737715cfcbf29f6708f900b4bb8a6d5e8";
+ sha256 = "189c90wax1zyzk017j4brq2i25smkmpkb05wzakywkf0rgswxwqh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/llvm-mode";
@@ -42957,12 +42017,12 @@
logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "logview";
- version = "20170705.1217";
+ version = "20170928.820";
src = fetchFromGitHub {
owner = "doublep";
repo = "logview";
- rev = "134b41557ab539219d9e3a1b3c8939df93676726";
- sha256 = "1jfdm64r6rj7pl6270v084fvaga5csa4snvbfjdlhs5bshn1d0v2";
+ rev = "72b6c5349206172a146b2c730b8ac040a92ebc3f";
+ sha256 = "1f93iyxf8v0jazzh6jljrm7r28z00nn14wr90qrh9y9chyq72n63";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview";
@@ -43101,22 +42161,22 @@
license = lib.licenses.free;
};
}) {};
- lsp-go = callPackage ({ fetchFromGitHub, fetchurl, go-mode, lib, lsp-mode, melpaBuild }:
+ lsp-go = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }:
melpaBuild {
pname = "lsp-go";
- version = "20170709.1021";
+ version = "20171021.336";
src = fetchFromGitHub {
owner = "emacs-lsp";
repo = "lsp-go";
- rev = "d3ff1fdf5c5e735d5beebff3b0bbbdd3432fbfdf";
- sha256 = "08kasnkg7v0haqrhd2r6dn094vcdhygc1v9nx3lhlfd1sq84m7qh";
+ rev = "d270b7c0bd893fdc73a97763e07706830756cad2";
+ sha256 = "0i9l56dmkxcycn9a2ddj1zwa9cmzb5lpj6qn5x1k9q9yfk9hsc6b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-go";
sha256 = "1yg21qqlf8ma734vaz6xrfym2058gvx7llsqy94fbbg1fg61c32c";
name = "lsp-go";
};
- packageRequires = [ go-mode lsp-mode ];
+ packageRequires = [ lsp-mode ];
meta = {
homepage = "https://melpa.org/#/lsp-go";
license = lib.licenses.free;
@@ -43125,12 +42185,12 @@
lsp-haskell = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, lib, lsp-mode, melpaBuild }:
melpaBuild {
pname = "lsp-haskell";
- version = "20170814.1358";
+ version = "20171021.330";
src = fetchFromGitHub {
owner = "emacs-lsp";
repo = "lsp-haskell";
- rev = "7c4caf7f87392146203ecd0616a059280deecd15";
- sha256 = "1i5rpmz8kzcjgxwvy1g3mlxd4y1bnnjzlk6j2sz4i7c75g2aprn4";
+ rev = "16ca9fa975e64e840e062485ed30e4b297d72424";
+ sha256 = "03zrk3h76hpacrqw7lchjbslh0lg081jqkgf9n5nhxj2jg60v3vd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-haskell";
@@ -43146,12 +42206,12 @@
lsp-java = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }:
melpaBuild {
pname = "lsp-java";
- version = "20170522.633";
+ version = "20171023.650";
src = fetchFromGitHub {
owner = "emacs-lsp";
repo = "lsp-java";
- rev = "350c48ff4bde3c19b02b14ee519cd6ac7514d94c";
- sha256 = "07392bkq5b1jymplxm76yskyf2d55s4hd46zf890jxrjzybk0ffp";
+ rev = "5176f63e80e8f971563c0b98658db7dc72404369";
+ sha256 = "07g259bx3vra2gf9mhxyd3qv1jb2s0lc0hndf0kvrcjdy29wwi52";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-java";
@@ -43164,15 +42224,57 @@
license = lib.licenses.free;
};
}) {};
+ lsp-javacomp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }:
+ melpaBuild {
+ pname = "lsp-javacomp";
+ version = "20171024.1547";
+ src = fetchFromGitHub {
+ owner = "tigersoldier";
+ repo = "lsp-javacomp";
+ rev = "ed23aaeee27e6253bed5752fb8fbb7a5fa61967c";
+ sha256 = "096rbyv0qwa454p1ns7g0py9lni5r6h1gw85wm5mwr00shjzq23n";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6b8a1c034554579a7e271409fa72020cfe441f68/recipes/lsp-javacomp";
+ sha256 = "1gp8dlcpik2lmpicccq2kya498pmw9m8vz9m1fbd725p7wk58fhi";
+ name = "lsp-javacomp";
+ };
+ packageRequires = [ emacs lsp-mode s ];
+ meta = {
+ homepage = "https://melpa.org/#/lsp-javacomp";
+ license = lib.licenses.free;
+ };
+ }) {};
+ lsp-javascript-typescript = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }:
+ melpaBuild {
+ pname = "lsp-javascript-typescript";
+ version = "20171027.1005";
+ src = fetchFromGitHub {
+ owner = "emacs-lsp";
+ repo = "lsp-javascript";
+ rev = "8a565260906f90bb39f2da54cdb6179ec27005a6";
+ sha256 = "1dx0b7sq6wn309l1iy8s3ccn21hkv0xs061jbm53hz40pn30sjqc";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/999a4b0cd84e821c7e785ae4e487f32cff5c346b/recipes/lsp-javascript-typescript";
+ sha256 = "0pml7f7874c5xx94qpq7w5sz5hcail8s5nm5sy5vgax1j742r5y1";
+ name = "lsp-javascript-typescript";
+ };
+ packageRequires = [ lsp-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/lsp-javascript-typescript";
+ license = lib.licenses.free;
+ };
+ }) {};
lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "lsp-mode";
- version = "20170905.1130";
+ version = "20171029.148";
src = fetchFromGitHub {
owner = "emacs-lsp";
repo = "lsp-mode";
- rev = "d69692651742b65398b4c1f9ee06d1670d9443d0";
- sha256 = "1f09shdirq81c37sg2hdgj1wqqvwmg5m7bkprz28fych76xi8jgr";
+ rev = "b221b2acce8936114649cdbdf0ce1d584487ef91";
+ sha256 = "0ndbhy1035ji31ffhc6hxybwm59kzmlp9hg1zjhfww4d0sym9hz9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode";
@@ -43185,15 +42287,36 @@
license = lib.licenses.free;
};
}) {};
+ lsp-ocaml = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }:
+ melpaBuild {
+ pname = "lsp-ocaml";
+ version = "20171022.308";
+ src = fetchFromGitHub {
+ owner = "emacs-lsp";
+ repo = "lsp-ocaml";
+ rev = "3683281bcb56fbe778fadb23e4363a411b6f9e73";
+ sha256 = "102cfv52hicmpbczs1z3cfz8d03p2hwzdkp3n0ljx1asnk4l1b8x";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/7be2d7a7af3d744c531e5e018d791bf2566df428/recipes/lsp-ocaml";
+ sha256 = "17334qcgqrz4jd5npizyq20fmxy07z2p3pq98s5np2kc4h9ara33";
+ name = "lsp-ocaml";
+ };
+ packageRequires = [ emacs lsp-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/lsp-ocaml";
+ license = lib.licenses.free;
+ };
+ }) {};
lsp-python = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }:
melpaBuild {
pname = "lsp-python";
- version = "20170430.443";
+ version = "20171021.254";
src = fetchFromGitHub {
owner = "emacs-lsp";
repo = "lsp-python";
- rev = "7057d3797ecfafab21f3365fd55ba14d44b278ec";
- sha256 = "1gw8zfxd9chln8z8sdxy9xjzs74q5zbhsgl9zc3sl8d0ml027qar";
+ rev = "5acea5f921dc396ea092ee253ec01b45dee3cbfd";
+ sha256 = "0nz0n7k0i0h77fn8w0d49b4pkljw7l15hzvjym16jh4gr1n098ar";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-python";
@@ -43206,22 +42329,22 @@
license = lib.licenses.free;
};
}) {};
- lsp-rust = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, rust-mode }:
+ lsp-rust = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }:
melpaBuild {
pname = "lsp-rust";
- version = "20170829.142";
+ version = "20171021.241";
src = fetchFromGitHub {
owner = "emacs-lsp";
repo = "lsp-rust";
- rev = "613a379e8cf62597181c72b3e4a69893852c60a6";
- sha256 = "19p8cw38kmj0kjw0kknicd8zva9f7vai9rjk3xbli5cwpmwvizy8";
+ rev = "239e0cb8912749266a6226b68c6bc3b4362876c1";
+ sha256 = "0ki66lcdc67hxx3llzw5x8vrsfi1p5m509jpcvkhrrxs1sqr4bqn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-rust";
sha256 = "0p86223pfpi4hh8m66ccksxgl0yi7zrigd1gmbz0bzqa6yjgbp28";
name = "lsp-rust";
};
- packageRequires = [ lsp-mode rust-mode ];
+ packageRequires = [ lsp-mode ];
meta = {
homepage = "https://melpa.org/#/lsp-rust";
license = lib.licenses.free;
@@ -43437,25 +42560,6 @@
license = lib.licenses.free;
};
}) {};
- macros-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "macros-plus";
- version = "20170307.842";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/macros+.el";
- sha256 = "0x9fycqw234s1i0ndy7v0d7vn654id245pi0kwphbqgnga7w3l6p";
- name = "macros+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/macros+";
- sha256 = "0aihszxsjnc93pbbkmkr1iwzvii3jw8yh1f6dpnjykgvb328pvqi";
- name = "macros-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/macros+";
- license = lib.licenses.free;
- };
- }) {};
macrostep = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "macrostep";
@@ -43564,12 +42668,12 @@
magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
melpaBuild {
pname = "magit";
- version = "20170913.343";
+ version = "20171031.1141";
src = fetchFromGitHub {
owner = "magit";
repo = "magit";
- rev = "ae72710292a94d9af92799d3ddeb86f365f34a56";
- sha256 = "1344dcngdk899xi9wjipvngq50xggbv06fb1w09zjzs8ckpsh8gf";
+ rev = "5c08d09cdaad506ca94616c59f39982f43f4c12f";
+ sha256 = "053ff7gr56chbfg3n6ysn5q13db2rjr5s7nkplkv72hzla381dys";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -43592,12 +42696,12 @@
magit-annex = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
melpaBuild {
pname = "magit-annex";
- version = "20170702.832";
+ version = "20170913.659";
src = fetchFromGitHub {
owner = "magit";
repo = "magit-annex";
- rev = "2aa23cd169166e92be3e874c723ff224a9d42c15";
- sha256 = "1bjv8a38y75cpbxhzxsnvzpq2cvs80x8ai7pspsqf4pp3w1dj45n";
+ rev = "895c229c2b0d822a4debb302d8638105ecb4ee20";
+ sha256 = "0316csgc95dalqmkxj6qlb7inzcg4csfs9n3im1ygswcswpdaajh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-annex";
@@ -43697,12 +42801,12 @@
magit-gitflow = callPackage ({ fetchFromGitHub, fetchurl, lib, magit, magit-popup, melpaBuild }:
melpaBuild {
pname = "magit-gitflow";
- version = "20170425.128";
+ version = "20170929.124";
src = fetchFromGitHub {
owner = "jtatarik";
repo = "magit-gitflow";
- rev = "5bdcfe0a7bf4f5bb9a927baa4880233bf11a4a6b";
- sha256 = "12pi6aw44lnzzcw0zgz5rxvcf4p700fkz4q2skbapwmds8gw3fg9";
+ rev = "cc41b561ec6eea947fe9a176349fb4f771ed865b";
+ sha256 = "0jz69wrrzvqadaphmjrr146nzvmphsbl7rmc3ccnpw1gw6gnz81f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dfaeb33dec2c75d21733b6e51d063664c6544e4d/recipes/magit-gitflow";
@@ -43781,12 +42885,12 @@
magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "magit-popup";
- version = "20170913.343";
+ version = "20171023.926";
src = fetchFromGitHub {
owner = "magit";
repo = "magit";
- rev = "ae72710292a94d9af92799d3ddeb86f365f34a56";
- sha256 = "1344dcngdk899xi9wjipvngq50xggbv06fb1w09zjzs8ckpsh8gf";
+ rev = "5c08d09cdaad506ca94616c59f39982f43f4c12f";
+ sha256 = "053ff7gr56chbfg3n6ysn5q13db2rjr5s7nkplkv72hzla381dys";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -43907,12 +43011,12 @@
magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, lib, magit, melpaBuild, s }:
melpaBuild {
pname = "magithub";
- version = "20170901.1234";
+ version = "20171029.1959";
src = fetchFromGitHub {
owner = "vermiculus";
repo = "magithub";
- rev = "7051c1bf8e316b116430be63c55b3010578c3eb4";
- sha256 = "0jga49kwp47m39nsp2a12vwaj5n54zgcjnfq214fjjdcdrqcl3n7";
+ rev = "2fcd5eebf3e052234950b3b07e43d26ce632a794";
+ sha256 = "0k5bxxfj60vr58g7rnj562ls8ijb0ia66fdiqpyffi5sf0wan13i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub";
@@ -44075,12 +43179,12 @@
makefile-executor = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "makefile-executor";
- version = "20170913.56";
+ version = "20171017.438";
src = fetchFromGitHub {
owner = "thiderman";
repo = "makefile-executor.el";
- rev = "90872c2e2ab05da7e8a9dd195fc696b4388c0f35";
- sha256 = "03505bzrlz8jxp5fda5zqn58860xbhhz5xy33wvnh1w9632ljdg9";
+ rev = "a950438c93dc2fdcb867ac25174c773deda95aff";
+ sha256 = "1vpa24k8gm9zr8mpam76k1wbzc1zama5s5ch1f8c1h539l8i8cl9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/08f8b4d680e4907dbd8ea46a75d98aa0e93c2bb9/recipes/makefile-executor";
@@ -44093,27 +43197,6 @@
license = lib.licenses.free;
};
}) {};
- maker-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
- melpaBuild {
- pname = "maker-mode";
- version = "20150116.354";
- src = fetchFromGitHub {
- owner = "fommil";
- repo = "maker-mode";
- rev = "335c43b08eff589040129dae1ea13c88793b069e";
- sha256 = "0w3kar52yf8clf9801c4jzfrixi10clc8fs8ni2d4pzhdwwca2zw";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/ba7edfa6ab6b93c346f92859db706acb3fd5fc6e/recipes/maker-mode";
- sha256 = "03q09jxmhwqy7g09navj08z9ir0rbh7w26c1av7hwhmq4i6xwg8a";
- name = "maker-mode";
- };
- packageRequires = [ dash s ];
- meta = {
- homepage = "https://melpa.org/#/maker-mode";
- license = lib.licenses.free;
- };
- }) {};
makey = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "makey";
@@ -44264,12 +43347,12 @@
mandm-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mandm-theme";
- version = "20170903.306";
+ version = "20170925.321";
src = fetchFromGitHub {
owner = "choppsv1";
repo = "emacs-mandm-theme";
- rev = "889cdcb8ea7234d2e6d9dad663e39bd5f872c28d";
- sha256 = "0x7fhzsx7pcbyy5dkx9aa2qvpnn7psc3nf8mqv96mvnzr5q1xg53";
+ rev = "078d6d6f11bd48193c5de590cfb0e3d0d687ffc9";
+ sha256 = "070280438388q57lpzvd5wdk16abmxixiq01n68hdskfcipdkn2d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mandm-theme";
@@ -44285,12 +43368,12 @@
mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }:
melpaBuild {
pname = "mandoku";
- version = "20170908.247";
+ version = "20171002.12";
src = fetchFromGitHub {
owner = "mandoku";
repo = "mandoku";
- rev = "14e2d3f7586001ae4b44582ef03728eaf8326643";
- sha256 = "0c1n5lnllm9mqar68jxm9sr5kyzl4v4ckrdmms68a9rvcfrbn6lg";
+ rev = "77647573331c602847b06b9e21de69f72cd7bad5";
+ sha256 = "0yqxsls9phvd4dgzb908xds4x437rqpm3ddy07pq3qq7ghri1cnv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku";
@@ -44461,12 +43544,12 @@
markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "markdown-mode";
- version = "20170830.2131";
+ version = "20171031.1725";
src = fetchFromGitHub {
owner = "jrblevin";
repo = "markdown-mode";
- rev = "2d790a7c72546b96b3fdf57e7b7d6af1663fb721";
- sha256 = "0jfldbw7wpy05rq7xzxm5w49pwcnsz97l1ajh3g526lbj76p2rnl";
+ rev = "7a62259a22ccbf59b0132d077348ee489edf5d1e";
+ sha256 = "137xkm76k6faak478hmnr6yrhymbfln0xs0ninzp4iy57kxyx9d9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode";
@@ -44657,12 +43740,12 @@
marshal = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, ht, json ? null, lib, melpaBuild }:
melpaBuild {
pname = "marshal";
- version = "20160807.1954";
+ version = "20171018.932";
src = fetchFromGitHub {
owner = "sigma";
repo = "marshal.el";
- rev = "d5b6fdd97159b22d5a9dbc3b0db18a04089b3f2f";
- sha256 = "1pix1cz8zv3kgf103ml1y42a0l2hvakbykfpbyx81z4nw7n958lf";
+ rev = "406ea2f60c7e4aeafd384b8d6696d726b3d8f611";
+ sha256 = "1mr5p2yiad1k15byrlk0a784kj7rvibpn4li5phk4rnm0zg1xy9s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/203f2061c5c7d4aefab3175de5e0538f12158ee3/recipes/marshal";
@@ -44863,25 +43946,6 @@
license = lib.licenses.free;
};
}) {};
- mb-depth-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "mb-depth-plus";
- version = "20170307.844";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/mb-depth+.el";
- sha256 = "1vqminlfc146c8wr00ck7drs5kf92fvdmhyqyh2hj6394cvqs7w9";
- name = "mb-depth+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/mb-depth+";
- sha256 = "031hh227rh7l818p3di4h34i4698yynw5g9a5sl2hj47c0734q6w";
- name = "mb-depth-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/mb-depth+";
- license = lib.licenses.free;
- };
- }) {};
mb-url = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mb-url";
@@ -45176,34 +44240,15 @@
license = lib.licenses.free;
};
}) {};
- menu-bar-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "menu-bar-plus";
- version = "20170720.710";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/menu-bar+.el";
- sha256 = "0yq995jyfw3a1dj49a4wnavfb29amw575dajps6nbv0g1q0rnwkf";
- name = "menu-bar+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/menu-bar+";
- sha256 = "181jxjnzdckmvpsdknhm21xwimvsp0qxn8azfn58dz41gl4xcg90";
- name = "menu-bar-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/menu-bar+";
- license = lib.licenses.free;
- };
- }) {};
merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "merlin";
- version = "20170731.907";
+ version = "20170917.430";
src = fetchFromGitHub {
owner = "the-lambda-church";
repo = "merlin";
- rev = "b53e4beeeb8da6d7cb035990a7e805fea5da0de6";
- sha256 = "1lw0s78zwr8rd4q4pg34m9q8yd5swh1fff3c5p992a2qlzfb0hax";
+ rev = "a5dbf8e321ff162476555e62264468dd6f55c279";
+ sha256 = "0mq4ddr3g64dd4bhq812hb5xvlkswfmib1nw34f3m8sghmaxcd5z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin";
@@ -45237,25 +44282,6 @@
license = lib.licenses.free;
};
}) {};
- message-x = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "message-x";
- version = "20151029.718";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/message-x.el?revision=9";
- sha256 = "05ic97plsysh4nqwdrsl5m9f24m11w24bahj8bxzfdawfima2bkf";
- name = "message-x.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/b7bf124ec30fa5551b31c0e0d39be234f19e2e81/recipes/message-x";
- sha256 = "0z12alizwrqp5f9wq3qllym9k5xljh904c9qhlfhp9biazj6yqwj";
- name = "message-x";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/message-x";
- license = lib.licenses.free;
- };
- }) {};
messages-are-flowing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "messages-are-flowing";
@@ -45263,8 +44289,8 @@
src = fetchFromGitHub {
owner = "legoscia";
repo = "messages-are-flowing";
- rev = "17a0d91658390ba8d38f325b3ece380e07e3cb49";
- sha256 = "0600is9cynvppdy9vrnr1c0m3cyxim0ha4gq4wbhw9h0cvkz8i1b";
+ rev = "ef879726957c850c3a5afd7f1118604991e37e32";
+ sha256 = "1mryk48z92r4j8f3qg0j0q5iygv7vnk1k0wgza5pq6bhrl5w13hq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/messages-are-flowing";
@@ -45406,12 +44432,12 @@
mhc = callPackage ({ calfw, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mhc";
- version = "20160704.633";
+ version = "20171016.335";
src = fetchFromGitHub {
owner = "yoshinari-nomura";
repo = "mhc";
- rev = "d5f7c5abe90831248581c26ef3abfec70b2c2b9c";
- sha256 = "0f5ilbl6dc5hf9s4lfp027qjdlwd0kzb7sni7lda6v5597vhsnb4";
+ rev = "03a50a7dd5f90fb981b72e4b9e9385e4d1fe3be3";
+ sha256 = "17p6gkf6xmx6sflzd3pyc3p3x7ma8p497hmj1yc7w863kqm8jclk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d8d3efa0fcd6cd4af94bc99b35614ef6402cbdba/recipes/mhc";
@@ -45759,25 +44785,6 @@
license = lib.licenses.free;
};
}) {};
- minor-mode-hack = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "minor-mode-hack";
- version = "20141226.1220";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/minor-mode-hack.el?revision=10";
- sha256 = "0vwvvhzqiad82qvfwygb2arq1mdvh1lj6q2as0a92fg1vc95qcb0";
- name = "minor-mode-hack.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/df182bfd8272f3ded761c90826c8cfe6bfd1a48b/recipes/minor-mode-hack";
- sha256 = "1f2wy25iphk3hzjy39ls5j04173g7gaq2rdp2grkawfhwx0ld4pj";
- name = "minor-mode-hack";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/minor-mode-hack";
- license = lib.licenses.free;
- };
- }) {};
mip-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mip-mode";
@@ -45820,44 +44827,6 @@
license = lib.licenses.free;
};
}) {};
- misc-cmds = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "misc-cmds";
- version = "20170823.842";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/misc-cmds.el?revision=104";
- sha256 = "1spds0fkbvk1br3lpaq3ifyvq0vk5rvyyx5x3cmrvpd0m5s01h87";
- name = "misc-cmds.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/misc-cmds";
- sha256 = "0bylb84icddgznmim18fwq1mhh3qz8yh8ch6lpadf9p3h420qgcl";
- name = "misc-cmds";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/misc-cmds";
- license = lib.licenses.free;
- };
- }) {};
- misc-fns = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "misc-fns";
- version = "20170307.848";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/misc-fns.el?revision=50";
- sha256 = "0jjmd33z36dikkbskskgbdv8pflkwaxn4ifajq4ghrdprdhm6gbm";
- name = "misc-fns.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/c2cbbe5a718ec961982a7f65de8f6ec1c9513696/recipes/misc-fns";
- sha256 = "1spjbkcac33lyfsgkd6z186a3432x9nw3akmx194gaap2863xcam";
- name = "misc-fns";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/misc-fns";
- license = lib.licenses.free;
- };
- }) {};
mixed-pitch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mixed-pitch";
@@ -45944,12 +44913,12 @@
mmm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mmm-mode";
- version = "20170808.1814";
+ version = "20171004.336";
src = fetchFromGitHub {
owner = "purcell";
repo = "mmm-mode";
- rev = "c68cee0beaeb99c5bd178fab6fec995bce4e501f";
- sha256 = "1k13q5hwb2p2bq5j84pln9kx18bs2x9zfnzgqm4acrxjp9hnknlc";
+ rev = "7661968fa6974996e58dfa28da33bca0cbde777d";
+ sha256 = "066qp884qw0bqcglncxvag89i1z5rmqjc73y7ksr7ll3309y1969";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/mmm-mode";
@@ -46049,12 +45018,12 @@
mocha = callPackage ({ f, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
melpaBuild {
pname = "mocha";
- version = "20170813.1957";
+ version = "20171016.903";
src = fetchFromGitHub {
owner = "scottaj";
repo = "mocha.el";
- rev = "ce9e42adf9333c68967597c17272b3a3c7564cea";
- sha256 = "1cl4ncmynhrvmllbkkwnw3064vw93xalk4zzy4bpb2zf74vwl1gy";
+ rev = "0f74ecf500f833f7f959187a375dacdd33d4d569";
+ sha256 = "03ixygw28hzn00136747mv2r3vii3n0gif1wqgg3k7ajh7c45f5b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/39c26134ba95f277a4e9400e506433d96a695aa4/recipes/mocha";
@@ -46116,8 +45085,8 @@
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "modalka";
- rev = "7ee76939b9269c652f93065a8fcc7da24434a167";
- sha256 = "0drhrid8gb9rk9rl8afsf3ninjzs4p78lnrp285xkhwn7hlri4v9";
+ rev = "88935a26318a574adeeb2301ae8d010f0102b1d3";
+ sha256 = "1zibawwflf2wx7hzg2ld7qvmlpljfd6nb86998ckzbx75s5yb20a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fa0a02da851a603b81e183f461da55bf4c71f0e9/recipes/modalka";
@@ -46172,44 +45141,6 @@
license = lib.licenses.free;
};
}) {};
- modeline-char = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "modeline-char";
- version = "20170307.854";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/modeline-char.el?revision=8";
- sha256 = "1c6ij1c0d6r9chzwqcpgdjq1rb2h0m09fpck9rc9rg5jy7fgdc0d";
- name = "modeline-char.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/modeline-char";
- sha256 = "0ksi5vfcwbyhgpp59qdl7l536zw2rd33xf4r2gihcx2g2k52h2w9";
- name = "modeline-char";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/modeline-char";
- license = lib.licenses.free;
- };
- }) {};
- modeline-posn = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "modeline-posn";
- version = "20170307.856";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/modeline-posn.el?revision=43";
- sha256 = "1cpab6k0p65nmw78y5v4lbpxw6pczkzk46zmkc76pi55yjpw6pbm";
- name = "modeline-posn.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/c62008950ea27b5a47363810f57063c1915b7c39/recipes/modeline-posn";
- sha256 = "0dngfcbcdh22fl6nd47dhg9z9iivj67six67zjr9j1cbngp10dwk";
- name = "modeline-posn";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/modeline-posn";
- license = lib.licenses.free;
- };
- }) {};
modern-cpp-font-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "modern-cpp-font-lock";
@@ -46255,12 +45186,12 @@
moe-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "moe-theme";
- version = "20170111.1838";
+ version = "20170914.2111";
src = fetchFromGitHub {
owner = "kuanyui";
repo = "moe-theme.el";
- rev = "70e71ef7404cc5c38254771695eee221090d5110";
- sha256 = "1dpcffb6pyggg2lj7n9lnxyg2clwm4q7hnxvgc87r6b61vjr3a20";
+ rev = "b8f0206614ab40ffb75e50ce6c38675fb9c7cf2e";
+ sha256 = "0pn3a1rrj7ycxh91x3q008b6rmq7rbl8ir6diqzqfp6y465pn2w2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4efefd7edacf90620436ad4ef9ceb470618a8018/recipes/moe-theme";
@@ -46402,12 +45333,12 @@
monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "monokai-theme";
- version = "20170731.504";
+ version = "20171013.236";
src = fetchFromGitHub {
owner = "oneKelvinSmith";
repo = "monokai-emacs";
- rev = "8dacce10f3c2d362c4fb39485a3f33c3b911b8b3";
- sha256 = "1j6zz9lkr4n5k758qqmk3n0w69fi9grgcv8zqvhxx7yvpk9c8nvs";
+ rev = "019e07947426f0192fc3458f3f72c19031b607de";
+ sha256 = "0id35345zp0fchbcz8qk2lg71jyln91k56vfama27ss3nzy3f9kz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme";
@@ -46567,25 +45498,6 @@
license = lib.licenses.free;
};
}) {};
- mouse-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "mouse-plus";
- version = "20170307.859";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/mouse+.el";
- sha256 = "1f49b10i1iqh0q2s2fa309dc617dzavah7fw0k1rpjk84kb001bd";
- name = "mouse+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/01cbe9b5bb88f8c02fab67a269ac53c8aa4d8326/recipes/mouse+";
- sha256 = "1fv7jnqzskx9iv92dm2pf0mqy2accl0svjl2kkb6v273n1day3f8";
- name = "mouse-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/mouse+";
- license = lib.licenses.free;
- };
- }) {};
mouse-slider-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mouse-slider-mode";
@@ -46607,25 +45519,6 @@
license = lib.licenses.free;
};
}) {};
- mouse3 = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "mouse3";
- version = "20170324.1050";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/mouse3.el?revision=39";
- sha256 = "0rnpfz0d4spxkyssgf3j5kfajm54i1vism2q0giikd0savrh0a1c";
- name = "mouse3.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/mouse3";
- sha256 = "1rppn55axjpqwqm2lq4dvwi3z7xkd5jkyqi1x8jqgcsfc9w6m777";
- name = "mouse3";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/mouse3";
- license = lib.licenses.free;
- };
- }) {};
move-dup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "move-dup";
@@ -46881,12 +45774,12 @@
mtg-deck-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mtg-deck-mode";
- version = "20170904.2002";
+ version = "20170925.1338";
src = fetchFromGitHub {
owner = "mattiasb";
repo = "mtg-deck-mode";
- rev = "c1ab6dbfbe83d0c90f2c9ba4dfeb31b09f1fb875";
- sha256 = "1xyd827b6wfdbhzj2ba4mywikfjwjs9xspn2aksbsl2bcby0n6zn";
+ rev = "546a62ada70aa89d325cc3941c8c9379a4c21553";
+ sha256 = "1gbgsfd04jdw6jrsp13h13jkkac5ndrn684pl18q0wjgx9kk11b6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/425fa66cffe7bfda71de4ff2b49e951456bdeae1/recipes/mtg-deck-mode";
@@ -46962,6 +45855,27 @@
license = lib.licenses.free;
};
}) {};
+ mu4e-query-fragments = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "mu4e-query-fragments";
+ version = "20170923.622";
+ src = fetchFromGitHub {
+ owner = "wavexx";
+ repo = "mu4e-query-fragments.el";
+ rev = "34ddad4e6785f575333efcc66153d892daa1c884";
+ sha256 = "0l5i3a88j9il2y0jq2sfzwi9q3czc1wi8n9nvgdysj5db5m4xsw6";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/21277a79a211b4d101809314bdb9963130a3d533/recipes/mu4e-query-fragments";
+ sha256 = "0h8rapfz9snvr722vr65gqa0xhgig81b2gvswjlzljwd2m98yzzn";
+ name = "mu4e-query-fragments";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/mu4e-query-fragments";
+ license = lib.licenses.free;
+ };
+ }) {};
multi = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "multi";
@@ -47004,25 +45918,6 @@
license = lib.licenses.free;
};
}) {};
- multi-eshell = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "multi-eshell";
- version = "20120608.1135";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/multi-eshell.el?revision=9";
- sha256 = "1w1jwfznpl214a1xx46zlgqbx9c5yjzpyqqrkn3xqjgnj485yhkl";
- name = "multi-eshell.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a9069a6eb1e57bccb06d26577cac70765de8e52f/recipes/multi-eshell";
- sha256 = "1i0mvgqxsc99dwp9qcdrijqxsxflrbxw846rgw89p1jfs8mp4l7d";
- name = "multi-eshell";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/multi-eshell";
- license = lib.licenses.free;
- };
- }) {};
multi-line = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
melpaBuild {
pname = "multi-line";
@@ -47193,12 +46088,12 @@
mustache = callPackage ({ dash, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
melpaBuild {
pname = "mustache";
- version = "20131117.1407";
+ version = "20170923.533";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "mustache.el";
- rev = "b0ea352813592424164520a49e86c04600242752";
- sha256 = "1n2ymd92qpvsby6ms0l3kjhdzzc47rri2aiscc6bs07hm4mjpr9q";
+ rev = "5e39654b933a18131146a0f3b3e3dc55c5058124";
+ sha256 = "0ilsdrvqy9zn0yb1c8zh1zidag32rfb9xhm43qpfcg6n5w6c7r82";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d1bcf9599ca6d2c29333071a80f96808d4ab52e2/recipes/mustache";
@@ -47295,25 +46190,6 @@
license = lib.licenses.free;
};
}) {};
- muttrc-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "muttrc-mode";
- version = "20090804.1552";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/muttrc-mode.el?revision=7";
- sha256 = "1xihp3zdqs9054j3bfrd9wnahsvvxjk1ags1iy50ncv5850ppjis";
- name = "muttrc-mode.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/7d3fd45af3345742cff7be99ad8210d7f8fd2a2f/recipes/muttrc-mode";
- sha256 = "0ym6rfrhrmpnlqhkxv9ck5893qm0yhswslvgc9vb4nl9hyc1b5jn";
- name = "muttrc-mode";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/muttrc-mode";
- license = lib.licenses.free;
- };
- }) {};
mvn = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mvn";
@@ -47503,25 +46379,6 @@
license = lib.licenses.free;
};
}) {};
- naked = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "naked";
- version = "20170418.1822";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/naked.el?revision=23";
- sha256 = "1k3j6dyp8p47q43i4ba53krl06yx32rkjnh2f5x1zqk6nxnb1wf8";
- name = "naked.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/naked";
- sha256 = "06p6dzhn34dva3677mrvwq2a2x3bhw7f486y654hszla7i75pilq";
- name = "naked";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/naked";
- license = lib.licenses.free;
- };
- }) {};
name-this-color = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "name-this-color";
@@ -47613,8 +46470,8 @@
src = fetchFromGitHub {
owner = "Malabarba";
repo = "Nameless";
- rev = "ab1a5c589378334eafca105af1a17f73b9065423";
- sha256 = "107q1rximjnag9r9vgwh0iv687i3rsscbdnjc46f8l16j6vi4n7d";
+ rev = "108f16e743aecd35401c0e914c896572cf1d5082";
+ sha256 = "110bxdn2sqxlxqffaxp0yc6g2hglbv91az00mmgc01n6hjxcrc3h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8e4ee4dae5f32a8d445dc0cc2455c1f7075c9b3d/recipes/nameless";
@@ -47630,12 +46487,12 @@
names = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "names";
- version = "20151201.404";
+ version = "20171012.1214";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "names";
- rev = "65b577b1215c4cfaee1ed5e98b0545e9ef7b9964";
- sha256 = "13r1qmibjikx6hz36m6xf79wap6fci2x7jz7rac5s52hq2hdj2wk";
+ rev = "1d45ec50568eb2f5b55973f7ed0b48c68f9f13aa";
+ sha256 = "1z0zdi9r6x6pqy2qfj9krkmbmlw9rlrgdvgn4dppfzrmrig8libr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/names";
@@ -47752,25 +46609,6 @@
license = lib.licenses.free;
};
}) {};
- narrow-indirect = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "narrow-indirect";
- version = "20170820.1748";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/narrow-indirect.el?revision=14";
- sha256 = "16knfw5h15f7al6sn1n40bcw2ahqsy9ipkvfk0h7r1vlpb92w2fq";
- name = "narrow-indirect.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/38e5dd845c99acaae719562595059154a08a5f00/recipes/narrow-indirect";
- sha256 = "10aq4gssayh3adw8yz2lza1xbypyffi8r03lsc0kiis6gd9ibiyj";
- name = "narrow-indirect";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/narrow-indirect";
- license = lib.licenses.free;
- };
- }) {};
narrow-reindent = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "narrow-reindent";
@@ -48275,22 +47113,22 @@
license = lib.licenses.free;
};
}) {};
- nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
+ nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck-nimsuggest, let-alist, lib, melpaBuild }:
melpaBuild {
pname = "nim-mode";
- version = "20170830.2113";
+ version = "20171028.2219";
src = fetchFromGitHub {
owner = "nim-lang";
repo = "nim-mode";
- rev = "bc3af5a44f4272a8afa6e6c09f95f1cdd205c70e";
- sha256 = "1spyz9n1p6n4npm6j4ngr89n7y2f33kp2xj6jwvd4y4340g62m49";
+ rev = "10296ac3d9ee70bf31180b5158ac3b4a58f45d22";
+ sha256 = "0mswc1f141xif3h4zshza0ar64s99fp6j3l795c67a3yvmc7l50v";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ccb5f24b9d55c77eaa7952a9e6a2e0ed7be24/recipes/nim-mode";
sha256 = "1kzn3kkkj7jzs7fqhvib196sl3vp7kbhb4icqzmvvmv366lkaib6";
name = "nim-mode";
};
- packageRequires = [ commenter emacs epc flycheck let-alist ];
+ packageRequires = [ commenter emacs epc flycheck-nimsuggest let-alist ];
meta = {
homepage = "https://melpa.org/#/nim-mode";
license = lib.licenses.free;
@@ -48299,12 +47137,12 @@
nimbus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "nimbus-theme";
- version = "20170909.1336";
+ version = "20171026.504";
src = fetchFromGitHub {
owner = "m-cat";
repo = "nimbus-theme";
- rev = "71b3a560e6d017907f43f7dd074d300653c1588b";
- sha256 = "0ip330ylvy6rwgvqravm58qh8ssbrd8nw2rbd3gbhcwiqakawsjl";
+ rev = "e78561a828e50b5bd0984723d9040620367180c8";
+ sha256 = "04cbr0a3kvk79lyrriblm4q7y00j0banwl7a4r9li4iq92rgcivh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fc0e6b456b76e2379c64a86ad844362c58146dc6/recipes/nimbus-theme";
@@ -48324,8 +47162,8 @@
src = fetchFromGitHub {
owner = "martine";
repo = "ninja";
- rev = "87111bff382655075f2577c591745a335f0103c7";
- sha256 = "1rmh2a2q3lw3wmnlh5y7g06nzhcgnhz5libgsjfl3jvpxzdlck76";
+ rev = "e234a7bdb6c42f4539c0ab09b624f191287c2c10";
+ sha256 = "01hsabhvp1yilzdss3mkvrskkvxw41xxch6lkwlcrr6h5f70szi2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/aed2f32a02cb38c49163d90b1b503362e2e4a480/recipes/ninja-mode";
@@ -48366,12 +47204,12 @@
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix-mode";
- rev = "eb7623fb3b23afec25619a76adab6bab5e338bf2";
- sha256 = "1shgbh2iawml605qhr1s8bcmy0by7d455lm70wb2wkznsdlwv6wp";
+ rev = "3294f8a2f83ace2d71f16c274a262ff76be412dc";
+ sha256 = "1p1dka9v8fm6rklspkscj5rs5f21dwi3bq44d3hjqw6xva4q7bx4";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/4c885d9d9f1a37f05c715f89fae51efb580faced/recipes/nix-mode";
- sha256 = "15xgqgrkypcplnfvl5j6w8abayzz8q0nw2wav01sdyx39ym005k3";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e1870d786dbfac3b14386c8030e06f2d13ab9da6/recipes/nix-mode";
+ sha256 = "10f3ly4860lkxzykw4fbvhn3i0c2hgj77jfjbhlk2c1jz9x4yyy5";
name = "nix-mode";
};
packageRequires = [ emacs ];
@@ -48383,12 +47221,12 @@
nix-sandbox = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "nix-sandbox";
- version = "20170131.241";
+ version = "20171004.1006";
src = fetchFromGitHub {
owner = "travisbhartwell";
repo = "nix-emacs";
- rev = "ace629f7645d12778c96ff7b5cf4b1e41a98af29";
- sha256 = "11infdrdjc30kxvfg5rh1zn4idvkhf9s0c6v60qn441m1d5bnavq";
+ rev = "7007363e773a419203a69798fb0e0731b2eb0f73";
+ sha256 = "00hv8fhyahkdh1vfy1qkahqvsik6d81c7mqh4gjiqxrmb2l1vbcb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/66be755a6566e8c0cfb5aafa50de29b434023c7a/recipes/nix-sandbox";
@@ -48408,8 +47246,8 @@
src = fetchFromGitHub {
owner = "travisbhartwell";
repo = "nix-emacs";
- rev = "ace629f7645d12778c96ff7b5cf4b1e41a98af29";
- sha256 = "11infdrdjc30kxvfg5rh1zn4idvkhf9s0c6v60qn441m1d5bnavq";
+ rev = "7007363e773a419203a69798fb0e0731b2eb0f73";
+ sha256 = "00hv8fhyahkdh1vfy1qkahqvsik6d81c7mqh4gjiqxrmb2l1vbcb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6846c7d86e70a9dd8300b89b61435aa7e146be96/recipes/nixos-options";
@@ -48509,12 +47347,12 @@
no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "no-littering";
- version = "20170906.558";
+ version = "20171015.2358";
src = fetchFromGitHub {
owner = "emacscollective";
repo = "no-littering";
- rev = "d1d649711c4ba63e458b229afdc64ed4639cf988";
- sha256 = "0416i7gv89r46x30swvqhqf7na9rkpm0w9lw1v49kxqdrqqdci67";
+ rev = "79c18c7efffd80446d81201b4c7dd92dde6cac3a";
+ sha256 = "1xganpzb7sy5dlazjzrx9cif1r1n8lf3za0jwlq806w7601g5nym";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering";
@@ -48677,12 +47515,12 @@
nord-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "nord-theme";
- version = "20170506.2351";
+ version = "20171005.1039";
src = fetchFromGitHub {
owner = "arcticicestudio";
repo = "nord-emacs";
- rev = "eb7929e41606776a45817946b5d6f79426767a93";
- sha256 = "1cb7la2al8124i4xfmripfzhabpnzh929qi1266p4c7jchyz2gxw";
+ rev = "be32879416bbed1d6524f7c30ac53fbfa5a0e024";
+ sha256 = "0q347f9bjayfl8y8vz83kjamf1lp58386nhy0iacjxsq4riwpric";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/31cb60069825abe3998c8b43bc9177b39a7f3659/recipes/nord-theme";
@@ -48716,11 +47554,11 @@
}) {};
notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "notmuch";
- version = "20170912.1817";
+ version = "20170927.415";
src = fetchgit {
url = "git://git.notmuchmail.org/git/notmuch";
- rev = "f2ed177e6260d835b8a13d2a53e1c8d5fa76edf2";
- sha256 = "0d4110cai0z2h2gggx93wfm8fj2av4dwk57gf835crsmv8y3wkj7";
+ rev = "1b91884296f7e423f2e190ccf7f590ccb3028fdd";
+ sha256 = "0f78b9nw7ccpkkf192ka40d5021gbj114capjlkf4d79qr8m91yh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -48757,12 +47595,12 @@
nov = callPackage ({ dash, emacs, esxml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "nov";
- version = "20170910.1145";
+ version = "20170924.512";
src = fetchFromGitHub {
owner = "wasamasa";
repo = "nov.el";
- rev = "91c4329f64ddc9a598fa6c58e1d9264aee073e72";
- sha256 = "0x3ijjhjg2q8gdqf4hgr2d8wy32qhxy48kbz0slibkn9yik3pvlz";
+ rev = "19ab463864f137b43704b4f34173349c88e84d8e";
+ sha256 = "00f5hhw157nwdwy26yn6l3z2hgk6xxvx5xl0hasskj1l9rg0zgh2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cf543955ba2d5d0074fa2a5ba176f9415f6e006d/recipes/nov";
@@ -48775,25 +47613,6 @@
license = lib.licenses.free;
};
}) {};
- novice-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "novice-plus";
- version = "20170307.925";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/novice+.el";
- sha256 = "1f49c0wv1zsi720g3a8ka3h17n7r81pzz7zfwalz0zxwxmh6jghb";
- name = "novice+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/novice+";
- sha256 = "0r4w4c6y4fny8k0kipzqjsn7idwbi9jq6x9yw51d41ra3pkpvfzf";
- name = "novice-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/novice+";
- license = lib.licenses.free;
- };
- }) {};
noxml-fold = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "noxml-fold";
@@ -48899,22 +47718,28 @@
license = lib.licenses.free;
};
}) {};
- nu-mode = callPackage ({ fetchFromGitHub, fetchurl, helm, help-fns-plus, lib, melpaBuild, transpose-frame, undo-tree }:
+ nu-mode = callPackage ({ ace-window, avy, fetchFromGitHub, fetchurl, lib, melpaBuild, transpose-frame, undo-tree, which-key }:
melpaBuild {
pname = "nu-mode";
- version = "20170825.1300";
+ version = "20171028.1443";
src = fetchFromGitHub {
owner = "pyluyten";
repo = "emacs-nu";
- rev = "711b5bd53c77ba66987fe9807a4442084f67789e";
- sha256 = "11iymqm51ky7k8ylwvcq770y8anaqn8giki63kf2a96f4rdglb1x";
+ rev = "683e2648a5b669e91138eec606f2e86f9f54ccd3";
+ sha256 = "0mf8cj729ag7c0z1155ziaqx9s119nwxg9231rb8i8qx17vdci2b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/230d5f8fdd965a24b8ff3cc94acf378d04815fca/recipes/nu-mode";
sha256 = "0nzv3p62k8yyyww6idlxyi94q4d07nis7ydypar8d01jfqlrybkn";
name = "nu-mode";
};
- packageRequires = [ helm help-fns-plus transpose-frame undo-tree ];
+ packageRequires = [
+ ace-window
+ avy
+ transpose-frame
+ undo-tree
+ which-key
+ ];
meta = {
homepage = "https://melpa.org/#/nu-mode";
license = lib.licenses.free;
@@ -49088,6 +47913,27 @@
license = lib.licenses.free;
};
}) {};
+ nyx-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "nyx-theme";
+ version = "20170910.607";
+ src = fetchFromGitHub {
+ owner = "GuidoSchmidt";
+ repo = "emacs-nyx-theme";
+ rev = "afe2b8c3b5421b4c292d182dcf77079b278e93d8";
+ sha256 = "1qamw4x3yrygy8qkicy6smxksnsfkkp76hlnivswh7dm3fr23v6m";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3440905a20bc91bb2637a87c04ff8410379f150d/recipes/nyx-theme";
+ sha256 = "17ajpsbwbal1rwgd38kckh1kvnd412h6fkvj2x4j5rqvjr9nhgr6";
+ name = "nyx-theme";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/nyx-theme";
+ license = lib.licenses.free;
+ };
+ }) {};
o-blog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "o-blog";
@@ -49158,8 +48004,8 @@
src = fetchFromGitHub {
owner = "astahlman";
repo = "ob-async";
- rev = "079dbcbfa229407ae2f53689a4d045f827adabd5";
- sha256 = "0jinxwv72yypns22iv2v4ll1wkg2ca5vbx1v36pgxgmjvawfilvr";
+ rev = "f0bfe88d6032e9ae8f4953e2569aeca5431a3e3d";
+ sha256 = "0ak23m2i24ix9443236zdvp3f3j27dis5k6pivic3whmb618g3v8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ob-async";
@@ -49172,26 +48018,6 @@
license = lib.licenses.free;
};
}) {};
- ob-axiom = callPackage ({ axiom-environment, emacs, fetchhg, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "ob-axiom";
- version = "20161122.1222";
- src = fetchhg {
- url = "https://bitbucket.com/pdo/axiom-environment";
- rev = "110e20a7a86c";
- sha256 = "0s18bbfw4kcv9iij1016pamq394rg8xr7016qp6cxyklp9hivcdm";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/ob-axiom";
- sha256 = "12cmzhgzk8314y6nvzdjwidalccz6h440lil83c1h4lz4ddlwmf6";
- name = "ob-axiom";
- };
- packageRequires = [ axiom-environment emacs ];
- meta = {
- homepage = "https://melpa.org/#/ob-axiom";
- license = lib.licenses.free;
- };
- }) {};
ob-blockdiag = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ob-blockdiag";
@@ -49234,6 +48060,27 @@
license = lib.licenses.free;
};
}) {};
+ ob-cfengine3 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "ob-cfengine3";
+ version = "20170915.634";
+ src = fetchFromGitHub {
+ owner = "nickanderson";
+ repo = "ob-cfengine3";
+ rev = "f38f87256efcb2b02f5c7042900087be941c1ddc";
+ sha256 = "09xn84d2vy3kxk2xihjml8zzrhv2cz2jy20dg7w6ll9wn38gs33h";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d068233c438e76cbcc6e9a97cbec9b2550a18ed6/recipes/ob-cfengine3";
+ sha256 = "1pp3mykc5k629qlqixpl2900m1j604xpp6agrngwagsvf7qkhnvl";
+ name = "ob-cfengine3";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/ob-cfengine3";
+ license = lib.licenses.free;
+ };
+ }) {};
ob-coffee = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ob-coffee";
@@ -49276,22 +48123,22 @@
license = lib.licenses.free;
};
}) {};
- ob-crystal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ ob-crystal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ob-crystal";
- version = "20170811.57";
+ version = "20171101.347";
src = fetchFromGitHub {
owner = "brantou";
repo = "ob-crystal";
- rev = "4bfd36c922d28e8a204218bde0e889cd1097ec04";
- sha256 = "00rlxm0gj2arcnjhy824id08gxpha73ikfipar780xm845ripm3j";
+ rev = "9d58b880b74e0ad83b37596bb44635e5d7ae5c3f";
+ sha256 = "11qly91h6cm0qdj2dx8lvmfgp7bakrvvwf106rqh4f98y1qv22xh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b9a7d43199a83ab6f672aaa69ef4e158c868f180/recipes/ob-crystal";
sha256 = "11mk2spwlddbrvcimhzw43b6d3gxzmi8br58bily1x4qkvl6zy4n";
name = "ob-crystal";
};
- packageRequires = [];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/ob-crystal";
license = lib.licenses.free;
@@ -49447,12 +48294,12 @@
ob-http = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "ob-http";
- version = "20170411.1842";
+ version = "20170920.2251";
src = fetchFromGitHub {
owner = "zweifisch";
repo = "ob-http";
- rev = "5fd0e99630e07c5e64f2483c6d46aefdd37677d2";
- sha256 = "1i5la27m36xfc8jwmz5i0yiim9ddmfaqjpahxgpbf63zks555vpk";
+ rev = "c4da6d47b3f96c31c00f9eaaf712b59afe00daef";
+ sha256 = "0rhxp7gw4d5yp6yvjcp80in22wckj4zl9siykalj0jm97hkwqmzz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/950b02f76a04f453992b8720032e8c4cec9a039a/recipes/ob-http";
@@ -49465,15 +48312,36 @@
license = lib.licenses.free;
};
}) {};
+ ob-hy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "ob-hy";
+ version = "20171101.344";
+ src = fetchFromGitHub {
+ owner = "brantou";
+ repo = "ob-hy";
+ rev = "a3512f274709dc4ab6c18d7955d361f8715505f0";
+ sha256 = "1i796041svy7njjl3aqaxzjydmm24q688vpxvqd0pj5hyajqdgqw";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/12a7a7dba169010a3a047f961010236a203c16c2/recipes/ob-hy";
+ sha256 = "18a8fpda0f28wxmjprhd9dmz7bpk1j3iayl20lqffrcal6m4f1h7";
+ name = "ob-hy";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/ob-hy";
+ license = lib.licenses.free;
+ };
+ }) {};
ob-ipython = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "ob-ipython";
- version = "20170902.1253";
+ version = "20171021.839";
src = fetchFromGitHub {
owner = "gregsexton";
repo = "ob-ipython";
- rev = "ed1c2d580037c0592066e1f33c0581890dd09e2e";
- sha256 = "0ciacp8llx0njkrcbzgs13srhjm2nxx0pr7v8ladlx0sfdsxj078";
+ rev = "c93d26342c28d1ba01ab46406f7f277128d85e6d";
+ sha256 = "08p7sm40s0sb4cplh92krp18jkjm62m5wsivcpzyln7ambb9ml3y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/557c36e86844c211f2d2ee097ce51ee9db92ea8b/recipes/ob-ipython";
@@ -49594,12 +48462,12 @@
ob-php = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ob-php";
- version = "20170819.245";
+ version = "20171017.2206";
src = fetchFromGitHub {
owner = "stardiviner";
repo = "ob-php";
- rev = "ffbda1f7df86778e3209ffeef832433f0eb25a69";
- sha256 = "00ca5m6rmrxzy1aldmavv7f5i4pjfcyivrlgv2ri6dm8amvbk72r";
+ rev = "c281c1e17f0fd7de4adb6c3e6029dc2bd76beca1";
+ sha256 = "1c0967cpimmr5j7ymr4654y62f615dfrv1h3385i7n57jsvqr6bs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/940a22790c9e5fd2f7729c71efad907683cc392c/recipes/ob-php";
@@ -49804,12 +48672,12 @@
ob-swift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ob-swift";
- version = "20151204.2311";
+ version = "20170921.625";
src = fetchFromGitHub {
owner = "zweifisch";
repo = "ob-swift";
- rev = "f376af0d86fb410e41289df59a0c2625954c9067";
- sha256 = "071rl0bvhwh5vqbl7n84shvzgqgwg2f5l9vb8wfs4y24hsqfgxmz";
+ rev = "ed478ddbbe41ce5373efde06b4dd0c3663c9055f";
+ sha256 = "1vwg10d33mwb32bpdbpghfihy3ryiqbc4yydpb5hfv3v5k83vs0x";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b401383966398d3223032c59baa920ce594e5fef/recipes/ob-swift";
@@ -50081,8 +48949,8 @@
src = fetchFromGitHub {
owner = "OCamlPro";
repo = "ocp-indent";
- rev = "5d83bc71d12c89850cb0fdff50d4830adb705b6c";
- sha256 = "0rcaa11mjqka032g94wgw9llqpflyk3ywr3lr6jyxbh1rjvnipnw";
+ rev = "002e047d848beb0e0b77538f0674dd171efc9d66";
+ sha256 = "1al44f7nrh4jbx4vdpbps92pk6px0my43b24brinck186j8d7vc4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e1af061328b15360ed25a232cc6b8fbce4a7b098/recipes/ocp-indent";
@@ -50224,12 +49092,12 @@
olivetti = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "olivetti";
- version = "20170823.1754";
+ version = "20171017.210";
src = fetchFromGitHub {
owner = "rnkn";
repo = "olivetti";
- rev = "da7955aaea2a3f3ad07b457b9737a24534674e33";
- sha256 = "11qvlwsy6l4v9jcdnf7g3yxy85g1qii4hmrpv6s85vbfsn9rxxw0";
+ rev = "4c8b62f54ec4151cf8b48a7e1f904d3b4a7d73d6";
+ sha256 = "06hyn8mmi7ikgwpyds17z35rjwxrlwjkvv1dmjcp4jirnqbp9lmk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti";
@@ -50266,12 +49134,12 @@
omni-kill = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "omni-kill";
- version = "20150526.2349";
+ version = "20171016.1440";
src = fetchFromGitHub {
owner = "AdrieanKhisbe";
repo = "omni-kill.el";
- rev = "4c8dbb6b2c9f1afc0f82077c04eab022e5387e85";
- sha256 = "1925mh47n4x9v780qp5l6cksl64v9mpyb87znsg93x6sxr0cvv4c";
+ rev = "904549c8fd6ac3cf22b5d7111ca8944e179cffea";
+ sha256 = "1mlnh5pdqdv1qb8jvi0wvkgbpy74zq807gmp04bp6cpxdns9j63f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c24df34d2fa5d908223379e909148423ba327ae2/recipes/omni-kill";
@@ -50287,12 +49155,12 @@
omni-log = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
melpaBuild {
pname = "omni-log";
- version = "20170420.407";
+ version = "20170930.535";
src = fetchFromGitHub {
owner = "AdrieanKhisbe";
repo = "omni-log.el";
- rev = "60fd1b7ba77bd82787e43ce1aee2832f53981c68";
- sha256 = "1s81qj4g8nhw6k4b7wi4ya9g51xbsqzyi659zs4zdxjxj7acdq8s";
+ rev = "11e959473c1bd9415d0cda785940c36ba6ad44ab";
+ sha256 = "081vq3wzl8w9yz1356np6h27d7yi5j8i3va9sc2flfwylmw1y9gr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/47bb19bb7b4713c3fd82c1035a2fe66588c069e3/recipes/omni-log";
@@ -50329,12 +49197,12 @@
omni-scratch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "omni-scratch";
- version = "20170416.329";
+ version = "20171009.1451";
src = fetchFromGitHub {
owner = "AdrieanKhisbe";
repo = "omni-scratch.el";
- rev = "0da549c1386f93ed4de201bf8779ba64ddc91347";
- sha256 = "0qfi54z2jqrkrdzriandwc9myzc27sxsx7nf20jf5qvcdgn13cl1";
+ rev = "9eee3161e5cb6df58618548a2173f4da7d194814";
+ sha256 = "1cppy9p5k8737jjgjlmfqqfdx048kpjn5cx7iw0dxal180y3i39g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6ba3e128a7fe4476d82266506b18ba9984c37944/recipes/omni-scratch";
@@ -50392,12 +49260,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 = "20170909.319";
+ version = "20171030.2201";
src = fetchFromGitHub {
owner = "OmniSharp";
repo = "omnisharp-emacs";
- rev = "b425270bed93b427ff519d6f51ad1d97531a0a92";
- sha256 = "0l9dk9idfsr21q0icx9fpgqyi4qlhnqal6sypak5zh8dgchrqif9";
+ rev = "906e29a702237f039f24c215fdb561a728a3df1b";
+ sha256 = "1l1rzl7y5j2wmlgx7ivivwvwvbn4h7pg5s7yqsk65n9kb59ha8s8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
@@ -50505,25 +49373,6 @@
license = lib.licenses.free;
};
}) {};
- oneonone = callPackage ({ fetchurl, hexrgb, lib, melpaBuild }: melpaBuild {
- pname = "oneonone";
- version = "20170416.858";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/oneonone.el?revision=129";
- sha256 = "0ag62z31mb5n50m9qph2ww945pr71j95c5xv7krna1iq01qr8ji1";
- name = "oneonone.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/oneonone";
- sha256 = "0v4nvhzgq97zbi18jd3ds57yh1fpv57b2a1cd7r8jbxwaaz3gpg9";
- name = "oneonone";
- };
- packageRequires = [ hexrgb ];
- meta = {
- homepage = "https://melpa.org/#/oneonone";
- license = lib.licenses.free;
- };
- }) {};
opam = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "opam";
@@ -50732,6 +49581,27 @@
license = lib.licenses.free;
};
}) {};
+ orca = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "orca";
+ version = "20171030.1216";
+ src = fetchFromGitHub {
+ owner = "abo-abo";
+ repo = "orca";
+ rev = "5e1744afb793dda744ddc6fe342144b5e90bea08";
+ sha256 = "0gqgs3rmdzm5vqk8azgzwannxjifvrf5fj40n543d0066c2dfsfi";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/f4d9cf89c58a9b36b7c2a42de2aecb3b60001908/recipes/orca";
+ sha256 = "012ndbrgm58r09snhvi476rw0lq4m913y0slc0cxb688p9wgz5w3";
+ name = "orca";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/orca";
+ license = lib.licenses.free;
+ };
+ }) {};
org-ac = callPackage ({ auto-complete-pcmp, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
melpaBuild {
pname = "org-ac";
@@ -50819,12 +49689,12 @@
org-autolist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-autolist";
- version = "20150922.705";
+ version = "20170924.1201";
src = fetchFromGitHub {
owner = "calvinwyoung";
repo = "org-autolist";
- rev = "da332fadcd9be4c5eb21c5e98c392b89743750b2";
- sha256 = "0j6fqgzvbmvvdh0dgwsxq004wxys2zwnq9wa3idm087ynp2a2ani";
+ rev = "c82d1e83e982b5f0c106b8800e5b0cfd5f73fdc1";
+ sha256 = "0ykiafbdjb2iy0s1gr6l51gddjbk08iwj4v13hgm8b675bl0cw56";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ca8e2cdb282674b20881bf6b4fc49af42a5d09a7/recipes/org-autolist";
@@ -50924,12 +49794,12 @@
org-brain = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "org-brain";
- version = "20170908.634";
+ version = "20171004.1305";
src = fetchFromGitHub {
owner = "Kungsgeten";
repo = "org-brain";
- rev = "9a84111f759c264bd6ab435995803d0f6234b78a";
- sha256 = "00a92064bjlrjrmy7xcfc5ajajxviar82pjisdm4pxd3jcab8qcw";
+ rev = "35d46695ceffff4069e66fa2a4f039509f1a3c7e";
+ sha256 = "0c0jps0gxsk3m8s78yp8141wh7g2nx8acd1jc0v4ffmlr8qi2csj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/47480fbae06e4110d50bc89db7df05fa80afc7d3/recipes/org-brain";
@@ -51012,8 +49882,8 @@
src = fetchFromGitHub {
owner = "IvanMalison";
repo = "org-projectile";
- rev = "48f621b595e748c5e03431f237facf258ffc9443";
- sha256 = "00n2msmwcjjiibrhrvpawzgz6qcjjfy9qnii1iaass0038g4bd89";
+ rev = "8cec702f602b18da90b3d6207888a887b8e07750";
+ sha256 = "1prfkkfsbmprcq4irsj1qgixgwrsddz2zb9gwl8r3rq8qwfn9lhn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-category-capture";
@@ -51026,27 +49896,6 @@
license = lib.licenses.free;
};
}) {};
- org-chinese-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "org-chinese-utils";
- version = "20170313.2148";
- src = fetchFromGitHub {
- owner = "tumashu";
- repo = "org-chinese-utils";
- rev = "f44d7114899102f1e1109bb7aeeab4330281ff94";
- sha256 = "127nnjdd7p3sy38pd39ivrpxgnzdhbh6sf99667s7qxryfx837y8";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-chinese-utils";
- sha256 = "0bxx81zigbv5vv3aficd65p03lgpp2iknj8qgvn2k4wgbv56j4q4";
- name = "org-chinese-utils";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/org-chinese-utils";
- license = lib.licenses.free;
- };
- }) {};
org-cliplink = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-cliplink";
@@ -51260,12 +50109,12 @@
org-download = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-download";
- version = "20170605.23";
+ version = "20170924.2309";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "org-download";
- rev = "131d2409b3639798ebac6d77c98eae446ea915dc";
- sha256 = "1l04vs47pl63daz9n0d2xby43kr2ynbykvdr7hjbyizcg9l9fzp7";
+ rev = "14261c2619be224fc4c499624abc2cba3663e7f5";
+ sha256 = "0d8lcg9gnzf5bpn1z83i5nni444mzy6mlqggadsrdav9bdf8cfy2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/edab283bc9ca736499207518b4c9f5e71e822bd9/recipes/org-download";
@@ -51428,12 +50277,12 @@
org-evil = callPackage ({ dash, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, monitor, org }:
melpaBuild {
pname = "org-evil";
- version = "20170529.741";
+ version = "20171004.255";
src = fetchFromGitHub {
owner = "GuiltyDolphin";
repo = "org-evil";
- rev = "aff7bf3885e318287abf7d542916d21372496bdd";
- sha256 = "1z6rj7nrjdmkc7skx2si7s462228bpka96p0zzmkg7wa82j7ywv9";
+ rev = "aae5688c15cef9f2f6105d395dab36b163d5af34";
+ sha256 = "01ablfw0prcb4bwsaa6fbqc80xz539a48psvnmddz98c8yjhb9g7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/17a4772d409aa5dbda5fb84d86c237fd2653c70b/recipes/org-evil";
@@ -51553,12 +50402,12 @@
org-iv = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, impatient-mode, lib, melpaBuild, org }:
melpaBuild {
pname = "org-iv";
- version = "20160609.1854";
+ version = "20171001.322";
src = fetchFromGitHub {
owner = "kuangdash";
repo = "org-iv";
- rev = "40fa39ae680794cd493dfa8624e5eff4d04c2363";
- sha256 = "1zn1bvk2kgd6a969m1d63v8ax52lanvb1h2w62ffpxlkap3kl6m8";
+ rev = "7f2bb1b32647655fd9d6684f6f09dcc66b61b0cd";
+ sha256 = "0s3fi8sk7jm5vr0fz20fbygm4alhpirv0j20jfi1pab14yhhf34h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e7db0c34f0f6fb9c3b9e581a74304cc9a26ed342/recipes/org-iv";
@@ -51574,12 +50423,12 @@
org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
melpaBuild {
pname = "org-jira";
- version = "20170527.2154";
+ version = "20171017.2015";
src = fetchFromGitHub {
owner = "ahungry";
repo = "org-jira";
- rev = "4d8bda9b5207175ecd3ae647ebec42b3546efd49";
- sha256 = "0877klmy48ad0rpy7azd4xbm9d07wrhr3g96sixx35wgp216kvlm";
+ rev = "ff048833113bac1ee67284826a6c3a4cd70793b4";
+ sha256 = "071z37sv6fw1dggi2ckphb1srzvanwnmy0xbsa3b2pfpv4yvvdhm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira";
@@ -51595,12 +50444,12 @@
org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-journal";
- version = "20170712.657";
+ version = "20170928.231";
src = fetchFromGitHub {
owner = "bastibe";
repo = "org-journal";
- rev = "69b237d1b3c5cc0eb81fb5918df25d01e999b0f1";
- sha256 = "1ss1lxxilbr177mlp4iygg8q74qfw68v8iap9fpj6lvlm7vawins";
+ rev = "06402de02461338503bf034ceca44c3a5a898778";
+ sha256 = "1myrxs1s51vpv3a47fbprsh4b17ylglxqv2nak5i1g2834plhpgv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal";
@@ -51676,55 +50525,15 @@
license = lib.licenses.free;
};
}) {};
- org-mac-iCal = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "org-mac-iCal";
- version = "20140107.519";
- src = fetchgit {
- url = "git://orgmode.org/org-mode.git";
- rev = "657302b97e222abb262070586c56fe5d64355035";
- sha256 = "0myi67sdr62q0qxjijkxbpmyhxvnrxwjwpq2al1cds0bk8q7nzq4";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
- sha256 = "1ilzvmw1x5incagp1vf8d9v9mz0krlv7bpv428gg3gpqzpm6kksw";
- name = "org-mac-iCal";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/org-mac-iCal";
- license = lib.licenses.free;
- };
- }) {};
- org-mac-link = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "org-mac-link";
- version = "20170105.1723";
- src = fetchgit {
- url = "git://orgmode.org/org-mode.git";
- rev = "657302b97e222abb262070586c56fe5d64355035";
- sha256 = "0myi67sdr62q0qxjijkxbpmyhxvnrxwjwpq2al1cds0bk8q7nzq4";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link";
- sha256 = "02rmhrwikppppw8adnzvwj43kp9wsyk60csj5pygg7cd7wah7khw";
- name = "org-mac-link";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/org-mac-link";
- license = lib.licenses.free;
- };
- }) {};
org-mime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-mime";
- version = "20170807.549";
+ version = "20171014.141";
src = fetchFromGitHub {
owner = "org-mime";
repo = "org-mime";
- rev = "8067e76eb1fb6a9c15229cc93015aba923120a19";
- sha256 = "0r33y6l74i8n2fbqcazq4r2659lqva855mf5lm5yf7spjga2f9vw";
+ rev = "db707a73379fb3b21ae6e24c6230bfd3dde7ef45";
+ sha256 = "1sy5d1nnhvkan877bx2pbc16n7sy2jn5cpdsca06mrxb1m3mxzbd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime";
@@ -51740,12 +50549,12 @@
org-mind-map = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "org-mind-map";
- version = "20170912.1411";
+ version = "20171012.1834";
src = fetchFromGitHub {
owner = "theodorewiles";
repo = "org-mind-map";
- rev = "73026279191516396637e6e33628be9c0314545b";
- sha256 = "04v5gdmprga75y9yqx2ism28vnwsy5ky7hfzzdi44mq2gd3m8hfl";
+ rev = "cd5dbe2bded1294de1bdc881e53d691244e5c921";
+ sha256 = "0x7nbgcsf0nhda4m7qrxdaa0sffkndfd59nrr09vcxap84rfwacm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3c8683ee547a6a99f8d258561c3ae157b1f427f2/recipes/org-mind-map";
@@ -51782,12 +50591,12 @@
org-mru-clock = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-mru-clock";
- version = "20170901.444";
+ version = "20171101.506";
src = fetchFromGitHub {
owner = "unhammer";
repo = "org-mru-clock";
- rev = "cb239b5704b742029145e7f15e928351e4e8dd9d";
- sha256 = "0h25w6i4qrbigcwpnwkz8wak5mh3kzh29nayzsf85jlq9vd2x5hq";
+ rev = "10f6a7021c82dc6795f4020e89889a5a72eb8832";
+ sha256 = "00f4l5w6p0l1x5ghpvbp5934m9m012fabvzb7apazwdr5c7xbd7q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b36bf1c1faa4d7e38254416a293e56af96214136/recipes/org-mru-clock";
@@ -51863,6 +50672,27 @@
license = lib.licenses.free;
};
}) {};
+ org-onenote = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, org, request }:
+ melpaBuild {
+ pname = "org-onenote";
+ version = "20171007.2200";
+ src = fetchFromGitHub {
+ owner = "ifree";
+ repo = "org-onenote";
+ rev = "5ce5cf4edb143180e0b185ac26826d39ae5bc929";
+ sha256 = "1jlnnb04ichcl155lklvjw91l8j1dvg77bv1815chak226aq4xqj";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/7705ee9a8733733664b6214bf4eec15d640c6895/recipes/org-onenote";
+ sha256 = "0qgmizzryb6747yd80d3nic3546f4h8vjd6c30jr99vv2ildjsfk";
+ name = "org-onenote";
+ };
+ packageRequires = [ oauth2 org request ];
+ meta = {
+ homepage = "https://melpa.org/#/org-onenote";
+ license = lib.licenses.free;
+ };
+ }) {};
org-outlook = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-outlook";
@@ -51914,21 +50744,21 @@
license = lib.licenses.free;
};
}) {};
- org-parser = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild }:
+ org-parser = callPackage ({ dash, emacs, fetchhg, fetchurl, ht, lib, melpaBuild }:
melpaBuild {
pname = "org-parser";
- version = "20170814.2016";
+ version = "20171002.2136";
src = fetchhg {
url = "https://bitbucket.com/zck/org-parser.el";
- rev = "f568dd98a8b2";
- sha256 = "15lbanb14ip0xwcd3ddq5a0099f299blvf6j3g03hmnzfa4pm7cy";
+ rev = "105050acee08";
+ sha256 = "1y1ikk950awxhvx4d930ymqa8ds6a0wlywzx09jvrnkvbisd4l63";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/28d55005cbce276cda21021a8d9368568cb4bcc6/recipes/org-parser";
sha256 = "06yb78mf486b986dhvqg3avflfyi271vykyars465qpk0v8ahq8h";
name = "org-parser";
};
- packageRequires = [ dash emacs ];
+ packageRequires = [ dash emacs ht ];
meta = {
homepage = "https://melpa.org/#/org-parser";
license = lib.licenses.free;
@@ -52041,12 +50871,12 @@
org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org-category-capture, projectile, s }:
melpaBuild {
pname = "org-projectile";
- version = "20170819.1047";
+ version = "20171022.950";
src = fetchFromGitHub {
owner = "IvanMalison";
repo = "org-projectile";
- rev = "48f621b595e748c5e03431f237facf258ffc9443";
- sha256 = "00n2msmwcjjiibrhrvpawzgz6qcjjfy9qnii1iaass0038g4bd89";
+ rev = "8cec702f602b18da90b3d6207888a887b8e07750";
+ sha256 = "1prfkkfsbmprcq4irsj1qgixgwrsddz2zb9gwl8r3rq8qwfn9lhn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9d7a7ab98f364d3d5e93f83f0cb3d80a95f28689/recipes/org-projectile";
@@ -52066,8 +50896,8 @@
src = fetchFromGitHub {
owner = "IvanMalison";
repo = "org-projectile";
- rev = "48f621b595e748c5e03431f237facf258ffc9443";
- sha256 = "00n2msmwcjjiibrhrvpawzgz6qcjjfy9qnii1iaass0038g4bd89";
+ rev = "8cec702f602b18da90b3d6207888a887b8e07750";
+ sha256 = "1prfkkfsbmprcq4irsj1qgixgwrsddz2zb9gwl8r3rq8qwfn9lhn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-projectile-helm";
@@ -52194,12 +51024,12 @@
org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, pdf-tools, s }:
melpaBuild {
pname = "org-ref";
- version = "20170808.625";
+ version = "20171019.724";
src = fetchFromGitHub {
owner = "jkitchin";
repo = "org-ref";
- rev = "0af19a6ed3ccde878c27c27f1413409fdc0de9f8";
- sha256 = "0prwvc3yywivhap6rrji25afcxc553nginzxgrr7fbkxy5vfprzg";
+ rev = "8fb1275b4c0e2dd46593754e497940c49fd9da6b";
+ sha256 = "0jha5qlab3gsyl8iysf1kqn2f15afvqjvnl2nyzh47llqng8yskj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
@@ -52457,12 +51287,12 @@
org-tfl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "org-tfl";
- version = "20161120.932";
+ version = "20170923.518";
src = fetchFromGitHub {
owner = "storax";
repo = "org-tfl";
- rev = "f0405e3ad62b90ea43489bdd6312adbd77edb9f3";
- sha256 = "0cznw60ivaz42ass35sf9i62x7mf9in6z8kr8wc5i1mb7hafy2hk";
+ rev = "f0d7d39106a1de5457f5160cddd98ab892b61066";
+ sha256 = "1rwdibiq0w4nzccmvdkpwnmfga70y35lfg2xlkqxd02x7bfl7j3m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d9e97f2fee577c7e3fb42e4ca9d4f422c8907faf/recipes/org-tfl";
@@ -52625,12 +51455,12 @@
org-vcard = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-vcard";
- version = "20161001.2202";
+ version = "20170929.410";
src = fetchFromGitHub {
owner = "flexibeast";
repo = "org-vcard";
- rev = "58f83784c580da893c214bd729aae3ab5d285f33";
- sha256 = "122qxg0ji9c7zj52vqlf9d6276w7rdlxg4ippy6dayqs8bhkimbg";
+ rev = "dbe266b79df4fb31f1766010322bf4e383ce1c03";
+ sha256 = "1rcqcgxvjshbz3n1p376h618xapj03n6m7b3cxgv9gnryviyr6ax";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/df860814a09c376c9a6a2c5e7f528bbae29810b2/recipes/org-vcard";
@@ -52667,12 +51497,12 @@
org-web-tools = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }:
melpaBuild {
pname = "org-web-tools";
- version = "20170906.102";
+ version = "20171014.804";
src = fetchFromGitHub {
owner = "alphapapa";
repo = "org-web-tools";
- rev = "9ae976aedacefdbe4a827bd66a4642f40bc878d4";
- sha256 = "18hbcjg30fd342mvab3h7v8y5mja90g54823mnvmffhrp657z7qc";
+ rev = "e9583248e838806271643770102e786671fabaf5";
+ sha256 = "07kdgkkl3f7w1nxdw1j7vcm2f05sdpd06dlw7vpdd77pdbwafp3h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f082bfb480649d21f586b7eb331c19d57e7a84cf/recipes/org-web-tools";
@@ -52727,6 +51557,27 @@
license = lib.licenses.free;
};
}) {};
+ org2ctex = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "org2ctex";
+ version = "20171016.2343";
+ src = fetchFromGitHub {
+ owner = "tumashu";
+ repo = "org2ctex";
+ rev = "1b74aa9cf45de224ffd6aa9b93f0debddc2b48bc";
+ sha256 = "17qkz3ja87hhq41hvlxvdzqipmi1gn38khd00dshsxhk5hg7i99a";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/8f77fe537ca8ee2ddb6e3efe71f3b3c560c52c7d/recipes/org2ctex";
+ sha256 = "0049zf3ls7vbbcz1hdwai57ih9gppk2j0gzwijzwkb23ccwaf64a";
+ name = "org2ctex";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/org2ctex";
+ license = lib.licenses.free;
+ };
+ }) {};
org2elcomment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "org2elcomment";
@@ -52793,12 +51644,12 @@
org2web = callPackage ({ cl-lib ? null, dash, el2org, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }:
melpaBuild {
pname = "org2web";
- version = "20170809.411";
+ version = "20171005.1617";
src = fetchFromGitHub {
owner = "tumashu";
repo = "org2web";
- rev = "b14aaecd9e51b3cc4fa4530bfc6f07dd47c80616";
- sha256 = "04f85kw7d5s8yszbm0270yyb49i3k5a9q35a6zdfhpmpfap48h90";
+ rev = "5243b399927a4c474bb3b8d1c8a00799df1f27d7";
+ sha256 = "0wsvfn409a2ivbich8b8zqza78sprirg4bl7igx536ydqclmi0n7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2864959163442165b9b1cd5471dc2649508decde/recipes/org2web";
@@ -53016,8 +51867,8 @@
src = fetchFromGitHub {
owner = "DamienCassou";
repo = "orgtbl-show-header";
- rev = "0b63ab4425b6e2af8ffb1f0b94839918d1720d09";
- sha256 = "161bsmgrbdhb73k36gqb5b96mf0y0sl8q9sjg81vx86bs9sbkddw";
+ rev = "112d54a44682f065318ed0c9c89a8f5b8907342a";
+ sha256 = "1s2bgsm4s33w5275qghw1axdpmz6bbyhki53jr2giyk4f90822gi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9c5ea906b1d642405ca532d89dbb32cf79f53582/recipes/orgtbl-show-header";
@@ -53096,12 +51947,12 @@
osx-dictionary = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "osx-dictionary";
- version = "20170208.505";
+ version = "20171026.34";
src = fetchFromGitHub {
owner = "xuchunyang";
repo = "osx-dictionary.el";
- rev = "ec16c40cc4db0140db1cf6ad1fb1198c7c344b2b";
- sha256 = "0n09s09qaqwdrpd4dgxj16bh3lgc8nzdld49z8zkipf3cfh5v040";
+ rev = "b16630ecf69f87ac873486d8b9c8c03e6c9ea7fa";
+ sha256 = "06qsg8hlw1b725pzpsg5f194pxqcg1pjncsi8j0815yrlzfcg6sp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ae4467ad646d663f0266f39a76f9764004903424/recipes/osx-dictionary";
@@ -53369,12 +52220,12 @@
outshine = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, outorg }:
melpaBuild {
pname = "outshine";
- version = "20170904.1524";
+ version = "20171005.955";
src = fetchFromGitHub {
owner = "alphapapa";
repo = "outshine";
- rev = "a695215b47ca4a950c47a69a5c6e4c695892b1b3";
- sha256 = "18c1iqfw2q9if6yhvgspcw5arhd549gcvwyphnsl9cl6q40q2vly";
+ rev = "75389b7104692f4f6a97dc72020d145f03affd25";
+ sha256 = "0j99wx48xq5vpla69yj5w255n3acbgc4bbig4kmbvayr2871ls7n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/outshine";
@@ -53415,8 +52266,8 @@
src = fetchFromGitHub {
owner = "tonini";
repo = "overseer.el";
- rev = "3269801dc5145d41c11599430229340e6dfa6cc6";
- sha256 = "1zjp1bw7ipg4ibabrc0wzzsvd4jydjq571768v2hdpzcdw36d8f7";
+ rev = "6be1f2a4df1b7a20298865b85502ee89e327898d";
+ sha256 = "0ipq5gflymvznb8xzfl524l09sj90787bzga9ymjjpc4rn9zmqlb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/overseer";
@@ -53516,12 +52367,12 @@
ox-epub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ox-epub";
- version = "20170414.0";
+ version = "20171020.1659";
src = fetchFromGitHub {
owner = "ofosos";
repo = "ox-epub";
- rev = "113300ed2c66cca10624e6d7bf5ff0a72e05653a";
- sha256 = "1xj643jybrd6idn6bazp0canj8pm9v3gs199fa17hlag7151ancw";
+ rev = "a93d1833533c3589dbba62dcdfd13f99881e0fad";
+ sha256 = "1iqdsp70h98qwfah91w9rj9j29952zkr6q261mrfy4c43jvghvln";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c3ac31dfef00e83fa6b716ea006f35afb5dc6cd5/recipes/ox-epub";
@@ -53579,12 +52430,12 @@
ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ox-hugo";
- version = "20170912.1322";
+ version = "20171029.1929";
src = fetchFromGitHub {
owner = "kaushalmodi";
repo = "ox-hugo";
- rev = "a486141e4e2c3f9f67e799e20af150611d77f850";
- sha256 = "1srrkc0bajmhp614avk4yr51zsp0gnmn47r1wi7qxkr6ybxwx8k1";
+ rev = "caa3aa99c6bef6d0dcaa4713a7934c7d410a5641";
+ sha256 = "0vadb0d7wgz37cdzhgciv0b0fd6wc4gwdz0ppdhk1s9y3hkcbkw6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo";
@@ -53642,12 +52493,12 @@
ox-jira = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ox-jira";
- version = "20170607.1513";
+ version = "20171001.216";
src = fetchFromGitHub {
owner = "stig";
repo = "ox-jira.el";
- rev = "a5e7c7166f5d4baf4b6487f44865f2636cda4698";
- sha256 = "14qybj34wvpn91m9hvfmcrsj5d9zzq5pyzjc61gd0zn482bklxz4";
+ rev = "db2ec528f46c9e611624ba28611c440a99bff255";
+ sha256 = "04zz6359xkn4w7jmmadxyvjd8pw21gw12mqwch1l9yxc4m9q474l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e8a77d9c903acd6d7fdcb53f63384144e85589c9/recipes/ox-jira";
@@ -53663,12 +52514,12 @@
ox-latex-chinese = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ox-latex-chinese";
- version = "20170401.439";
+ version = "20171014.1532";
src = fetchFromGitHub {
owner = "tumashu";
repo = "ox-latex-chinese";
- rev = "f79d25443987a169a1234f5fbb2bc115cccea33e";
- sha256 = "1sw7wvsyp5z7jdijkc3lyfx7b0cq3c60fjdvmqlpygl9020md99w";
+ rev = "3af3872c5435b6d4feccd0fd2bac32cd156724dd";
+ sha256 = "06b3k3c407dvj0gx73w8wspy2mndl1q2s9wlq4g6hs2v4i2pd9dd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a679ebaedcb496f915b9338f9d5c003e1389594d/recipes/ox-latex-chinese";
@@ -53728,14 +52579,14 @@
pname = "ox-nikola";
version = "20151114.316";
src = fetchFromGitHub {
- owner = "masayuko";
+ owner = "msnoigrs";
repo = "ox-nikola";
rev = "5bcbc1a38f6619f62294194f13ca0cd4ca14dd48";
sha256 = "0cc14p6c3d4djfmrkac0abb2jq128vlmayv2a8cyvnyjffyvjbk7";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/3af3905e1ce36397645a54078280852a8a7eb1eb/recipes/ox-nikola";
- sha256 = "1amplnazs9igfd382djq23d8j7r0knr0hwlpasd01aypc25c82a4";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/4e3fa1b0728ad3058376800ec5e2e9e3847c1d2f/recipes/ox-nikola";
+ sha256 = "13k5wggz8bhnfgpsc09jnisk7xdb226d6imp7v6vmd1ax9m2xb0w";
name = "ox-nikola";
};
packageRequires = [ emacs org ox-rst ];
@@ -53751,8 +52602,8 @@
src = fetchFromGitHub {
owner = "kawabata";
repo = "ox-pandoc";
- rev = "7a7635ceb3e6c6050e1a932dc91b639c41572b51";
- sha256 = "1fr33hljpb9f8035ghqrrw14ybqjnc8w0m714yx8jp6hbvjvgkdn";
+ rev = "63a1e2b39049a95f6ad7f599561bcfea45086bc2";
+ sha256 = "0iw5imsf7qllkrh39p4pwp6ibwx08nfydfrzwc7bvck0qgzrs7fv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ca17de8cdd53bb32a9d3faaeb38f19f92b18ee38/recipes/ox-pandoc";
@@ -53831,16 +52682,16 @@
ox-rst = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ox-rst";
- version = "20170418.758";
+ version = "20171004.1553";
src = fetchFromGitHub {
- owner = "masayuko";
+ owner = "msnoigrs";
repo = "ox-rst";
- rev = "70f15591715796b1d96af660481739f019c295cb";
- sha256 = "1q6qfgfajl103hsf5zp4zxpf4svypv0n1kiqkhjp12b0hy45n2l0";
+ rev = "6d1eab55ff7c8dc4bcf511c9483e69f2a840e928";
+ sha256 = "10z922lcg8hz517kg57knx2irfcac8plp9nsxayrbxpkjx7mmjlj";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/3af3905e1ce36397645a54078280852a8a7eb1eb/recipes/ox-rst";
- sha256 = "1vyj6frrl7328n2x7vc3qwv3ssdhi8bp6ja5h2q4bqalc6bl1pq0";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/85770d6e235217e98dda9d8b9f027a4ba3ebba96/recipes/ox-rst";
+ sha256 = "0447q0gvasii57rp391la9prz0w228jnzgi59s785vzswdryww0n";
name = "ox-rst";
};
packageRequires = [ emacs org ];
@@ -53894,12 +52745,12 @@
ox-trac = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ox-trac";
- version = "20151102.955";
+ version = "20171026.1123";
src = fetchFromGitHub {
owner = "JalapenoGremlin";
repo = "ox-trac";
- rev = "2f2f70eefb9679025ae5812e221f0c118da36012";
- sha256 = "0w6963jvz1sk732nh18735dxivd6nl59jd4m26ps6l4wqhqby0db";
+ rev = "03cc31efb1aa06991918f1071e250a9d58f96cfb";
+ sha256 = "0knrmq0sc8s9c6j0967jmrp2hq8jcwg281qqk89y8j9rpbmhbaj6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4b73753ef9229d0fdfbe237acc63126f1786a494/recipes/ox-trac";
@@ -54020,12 +52871,12 @@
package-build = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "package-build";
- version = "20170910.124";
+ version = "20171020.1419";
src = fetchFromGitHub {
owner = "melpa";
repo = "package-build";
- rev = "46055de8792a1c7c01d06f74148dae6d700b00d6";
- sha256 = "1x1kln1bdqxxgan1pkjs98a9d3737j4qfpza4r70va7wvsy3ndhj";
+ rev = "e4d174870ea40275a8bc35996416326cf28051f9";
+ sha256 = "00p7hrcb2ivk6sjxqccbpswjsk5rj02nyd29d2nd6b8r3fskskzp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/948fb86b710aafe6bc71f95554655dfdfcab0cca/recipes/package-build";
@@ -54062,12 +52913,12 @@
package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "package-lint";
- version = "20170907.201";
+ version = "20171006.1846";
src = fetchFromGitHub {
owner = "purcell";
repo = "package-lint";
- rev = "2fc3bc9530caea437a55e23c13d31d8803193107";
- sha256 = "076da92vc86kdc7gdh8id7w8qadh0fbiz068qzk8kr8w5bw6zkr6";
+ rev = "ff64e1171e8330972c26bf547042429927aed7c7";
+ sha256 = "11hsxvla2vq944zfd8kr0wynvkr7n90jv714ll6f7yhn10nrraks";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint";
@@ -54206,22 +53057,22 @@
license = lib.licenses.free;
};
}) {};
- page-break-lines = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ page-break-lines = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "page-break-lines";
- version = "20170829.157";
+ version = "20171020.108";
src = fetchFromGitHub {
owner = "purcell";
repo = "page-break-lines";
- rev = "c82759f267a81a07ed7aafffbbbfaa3e94941b59";
- sha256 = "17kly423l5fyqzmhbxqwd9fvn191bzq6pn3ng1ynla51cg47zskl";
+ rev = "ae1c0065984429c7364a667abb9180e80134c4c0";
+ sha256 = "1j2fw5p5cwyxpb3clym59jbma06r7la83n62xmz0q1z41llmwx4j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/page-break-lines";
sha256 = "0i5kx191wnq9763jyqxbyh33hvdaqbd98a1rhgqd97zhvg0hslz1";
name = "page-break-lines";
};
- packageRequires = [];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/page-break-lines";
license = lib.licenses.free;
@@ -54269,25 +53120,6 @@
license = lib.licenses.free;
};
}) {};
- palette = callPackage ({ fetchurl, hexrgb, lib, melpaBuild }: melpaBuild {
- pname = "palette";
- version = "20170307.936";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/palette.el?revision=84";
- sha256 = "112b91z1f4p0j4kzrn8110w9pk2fyndjqiiyh0vkwah2ihpsw3pj";
- name = "palette.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/2cdf2d07307007a95d1fe8dc8d2f105c34a26416/recipes/palette";
- sha256 = "1s9lklvr1b0a496q0ljbhkl8zdx80d7bqvkdjnfp35z2s37f1zz3";
- name = "palette";
- };
- packageRequires = [ hexrgb ];
- meta = {
- homepage = "https://melpa.org/#/palette";
- license = lib.licenses.free;
- };
- }) {};
palimpsest = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "palimpsest";
@@ -54333,12 +53165,12 @@
pamparam = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, lispy, melpaBuild, worf }:
melpaBuild {
pname = "pamparam";
- version = "20170910.537";
+ version = "20170927.1048";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "pamparam";
- rev = "d452c3baa19d51fb04c5a52f550b560fe695eb0a";
- sha256 = "02qrc3qxajzxm9lfrd33i9sbawh9nf4gz9i3drzhv11ca549paaq";
+ rev = "c840a8f941940bb8e694c635995566faee995c7b";
+ sha256 = "0wqnzgkcwhrgxdkrlk6i469gcas9477pbkv878cqq9ifsjwvf42n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/067b5e3594641447478db8c1ffcb36d63018b1b2/recipes/pamparam";
@@ -54417,16 +53249,16 @@
paper-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, hexrgb, lib, melpaBuild }:
melpaBuild {
pname = "paper-theme";
- version = "20151231.932";
+ version = "20170924.1231";
src = fetchFromGitHub {
owner = "cadadr";
- repo = "paper-theme";
- rev = "15af5e31492f79dc0d47787150ef39d6318a2608";
- sha256 = "1xh614czldjvfl66vhkyaai5k4qsg1l3mz6wd5b1w6kd45qrc54i";
+ repo = "elisp";
+ rev = "b3d8b45c76134e2248448d719c840776e41b747a";
+ sha256 = "0fy0b04mf3brx86xjnidkwg4zs4nh123nc6pgrl4mp6d6552vv98";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a35a0888a7a27174b5de58d99b01554769041f46/recipes/paper-theme";
- sha256 = "04diqm2c9fm29zyms3hplkzb4kb7b2kyrxdsy0jxyjj5kabypd50";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/a7ea18a56370348715dec91f75adc162c800dd10/recipes/paper-theme";
+ sha256 = "1ph6c6g907cnxzl74byc754119qia8rs8y7wvaj8i6q3fz2658zr";
name = "paper-theme";
};
packageRequires = [ emacs hexrgb ];
@@ -54463,8 +53295,8 @@
src = fetchFromGitHub {
owner = "Malabarba";
repo = "paradox";
- rev = "c508a52aee7f10f5e9b750b4724e264a3e694757";
- sha256 = "1xbys48368a6vcyjqxn71lg6yf7zvb2k9dlf07dl6hvh0a7qlpqa";
+ rev = "dfdfbec8b4a3b71966c134f00c3f5edfa87b6245";
+ sha256 = "1l0rs49lbclq4ayhnx6vi6bxn37a0h2ylk73fjcbar2lbr1dhf9r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/paradox";
@@ -54706,22 +53538,22 @@
license = lib.licenses.free;
};
}) {};
- pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store }:
+ pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, password-store-otp }:
melpaBuild {
pname = "pass";
- version = "20170911.456";
+ version = "20171010.410";
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "pass";
- rev = "f811120c33279fb6881c0a70ae26862adefcd659";
- sha256 = "07m80mscxfi5wmf0cvymlnpcp4aprzn8ynaxs6vxgpr11gwr8zvm";
+ rev = "0f4ff034fb31b18f387e67f1de4029826db6cd0b";
+ sha256 = "084497na8qql638qjhgad02rvhwyzz81xwh70p6rxxwfzj0i1p17";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/428c2d53db69bed8938ec3486dfcf7fc048cd4e8/recipes/pass";
sha256 = "1vvyvnqf6k7wm0p45scwi6ny86slkrcbr36lnxdlkf96cqyrqzfr";
name = "pass";
};
- packageRequires = [ emacs f password-store ];
+ packageRequires = [ emacs f password-store password-store-otp ];
meta = {
homepage = "https://melpa.org/#/pass";
license = lib.licenses.free;
@@ -54811,18 +53643,19 @@
license = lib.licenses.free;
};
}) {};
- password-store = callPackage ({ emacs, f, fetchgit, fetchurl, lib, melpaBuild, s, with-editor }:
+ password-store = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, with-editor }:
melpaBuild {
pname = "password-store";
version = "20170829.1633";
- src = fetchgit {
- url = "https://git.zx2c4.com/password-store";
- rev = "65cead8c0fdb07ce3821f6b97bdcb32684d0c3f7";
- sha256 = "0rm364l9mg2gl16ng5zd02gkfq8592mhrp81sk1v0wwh8wlyrzrh";
+ src = fetchFromGitHub {
+ owner = "zx2c4";
+ repo = "password-store";
+ rev = "7252e8b3cf829e908179913daad16ff2b8bdefdd";
+ sha256 = "1wmayp7wjlfxdjb0wlmjqyxqa95ssrhhxhkiy0ip3bgip77s7rbw";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/ceff76206bd44d92c00adc931236c4ae15db5583/recipes/password-store";
- sha256 = "06l4xlvrjswy5kndn6h6swliqcp007nh4fyvma3jaac4f3x2qi65";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/207f8ec84572176749d328cb2bbc4e87c36f202c/recipes/password-store";
+ sha256 = "03r8j14l12yc42b51fzvn1jh8j85nyl1rg6c80r0a7ihwkj27jv6";
name = "password-store";
};
packageRequires = [ emacs f s with-editor ];
@@ -54834,12 +53667,12 @@
password-store-otp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, s }:
melpaBuild {
pname = "password-store-otp";
- version = "20170912.349";
+ version = "20170928.18";
src = fetchFromGitHub {
owner = "volrath";
repo = "password-store-otp.el";
- rev = "2965da7d8edd32bd4ef62f487ea6bcd08c599c89";
- sha256 = "1svm6rlh4f0rjcl0fjy3x4bfakdn9npi8w7ak217ad2k08j44bzd";
+ rev = "a39a64a91de36e87b852339635bd3c5fb0e32441";
+ sha256 = "0gb48blvnn6ci2wl45z81p41ny7vbgl610hqy6b2hyr2171qjd60";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fc89d02554a6ff150ad42634879073892f3e88be/recipes/password-store-otp";
@@ -55296,12 +54129,12 @@
pdf-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, tablist }:
melpaBuild {
pname = "pdf-tools";
- version = "20170912.711";
+ version = "20171012.2226";
src = fetchFromGitHub {
owner = "politza";
repo = "pdf-tools";
- rev = "c1b183f71e618693ac6ec20f051ca41270be3bce";
- sha256 = "059fmrakfzwq4xqf246ksi9h7gfm37f29565w9mvlq4z7hhbf5z3";
+ rev = "0f99f0c06514acf51445e7e4cb0f638fa0c75ee5";
+ sha256 = "1gc7n5r60ib65bnkgpac3bn71pxnm58sxajnwjfkwi9xzgw72acv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools";
@@ -55401,11 +54234,11 @@
pelican-mode = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pelican-mode";
- version = "20170818.1352";
+ version = "20171001.503";
src = fetchgit {
url = "https://git.korewanetadesu.com/pelican-mode.git";
- rev = "9b2a64b9d57ee4eb95e40a309fbab4bcfa5b5fef";
- sha256 = "19gqg2p56r0iz5l3p5y421c107f3jggwi60xk2wamx5jv9rbrn2d";
+ rev = "64d41f0ee5970b2d875880994eb287b97cad24a1";
+ sha256 = "0xivc8sdp6h3fajyj7g73xnyfqlkhfpm2cs9x3mpyr42502lmn2c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/aede5994c2e76c7fd860661c1e3252fb741f9228/recipes/pelican-mode";
@@ -55438,48 +54271,6 @@
license = lib.licenses.free;
};
}) {};
- perl-completion = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "perl-completion";
- version = "20090527.2336";
- src = fetchFromGitHub {
- owner = "imakado";
- repo = "perl-completion";
- rev = "f2ec91b88a8b7d97d40d6c90a89eaf8e595c2b89";
- sha256 = "0fzypcxxd5zlkcybz0xppf09l0vf4vsfisr2y3ijsmxhg7yrwzj5";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/987c14a2c4a31e27382d05cdbca18a3d2661d2e1/recipes/perl-completion";
- sha256 = "01p17mlkwjm60f14arda3ly8ng0r98nn3rly94ghn6jr7r7fv14b";
- name = "perl-completion";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/perl-completion";
- license = lib.licenses.free;
- };
- }) {};
- perl6-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
- melpaBuild {
- pname = "perl6-mode";
- version = "20160730.1455";
- src = fetchFromGitHub {
- owner = "hinrik";
- repo = "perl6-mode";
- rev = "14073feeb0f8ad2225616d550133f8f473a51b33";
- sha256 = "1j6zgr9vfyqpdya8975sjh2ny70rqqyj9zbl63kldkirppnw995i";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/d4bbb2171c70958d5ab3730f974db3b07561a81b/recipes/perl6-mode";
- sha256 = "0af1djypd8n0n1fq10sl8mrdg27354kg9g87d6xz4q5phvi48cqv";
- name = "perl6-mode";
- };
- packageRequires = [ emacs pkg-info ];
- meta = {
- homepage = "https://melpa.org/#/perl6-mode";
- license = lib.licenses.free;
- };
- }) {};
perlbrew = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "perlbrew";
@@ -55588,12 +54379,12 @@
persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "persp-mode";
- version = "20170908.648";
+ version = "20171014.111";
src = fetchFromGitHub {
owner = "Bad-ptr";
repo = "persp-mode.el";
- rev = "fd57484756b7a7e34895bf55238413005ab35959";
- sha256 = "1f7qcy5swiqx17835dvwb89x0ndhviyxi5bqk2gn14c1z8fmld5a";
+ rev = "ccf87da2c230c3a91e627105b0f034a954e6842a";
+ sha256 = "1dv3ghl9falw888bl1w0d5pzp0jz8qsbisd7kfd887bsyn7x7jqw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode";
@@ -55672,12 +54463,12 @@
perspeen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }:
melpaBuild {
pname = "perspeen";
- version = "20170813.1754";
+ version = "20170916.404";
src = fetchFromGitHub {
owner = "seudut";
repo = "perspeen";
- rev = "6b3a3b0468199a8db10a73d119dfcd8833d181b6";
- sha256 = "13rivw5rafl4pb68l500ksbzpz00yp7lx9wi9vy8nz0hwr80jd0p";
+ rev = "525f2f25358f17c7269c3750d56bfb8a6d59b5e6";
+ sha256 = "17nv33nl60jdn6cz6abbj6jxnvjcshaq4a22lkssxczp968k1qn3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/perspeen";
@@ -55693,12 +54484,12 @@
pfuture = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pfuture";
- version = "20170531.805";
+ version = "20170726.1502";
src = fetchFromGitHub {
owner = "Alexander-Miller";
repo = "pfuture";
- rev = "a6c32c69abdb9b91baf8036b88cc4f477f611bd5";
- sha256 = "0ly38dzg754n4s2xs09kaisxs14ikm42d9sjhw9p9xirzqm7zd5j";
+ rev = "8b5cd8dfb8769d2b24484a313d3d21938afd3dfb";
+ sha256 = "1d63sfwy7qmldhq2xda9dglg91cy2kpjdr2rlmqb48w95wf0am3m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5fb70c9f56a58b5c7a2e8b69b191aa2fc7c9bcc8/recipes/pfuture";
@@ -55798,12 +54589,12 @@
phan = callPackage ({ composer, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "phan";
- version = "20170205.604";
+ version = "20171017.2045";
src = fetchFromGitHub {
owner = "emacs-php";
repo = "phan.el";
- rev = "6442663bf7618bc614b6c47b0ad7bc591c68f947";
- sha256 = "0s38vbnsbpazca0jsahjmms7qgq74gsvfn2zkrfkhx9y8cpfxrrb";
+ rev = "17b44a62580272bcf5ee91fb58098292e9de6f83";
+ sha256 = "002qak8jlim6pjj3ckikzzcc6n40mcqd5qvzakazi1q01z1ffsnd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/phan";
@@ -56113,12 +54904,12 @@
php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "php-mode";
- version = "20170729.1258";
+ version = "20171018.1236";
src = fetchFromGitHub {
owner = "ejmr";
repo = "php-mode";
- rev = "151ae717b03d6d5fcc2bc86e349175840bfbe079";
- sha256 = "00f2k41zmda299rj4lfpxisnrr9i5f0gg51cb8fri7lyjzrq829a";
+ rev = "0e87a708fb0cf7bb5ad88baf08bd60e061e8b63c";
+ sha256 = "13676hca2mdfawc61g3hp1m56wv45i37g8gxhjb3mvjyjrb10rkv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode";
@@ -56134,12 +54925,12 @@
php-plus--mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "php-plus--mode";
- version = "20170215.657";
+ version = "20171027.921";
src = fetchFromGitHub {
owner = "echosa";
repo = "phpplus-mode";
- rev = "8224e6aabc2e3d046d717b4c87c643aa98a8e203";
- sha256 = "041xv3c2gwcxlj9bnjx6hlrm2k7s7fyzqbp4c583is6jx1adjfn3";
+ rev = "523e7e50f9978ba74b8a324f9f896cd9b5dfd9de";
+ sha256 = "0xf79pxsrfr9bi3138hdq2ccrh391sci8lvmvzcs3vnzw0hrzbfh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d542e94471b9f601f1ee6f31e727bc4a31fa8f9e/recipes/php+-mode";
@@ -56845,25 +55636,6 @@
license = lib.licenses.free;
};
}) {};
- plsql = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "plsql";
- version = "20121115.243";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/plsql.el?revision=5";
- sha256 = "1v0wvy9fd1qq3aq83x5jv3953n0n51x7y2r2ql11j0h8xasy42p1";
- name = "plsql.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/eb457144c112a7a9de2fc4c634dfd6c2dda2e486/recipes/plsql";
- sha256 = "1jvppmfdll34b8dav5dvbabfxiapv92p7lciblj59a707bbdb7l1";
- name = "plsql";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/plsql";
- license = lib.licenses.free;
- };
- }) {};
plur = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "plur";
@@ -56909,8 +55681,8 @@
version = "20170419.303";
src = fetchgit {
url = "https://git.savannah.gnu.org/git/gettext.git";
- rev = "5ad8c92742daaf4434fded196ff23638cdaa621b";
- sha256 = "1z3cy6n727lrsm8smksb48hbj2ckh4wri44c0423hdf84qp5ifg8";
+ rev = "981c523ddbd1462970335a1069573ca3bdd3df5e";
+ sha256 = "1aq95scp0lg5r1fsn62r54dqamm3174wzrr0h3vxx75m3iycsxxi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/po-mode";
@@ -56944,6 +55716,27 @@
license = lib.licenses.free;
};
}) {};
+ pocket-lib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, request }:
+ melpaBuild {
+ pname = "pocket-lib";
+ version = "20171026.1610";
+ src = fetchFromGitHub {
+ owner = "alphapapa";
+ repo = "pocket-lib.el";
+ rev = "52d4c3d9ca500acbf0a4cac4abfacc0641007abe";
+ sha256 = "1c59xzh2acrfmld0fg78h3kyzhgfcfcbk7nmvb584jr2qppkszgy";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/71f17ce28f4fc8c2c100848be8aec15526ef8697/recipes/pocket-lib";
+ sha256 = "0v619blifmvm36dr773wjf35fjji4dj3pyck9nkz0m8zmpz0fg78";
+ name = "pocket-lib";
+ };
+ packageRequires = [ dash emacs kv request ];
+ meta = {
+ homepage = "https://melpa.org/#/pocket-lib";
+ license = lib.licenses.free;
+ };
+ }) {};
pocket-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pocket-api }:
melpaBuild {
pname = "pocket-mode";
@@ -56965,6 +55758,36 @@
license = lib.licenses.free;
};
}) {};
+ pocket-reader = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, org-web-tools, ov, pocket-lib, rainbow-identifiers, s }:
+ melpaBuild {
+ pname = "pocket-reader";
+ version = "20171023.737";
+ src = fetchFromGitHub {
+ owner = "alphapapa";
+ repo = "pocket-reader.el";
+ rev = "e65a7e7529ece4fb7a738c062e73d5c07ace9574";
+ sha256 = "0bqxsvhmwvf0gpjmmh7pmzyw4lpcarj2prm52bgncch8x1f0gvnp";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/835a7bf2f72987183e9d15ada7ae747fb5715c11/recipes/pocket-reader";
+ sha256 = "0gcgmz4mhjgvqbh2gmv8v09sy80cnfccjym455m0fbl31b8dczhf";
+ name = "pocket-reader";
+ };
+ packageRequires = [
+ dash
+ emacs
+ kv
+ org-web-tools
+ ov
+ pocket-lib
+ rainbow-identifiers
+ s
+ ];
+ meta = {
+ homepage = "https://melpa.org/#/pocket-reader";
+ license = lib.licenses.free;
+ };
+ }) {};
podcaster = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "podcaster";
@@ -57028,25 +55851,6 @@
license = lib.licenses.free;
};
}) {};
- point-undo = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "point-undo";
- version = "20100504.129";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/point-undo.el?revision=6";
- sha256 = "13c1iw77ccvrfrv4lyljg8fpm7xqhnv29yzvig8wr8b5j2vsd8bz";
- name = "point-undo.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/ce31bd8f9a1ad4f3252f8cd4ef15984495df18bd/recipes/point-undo";
- sha256 = "0by7ifj1lf0w9pp7v1j9liqjs40k8kk9yjnznxchq172816zbg3k";
- name = "point-undo";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/point-undo";
- license = lib.licenses.free;
- };
- }) {};
pointback = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pointback";
@@ -57134,12 +55938,12 @@
pomidor = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pomidor";
- version = "20170817.2253";
+ version = "20170925.2301";
src = fetchFromGitHub {
owner = "TatriX";
repo = "pomidor";
- rev = "58a4368d91d472aa47a83f498be82db8929cf41a";
- sha256 = "1g6mwx6gq6zlzn06izic81qf2ppqprfmap5hgsksx1xbickkmwdx";
+ rev = "16bed77ff933cb5f8430b6eacf27509631d22072";
+ sha256 = "1w2ql67arjzzjakqm34gbs3vf6w9yzkw5kzi5vrvkcwajqq8qq56";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0d4f313081594df23f357c40feb456847d8bd0/recipes/pomidor";
@@ -57218,12 +56022,12 @@
ponylang-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ponylang-mode";
- version = "20170514.1419";
+ version = "20171028.1356";
src = fetchFromGitHub {
owner = "SeanTAllen";
repo = "ponylang-mode";
- rev = "88833317195f5ee2880e33a907861c6c2d3851da";
- sha256 = "0kzzf03m1jzkl9fxzivzh3536c0c9l7m9g5h7zycdz7nj5da38c0";
+ rev = "5e23459dc395eb77fa4c6cfa3d6c08b1b185a6df";
+ sha256 = "0iwdnv56200w53ba4f66vih7gha2nb36ajnvbqixc0byibwcsnc9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7d51adec3c6519d6ffe9b3f7f8a86b4dbc2c9817/recipes/ponylang-mode";
@@ -57239,12 +56043,12 @@
pophint = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
melpaBuild {
pname = "pophint";
- version = "20170403.701";
+ version = "20170917.1948";
src = fetchFromGitHub {
owner = "aki2o";
repo = "emacs-pophint";
- rev = "5d1db7c0b92862ba2cc5f3566b25840b8ce3ba59";
- sha256 = "09av2krrmm8g3f3f31kl4j4agmmf8hx9irzrqyvgshljflk0nq1q";
+ rev = "909025c5a871ca4b9ec7aed7f1a27c819a94dba1";
+ sha256 = "0qbb36qijkzbzxlmqsvvddm7x2gk9rkafnyjbkxsl76rz1ajy6nz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0055c2887acbbd8a2803bf3f81ac2cc444cc805a/recipes/pophint";
@@ -57533,12 +56337,12 @@
powerline = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "powerline";
- version = "20170708.1442";
+ version = "20171023.750";
src = fetchFromGitHub {
owner = "milkypostman";
repo = "powerline";
- rev = "8a246902e86a0c59015bb897a9c59be9729ef5c4";
- sha256 = "1q90y0l0vdach8irb9cigw8w5nllvzv5hg8hd8ljpb4j9jhc5y5n";
+ rev = "fda4fb96984607d4a6502b1d8c8898e56d10cf6c";
+ sha256 = "1lz3kr8w9z9xx5amqqvim85asjji13q84d4r1cb5x77wajmj1p21";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f805053cd4dd9ed53ee0df17ad69429bc62325bb/recipes/powerline";
@@ -57593,44 +56397,6 @@
license = lib.licenses.free;
};
}) {};
- pp-c-l = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "pp-c-l";
- version = "20170307.939";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/pp-c-l.el?revision=25";
- sha256 = "0q36bq82lp381jnzf8kapiiglqgibzkhsxlhpgfdg3ynbmw5i1cc";
- name = "pp-c-l.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/pp-c-l";
- sha256 = "0gbqxlrsh9lcdkrj8bqh1mpxyhdlwbaxz4ndp5s90inmisaqb83v";
- name = "pp-c-l";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/pp-c-l";
- license = lib.licenses.free;
- };
- }) {};
- pp-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "pp-plus";
- version = "20170307.938";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/pp+.el";
- sha256 = "0a1dj9n3n81xal17djj15hqa71cqphjnf9k9z03vnpw8zq0m93lh";
- name = "pp+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/pp+";
- sha256 = "1ng5x7dp85y6yqj6q43h08qdnapg2j1ab8rmc47w4w79d1pryniq";
- name = "pp-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/pp+";
- license = lib.licenses.free;
- };
- }) {};
ppd-sr-speedbar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, project-persist-drawer, sr-speedbar }:
melpaBuild {
pname = "ppd-sr-speedbar";
@@ -57757,25 +56523,6 @@
license = lib.licenses.free;
};
}) {};
- pretty-lambdada = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "pretty-lambdada";
- version = "20170307.940";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/pretty-lambdada.el?revision=15";
- sha256 = "0b8m96hbqmgyqmv5f890fnyl9vl2wcsaz8w4b11wdprh82ravp4r";
- name = "pretty-lambdada.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/pretty-lambdada";
- sha256 = "16v5fgifz672c37xyzv557mm6za4rldvdrb26vdymxqg4fy62fd6";
- name = "pretty-lambdada";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/pretty-lambdada";
- license = lib.licenses.free;
- };
- }) {};
pretty-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pretty-mode";
@@ -57905,12 +56652,12 @@
processing-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "processing-mode";
- version = "20150217.432";
+ version = "20171022.1602";
src = fetchFromGitHub {
owner = "ptrv";
repo = "processing2-emacs";
- rev = "a57415e523c9c3faeef02fa62a2b749270c4cc33";
- sha256 = "1smw786dcjvdn2j6bwqn2rfzhw039rrhxiv7vlrgzm0fyy2v1q6h";
+ rev = "448aba82970c98322629eaf2746e73be6c30c98e";
+ sha256 = "1fv74k37yyrh6jzasgqj88lrbq152gs9gpbjpxn7fz424c38gq2q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ba59561e8a2f259fde170a79844af5e1ef5ed34f/recipes/processing-mode";
@@ -57930,8 +56677,8 @@
src = fetchFromGitHub {
owner = "ptrv";
repo = "processing2-emacs";
- rev = "a57415e523c9c3faeef02fa62a2b749270c4cc33";
- sha256 = "1smw786dcjvdn2j6bwqn2rfzhw039rrhxiv7vlrgzm0fyy2v1q6h";
+ rev = "448aba82970c98322629eaf2746e73be6c30c98e";
+ sha256 = "1fv74k37yyrh6jzasgqj88lrbq152gs9gpbjpxn7fz424c38gq2q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ba59561e8a2f259fde170a79844af5e1ef5ed34f/recipes/processing-snippets";
@@ -58049,26 +56796,6 @@
license = lib.licenses.free;
};
}) {};
- project-local-variables = callPackage ({ fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "project-local-variables";
- version = "20080502.952";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/project-local-variables.el?revision=1";
- sha256 = "1bb5b6hxg3gvwf0sqwkd97nnipsmr60py0rnsfhgvizn4cj3khhw";
- name = "project-local-variables.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/project-local-variables";
- sha256 = "1jys9nac2912jdv40fly1q4i30xa8b1v2ndbc50rk4ysarhbhdd9";
- name = "project-local-variables";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/project-local-variables";
- license = lib.licenses.free;
- };
- }) {};
project-persist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "project-persist";
@@ -58155,12 +56882,12 @@
projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
melpaBuild {
pname = "projectile";
- version = "20170827.2053";
+ version = "20171031.456";
src = fetchFromGitHub {
owner = "bbatsov";
repo = "projectile";
- rev = "adf6ae2dbfbdca96aec49115ca35867006f326b1";
- sha256 = "1x39v7lb63k2nfa4xyvkgvgxbd88jcqnwdmd78a86p5zc3m42zk9";
+ rev = "7892f642ce7ab6ee816e5926ae02ea2014dac2a8";
+ sha256 = "17vclk40435qv2g0fjgyc0fndjghd2x20i43zvcff45yjqmyhw88";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile";
@@ -58306,8 +57033,8 @@
src = fetchFromGitHub {
owner = "nlamirault";
repo = "sift.el";
- rev = "ef509ac4c579340e8d924c26d9e5858a9f4fb9de";
- sha256 = "0i8gqzvpl3drzp031dqdpsi1ssr3az8fzb7xpbxnamzscfz6pdyc";
+ rev = "4ce8878a0fc396ded7521ce38852d93e1d863065";
+ sha256 = "1x78i6svi4cwah9xw85imhpncvxsx4xim4fzykpnd328mxkk07h6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a730e1331b0486c4bd2d309b85d2f8810489eb47/recipes/projectile-sift";
@@ -58341,6 +57068,27 @@
license = lib.licenses.free;
};
}) {};
+ projectile-trailblazer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }:
+ melpaBuild {
+ pname = "projectile-trailblazer";
+ version = "20170928.924";
+ src = fetchFromGitHub {
+ owner = "micdahl";
+ repo = "projectile-trailblazer";
+ rev = "a37a4f7b7f727d98e4c74c0256e059e84263553d";
+ sha256 = "1njs2aps4mlbnnfjkfwrb8vy8lg6lyxzxkxpscv91la7yf3wpc3g";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/f9c6f2f92ff99e7a3241003dc396f978f3916c8a/recipes/projectile-trailblazer";
+ sha256 = "18cijb5c1ym5kn2g2apbijbfd3aqhrraki8vv9bk8rvi7wmm6qj4";
+ name = "projectile-trailblazer";
+ };
+ packageRequires = [ emacs f inf-ruby inflections projectile rake ];
+ meta = {
+ homepage = "https://melpa.org/#/projectile-trailblazer";
+ license = lib.licenses.free;
+ };
+ }) {};
projectile-variable = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "projectile-variable";
@@ -58365,12 +57113,12 @@
projector = callPackage ({ alert, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
melpaBuild {
pname = "projector";
- version = "20170717.1151";
+ version = "20171006.1258";
src = fetchFromGitHub {
owner = "waymondo";
repo = "projector.el";
- rev = "ec63167ee21d537f410c0971f82e2ffdfd6fa008";
- sha256 = "155wnks7i73c3kvgysnfy0379d1fp78qv2b8lhsaxwx7jh356dbm";
+ rev = "03751fca880c95cf47e560c78cfc2aaa056cd455";
+ sha256 = "1yg9pcs6pbwd7a35q0jqjwnqwjqz4v5jd24msr51xh0v8kbs2v61";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/420ffea4549f59677a16c1ee89c77b866487e302/recipes/projector";
@@ -58530,22 +57278,22 @@
license = lib.licenses.free;
};
}) {};
- proportional = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, use-package }:
+ proportional = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "proportional";
- version = "20170628.137";
+ version = "20171025.1637";
src = fetchFromGitHub {
owner = "ksjogo";
repo = "proportional";
- rev = "eb2bb2b3d1ca058365049271dc341b1180009f1a";
- sha256 = "1lc3xvkvy5lcy5zralbnwqlxmar443yq735pd023z6di54xm3991";
+ rev = "f671ffe8fd803e2fc462e2e1844aeeab1a13918e";
+ sha256 = "02sbrcb9c27djk64xv41vii6pbw83b6iljrd66w4ad9hgz2pkxzk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9e0a7f061df4cce44e5fe98f6e1c31bec4a7338f/recipes/proportional";
sha256 = "022lhbslzd67wyah8r0gl73vzxgjjwia08l3ssdd08jj3p56m3wx";
name = "proportional";
};
- packageRequires = [ emacs use-package ];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/proportional";
license = lib.licenses.free;
@@ -58579,8 +57327,8 @@
src = fetchFromGitHub {
owner = "google";
repo = "protobuf";
- rev = "06aa8dc9e730cc39c67d0ff9c0c95e645ccf03c9";
- sha256 = "0na3apgapd78z57jfdwns35mflqgwjwbcj2lmspg9ipg0x191378";
+ rev = "cbe250591fca9d2e776776be065a72c5550a5556";
+ sha256 = "0g8zp8ws7i9v3a719dvwkva0f9rap5s6jdpw2j8cj1kp94bvk9fl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -58617,12 +57365,12 @@
psc-ide = callPackage ({ cl-lib ? null, company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, s, seq }:
melpaBuild {
pname = "psc-ide";
- version = "20170817.1206";
+ version = "20171031.129";
src = fetchFromGitHub {
owner = "epost";
repo = "psc-ide-emacs";
- rev = "fb3040a1204c4a6f7a54abc499fb88074627cb3e";
- sha256 = "0fh2xv0rz5mkhqvcaj55wpx39f953qalz5v46v35nzmhc0fpmzab";
+ rev = "d28c33f65318a475133afc2f42e103db9251d2a2";
+ sha256 = "19f9aw675d6crhd9j9jvqya39ddsf4f6hcwb03525k307syvg62y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/384ffc463cc6edb4806f8da68bd251e662718e65/recipes/psc-ide";
@@ -58648,12 +57396,12 @@
psci = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, purescript-mode, s }:
melpaBuild {
pname = "psci";
- version = "20170818.1301";
+ version = "20171011.50";
src = fetchFromGitHub {
owner = "purescript-emacs";
repo = "emacs-psci";
- rev = "875ea3231e4aceadf7718daef75a1426ff8e87e5";
- sha256 = "11yihnlm7cawyhgava70xja8rf0gi6j1jf3z4x8ylf5wjj6fbbfc";
+ rev = "5360b244c588ed2f2a5bb86180cb5d4deb2216de";
+ sha256 = "0m9lpwwm29h0pms1rnwnh67ff1n1dmf25yy429g438zq98l94x9s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3451719ce5096383db082917716a5ed8346fc186/recipes/psci";
@@ -58711,12 +57459,12 @@
psysh = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "psysh";
- version = "20170610.2104";
+ version = "20171022.2229";
src = fetchFromGitHub {
owner = "emacs-php";
repo = "psysh.el";
- rev = "f72d6fe41af2d9566d41b167cda66e97efdf8cfa";
- sha256 = "0hr8nlxcqfas9wl5ahz9hmvpa8b6k35n4f7iv9dx6zwf5q48q7y7";
+ rev = "926af4ae0c068ed699fc939f4b3e642aaa6f7c9e";
+ sha256 = "0k6kb4xbfxcvd7dm3kb600mq56xyy086zi7nal04jkv9lc59bwn7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/psysh";
@@ -58750,27 +57498,48 @@
license = lib.licenses.free;
};
}) {};
- pug-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ pug-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pug-mode";
- version = "20170913.348";
+ version = "20171018.829";
src = fetchFromGitHub {
owner = "hlissner";
repo = "emacs-pug-mode";
- rev = "3a3bdf96e64dc6f5d031bf0ed2b6002a600187ad";
- sha256 = "02mx4gs8hlinrxm8jas9jy83kvglaqjz3sxn4m4hrrj07gz0si96";
+ rev = "9dcebdb10c50620a3a5c6d71361d53bf482a482e";
+ sha256 = "1rkbk8apd612ixksyssmmkrhswks6gbxl9kxhrbaxszfrrhqx86v";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b3710aac9f3df3a23238af1f969c462b3692f260/recipes/pug-mode";
sha256 = "1njhr95y2rx7inpl9phxxz580844p2iadqlga1kj7xzvjz698x85";
name = "pug-mode";
};
- packageRequires = [ emacs ];
+ packageRequires = [ cl-lib emacs ];
meta = {
homepage = "https://melpa.org/#/pug-mode";
license = lib.licenses.free;
};
}) {};
+ pulseaudio-control = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "pulseaudio-control";
+ version = "20171024.2339";
+ src = fetchFromGitHub {
+ owner = "flexibeast";
+ repo = "pulseaudio-control";
+ rev = "08c59e1dc45ec96edb62f34036e82cf5f14c0e8b";
+ sha256 = "10cgg1r00kz2fsnnryvzay5pf8s1pwb1dzlds1fbjdnyfvdgammv";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/7964f226e12c3a27ff856e28f4b030ebf304aea2/recipes/pulseaudio-control";
+ sha256 = "1vdhg85lbdx7sj1xg2vhhfmhrrp5q2x560agnsb0gxi2akp6z9r0";
+ name = "pulseaudio-control";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/pulseaudio-control";
+ license = lib.licenses.free;
+ };
+ }) {};
punctuality-logger = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "punctuality-logger";
@@ -58837,12 +57606,12 @@
puppet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
melpaBuild {
pname = "puppet-mode";
- version = "20170719.752";
+ version = "20170928.1007";
src = fetchFromGitHub {
owner = "voxpupuli";
repo = "puppet-mode";
- rev = "fb1b683191d767eab312ea424de3517062d86420";
- sha256 = "12kxxgm61myna4wf3hgai8dgrssc9dnv75fh2mbcgwqggbfv8wlv";
+ rev = "e04f041386ebfe29fc67c3407e85b577b820df4f";
+ sha256 = "0hcp7hmxri62qcx80zqphlhwrhzapzi0c07kk4l2cm75xfy20a2l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1de94f0ab39ab18dfd0b050e337f502d894fb3ad/recipes/puppet-mode";
@@ -58858,12 +57627,12 @@
purescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "purescript-mode";
- version = "20161216.133";
+ version = "20170926.242";
src = fetchFromGitHub {
owner = "dysinger";
repo = "purescript-mode";
- rev = "c88126070c052d636f4dad5525846a1b200fce43";
- sha256 = "1ndclsywvh5x06gmvk44zjlgfamdn55lygdgxf3x1vrznvr0jawy";
+ rev = "e2d6519a9669a1443db1040cf098bc3ea30ec861";
+ sha256 = "1k8q32ipa684hvk7iwpdzqwikimw8g3j6gkmz9yi5fxflq6z1swr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/77175fa470e517fa134751fbb38e144eb5b979ff/recipes/purescript-mode";
@@ -59297,12 +58066,12 @@
pyim = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, pyim-basedict }:
melpaBuild {
pname = "pyim";
- version = "20170901.2053";
+ version = "20170916.2024";
src = fetchFromGitHub {
owner = "tumashu";
repo = "pyim";
- rev = "54c05392e5a9523e34c7d54f8999632358f0ed89";
- sha256 = "0cxyz8b1djsdd0pxy15aamxx8j4vxvakinmrrwm3k6saqx8frmr9";
+ rev = "d44db4cb74c1c0cf6f814ff14d0be8e733f8404a";
+ sha256 = "02b2aknx127xvl8amf74krvd7z33kyr049iw5h0665zkzsli4g8w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim";
@@ -59427,8 +58196,8 @@
src = fetchFromGitHub {
owner = "PyCQA";
repo = "pylint";
- rev = "e231a409a83a23c24c8b7dbbaca79314eee6d4c6";
- sha256 = "0xkbhd2cgsmqkbkscaa758ngfg01cdym7qgh809wsa0j6xf058lp";
+ rev = "dd78aedcf0f499188ad8232f2193ba62c791d33e";
+ sha256 = "0hqxh294hg9y8nz4i8p2mipg65d6p6wfy9kqlfx9zy5cm19dn7fm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint";
@@ -59570,12 +58339,12 @@
python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "python-mode";
- version = "20170825.20";
+ version = "20171031.431";
src = fetchFromGitLab {
owner = "python-mode-devs";
repo = "python-mode";
- rev = "e0fab065042a7e35b73928e94f32f649eac6a3af";
- sha256 = "0vpzzfdr85zp2gsh148yp1b1aynwcgvva69r3qjj0cwm13f28492";
+ rev = "06e1db1bb2f4d2da994387f2cbb1cfc6e5db242b";
+ sha256 = "019j22hmc1f1izc61l8hnasvs4vj9sb9pl9w3v63ck086h89jda1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode";
@@ -59633,12 +58402,12 @@
python-x = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, folding, lib, melpaBuild, python ? null }:
melpaBuild {
pname = "python-x";
- version = "20161029.531";
+ version = "20171006.336";
src = fetchFromGitHub {
owner = "wavexx";
repo = "python-x.el";
- rev = "ef749fe2d3e58d5f6d7f32453d06964786c085d5";
- sha256 = "1nncinrwh0nqy8wn1q8yzi15nf15gj576ccsp5l28951gjgkc6s9";
+ rev = "9bf0d16cfe7b5f24b98d6b33cbc8763edaceb174";
+ sha256 = "0x255lnfyv2i7yz6ipx5adazqmvgmf4mdcixzs1wv85gazmbgfc5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/87ed5ea4868945df1bf92d1eae5d3ebb83ece117/recipes/python-x";
@@ -59675,12 +58444,12 @@
pyvenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pyvenv";
- version = "20170826.812";
+ version = "20171005.1106";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "pyvenv";
- rev = "fc1e9c1fbac00460a32435390b94a8ce4f5542ce";
- sha256 = "0ckam3mkx44hrdykrhvm147xvw09rn328byl6dcpd3ygdqamwpdk";
+ rev = "9f528449dfc35516647118689a2104603f23b49c";
+ sha256 = "11yznfndkbyl6cmi7blxrr5yw9b32qw01abhvsj8jz1g1wnxhn45";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e37236b89b9705ba7a9d134b1fb2c3c003953a9b/recipes/pyvenv";
@@ -59903,6 +58672,27 @@
license = lib.licenses.free;
};
}) {};
+ quick-shell-keybind = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "quick-shell-keybind";
+ version = "20171022.2313";
+ src = fetchFromGitHub {
+ owner = "eyeinsky";
+ repo = "quick-shell-keybind";
+ rev = "5f4541a5a5554d108bf16b5fd1713e962161ca1b";
+ sha256 = "19hqywwf80q6ay886xmcjjpr4pghkw78hzdg0mrpkpkqn2vj06gk";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e9bf4d78da24d88476545f97b2af0527dde73600/recipes/quick-shell-keybind";
+ sha256 = "1f66wk2m0yykcbq6qbalgscpq8s53qshyyqdnimlmdi0g0glif1b";
+ name = "quick-shell-keybind";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/quick-shell-keybind";
+ license = lib.licenses.free;
+ };
+ }) {};
quickref = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "quickref";
@@ -60032,12 +58822,12 @@
racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "racket-mode";
- version = "20170913.509";
+ version = "20170913.534";
src = fetchFromGitHub {
owner = "greghendershott";
repo = "racket-mode";
- rev = "d57b3a6c64835fe334501bb2b1f8e370be777d90";
- sha256 = "11mh94lcmwh0qb68lyqmdkannq9p9y3j32mmwc23q88z1z7vvbf6";
+ rev = "33877b1bb24faea68842e0396bd5718b84e47451";
+ sha256 = "0681mzwx08zwbh8qg3s26jw1jn4fw2ljp1akxqkhy08sxhafqvb1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode";
@@ -60116,12 +58906,12 @@
rainbow-blocks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rainbow-blocks";
- version = "20140306.1033";
+ version = "20171025.738";
src = fetchFromGitHub {
owner = "istib";
repo = "rainbow-blocks";
- rev = "8335993563aadd4290c5fa09dd7a6a81691b0690";
- sha256 = "02x5ciyafqwak06yk813kl8p92hq03wjsk1882q8axr9q231100c";
+ rev = "dd435d7bb34ff6f162a5f315df308b90b7e9f842";
+ sha256 = "06yfb3i7wzvqrhkb61zib9xvpb5i00s4frizkzff66im05k0n795";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rainbow-blocks";
@@ -60137,12 +58927,12 @@
rainbow-delimiters = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rainbow-delimiters";
- version = "20160430.2358";
+ version = "20170929.432";
src = fetchFromGitHub {
owner = "Fanael";
repo = "rainbow-delimiters";
- rev = "93cd2dc873e7fedca7abc599cd97d46db4376ac7";
- sha256 = "0vs9pf8lqq5p5qz1770pxgw47ym4xj8axxmwamn66br59mykdhv0";
+ rev = "19b93892afa0494ba749c2ca9c154e04447ad778";
+ sha256 = "0c2a8pbhzzy0bxx8gxz320r106k69hvwkn43j06i6sidbgjwh786";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d2cf11dbff76f0e3581b865f48bb44a307aa7f23/recipes/rainbow-delimiters";
@@ -60179,12 +58969,12 @@
rake = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rake";
- version = "20161114.605";
+ version = "20170921.801";
src = fetchFromGitHub {
owner = "asok";
repo = "rake";
- rev = "e680f1a8f2591af7c80cad188340601b101b5ddc";
- sha256 = "1dk2clsnmjy3bfv6laxf8sslvdajjbwpk83ss8v9xm55dcxjvd7n";
+ rev = "a27322262ebcce7765574b577000f6f939400206";
+ sha256 = "1fzlll8s5vri5hmqsx5ilbrms73b0rsn3k6m5dgq6rhgn5z5k6r1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bf0f84698dda02a5b84a244ee29a23a6faa9de68/recipes/rake";
@@ -60494,12 +59284,12 @@
rdf-prefix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rdf-prefix";
- version = "20170514.859";
+ version = "20170915.1200";
src = fetchFromGitHub {
owner = "simenheg";
repo = "rdf-prefix";
- rev = "35129521d5b6035e5dd75d5b3481ce4971f46034";
- sha256 = "1iy9385n8a2b7ph4wdf8p92n81slirsxxckrc3khbk5zrpp62z5k";
+ rev = "25cc3c8902f16191496b549705b00ffc7dff51f1";
+ sha256 = "00ycsqzgn5rq8r4r86z1j43i2a7wj4r3c2vcggdaizyf4parmgmy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f083bd629697038ea6391c7a4eeedc909a5231/recipes/rdf-prefix";
@@ -60641,12 +59431,12 @@
real-auto-save = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "real-auto-save";
- version = "20150701.815";
+ version = "20170918.730";
src = fetchFromGitHub {
owner = "chillaranand";
repo = "real-auto-save";
- rev = "81bf61742ea553ccdee0e22d3abb43fcf07f82cf";
- sha256 = "1kghhps8mqys5l59qwzv3fgy1fvb15cnyaxmk29v818a6khjc5l2";
+ rev = "780d6c1c219e1f1efde1159a99af97b1c54c005d";
+ sha256 = "1wcyvyc3nwr9a89v8i4wmqvy2fwf7x7f3kcj7a8kdnp2albkvwsa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/525039a3dc29190829bf50d608ef09bc4a8557af/recipes/real-auto-save";
@@ -60662,12 +59452,12 @@
realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }:
melpaBuild {
pname = "realgud";
- version = "20170907.916";
+ version = "20171006.1840";
src = fetchFromGitHub {
owner = "rocky";
repo = "emacs-dbgr";
- rev = "f41b7a7f8eac0be5c4d8780af1d461f9e51e9cad";
- sha256 = "1k3xsidc05dls9scsi7vvrrqlfgqk343crgh89amg066s5p55s6y";
+ rev = "081f7edc79a8e510d47e10c6ce4306b2f850df1f";
+ sha256 = "0nj95w5jfck0lhnrrnrl6h31cvgnpizbhnr52k7mf360vwrsjil6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud";
@@ -60770,6 +59560,27 @@
license = lib.licenses.free;
};
}) {};
+ reason-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "reason-mode";
+ version = "20171027.2235";
+ src = fetchFromGitHub {
+ owner = "reasonml-editor";
+ repo = "reason-mode";
+ rev = "a9de59cced37b44db72ee248107021a660561d11";
+ sha256 = "04g3598ykczxkmj5gjd4airfl41b821agy6r4h2bnq5fcfdj0jnx";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/f9f1a18c13601f3a4fd7b1bbfe7d5da07746e492/recipes/reason-mode";
+ sha256 = "07sirgj8bs9yv7pbx1lahwslvjd2aadkzkz7lsyw6xflj5fxpggr";
+ name = "reason-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/reason-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
rebecca-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rebecca-theme";
@@ -60777,8 +59588,8 @@
src = fetchFromGitHub {
owner = "vic";
repo = "rebecca-theme";
- rev = "ee0d8796eca831110b7084a2af96fb4184d0a418";
- sha256 = "138hs6lgql40cn86p7v2xhb7ck2zcvz1vi6jd7fk55l0xgj5w61k";
+ rev = "add349748d0f648587bf17d14036677570f081aa";
+ sha256 = "1932ga5j5cv3w32iwxjdjs2jdz20sw5ai10dnxb6bdzh68kkw4f3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/19f40f30113c7dabd76a2d0e52898e6d6be69a35/recipes/rebecca-theme";
@@ -60812,25 +59623,6 @@
license = lib.licenses.free;
};
}) {};
- recentf-ext = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "recentf-ext";
- version = "20161210.840";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/recentf-ext.el?revision=5";
- sha256 = "0pzimhqkrdg2s9zw7ysir740cmaycf6fjs08bmlfjads7vdbjfpg";
- name = "recentf-ext.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/5a36ac5e0fc3599d50d7926cacf16b7a315f0e76/recipes/recentf-ext";
- sha256 = "1m54w1n3ci5j7i1jhw6cs7dgzmxrj1hsrrarqlrd1d4iqhixjzbq";
- name = "recentf-ext";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/recentf-ext";
- license = lib.licenses.free;
- };
- }) {};
recompile-on-save = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "recompile-on-save";
@@ -60855,12 +59647,12 @@
recover-buffers = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "recover-buffers";
- version = "20150812.5";
+ version = "20171008.2137";
src = fetchFromGitHub {
owner = "tripleee";
repo = "recover-buffers";
- rev = "a1db7f084977697081da3497628e3514e032b966";
- sha256 = "114ssmby614xjs7mrpbbsdd4gj5ra6klfh8h6z8iij8xn3kii83q";
+ rev = "81a5cb53099955ebc2a411a44cba5a394ee3f2d1";
+ sha256 = "07dfdvz5rn5l13xdycd7h75zaq0pw2afb9n1yiq01fqk6gvrhc5b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/43b33cfb794c35de78fde6eabb71ffe01049d23d/recipes/recover-buffers";
@@ -60957,25 +59749,6 @@
license = lib.licenses.free;
};
}) {};
- redo-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "redo-plus";
- version = "20131117.351";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/redo+.el";
- sha256 = "1jc4n60spzssa57i3jwrqwy20f741hb271vmmx49riycx1ybx3d3";
- name = "redo+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/redo+";
- sha256 = "0v7nrn6fbjx4mb0xsnkvqxk2hp35wfy83si5bavwwym4jcb5pl2r";
- name = "redo-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/redo+";
- license = lib.licenses.free;
- };
- }) {};
redpen-paragraph = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
melpaBuild {
pname = "redpen-paragraph";
@@ -61000,12 +59773,12 @@
redprl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "redprl";
- version = "20170903.911";
+ version = "20171030.1346";
src = fetchFromGitHub {
owner = "RedPRL";
repo = "sml-redprl";
- rev = "f96a5a50354cdc8a83b8fe347fafc49ad6c303a0";
- sha256 = "0pq0730b8nxm4xhb3dilnmp7lhv8vb83q7860dc64mds3fl12fg0";
+ rev = "b01bf5db718395eead17b679ed10c6b876117034";
+ sha256 = "0vnfjh0h0z9w28fb1sjncsjcc8f7h1ll0svm203cb5vw6v9d8nrs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl";
@@ -61018,26 +59791,6 @@
license = lib.licenses.free;
};
}) {};
- redshank = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "redshank";
- version = "20120510.1230";
- src = fetchgit {
- url = "http://www.foldr.org/~michaelw/projects/redshank.git";
- rev = "f98e68f532e622bcd464292ca4a9cf5fbea14ebb";
- sha256 = "1jdkgvd5xy9hl5q611jwah2n05abjp7qcy9sj4k1z11x0ii62b6p";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/f2cf21b79d47a4bc154ac15f8111794ca9eeac16/recipes/redshank";
- sha256 = "07s4gja1w8piabkajbzrgq77mkdkxr0jy9bmy2qb9w2svfsyns9b";
- name = "redshank";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/redshank";
- license = lib.licenses.free;
- };
- }) {};
redtick = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "redtick";
@@ -61394,25 +60147,6 @@
license = lib.licenses.free;
};
}) {};
- replace-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "replace-plus";
- version = "20170801.1947";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/replace+.el";
- sha256 = "0vlk2sjszzzkf94vfgb52ck4qbqp9ll1kdlxnmxixjxxl8iciwzj";
- name = "replace+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/replace+";
- sha256 = "1imsgr3v8g2p2mnkzp92ga3nvckr758pblmlha8gh8mb80089krn";
- name = "replace-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/replace+";
- license = lib.licenses.free;
- };
- }) {};
replace-symbol = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "replace-symbol";
@@ -61707,25 +60441,6 @@
license = lib.licenses.free;
};
}) {};
- reveal-next = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "reveal-next";
- version = "20170101.1120";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/reveal-next.el?revision=7";
- sha256 = "0vqacr3q9n772qmyyj35dxkqp79yqrpfhlf8zj70jzg04xzy6f0m";
- name = "reveal-next.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/38e5dd845c99acaae719562595059154a08a5f00/recipes/reveal-next";
- sha256 = "0fp6ssd4fad0s2pbxbw75bnx7fcgasig8xvcx7nls8m9p6zbbmh2";
- name = "reveal-next";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/reveal-next";
- license = lib.licenses.free;
- };
- }) {};
reverse-im = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "reverse-im";
@@ -61771,12 +60486,12 @@
review-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "review-mode";
- version = "20170804.545";
+ version = "20171029.650";
src = fetchFromGitHub {
owner = "kmuto";
repo = "review-el";
- rev = "e166efd9b8596a9abe14afae79b33eaa808c14ea";
- sha256 = "0cnwfb3q9xfsrzg5sf64y4p00wdcw0iiz5iard00siva0q0s5k9x";
+ rev = "115cd06558c01889f89feaa659e0d7513a2ad21e";
+ sha256 = "0162gg3hf633zhr5jwj222lx143xvph001qmpmlbbqdxc0sgw5hv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f2f9e2667389577d0703874ca69ebe4800ae3e01/recipes/review-mode";
@@ -61810,41 +60525,22 @@
license = lib.licenses.free;
};
}) {};
- rfringe = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "rfringe";
- version = "20110405.820";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/rfringe.el?revision=1";
- sha256 = "02i5znln0aphvmvaia3sz75bvjhqwyjq1blf5qkcbprnn95lm3yh";
- name = "rfringe.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rfringe";
- sha256 = "16a647gvvn5nzgng7a8pam4ay6aifvhldaxg2xfz9fcafzkvw967";
- name = "rfringe";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/rfringe";
- license = lib.licenses.free;
- };
- }) {};
- rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
+ rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "rg";
- version = "20170908.2359";
+ version = "20171018.1317";
src = fetchFromGitHub {
owner = "dajva";
repo = "rg.el";
- rev = "adfdf6230f02f469a1b508922b6837f95f6434d2";
- sha256 = "0bk0caadn3wq2ck2acyvdssllw45l455binpm5i3i63nzs73v8r2";
+ rev = "5de611eae7787ecbc285fe7e31e412b9281a4e14";
+ sha256 = "18mhcipj5yywd5648pwm955wx3ipsnp9nwjyyl270qnn56hwkb6g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg";
sha256 = "0i78qvqdznh1z3b0mnzihv07j8b9r86dc1lsa1qlzacv6a2i9sbm";
name = "rg";
};
- packageRequires = [ cl-lib emacs s seq ];
+ packageRequires = [ cl-lib emacs s ];
meta = {
homepage = "https://melpa.org/#/rg";
license = lib.licenses.free;
@@ -61899,8 +60595,8 @@
src = fetchFromGitHub {
owner = "Malabarba";
repo = "rich-minority";
- rev = "333e4669f76a0fb68b433117d377711e418a525e";
- sha256 = "0ms42fnfis6y2h717cqhngzv7ysgf8340rsfm2i7rx2gbdynr1ic";
+ rev = "3201f6e1769beb9f6cbbda392bef99fce337acf4";
+ sha256 = "1qa447k3qq2x1i2nxbm60wzr8kaysk3cifl09c13sv97n4yq3x2b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/rich-minority";
@@ -61920,8 +60616,8 @@
src = fetchFromGitHub {
owner = "wavexx";
repo = "rigid-tabs.el";
- rev = "d48ba58acbe8934700cd23db2acb574b09306238";
- sha256 = "03dmyn5lnw0mj4ymgyxz6gksl2byw31plxn61qcggkj6gk8g500d";
+ rev = "eba84ceaba2e57e76ad2dfbb7a7154238a25d956";
+ sha256 = "18rba101m9vmjl4mf3x0k7wvbgn6qmay9la745vzpr3lx1f4nn98";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/689b0060ee5db505fc0ed4603aca204b2d3c63a2/recipes/rigid-tabs";
@@ -61937,12 +60633,12 @@
rimero-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rimero-theme";
- version = "20170819.648";
+ version = "20171001.821";
src = fetchFromGitHub {
owner = "yveszoundi";
repo = "emacs-rimero-theme";
- rev = "451b9d30f7ef711ee8c9c304677c7dcac6c57cfb";
- sha256 = "0442s4pj8v4ympf8nk1zgrvk3d16djgdhknlvkwi296db3zixbc4";
+ rev = "2c15da5a4d56f1b29db2fc178d387eb86e7abd39";
+ sha256 = "0pvykjz0a2jgq2dghhshc4w7852jrlk0vy35ppbn956yp7rq9sx3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c6d07b0c021001195e6e0951c890566a5a784ce1/recipes/rimero-theme";
@@ -62042,12 +60738,12 @@
rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
melpaBuild {
pname = "rjsx-mode";
- version = "20170808.634";
+ version = "20171029.1156";
src = fetchFromGitHub {
owner = "felipeochoa";
repo = "rjsx-mode";
- rev = "39474fe464d76112e278445996cfd4ff84c39af8";
- sha256 = "11wz3gqdyb4ffsy9qdria0515ry643g3yjzidvaqccx6g59g4d5x";
+ rev = "4c10dcd764ade8e3d5dc235c26ba9299576a513d";
+ sha256 = "034hrzcvbnsrr9cxy2wzggnsax708hd231hfkixwffzrrwdlhwz8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode";
@@ -62126,12 +60822,12 @@
rope-read-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rope-read-mode";
- version = "20170620.237";
+ version = "20171003.719";
src = fetchFromGitHub {
owner = "marcowahl";
repo = "rope-read-mode";
- rev = "bbb67d54a31ce238e4a8b1aae677ef055aea27ba";
- sha256 = "1l00km1rrnybskv0rv0kqxdrqimmfwz4mmil64m2d6vl0nqickb0";
+ rev = "77b183a6f5450138388509f54a6a2ce442766e50";
+ sha256 = "0ddm7gwr51ip8mc79jxkvp52sxhlvs0kyy59v7r7pf5mbadbpsbz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/14a674559aa485e92357a8b941304ae8167b9c3e/recipes/rope-read-mode";
@@ -62191,14 +60887,14 @@
pname = "rpm-spec-mode";
version = "20160710.436";
src = fetchFromGitHub {
- owner = "bjorlykke";
+ owner = "stigbjorlykke";
repo = "rpm-spec-mode";
rev = "c1c38050c48ea330c7cea632b8785d66daeefb2b";
sha256 = "0427kcvf2ljhzwxskn3jzk0ncrl3f9zcz2sm83d9pmhh5jax2gch";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/f1ce736b8db53fea4935d195a0d07dc8141125a8/recipes/rpm-spec-mode";
- sha256 = "01vggdv8sac4p0szwk7xgxcglmd5a1hv5q0ylf8zcp1lsyyh8ypd";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/bb7e188fffda3d4e42690511775e5e32a11e1b34/recipes/rpm-spec-mode";
+ sha256 = "1ygk0pdhq1hvgzd173h79lxb04b9lmvq4hi70qf9244bqbm0m182";
name = "rpm-spec-mode";
};
packageRequires = [];
@@ -62252,12 +60948,12 @@
rspec-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }:
melpaBuild {
pname = "rspec-mode";
- version = "20170312.56";
+ version = "20171025.1606";
src = fetchFromGitHub {
owner = "pezra";
repo = "rspec-mode";
- rev = "1f468e443e7f2d8419eec29e42074edc400f8c0c";
- sha256 = "03wv1k3ppvdk2776bkbz8bhxw5n7h4b8zm3b2j2j6x7hrxfza5h4";
+ rev = "94a04f148922852b591957b0b3b22de5c4237448";
+ sha256 = "04qcicaklj9fhl0wbb8axi8zvd0az43cnrhf53vhgwsgnf7rjya2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cd83e61b10da20198de990aa081b47d3b0b44d43/recipes/rspec-mode";
@@ -62273,12 +60969,12 @@
rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rtags";
- version = "20170903.1710";
+ version = "20171027.1028";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "2af4d6a32e8194f8fbcc23fd94395e3d595a3c25";
- sha256 = "0091w529lvbjlw1fdb3qjgb8fd5fcwxhqyr4ps5cvxl5bqnwlw39";
+ rev = "7fa54d513fc716b2dc1055636b4728ab29dfdd3e";
+ sha256 = "1i0php9nnpgsmb4l1sc7qgxvdgg4hyviq68f4k41b9bcwab2hbl8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags";
@@ -62333,18 +61029,19 @@
license = lib.licenses.free;
};
}) {};
- ruby-additional = callPackage ({ emacs, fetchsvn, fetchurl, lib, melpaBuild, ruby-mode ? null }:
+ ruby-additional = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }:
melpaBuild {
pname = "ruby-additional";
- version = "20161115.2259";
- src = fetchsvn {
- url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/";
- rev = "59866";
- sha256 = "05rkz2wvyr00rr6g5sc2jgx1v2m81cbf24gjazxw4i9b3sf55ykr";
+ version = "20171001.2106";
+ src = fetchFromGitHub {
+ owner = "emacsorphanage";
+ repo = "ruby-additional";
+ rev = "14f380893cb7c1d9ddbb4ed1a2fc280999c82fde";
+ sha256 = "07mbjnph72l52f0bgz6qn5pbnfiyjx5p1ranq5g4csbfpx9jcc3s";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ruby-additional";
- sha256 = "1x5574swmch89jz2jiq6g34igp94bivzld0lb1nhyb1i3v1msq6i";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/ruby-additional";
+ sha256 = "1ivxn787k64q5jl0dxmxbj240ykcyvfhfam5fdvrwvc3yysk2dx7";
name = "ruby-additional";
};
packageRequires = [ emacs ruby-mode ];
@@ -62353,25 +61050,6 @@
license = lib.licenses.free;
};
}) {};
- ruby-block = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "ruby-block";
- version = "20131210.1931";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/ruby-block.el?revision=12";
- sha256 = "0c4vy9xsw44g6q9nc8aaav5avgp34h24mvgcnww468afiimivdcq";
- name = "ruby-block.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/e2149ce3baef9ac01d5b2e8b1a933a3e1206015f/recipes/ruby-block";
- sha256 = "0jfimjq1xpwxkxya452kp27h0fdiy87aj713w3zsm04k7l6i12hm";
- name = "ruby-block";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/ruby-block";
- license = lib.licenses.free;
- };
- }) {};
ruby-compilation = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
melpaBuild {
pname = "ruby-compilation";
@@ -62459,12 +61137,12 @@
ruby-hash-syntax = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ruby-hash-syntax";
- version = "20141010.839";
+ version = "20171013.50";
src = fetchFromGitHub {
owner = "purcell";
repo = "ruby-hash-syntax";
- rev = "f3270274a9d12537263d9ae0b8f4e60c542cf77f";
- sha256 = "1ck3xhavilq5qdcc9libd6dyzqz7b0cxd3q5nd7kaxicc28h9p80";
+ rev = "bc05c3130a5d3237f04c6064297e56de5f73887d";
+ sha256 = "1jwvyj3kqchd40h37m75ydl0gjrbm873dhfn1grqg4sgk60hr414";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c7d21a43a4bf267507bdc746ec9d0fd82049c0af/recipes/ruby-hash-syntax";
@@ -62522,12 +61200,12 @@
ruby-test-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pcre2el, ruby-mode ? null }:
melpaBuild {
pname = "ruby-test-mode";
- version = "20170515.1008";
+ version = "20171016.931";
src = fetchFromGitHub {
owner = "r0man";
repo = "ruby-test-mode";
- rev = "740ff1a7c81eb8380fd0f0cdb7c32238acf13dd1";
- sha256 = "1a7lhx7ibh9rrxdamxwd107npnmsf9sxbksvy9rm8l3rnm8yjnvy";
+ rev = "87f6d770f8d2326c8d36099aeee5d577f3e2af69";
+ sha256 = "0qiwc2h5hyh6np16a2gfcchbnyh7v5wnzd8idr64cmd9blg3jh8d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ruby-test-mode";
@@ -62582,6 +61260,27 @@
license = lib.licenses.free;
};
}) {};
+ run-stuff = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "run-stuff";
+ version = "20170813.1957";
+ src = fetchFromGitHub {
+ owner = "ideasman42";
+ repo = "emacs-run-stuff";
+ rev = "2e23a78c26f62141142c743febd57ec54c78c0e3";
+ sha256 = "04m7hpda5hbmr0dni4cnpdjxwzk3sygpr5m158gswhbwh2p4r0j4";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0d6e9ce2acd859b887f7e161f4b9969be1a0b8ef/recipes/run-stuff";
+ sha256 = "0zx96m6cval5g4p0lhy9kpyycp2jygaq3y2njhkpij9gl4nb2ll2";
+ name = "run-stuff";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/run-stuff";
+ license = lib.licenses.free;
+ };
+ }) {};
runner = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "runner";
@@ -62648,12 +61347,12 @@
rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rust-mode";
- version = "20170827.1300";
+ version = "20171013.258";
src = fetchFromGitHub {
owner = "rust-lang";
repo = "rust-mode";
- rev = "c8280aea1d02ae84bff2a6f02f8dc7701309c8b6";
- sha256 = "105ayzqkcd8q2zhny1x84gdry6mfp92zfa8ihfqlfvva6ax6v1vp";
+ rev = "b8e49089713714a9f3f815b399df569a0e507e73";
+ sha256 = "0ny5prsm70incv30g5310bknbpix0415dn16hhf55rhjhwg39dns";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode";
@@ -62732,12 +61431,12 @@
s = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "s";
- version = "20170906.1304";
+ version = "20171101.219";
src = fetchFromGitHub {
owner = "magnars";
repo = "s.el";
- rev = "3a95064647d1f39b90e65a56f1fdfceb7c329f75";
- sha256 = "0n2c6islny418pfmaz1bjij1j2s1qailga0vha32qanx4fx7yf3v";
+ rev = "71f2902fc7875b3df9ee089c85904a4e8a00d438";
+ sha256 = "0k6ny3ca4iwvhmzpdfs5v44l19djwpx8x7a1kfjgdafdh2x6d7ds";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/s";
@@ -62771,6 +61470,27 @@
license = lib.licenses.free;
};
}) {};
+ s12cpuv2-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "s12cpuv2-mode";
+ version = "20171013.1351";
+ src = fetchFromGitHub {
+ owner = "AdamNiederer";
+ repo = "s12cpuv2-mode";
+ rev = "b17d4cf848dec1e20e66458e5c7ff77a2c051a8c";
+ sha256 = "1fc132gv48xwrxiw139kc9f5wkhjgsgqdfm6b7v97xj5025zg6hr";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6c1b9bbdc4deb17636270c7f2be0b43b647c695a/recipes/s12cpuv2-mode";
+ sha256 = "0mrcf5s7vmkyrsdka7qd2vfcmdy8hzf6a6g14la88rxrv4chv29s";
+ name = "s12cpuv2-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/s12cpuv2-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
sackspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sackspace";
@@ -62841,8 +61561,8 @@
src = fetchFromGitHub {
owner = "glynnforrest";
repo = "salt-mode";
- rev = "ea4980b9c9e8e7570086a2558fe7f66c62a528ad";
- sha256 = "0ygi9kzkfqzizygaqwqpymn8s7kr8ci38v61qmy4n58n9c19fdwx";
+ rev = "a41c07660199cfad3f9dd928d5674d2727508035";
+ sha256 = "0y7z4lfvhd1aiyhy0yhrx9jdjsy2k1di6y747rjmf0rlwcq2gb2q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9dcf1a93a06fc42581521c88cfd988b03bedc000/recipes/salt-mode";
@@ -63051,8 +61771,8 @@
src = fetchFromGitHub {
owner = "openscad";
repo = "openscad";
- rev = "5fbb1060ad967ac8af34687c7e7bcac69c7381e0";
- sha256 = "1gfpkqhqw9n0x325ar7ln9j2052r8hk65ilhz3dp7x865mqdm2wn";
+ rev = "11ef66e8aa8d97f0ed8786c46daa091b1d812867";
+ sha256 = "1p0xhsvpxk6sbw4fwq5yhnz8kgf5m7g5q3vxpx8qn7bsd3z0sg31";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode";
@@ -63256,12 +61976,12 @@
scpaste = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild }:
melpaBuild {
pname = "scpaste";
- version = "20160613.1943";
+ version = "20171031.1337";
src = fetchFromGitHub {
owner = "technomancy";
repo = "scpaste";
- rev = "eb415f7ca56d64c89cf99d5c6f8a442c4ec3912e";
- sha256 = "1fycdsa93bfiij72cwyc0rp85bwv3lv4r169p9czsph5ns466b65";
+ rev = "68445166750a46c86dd7f2ffdca14d3c50e431de";
+ sha256 = "0q8cka12gx11wpjz1jk24kn5m1nlqa1xnadlxflhz2x5p9fkscvq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9007fb32097bc63731c3615dae9342fcef2558a2/recipes/scpaste";
@@ -63421,25 +62141,6 @@
license = lib.licenses.free;
};
}) {};
- screenshot = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "screenshot";
- version = "20120509.405";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/screenshot.el?revision=8";
- sha256 = "0q7yxaaa0fic4d2xwr0qk28clkinwz4xvw3wf8dv1g322s0xx2cw";
- name = "screenshot.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/24f113097db4cc27a2e9c7b9086af6d263e6fcb7/recipes/screenshot";
- sha256 = "0aw2343as38y26r2g7wpn1rq1n6xpw4y5c7ir8qh1crkc1y513hs";
- name = "screenshot";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/screenshot";
- license = lib.licenses.free;
- };
- }) {};
scribble-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "scribble-mode";
@@ -63506,12 +62207,12 @@
sdcv = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, showtip }:
melpaBuild {
pname = "sdcv";
- version = "20170801.2216";
+ version = "20171002.210";
src = fetchFromGitHub {
owner = "stardiviner";
repo = "sdcv.el";
- rev = "ebe45a5fb1e465cb4150e4dbe38a069b2a218219";
- sha256 = "0pcbrzii9x7v3qqygr29yi6pg1gvzjbsgcfziispsf24n01lrrly";
+ rev = "1aad9defb871dc07e27f603092bb81413be54cf2";
+ sha256 = "1ij7inm1f59hmn9s1iqnywk1acfm0pqiim2s36vwrljy9lnb4ls8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/173e233b2dacaaf54d92f3bcc06e54d068520dd4/recipes/sdcv";
@@ -63608,25 +62309,6 @@
license = lib.licenses.free;
};
}) {};
- second-sel = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "second-sel";
- version = "20170702.729";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/second-sel.el?revision=29";
- sha256 = "1yq06a04j44r019cjv2jb3kfpfqhnxdf3b4hhz4d3fz7v1hsicwg";
- name = "second-sel.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/second-sel";
- sha256 = "1nzy5ms5qf5big507kg3z5m6d6zgnsv2fswn359r2j59cval3fvr";
- name = "second-sel";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/second-sel";
- license = lib.licenses.free;
- };
- }) {};
secretaria = callPackage ({ alert, emacs, f, fetchgit, fetchurl, lib, melpaBuild, org, s }:
melpaBuild {
pname = "secretaria";
@@ -63899,26 +62581,6 @@
license = lib.licenses.free;
};
}) {};
- sequential-command = callPackage ({ fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "sequential-command";
- version = "20151207.1403";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/sequential-command.el?revision=3";
- sha256 = "0vg8rqzzi29swznhra2mnf45czr2vb77dpcxn3j0fi7gynx3wcwk";
- name = "sequential-command.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/31db031dc8712e89042d4ce80438a4267a241739/recipes/sequential-command";
- sha256 = "03qybacgy5fs3lam73x0rds4f68s173mhbah6rr97272nikd50v1";
- name = "sequential-command";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/sequential-command";
- license = lib.licenses.free;
- };
- }) {};
servant = callPackage ({ ansi, commander, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up, web-server }:
melpaBuild {
pname = "servant";
@@ -64048,12 +62710,12 @@
sexy-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sexy-monochrome-theme";
- version = "20170611.859";
+ version = "20171011.536";
src = fetchFromGitHub {
owner = "voloyev";
repo = "sexy-monochrome-theme";
- rev = "8def559784c9f3ebaad179caaff58a9c6afc83a5";
- sha256 = "043pplyjdvqz45q1vlnkh8j8a4fhiw4km3b2xb06bycgs3ysb42h";
+ rev = "9fb835606088a0d24600faa12fe24d85cb2c0731";
+ sha256 = "182wzr7lisrszivxpjp29m7vjxxi429mshp2labf2abqkfrb9jv4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dfd5ae9a93e036d11899c7adffdf6b63c2b21381/recipes/sexy-monochrome-theme";
@@ -64069,12 +62731,12 @@
shackle = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "shackle";
- version = "20170213.1534";
+ version = "20171018.1120";
src = fetchFromGitHub {
owner = "wasamasa";
repo = "shackle";
- rev = "979b021077655ca38749a60c9752c0817e8fd93e";
- sha256 = "11qp4gqxfi5d6krvxlqxfn58b1kcgsnldpi54r8lx6mis8l0f4wl";
+ rev = "0cee957bc0bfbdee5ea3f3e430e94cdcd87ed0c3";
+ sha256 = "18zhrn18asbpanmlgasy271gfh6qywr947fx2svxz5b1w40hhyr0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/806e7d00f763f3fc4e3b8ebd483070ac6c5d0f21/recipes/shackle";
@@ -64444,17 +63106,19 @@
license = lib.licenses.free;
};
}) {};
- shimbun = callPackage ({ fetchcvs, fetchurl, lib, melpaBuild }: melpaBuild {
+ shimbun = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
pname = "shimbun";
- version = "20170503.1327";
- src = fetchcvs {
- cvsRoot = ":pserver:anonymous@cvs.namazu.org:/storage/cvsroot";
- module = "emacs-w3m";
- sha256 = "6ef1dd834a16cf3b8a0ec7a7412ae7410f0392d616eb3329f78011039384fc6d";
+ version = "20171018.131";
+ src = fetchFromGitHub {
+ owner = "emacsorphanage";
+ repo = "w3m";
+ rev = "e2e2c907f4fa575bec74803aab95af426cb37e6e";
+ sha256 = "13lzj1h6ib779fszmvlz3wamnjibivdrxl8hd5l3xhh7fkgbc8c8";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/8bbb18b0db057b9cca78ae7280674fd1beb56443/recipes/shimbun";
- sha256 = "05dxdyh8xvbpjmc19q733jmjd6kgv8rdahjd3bw5wwsb3smqig4x";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/shimbun";
+ sha256 = "1rjykr0y5jfd6r3shm8x23yyra6qjsb55jrfc45rhpb89klyg1nk";
name = "shimbun";
};
packageRequires = [];
@@ -64547,25 +63211,6 @@
license = lib.licenses.free;
};
}) {};
- showkey = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "showkey";
- version = "20170307.1528";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/showkey.el?revision=11";
- sha256 = "143889knvy6ifvq759869gbjfg10k10mi2by2hajcgzqhby72h61";
- name = "showkey.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/showkey";
- sha256 = "04lw32k1imvpfc4dr5pz11sx74982xr13hcyblvrz1zxhgixb1z1";
- name = "showkey";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/showkey";
- license = lib.licenses.free;
- };
- }) {};
showtip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "showtip";
@@ -64695,12 +63340,12 @@
shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "shx";
- version = "20170805.1619";
+ version = "20171004.1113";
src = fetchFromGitHub {
owner = "riscy";
repo = "shx-for-emacs";
- rev = "8166b02ebbab43d8a33d47b8221a94b69fc63487";
- sha256 = "0n97iys2xyg1lzkn8bqsx0sgqpzci1pxg69v42cpzmyrz3h54bwp";
+ rev = "e53d798ba4a4c07a3ee1c194840c937b18c02087";
+ sha256 = "0sig9gpa2wn23skwny9jpvwxax0gbwp143anvgkc5gm87iw2jgrd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx";
@@ -64734,6 +63379,27 @@
license = lib.licenses.free;
};
}) {};
+ sicp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "sicp";
+ version = "20171028.1523";
+ src = fetchFromGitHub {
+ owner = "webframp";
+ repo = "sicp-info";
+ rev = "8e13f7ff4695a05471486d37a6c5f979a5b965fb";
+ sha256 = "15krfnj2qz4j2ns4a05a4wwaknhx77m4jhazg7zvz9xm4b4j1qm8";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/1363d7b6e95375ac63f07eed2b3947f4f81bc9ba/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";
@@ -64741,8 +63407,8 @@
src = fetchFromGitHub {
owner = "nlamirault";
repo = "sift.el";
- rev = "ef509ac4c579340e8d924c26d9e5858a9f4fb9de";
- sha256 = "0i8gqzvpl3drzp031dqdpsi1ssr3az8fzb7xpbxnamzscfz6pdyc";
+ rev = "4ce8878a0fc396ded7521ce38852d93e1d863065";
+ sha256 = "1x78i6svi4cwah9xw85imhpncvxsx4xim4fzykpnd328mxkk07h6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sift";
@@ -64884,12 +63550,12 @@
simple-httpd = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "simple-httpd";
- version = "20170125.1910";
+ version = "20171004.938";
src = fetchFromGitHub {
owner = "skeeto";
repo = "emacs-web-server";
- rev = "348483efea6ec2752bc5aa4028a16087d19b2809";
- sha256 = "191aq4zhg5a8g6ypkbh20rnqyk76lhxfhnq5ww0g5hzpig8srxaa";
+ rev = "e7775d3bc5c6b73255814d0a62dc954e23a12c15";
+ sha256 = "0pjhxhzzxrpcczwvd7b6a6q1nfmsr6m6mnlxn13nwf3r270grz87";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/simple-httpd";
@@ -64923,26 +63589,6 @@
license = lib.licenses.free;
};
}) {};
- simple-plus = callPackage ({ fetchurl, lib, melpaBuild, strings }:
- melpaBuild {
- pname = "simple-plus";
- version = "20170307.1529";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/simple+.el";
- sha256 = "061vw3w8gl1lcjy67ina4w496i91addsl5s3xbffk2q6k1qhjsdi";
- name = "simple+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/simple+";
- sha256 = "12fsgjk53fq2316j8nm6wvdckpyg9hq3v65j5c52i0g0cwmx62ra";
- name = "simple-plus";
- };
- packageRequires = [ strings ];
- meta = {
- homepage = "https://melpa.org/#/simple+";
- license = lib.licenses.free;
- };
- }) {};
simple-rtm = callPackage ({ dash, fetchFromGitLab, fetchurl, lib, melpaBuild, rtm }:
melpaBuild {
pname = "simple-rtm";
@@ -65198,12 +63844,12 @@
slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }:
melpaBuild {
pname = "slack";
- version = "20170903.2004";
+ version = "20171017.822";
src = fetchFromGitHub {
owner = "yuya373";
repo = "emacs-slack";
- rev = "5df0ea55257b2c1f3a4e4352af4854fb81dee5cc";
- sha256 = "0xrmsfi1nzm5yhmsxhn7xq87z70jkb68c3il4xf8r4lz6a0d8m4p";
+ rev = "c8f4c3312b574b8f4cd5ddaaa6ec7710893a9ff0";
+ sha256 = "01aibrnkzyi40b7bfz5wfl34wwjil4nylg6llkhrmzc6mfqabnjy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack";
@@ -65261,12 +63907,12 @@
slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }:
melpaBuild {
pname = "slime";
- version = "20170828.451";
+ version = "20170929.1441";
src = fetchFromGitHub {
owner = "slime";
repo = "slime";
- rev = "f223388c78ea51ce7717e9bbae14c50ad2386c2c";
- sha256 = "07jks9fnqjv2i9sjfpgj7r3a7g5aha4aipsffjbnw1qd930ygw83";
+ rev = "c5fa94f86b61f3a14a7348b4fa001a0e1c62cef2";
+ sha256 = "0y9n40knm1r3z0kx0xd5yda5191m5s2ibsxb2sa23qp1yj2qs6xm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime";
@@ -65303,12 +63949,12 @@
slime-docker = callPackage ({ cl-lib ? null, docker-tramp, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }:
melpaBuild {
pname = "slime-docker";
- version = "20170718.1157";
+ version = "20171004.1151";
src = fetchFromGitHub {
owner = "daewok";
repo = "slime-docker";
- rev = "dc41f7c33de497bc622f037f33ea2a1ecfa1069f";
- sha256 = "169vy9wjkf0vzqgdbm30rssl82xl2n73hipnaidncbw9sd8cpx1y";
+ rev = "13fa8be2fca516f3ff5fb70fa79dd8404bf86439";
+ sha256 = "005zkypg2hkyzpkcv1rzfrmg8amg1bp0534y13xjqq3rz1p602bx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/15ec3f7208287161571c8fc3b29369ceabb44e5f/recipes/slime-docker";
@@ -65429,12 +64075,12 @@
sly = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sly";
- version = "20170912.445";
+ version = "20171011.809";
src = fetchFromGitHub {
owner = "capitaomorte";
repo = "sly";
- rev = "ac50082050df5274a5d71e182abca0d0b0fe71d1";
- sha256 = "14cknfz1nnk82svdp92sq6cdpndd5d25l7fgd5zi2l4j5i57rj0b";
+ rev = "687942cb08525bb10abef0d0fdfb57dd69e988b8";
+ sha256 = "1hzc6cpndzc9lb82g6k8g65spnw09impgnfj6lfm9v25pbyg8y2m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/79e7213183df892c5058a766b5805a1854bfbaec/recipes/sly";
@@ -65552,6 +64198,27 @@
license = lib.licenses.free;
};
}) {};
+ smart-backspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "smart-backspace";
+ version = "20171013.2226";
+ src = fetchFromGitHub {
+ owner = "itome";
+ repo = "smart-backspace";
+ rev = "a10ec44ff325ec8c4c98b1a6e44e89e60a9aa4ac";
+ sha256 = "0p19qikalmvs9y1lws08mxvh2k8s219mpm3nyi9aqq62ryyfwf1n";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/88cd95cd623fb00d1bc6800c1dd3c665a0cce349/recipes/smart-backspace";
+ sha256 = "152xdxzrr91qiyq25ghvjlbpc627cw4s120axmz2p2d48pinwir9";
+ name = "smart-backspace";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/smart-backspace";
+ license = lib.licenses.free;
+ };
+ }) {};
smart-comment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "smart-comment";
@@ -65722,12 +64389,12 @@
smart-mode-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rich-minority }:
melpaBuild {
pname = "smart-mode-line";
- version = "20170708.1317";
+ version = "20171013.849";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "smart-mode-line";
- rev = "216475320fa43b3c261b8b13b7a1e3d304166a8e";
- sha256 = "1akph66w1xpjkvxpi6dgl1bi0nwx33l25cwyq08g1wbvkjqwib30";
+ rev = "1facbe9816b602c640ddb23602e30588d6d904ca";
+ sha256 = "1fgh4yss9brchnfphdijy23qknv30hxkgsbz6p2d5ck6w7xml4lc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/smart-mode-line";
@@ -65747,8 +64414,8 @@
src = fetchFromGitHub {
owner = "Malabarba";
repo = "smart-mode-line";
- rev = "216475320fa43b3c261b8b13b7a1e3d304166a8e";
- sha256 = "1akph66w1xpjkvxpi6dgl1bi0nwx33l25cwyq08g1wbvkjqwib30";
+ rev = "1facbe9816b602c640ddb23602e30588d6d904ca";
+ sha256 = "1fgh4yss9brchnfphdijy23qknv30hxkgsbz6p2d5ck6w7xml4lc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/60072b183151e519d141ec559b4902d20c87904c/recipes/smart-mode-line-powerline-theme";
@@ -65803,6 +64470,27 @@
license = lib.licenses.free;
};
}) {};
+ smart-semicolon = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "smart-semicolon";
+ version = "20171007.1833";
+ src = fetchFromGitHub {
+ owner = "iquiw";
+ repo = "smart-semicolon";
+ rev = "c11096679dbed3875c37413337ee490ee7951b63";
+ sha256 = "1v6z3a1f6nxc62n7595qnji39ywdsz7xy5bkl2218v3y7gkbc518";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/fe339b95636b02ceb157294055d2f5f4c4b0b8cf/recipes/smart-semicolon";
+ sha256 = "1vq6l3vc615w0p640wy226z5i7dky666sgzczkngv07kag0iwqp0";
+ name = "smart-semicolon";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/smart-semicolon";
+ license = lib.licenses.free;
+ };
+ }) {};
smart-shift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "smart-shift";
@@ -65890,12 +64578,12 @@
smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "smartparens";
- version = "20170913.130";
+ version = "20171101.244";
src = fetchFromGitHub {
owner = "Fuco1";
repo = "smartparens";
- rev = "7d368051dec40e8e129d84bca5070bb7e83ad72a";
- sha256 = "1rbwjmp71wh234qrjss00xgcnh8jcha19lmz15nwrrwvpmmspg0c";
+ rev = "9682ba930374a4d62b444950b008d2bca1cffba1";
+ sha256 = "1nsi3x9zizbxx95ka5cgl5rnsw5iz92acjcv6b4id0acaysq6mdm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens";
@@ -66226,12 +64914,12 @@
snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }:
melpaBuild {
pname = "snakemake-mode";
- version = "20170430.1436";
+ version = "20171030.1016";
src = fetchFromGitHub {
owner = "kyleam";
repo = "snakemake-mode";
- rev = "8a4da1125dd284e55139084d62fb29af5bcbcc20";
- sha256 = "1c85ycaqyrncp7pbax6mdnz1v91hpi1pc9jspd6irwhhs8b9jxfk";
+ rev = "990d6d8e98b96b9afe5b9b340507b1aecd8de1ce";
+ sha256 = "1bd6kwzkk8vfhfc7m384y40lh6rdw90g6624c0hlfrs9zwihmvs3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode";
@@ -66328,22 +65016,22 @@
license = lib.licenses.free;
};
}) {};
- snoopy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ snoopy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "snoopy";
- version = "20170730.1951";
+ version = "20171008.1304";
src = fetchFromGitHub {
owner = "anmonteiro";
repo = "snoopy-mode";
- rev = "8adce636376812df99bd79f3fbb3d9ec19a02351";
- sha256 = "04sq37bpvg6lqsqmjvdm9jzwrq4xhbakfzl5b2rcm3mlhzwnhs88";
+ rev = "ec4123bdebfe0bb7bf4feaac2dc02b59caffe386";
+ sha256 = "01l44lshw0zvykay9886s1vqryanagkd4ciw3ramchn0baqz11vl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4a882cd92964ac195a09469006c9a44dc202f000/recipes/snoopy";
sha256 = "1wa8jykqyj6rxqfhwbiyli6yh8s7n0pqv7fc9sfaymarda93zbgi";
name = "snoopy";
};
- packageRequires = [ emacs ];
+ packageRequires = [ cl-lib emacs ];
meta = {
homepage = "https://melpa.org/#/snoopy";
license = lib.licenses.free;
@@ -66457,12 +65145,12 @@
solarized-theme = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "solarized-theme";
- version = "20170831.1159";
+ version = "20170924.1440";
src = fetchFromGitHub {
owner = "bbatsov";
repo = "solarized-emacs";
- rev = "ae7bc3f102cff597092dad7fc0bfd49e1865b0cf";
- sha256 = "0d4cs7s2k5plf2ya0df72pvpf30xdhdbfybm0179dma4fw9fx0is";
+ rev = "a2595627a793c57fa904ac210a6ca07fe1fef656";
+ sha256 = "1q65mrarmqxsvc27flr6wy6v3yrmpw5i6hax95hh6y50zx3hfsd1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/solarized-theme";
@@ -66478,12 +65166,12 @@
solidity-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "solidity-mode";
- version = "20170712.1442";
+ version = "20171001.926";
src = fetchFromGitHub {
owner = "ethereum";
repo = "emacs-solidity";
- rev = "e4aa0190145d5cfad7d3f052ba44c88a1ebb6c7f";
- sha256 = "1dh2av9grij2v179vfr2pric6bxibxbg34ij3488ki9crc2zpv4y";
+ rev = "d0a09c68912fcd03e384b0b2a9746f4e002d0df8";
+ sha256 = "0zs16af2j6l0vypgikvs78x82cq8m5yfdfpi550cymkv7mjydj4v";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bb9df5ec0692352b6494d435d11166f4ea26c99e/recipes/solidity-mode";
@@ -66499,12 +65187,12 @@
sonic-pi = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, highlight, lib, melpaBuild, osc }:
melpaBuild {
pname = "sonic-pi";
- version = "20170313.810";
+ version = "20171011.503";
src = fetchFromGitHub {
owner = "repl-electric";
repo = "sonic-pi.el";
- rev = "494981aa8f7828392a930ef8533698944738090e";
- sha256 = "1x9qn6b4nbld9v0r7vi3mg6w7nsa76pzyn1fl118n14a8kkc0is7";
+ rev = "6b362bbdfacf7aabeb494c3e22f6fd3f48ca9738";
+ sha256 = "0xk03swaclhm41vnwzmwil05mgabkb23lrp28wvl6qxzhd3hmrwq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sonic-pi";
@@ -66583,12 +65271,12 @@
sotclojure = callPackage ({ cider, clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sotlisp }:
melpaBuild {
pname = "sotclojure";
- version = "20170512.612";
+ version = "20170921.1708";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "speed-of-thought-clojure";
- rev = "84e2be5939c33d44f9518aea60cfccff4d6c9707";
- sha256 = "1jz3lscjq8xfkrx464a1s8vyggnh5sjl8jvq8dvx0w7blny2jvz8";
+ rev = "ceac82aa691e8d98946471be6aaff9c9a4603c32";
+ sha256 = "1a6riq7ksk5m76dsgc75d8b992nyr50l48l8cpms9064m6b0r9jv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2ccef8af91eada4449d9cd4bda6bd28272722e/recipes/sotclojure";
@@ -66800,12 +65488,12 @@
spaceline = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, s }:
melpaBuild {
pname = "spaceline";
- version = "20170630.2327";
+ version = "20171016.157";
src = fetchFromGitHub {
owner = "TheBB";
repo = "spaceline";
- rev = "e6ccec6c80ee2bbddbad5a88cb9d2cd2db8a1a33";
- sha256 = "0ga99imh00h0bnc4m2q335y0x8zp6xs1n47rqqhxp6iwmw2fz20z";
+ rev = "251d92ef77ed4daa798e3300e5c671052870827e";
+ sha256 = "13mnsvlncrzsh2q8xhx5ippvhlrk9sgsrbpcihk0m90d2bxj53qy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/46e4c876aeeb0bb0d0e81dcbb8363a5db9c3ff61/recipes/spaceline";
@@ -66842,12 +65530,12 @@
spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "spacemacs-theme";
- version = "20170823.1658";
+ version = "20171020.531";
src = fetchFromGitHub {
owner = "nashamri";
repo = "spacemacs-theme";
- rev = "30b198ce87a92777f74e34ddee775b99d05b46c3";
- sha256 = "0a77y9njks44xx1c5j0cxpgkqwlz6lrzkbph3qwnbzkydnbyxgiy";
+ rev = "0a5a745c209daafc0e60b8db92993802a9c05fb8";
+ sha256 = "1wnf0jwdavkpv3xz2mni7n29qfp60i28530hmaimlk8mnhb2x94k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme";
@@ -66926,12 +65614,12 @@
sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sparql-mode";
- version = "20170831.832";
+ version = "20171030.528";
src = fetchFromGitHub {
owner = "ljos";
repo = "sparql-mode";
- rev = "397a0d5b6da3f60ca52bebd5e698b0a764956cd2";
- sha256 = "1z9w4cn5lanxl24ws4km816dfx4fszvgvrlb2ih3wsbc13710h1l";
+ rev = "e220a0c0c478fee0be3622442651981cdd82090c";
+ sha256 = "1k1ih6y9yq1fx13863yacx69v6f77b8xhkrx5i2dpm4h7wki1dg4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode";
@@ -66944,25 +65632,6 @@
license = lib.licenses.free;
};
}) {};
- speck = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "speck";
- version = "20160717.951";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/speck.el?revision=12";
- sha256 = "0zn7gjrga1ly1za04jd4s61m1dwkyy960x7g3x9hn4szqvpcsvfa";
- name = "speck.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/speck";
- sha256 = "06x5543pwqazs4airj43208caw3sxw7zb148njbn33qgl09r1iv6";
- name = "speck";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/speck";
- license = lib.licenses.free;
- };
- }) {};
speech-tagger = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "speech-tagger";
@@ -67011,8 +65680,8 @@
src = fetchFromGitHub {
owner = "parkouss";
repo = "speed-type";
- rev = "5d691f57743304db63b6afdc5bd79dabd282d390";
- sha256 = "08qp2b80rh9k8h5vv141lfsg73rqqikhh7ygal789rr278ai1rjf";
+ rev = "9940383d94688e7f130b01f9872182ab59edf00f";
+ sha256 = "0gfiw3rmqyargc1prkrglmzvzxm03nszqqba1q9zd7cs0m315pmm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d6c33b5bd15875baea0fd2f24ee8ec9414a6f7aa/recipes/speed-type";
@@ -67091,12 +65760,12 @@
spice-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "spice-mode";
- version = "20160919.330";
+ version = "20171027.2343";
src = fetchFromGitHub {
owner = "stardiviner";
repo = "spice-mode";
- rev = "1dcaa4b4cd1527cf15bfc6dfc278c574359a5062";
- sha256 = "0ngfyxpvwgyqh99vjr2msqan0hma1qlljkx971qjxcpn0y80dj23";
+ rev = "702bf2d5c3561be44771ea77b476532d32068504";
+ sha256 = "1wqcy9nmhpl3vyasvc79msgd25xbbzva9nbxkdrsbpg07p1is9ik";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/spice-mode";
@@ -67403,25 +66072,6 @@
license = lib.licenses.free;
};
}) {};
- sqlplus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "sqlplus";
- version = "20170710.150";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/sqlplus.el?revision=26";
- sha256 = "19lrk1a9d9ljdnsiar5cgmp68c26b6aihi3rbgf3d5bcg9iqbp7q";
- name = "sqlplus.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/41b1fc299cf8eeba1916a58ad8f50eb4560f0252/recipes/sqlplus";
- sha256 = "1z9pf36b1581flykis9cjv7pynnp94fm4ijzjy6hvqyj81aikxpz";
- name = "sqlplus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/sqlplus";
- license = lib.licenses.free;
- };
- }) {};
sqlup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sqlup-mode";
@@ -67572,12 +66222,12 @@
ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ssh-deploy";
- version = "20170907.305";
+ version = "20171031.2204";
src = fetchFromGitHub {
owner = "cjohansson";
repo = "emacs-ssh-deploy";
- rev = "72a503394ee43023100a6f2624ad40a4325f5938";
- sha256 = "0ss1q3ywznkj180rndpi3zrcxz3bgm3a87wx194xyq5dzijaydw5";
+ rev = "5cd1f8080fefb64e6eaa1098cc191db6abb97e23";
+ sha256 = "0pn9wf4svka3rxzy09jarjp3ycz2bvm39898qaikjf0dwaydlqlw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy";
@@ -67782,12 +66432,12 @@
steam = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "steam";
- version = "20160427.231";
+ version = "20171008.1327";
src = fetchFromGitHub {
owner = "Kungsgeten";
repo = "steam.el";
- rev = "a0547487ccf40aa582af3dd0d433a1b153d25246";
- sha256 = "142jamr8mi1nkjvivvkh2qgh5fch89xpg5wwi8q0b6hcqcsy8nqn";
+ rev = "476da75cce7def2f3323e4a112a500728178e71e";
+ sha256 = "1d23m611p001i846ypv9mz78hqn4wmjnh6cwa2yif9h6m44g1dsf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/25a45eb6297168cd0ce4c4db5574362addad5c69/recipes/steam";
@@ -67842,25 +66492,6 @@
license = lib.licenses.free;
};
}) {};
- sticky = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "sticky";
- version = "20101129.1852";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/sticky.el?revision=4";
- sha256 = "18izyia1j3w2c07qhkp9h6rnvw35m5k1brrrjhm51fpdv2xj65fy";
- name = "sticky.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/1c3a9689703b8c8edbffdc966cded9ea98fc8762/recipes/sticky";
- sha256 = "1xjkdwphq3m4jrazsfnzrrcrqikfdxzph3jdzkpbzk3grd4af96w";
- name = "sticky";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/sticky";
- license = lib.licenses.free;
- };
- }) {};
stickyfunc-enhance = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "stickyfunc-enhance";
@@ -68008,25 +66639,6 @@
license = lib.licenses.free;
};
}) {};
- strings = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "strings";
- version = "20170307.1533";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/strings.el?revision=49";
- sha256 = "08sq20ys4xkkg11jyrnlzibl5v73i7zlnj28ygivy3sqvp07z7iz";
- name = "strings.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/strings";
- sha256 = "0n3239y7biq3rlg74m7nqimhf654w4snnw2zm7z84isgwzz2dphk";
- name = "strings";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/strings";
- license = lib.licenses.free;
- };
- }) {};
stripe-buffer = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "stripe-buffer";
@@ -68235,25 +66847,6 @@
license = lib.licenses.free;
};
}) {};
- subr-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "subr-plus";
- version = "20170501.916";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/subr+.el";
- sha256 = "1vrs390vqcsjwzf6pzcvqjc3mliac66g7g5kifvz9zp0v3bq6x7d";
- name = "subr+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/subr+";
- sha256 = "17i5sgsv8clh3pzpkv5zvhmm584m1rvsypd6nh6ks2jpidwgs8x1";
- name = "subr-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/subr+";
- license = lib.licenses.free;
- };
- }) {};
sudo-edit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sudo-edit";
@@ -68320,12 +66913,12 @@
suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }:
melpaBuild {
pname = "suggest";
- version = "20170806.1414";
+ version = "20171016.1420";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "suggest.el";
- rev = "6ae090cab9bc16650c1788e83ccd2fe95a959de2";
- sha256 = "1rnp7zwr5j345l569zhpskf7g6bkg0jmplzjwy79rlv3h3d6rv4d";
+ rev = "345e00569333095eb24e61239a80b0f0c77b2d11";
+ sha256 = "0npqvhnfmrx7jq1slz489rh2l4rnfhqhbi6ybdzw5rism8r3jqwb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest";
@@ -68359,22 +66952,24 @@
license = lib.licenses.free;
};
}) {};
- summarye = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "summarye";
- version = "20130328.327";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/summarye.el?revision=4";
- sha256 = "0q5m8d6p9aqbfx17zgznkqw2jgh027xix4894wrdz91670zxd3py";
- name = "summarye.el";
+ sunburn-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "sunburn-theme";
+ version = "20171021.1407";
+ src = fetchFromGitHub {
+ owner = "mvarela";
+ repo = "Sunburn-Theme";
+ rev = "566280a981097b89b19c4bba921f568c77212db6";
+ sha256 = "08a3js02zxqgxrk4afr2n39jf34pnv9mwiykysbhf560blq8gha2";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/85e28911e6b8173188f45331c6540681691223f2/recipes/summarye";
- sha256 = "1znd96ixg1n90yjiny84igb7m8qsbiibn7s6bky8g6n2k7zzmq65";
- name = "summarye";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/bfd68b90234222dbf5907a29d506b6c4e61a372b/recipes/sunburn-theme";
+ sha256 = "09shmaaii0lfd52v49cazn91sj4jz2siqbanw682vi7zsl79jx9f";
+ name = "sunburn-theme";
};
- packageRequires = [];
+ packageRequires = [ emacs ];
meta = {
- homepage = "https://melpa.org/#/summarye";
+ homepage = "https://melpa.org/#/sunburn-theme";
license = lib.licenses.free;
};
}) {};
@@ -68444,12 +67039,12 @@
super-save = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "super-save";
- version = "20160426.729";
+ version = "20171008.3";
src = fetchFromGitHub {
owner = "bbatsov";
repo = "super-save";
- rev = "701c98eef4b9b21cd6cfd31f190f9988d32353aa";
- sha256 = "1frm90kssrp4s6x0g4vq4jkssh8rnrfjbgwa05igsjnsbnnfxxd1";
+ rev = "1c8fbd5e18277e4af0ada2678a854b1c9072db38";
+ sha256 = "0mh7xp71l9xybbv17b1rsbpa60bwjw79ql9krj1kzy2c2pv9hmff";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9730b65787b26d3909952cf246a01bd349e5fbab/recipes/super-save";
@@ -68490,8 +67085,8 @@
src = fetchFromGitHub {
owner = "TheSuspiciousWombat";
repo = "SusColors-emacs";
- rev = "8f5cdf8de5e58db838ef0e803b60b7d74fc2a889";
- sha256 = "1wc4l7zvb8zmh48cgrl7bkbyfj0sflzq28sc8jssghkcl2735cbg";
+ rev = "b946e7924aa02fa7441c970026898f17fe97601f";
+ sha256 = "0553fgiyjy2n3wa2agwzvadf6il85waf2vjpsy75ljj6lw8glhka";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/suscolors-theme";
@@ -68609,25 +67204,6 @@
license = lib.licenses.free;
};
}) {};
- swbuff-x = callPackage ({ fetchurl, lib, melpaBuild, swbuff }: melpaBuild {
- pname = "swbuff-x";
- version = "20130607.314";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/swbuff-x.el?revision=9";
- sha256 = "1fkicyjvanh8yk2y27sq075sarcyqhsdz0r4xhillpnv34ji98r5";
- name = "swbuff-x.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/42bac16fa83eb3df693835326444f4bd4255cf1d/recipes/swbuff-x";
- sha256 = "1wglcxgfr839lynwsl8i7fm70sxxjidy3ib6ibz0kgiwr41rh49y";
- name = "swbuff-x";
- };
- packageRequires = [ swbuff ];
- meta = {
- homepage = "https://melpa.org/#/swbuff-x";
- license = lib.licenses.free;
- };
- }) {};
sweetgreen = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, request }:
melpaBuild {
pname = "sweetgreen";
@@ -68652,12 +67228,12 @@
swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
melpaBuild {
pname = "swift-mode";
- version = "20170909.430";
+ version = "20170918.51";
src = fetchFromGitHub {
owner = "chrisbarrett";
repo = "swift-mode";
- rev = "59dcd603848656c691f76cc5095ea354c307dbcf";
- sha256 = "127xx6qmxlh81pylrvx60d280ginms09qv24xv5g8lg08bi9zmkx";
+ rev = "e8d9a5d7af59e8be25997b8b048d7c3e257cd0b0";
+ sha256 = "035478shf1crb1qnhk5rmz08xgn0z2p6fsw0yii1a4q5f3h85xrc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode";
@@ -68694,12 +67270,12 @@
swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "swiper";
- version = "20170911.1036";
+ version = "20170926.937";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "0a1d361b926291874124f8c63a653d83ead64a36";
- sha256 = "0ssbsllpv0lyr7dhnipwd7zgpxvfm36rldr7vkxh5maajdkamls7";
+ rev = "96663b77945ab21e4e1b0aab690fc2e926f01f9c";
+ sha256 = "0r691dzs77zdkvjzb787kjg8zvvba8gdj2da9zjb14m4nyjmg9d9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -68736,11 +67312,11 @@
switch-buffer-functions = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "switch-buffer-functions";
- version = "20160702.2157";
+ version = "20171011.1004";
src = fetchFromGitHub {
owner = "10sr";
repo = "switch-buffer-functions-el";
- rev = "4778a2bc9ecfb71bb2b6a65c7108260ec8f30a37";
+ rev = "651696ef9dec7affbe51c81d9318288376c35899";
sha256 = "0xv57imh6w6kbh1i1ib9k9x2h01l4vdxs2i667a76ym6dmsjbx2x";
};
recipeFile = fetchurl {
@@ -68841,12 +67417,12 @@
symbol-overlay = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "symbol-overlay";
- version = "20170825.2047";
+ version = "20171031.658";
src = fetchFromGitHub {
owner = "wolray";
repo = "symbol-overlay";
- rev = "6c7ec584b62b7922a5398a552a1bf60f8144306c";
- sha256 = "0haflm6b8aqjbs54h3khax62rwlky3y8py4jq4m664r1nb91ni57";
+ rev = "6076319f57a7e8dbf2fe11250def5a3fa3c0c854";
+ sha256 = "11ny21rbczmkc7ni3kfw94dyc70bxwzn35f9gryxn1ppw48c7zsx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c2a468ebe1a3e5a35ef40c59a62befbf8960bd7b/recipes/symbol-overlay";
@@ -68964,25 +67540,6 @@
license = lib.licenses.free;
};
}) {};
- synonyms = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "synonyms";
- version = "20170307.1537";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/synonyms.el?revision=63";
- sha256 = "0456mmp3niljpghqcngknqkrxmpkba3n95ab4pf0b0021z2zjyxk";
- name = "synonyms.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/synonyms";
- sha256 = "1b000scgba310i7w27c8wj0iflqqgwik524ql084wpqvikwqnlzm";
- name = "synonyms";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/synonyms";
- license = lib.licenses.free;
- };
- }) {};
synosaurus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "synosaurus";
@@ -69025,22 +67582,22 @@
license = lib.licenses.free;
};
}) {};
- syntactic-close = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ syntactic-close = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "syntactic-close";
- version = "20170907.6";
+ version = "20171004.1037";
src = fetchFromGitHub {
owner = "emacs-berlin";
repo = "syntactic-close";
- rev = "143faf5ecd6388f4ea76d668b4814415befcf883";
- sha256 = "0dwanswsyxhi7izah9qm6jzl5yvfany62f5m80r9kfkhcq68hyx9";
+ rev = "e2cd1f332d111b0e90d9a72f35bc969c7638b7cf";
+ sha256 = "18fq9v1kb6bx0xxd1cic2f3gfwv82y4mjs5qg7q2ra1cz5d502w9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f2c15c0c8ee37a1de042a974c6daddbfa7f33f1d/recipes/syntactic-close";
sha256 = "19lrzxxyzdj1nrzdgzandjz3b8b4pw7akbv86yf0mdf023d9as1f";
name = "syntactic-close";
};
- packageRequires = [];
+ packageRequires = [ cl-lib emacs ];
meta = {
homepage = "https://melpa.org/#/syntactic-close";
license = lib.licenses.free;
@@ -69132,12 +67689,12 @@
systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "systemd";
- version = "20170911.625";
+ version = "20171006.1352";
src = fetchFromGitHub {
owner = "holomorph";
repo = "systemd-mode";
- rev = "a3d39214b70c3dde0be12a53260e3fa470530ad6";
- sha256 = "1wvf7m6j73y0aavz14f0xjmqs7hxbw0ifzxw5hdvhsw8bsvagbmi";
+ rev = "22f024fe8f433af7b6a6b99520cea1e766894fe5";
+ sha256 = "11h1nr9gz0mw2gwlplv00i06s9ziw77a7zfcrrzd01rmanz1m4fa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ca810e512c357d1d0130aeeb9b46b38c595e3351/recipes/systemd";
@@ -69404,12 +67961,12 @@
tangotango-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "tangotango-theme";
- version = "20150702.104";
+ version = "20170924.809";
src = fetchFromGitHub {
owner = "juba";
repo = "color-theme-tangotango";
- rev = "08c3b9270547970dbce2cb1e35e66f6ae380c8b2";
- sha256 = "11xb7xpmxvgv7mrjd2vlbjz3h5fa541aydv6bdxngjq6y3qn6wsp";
+ rev = "e2f2ea9c35f06dfc43a29c91c14cf0cdb19f2144";
+ sha256 = "01gvsvha8z7pyr8c33gh3xmz47lh6b8g0nwf1gzdiw1gd0sfhs4z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ebfcfa3ba4ca77443667a9478d59214810cd8cc2/recipes/tangotango-theme";
@@ -69450,8 +68007,8 @@
src = fetchFromGitHub {
owner = "phillord";
repo = "tawny-owl";
- rev = "f103ace956d5e7039cf0785d93c2956bd7bea4f4";
- sha256 = "0w82lzig3fy4p59rjj5dgi15mlmx6v4s6vm3z58rj65ql7qfzf88";
+ rev = "a8fc8300481a1e033a3811ccda54e552392d1689";
+ sha256 = "1lkldr6rr21f97vp6kms2ha8hsszhmba4sn07is4k55lpvlnxd49";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ea9a114ff739f7d6f5d4c3167f5635ddf79bf60c/recipes/tawny-mode";
@@ -69719,12 +68276,12 @@
term-manager = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "term-manager";
- version = "20170903.1212";
+ version = "20171020.141";
src = fetchFromGitHub {
owner = "IvanMalison";
repo = "term-manager";
- rev = "f4291eae7a18d7f1737c71c609f50398b1a962b3";
- sha256 = "0brvpayi7bigcri95958w0zin84dpqw80rqg047p07mc8833nkqg";
+ rev = "13a0f1637a1f075d70211ccb8162e63a18a474da";
+ sha256 = "0hvn60wk3w27fjb023drnaw0gmys6ancha8blpl0r4vc5k203kcf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0b2f7d8c8fcbb535432f8e70729d69a572e49a1a/recipes/term-manager";
@@ -69807,8 +68364,8 @@
src = fetchFromGitHub {
owner = "IvanMalison";
repo = "term-manager";
- rev = "f4291eae7a18d7f1737c71c609f50398b1a962b3";
- sha256 = "0brvpayi7bigcri95958w0zin84dpqw80rqg047p07mc8833nkqg";
+ rev = "13a0f1637a1f075d70211ccb8162e63a18a474da";
+ sha256 = "0hvn60wk3w27fjb023drnaw0gmys6ancha8blpl0r4vc5k203kcf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5260876280148fae28a459f07932cebb059b560e/recipes/term-projectile";
@@ -69866,12 +68423,12 @@
terminal-here = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "terminal-here";
- version = "20170805.251";
+ version = "20171022.552";
src = fetchFromGitHub {
owner = "davidshepherd7";
repo = "terminal-here";
- rev = "5e440c33a1d24762477863af5c9b7a896df4be1b";
- sha256 = "0kqn3gzm5q37d2iz0wk2xcl7qlmqkblwy8zdc7plc6syldnh91aj";
+ rev = "b3659e13d3d41503b4fc59dd2c7ea622631fc3ec";
+ sha256 = "1z3ngwgv8ybwq42lkpavk51a25zdkl6v9xdfi41njpxdpbfcmx8z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f8df6f7e23476eb52e7fdfbf9de277d3b44db978/recipes/terminal-here";
@@ -69887,12 +68444,12 @@
tern = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
melpaBuild {
pname = "tern";
- version = "20161222.850";
+ version = "20170925.1333";
src = fetchFromGitHub {
owner = "ternjs";
repo = "tern";
- rev = "cbbc2167cabc185c151fcfb32b2094b93b387422";
- sha256 = "02vwq91ra4yrx0davi6sri0hh7p3fbwwz8flqrk5kaxz1rwqgq20";
+ rev = "5c395b5d696aad5a185724f56c74a7f83349f3bd";
+ sha256 = "11sp1jz0fn8gnc28qvyrmc7qxr1gn5r3vxv6gp46p7cmgg9mflri";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern";
@@ -69912,8 +68469,8 @@
src = fetchFromGitHub {
owner = "ternjs";
repo = "tern";
- rev = "cbbc2167cabc185c151fcfb32b2094b93b387422";
- sha256 = "02vwq91ra4yrx0davi6sri0hh7p3fbwwz8flqrk5kaxz1rwqgq20";
+ rev = "5c395b5d696aad5a185724f56c74a7f83349f3bd";
+ sha256 = "11sp1jz0fn8gnc28qvyrmc7qxr1gn5r3vxv6gp46p7cmgg9mflri";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete";
@@ -70073,6 +68630,27 @@
license = lib.licenses.free;
};
}) {};
+ tex-smart-umlauts = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "tex-smart-umlauts";
+ version = "20160427.58";
+ src = fetchFromGitHub {
+ owner = "emacsorphanage";
+ repo = "tex-smart-umlauts";
+ rev = "5261b931443558f4252489a1e6616034848aff02";
+ sha256 = "1rq1l52mgbasgwvjwpivjrfjf8l8r85wdkfpbw8213449qh9c9zh";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/tex-smart-umlauts";
+ sha256 = "05q5mzl0pya682hdmjyp09hh121dc5y4d5vgqjffx3yfd5kgsy5w";
+ name = "tex-smart-umlauts";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/tex-smart-umlauts";
+ license = lib.licenses.free;
+ };
+ }) {};
textile-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "textile-mode";
@@ -70178,25 +68756,6 @@
license = lib.licenses.free;
};
}) {};
- tfs = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "tfs";
- version = "20120508.1120";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/tfs.el?revision=9";
- sha256 = "16byw8ix7bjh5ldr8rymisq2bhc5sh7db6rhpf0x28yd6mmzn73v";
- name = "tfs.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/tfs";
- sha256 = "0h38qd1xhfd0my26i6w5j1jr91r5qal8x4bp7ij1cym72yxspna6";
- name = "tfs";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/tfs";
- license = lib.licenses.free;
- };
- }) {};
theme-changer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "theme-changer";
@@ -70260,64 +68819,6 @@
license = lib.licenses.free;
};
}) {};
- thesaurus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "thesaurus";
- version = "20121125.1137";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/thesaurus.el?revision=6";
- sha256 = "0zcyasdzb7dvmld8418cy2mg8mpdx01bv44cm0sp5950scrypsaq";
- name = "thesaurus.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/thesaurus";
- sha256 = "1cnna27dlragk4w3f59xbrwppp49r010qdn7n3n7wvhibv3cfyd7";
- name = "thesaurus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/thesaurus";
- license = lib.licenses.free;
- };
- }) {};
- thing-cmds = callPackage ({ fetchurl, hide-comnt, lib, melpaBuild }:
- melpaBuild {
- pname = "thing-cmds";
- version = "20170726.1355";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/thing-cmds.el?revision=58";
- sha256 = "07z49csdlrf08h8d8p9n8j492r22s7wgpzjwafppbsm4mvgshmq9";
- name = "thing-cmds.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/thing-cmds";
- sha256 = "133bm2cw9ar6m2amj0rrq4wbj9c3zl61gaprx0vlasxj2cyxs7yw";
- name = "thing-cmds";
- };
- packageRequires = [ hide-comnt ];
- meta = {
- homepage = "https://melpa.org/#/thing-cmds";
- license = lib.licenses.free;
- };
- }) {};
- thingatpt-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "thingatpt-plus";
- version = "20170307.1539";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/thingatpt+.el";
- sha256 = "1k9y354315gvhbdk0m9xpjx24w1bwrnzlnfiils8xgdwnw4py99a";
- name = "thingatpt+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/thingatpt+";
- sha256 = "0w031lzjl5phvzsmbbxn2fpziwkmdyxsn08h6b9lxbss1prhx7aa";
- name = "thingatpt-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/thingatpt+";
- license = lib.licenses.free;
- };
- }) {};
thingopt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "thingopt";
@@ -70409,8 +68910,8 @@
src = fetchFromGitHub {
owner = "apache";
repo = "thrift";
- rev = "1744cdcb674a20c554ae9f23cb95c0c8eff63b90";
- sha256 = "12zclwdqr1v2pbp0i4d5m2bgr7s20bm5yyjpakg61sx5nld2j9sg";
+ rev = "a533ea1615e9df935e77b99440cf264c6b417e3e";
+ sha256 = "0nx6amk2jawd5nqkz54sx1x29a8nkpa7h9b4qgn0j7j5sdvfyrxr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -70423,26 +68924,6 @@
license = lib.licenses.free;
};
}) {};
- thumb-frm = callPackage ({ fetchurl, frame-cmds, frame-fns, lib, melpaBuild }:
- melpaBuild {
- pname = "thumb-frm";
- version = "20170307.1540";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/thumb-frm.el?revision=62";
- sha256 = "1mfz4gkq71sp9q7pa8q0md36g7x0dpsqz0np507dx2kypzqhklpd";
- name = "thumb-frm.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/thumb-frm";
- sha256 = "1fjjd80drm8banni909lww9zqazr1kk9m40xwwa1ln2zicaf091c";
- name = "thumb-frm";
- };
- packageRequires = [ frame-cmds frame-fns ];
- meta = {
- homepage = "https://melpa.org/#/thumb-frm";
- license = lib.licenses.free;
- };
- }) {};
thumb-through = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "thumb-through";
@@ -70464,15 +68945,36 @@
license = lib.licenses.free;
};
}) {};
+ tickscript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "tickscript-mode";
+ version = "20171101.108";
+ src = fetchFromGitHub {
+ owner = "msherry";
+ repo = "tickscript-mode";
+ rev = "45ce0b4f8f18ffa00a4fd2ab3823118f69b94653";
+ sha256 = "0w6gh6nb81c5jp4px6xx5d3wmwgkh6irzwgk42g0mkhjifzm83ip";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/c60ee1839f728c5041bde1fe4fa62c4d41c746ef/recipes/tickscript-mode";
+ sha256 = "0wnck6j377idx7h7csmfdhp6napv3zs4sd24lknfclafhslllp54";
+ name = "tickscript-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/tickscript-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }:
melpaBuild {
pname = "tide";
- version = "20170911.521";
+ version = "20171009.1142";
src = fetchFromGitHub {
owner = "ananthakumaran";
repo = "tide";
- rev = "af6adf6170e23a44ba773e07899ec602ae659663";
- sha256 = "0y8kfibip9saa9mh1bhgnqjzkx0yyss1z1ssxq1qvndnq8sp4rpz";
+ rev = "d4a86487475b08adcbc1974c3362ce247d65a381";
+ sha256 = "1f0l8s50ihhl4w00q5f101g9bfn9zssh4ippbchfdz4ialisyk2y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
@@ -70485,25 +68987,6 @@
license = lib.licenses.free;
};
}) {};
- tidy = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "tidy";
- version = "20111222.956";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/tidy.el?revision=9";
- sha256 = "0psci55a3angwv45z9i8wz8jw634rxg1xawkrb57m878zcxxddwa";
- name = "tidy.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/bf079dbd04675ecd5f511b940d7cc5f80ccc94c4/recipes/tidy";
- sha256 = "09xb2k3k99hp3m725f31s6hlaxgl4fsaa1dylahxvdfddhbh290m";
- name = "tidy";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/tidy";
- license = lib.licenses.free;
- };
- }) {};
tile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, stream }:
melpaBuild {
pname = "tile";
@@ -70747,12 +69230,12 @@
tldr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "tldr";
- version = "20170702.1859";
+ version = "20171023.1929";
src = fetchFromGitHub {
owner = "kuanyui";
repo = "tldr.el";
- rev = "ebdeb08950823765bf58dc2aba3559a5ad1103f1";
- sha256 = "1aigfmp4ra9qfwyk151y0cxmgd3n42rcjawklfm6ch2g49vx559q";
+ rev = "fe1bd5cee3d30741c816f3ccc118b94105ceba4c";
+ sha256 = "1hdkrgv03w968qf8fm7c35k5pahk9wfwz5vy8xz6568ci1af47h3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/45af2c5d1a36fcbf739812594c5cc878bf319a26/recipes/tldr";
@@ -70789,12 +69272,12 @@
toc-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "toc-org";
- version = "20170518.451";
+ version = "20171009.156";
src = fetchFromGitHub {
owner = "snosov1";
repo = "toc-org";
- rev = "5a8a3f9b3a1440eb207a031685b7f4d77ef05b76";
- sha256 = "0cwc7l8vf6x62s7727a6zr099zxgbbgnqkb2y60js6bys2mxqv99";
+ rev = "4d259c9cea3f575e5210974c025ebe3d51cc317f";
+ sha256 = "04y7zib1wpxswkh7srxgh4bq25cpsybpi2aaynrwjms695ggh346";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1305d88eca984a66039444da1ea64f29f1950206/recipes/toc-org";
@@ -70810,12 +69293,12 @@
todotxt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "todotxt";
- version = "20160919.2238";
+ version = "20170919.1141";
src = fetchFromGitHub {
owner = "rpdillon";
repo = "todotxt.el";
- rev = "c0d0e8320ba9284710d46941eaf6847f909b589e";
- sha256 = "08fd5lk1gq9clxhz5i81qm5f0a20yrx49iy13bx1p59gj20f1z41";
+ rev = "afa4079f15f705a4fa34ea8e14b122e73028f285";
+ sha256 = "07rhjxl8kvsjf23kxyl6xj51a2z1r66h4bsdsfj7nncavvybzqn3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/todotxt";
@@ -71038,44 +69521,6 @@
license = lib.licenses.free;
};
}) {};
- tool-bar-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "tool-bar-plus";
- version = "20170307.1542";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/tool-bar+.el";
- sha256 = "09myj10ifjjc43invxbiinskv5xllkqvqfnzmc7893k2hp2miczm";
- name = "tool-bar+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/tool-bar+";
- sha256 = "07nsas600w5kxx7yzg52ax9avry8kq429mqlrs38jg5ycf3b1l6d";
- name = "tool-bar-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/tool-bar+";
- license = lib.licenses.free;
- };
- }) {};
- top-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "top-mode";
- version = "20130605.1039";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/top-mode.el?revision=3";
- sha256 = "0a5rl1cgznycqwx4r48mh69lgm8ixbnlfzbqdyvclgm8fldbannn";
- name = "top-mode.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/top-mode";
- sha256 = "0hrjlbiz827v9yf4086wlghw64rhvvlsbzv8lzs6pprdwbpr9pdx";
- name = "top-mode";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/top-mode";
- license = lib.licenses.free;
- };
- }) {};
tornado-template-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "tornado-template-mode";
@@ -71183,12 +69628,12 @@
traad = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, request, request-deferred, virtualenvwrapper }:
melpaBuild {
pname = "traad";
- version = "20170713.2320";
+ version = "20171010.2353";
src = fetchFromGitHub {
owner = "abingham";
repo = "emacs-traad";
- rev = "7a443ad17643060f9b4c2897abe185bb9221e304";
- sha256 = "1n91a8bdrji0kca38bh6jzwjfsg90jqqa47vvazsqk072fjjbnkr";
+ rev = "5ee7a4411fa39601ff59873f1e129fdb64df4e97";
+ sha256 = "0h9hx5jpi0clmrj7sf0srisdp9h5zgakwrs7cyqs3hmw7z4ds5r2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2b3eb31c077fcaff94b74b757c1ce17650333943/recipes/traad";
@@ -71214,8 +69659,8 @@
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "circe";
- rev = "452dfb407b640ba6eb288ff25a9de27446a409c4";
- sha256 = "1yqnpvk5ib754bkb8gcd8skf0d3rqxkqwcsbibr052ilrp5ampcl";
+ rev = "6b110d4c2c6447c4ed65cfa5b7e8676620081ee2";
+ sha256 = "01llr34y9mvgpbz3y10l7gmp40qvislwhm6jb2fvcb7vdn9k9gmz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking";
@@ -71315,12 +69760,12 @@
transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
melpaBuild {
pname = "transmission";
- version = "20170906.1911";
+ version = "20171029.1210";
src = fetchFromGitHub {
owner = "holomorph";
repo = "transmission";
- rev = "de23122e2c1d0c184e2439dd142ddedb0eb043b3";
- sha256 = "0wa89zppxvr6cbaxn8qjdcqvnfsgq3bdzb45rbab8hwc4p8fv76f";
+ rev = "d78ae51fdc9292cc0b77dfb18279b38b6ccbf480";
+ sha256 = "01k0nppxvkd2cy13hjcvihgh6j9c4by92yxv4jv8zvaz35fqf92n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission";
@@ -71417,22 +69862,22 @@
license = lib.licenses.free;
};
}) {};
- treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pfuture, s }:
+ treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pfuture, s }:
melpaBuild {
pname = "treemacs";
- version = "20170911.819";
+ version = "20171101.340";
src = fetchFromGitHub {
owner = "Alexander-Miller";
repo = "treemacs";
- rev = "b967e5ac38625992a19e42eb680892f4fa18e88f";
- sha256 = "18i9aj6ajl41mn2456g48wdpqm188vsc5cqiqsj27gqvpnqkkns3";
+ rev = "444f0517a875dbb5b832f3c3270f0ea2a39bc258";
+ sha256 = "0k5rfdck8895s2906f4b213kn1icnrd49217gbm9llzqhskl8hdq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/486f21e99856a77f470d246f3c71cd32d2e61ad6/recipes/treemacs";
sha256 = "07npjnhn9a0b537h1wmvy57bmicd2cji7bslp4wbnrfmmg2jdc3a";
name = "treemacs";
};
- packageRequires = [ ace-window cl-lib dash emacs f pfuture s ];
+ packageRequires = [ ace-window cl-lib dash emacs f hydra pfuture s ];
meta = {
homepage = "https://melpa.org/#/treemacs";
license = lib.licenses.free;
@@ -71441,12 +69886,12 @@
treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }:
melpaBuild {
pname = "treemacs-evil";
- version = "20170625.1401";
+ version = "20170925.2232";
src = fetchFromGitHub {
owner = "Alexander-Miller";
repo = "treemacs";
- rev = "b967e5ac38625992a19e42eb680892f4fa18e88f";
- sha256 = "18i9aj6ajl41mn2456g48wdpqm188vsc5cqiqsj27gqvpnqkkns3";
+ rev = "444f0517a875dbb5b832f3c3270f0ea2a39bc258";
+ sha256 = "0k5rfdck8895s2906f4b213kn1icnrd49217gbm9llzqhskl8hdq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil";
@@ -71466,8 +69911,8 @@
src = fetchFromGitHub {
owner = "Alexander-Miller";
repo = "treemacs";
- rev = "b967e5ac38625992a19e42eb680892f4fa18e88f";
- sha256 = "18i9aj6ajl41mn2456g48wdpqm188vsc5cqiqsj27gqvpnqkkns3";
+ rev = "444f0517a875dbb5b832f3c3270f0ea2a39bc258";
+ sha256 = "0k5rfdck8895s2906f4b213kn1icnrd49217gbm9llzqhskl8hdq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b694918c94e6311745776d451aa2519924beef2d/recipes/treemacs-projectile";
@@ -71670,12 +70115,12 @@
tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "tuareg";
- version = "20170912.206";
+ version = "20171101.231";
src = fetchFromGitHub {
owner = "ocaml";
repo = "tuareg";
- rev = "928ed2a5153094d772ad5a0831f4bd84e819755d";
- sha256 = "1844cqykzik3cn9wqas56h2mfh0wlxq53srdl6inx7j27mm1v7ga";
+ rev = "359d0e7a4f75dee8f57557b7cc133ae3a65f78a5";
+ sha256 = "0v8wzifrc99y4dzl1wdkil1df76d5ijl2pasx5qdig69mpf5gj1w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg";
@@ -71943,12 +70388,12 @@
typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "typescript-mode";
- version = "20170831.619";
+ version = "20171022.1029";
src = fetchFromGitHub {
owner = "ananthakumaran";
repo = "typescript.el";
- rev = "0f41709e1525403767bd4889cb913900c68448dd";
- sha256 = "038fya0gd3vy5rpf2b4ynksc1alb8va0zw7flh4y4azrmgmpxwi0";
+ rev = "56a1ea861f80979d376716629abfce45a8e5e2c7";
+ sha256 = "1lbfia8n2zwg9j8f9y1shjg88zmgr3cz03dk3277yrvh9djs8kcx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode";
@@ -71961,25 +70406,6 @@
license = lib.licenses.free;
};
}) {};
- typing = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "typing";
- version = "20121026.1418";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/typing.el?revision=13";
- sha256 = "0mgvpdp3vlvjy32d163h2mzsf9j2ij2f542sdr3rsy8l80n6nx31";
- name = "typing.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/1bc0c7b53431a9d2bc41c9a7a755bdad0fa0f5cf/recipes/typing";
- sha256 = "0b72lbzji105wzvsi58l6pjc08qcwrm5ddf42irdxi956081pzp3";
- name = "typing";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/typing";
- license = lib.licenses.free;
- };
- }) {};
typing-game = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "typing-game";
@@ -72025,12 +70451,12 @@
typo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "typo";
- version = "20160121.330";
+ version = "20171005.1045";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "typoel";
- rev = "f7d07cedf90ce65f226a66c428c0788d2bd7b912";
- sha256 = "0bn1bvs334wb64bli9h613zf1vzjyi0pz8bgyq1wy12qmbwwmfwk";
+ rev = "73c8d960e9dcbb77a4ad6166b4685122a0f208ee";
+ sha256 = "1zlnfjav11842am9n043j3hk23134hp92k1pg86jvnsj5mwmp9ij";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/typo";
@@ -72085,25 +70511,6 @@
license = lib.licenses.free;
};
}) {};
- ucs-cmds = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "ucs-cmds";
- version = "20170308.1512";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/ucs-cmds.el?revision=23";
- sha256 = "072swg5iyx9n4xpdm65ydh2z7g11jqi3jjwkhcd7a389lavfqnbw";
- name = "ucs-cmds.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/ucs-cmds";
- sha256 = "1n0f0qf8w8ark78fs67aaxnqpk0km97hy59pnxwfyahgjl2qz6d1";
- name = "ucs-cmds";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/ucs-cmds";
- license = lib.licenses.free;
- };
- }) {};
ucs-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild, pcache, persistent-soft }:
melpaBuild {
pname = "ucs-utils";
@@ -72188,25 +70595,6 @@
license = lib.licenses.free;
};
}) {};
- unbound = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "unbound";
- version = "20160505.2355";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/unbound.el?revision=11";
- sha256 = "0awmzz9cfr17ggpzsgxqqhz5946l7705vvkfaiz7qx9wg0pbch18";
- name = "unbound.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/118e8df30e4caf2a5ef668af8970cfbfc2327004/recipes/unbound";
- sha256 = "1ys6pgb3lhx4ihhv8i28vrchp1ad37md7lnana40macf5n72d77x";
- name = "unbound";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/unbound";
- license = lib.licenses.free;
- };
- }) {};
uncrustify-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "uncrustify-mode";
@@ -72556,12 +70944,12 @@
unify-opening = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "unify-opening";
- version = "20170215.657";
+ version = "20171011.201";
src = fetchFromGitHub {
owner = "DamienCassou";
repo = "unify-opening";
- rev = "2f0164328b9234c9083758349103be873cb65af8";
- sha256 = "0d7advfxfnx0v2y292fq4ynqm7ial6p0x7mh28l511b8b4qgpjgv";
+ rev = "fbe53b56e9629143a73c5da9e7797579508e0fbf";
+ sha256 = "0hr65nrywa9yijqymw902q02adyczbwzam2ahv8m2wzay5pcwg8a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0a2faab13744262ef4d12750f70b300b3afd2835/recipes/unify-opening";
@@ -72742,34 +71130,15 @@
license = lib.licenses.free;
};
}) {};
- usage-memo = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "usage-memo";
- version = "20110722.851";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/usage-memo.el?revision=12";
- sha256 = "00g1zj5fjykdi6gh2wkswpwx132xa6jmwfnrgfg5r96zwb8pib4i";
- name = "usage-memo.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/ae8f3adf42300fc0d8f0c5474edf839614d84978/recipes/usage-memo";
- sha256 = "05n50adjnavl7ag24wfjwlnbv5x55qlhmplgsm8j57gjig01nd95";
- name = "usage-memo";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/usage-memo";
- license = lib.licenses.free;
- };
- }) {};
use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "use-package";
- version = "20170812.2256";
+ version = "20171030.1428";
src = fetchFromGitHub {
owner = "jwiegley";
repo = "use-package";
- rev = "360df30683a711c443f87e495ba14cdd125a505d";
- sha256 = "0nz0gk6gf9060hbyqr5vgzwr620k6l5sk9n6jbhfyrwmcscnmilc";
+ rev = "82d15961a0f2dc7842a98030d6daee0061ef63dc";
+ sha256 = "0i9cqms0bm6vfn8mzkzv40dql2mzmp2jma1na6m8bf1z2ciszy6l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package";
@@ -73058,16 +71427,16 @@
vc-fossil = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "vc-fossil";
- version = "20170811.1453";
+ version = "20171018.2216";
src = fetchFromGitHub {
- owner = "emacsorphanage";
- repo = "vc-fossil";
- rev = "0aceef306726815a84e304253711bb6d3bdf497b";
- sha256 = "1i50nyhb3qc404xilm5j31ifyrlh98mjxk98fl0gz1cpbygvklds";
+ owner = "venks1";
+ repo = "emacs-fossil";
+ rev = "abdb5487831e641c291c0dcb3848f539ca11f400";
+ sha256 = "024bf8cjf3srz0zrxk90c63yz9v525m83znb2fscwa1fwvnnpqkn";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/91f2e615c887f353a82deee75990609d0dc66bbe/recipes/vc-fossil";
- sha256 = "09pslw9gamjn1hly4l3bfci6rf4xw2xq42cr7na2rj0k8c1lvxcx";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/31c5ee4b625b90c1af66d7d11a25af8e1aa307b1/recipes/vc-fossil";
+ sha256 = "11ps2wrkjrjm1d984mf80wwj1hzskw5qrn0nv7md21lp75kxsvxb";
name = "vc-fossil";
};
packageRequires = [];
@@ -73331,12 +71700,12 @@
vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine }:
melpaBuild {
pname = "vhdl-tools";
- version = "20170701.1603";
+ version = "20171025.514";
src = fetchFromGitHub {
owner = "csantosb";
repo = "vhdl-tools";
- rev = "c08343904835cbae12f48e0758b0a6a014d76a74";
- sha256 = "1skh9p5s9nbl6jvljj9bfn19fdzjx8lvx1q6rzldld07xwaif4qb";
+ rev = "b6d07ba21e9073a0e008831bfb82fbddbd0b5e90";
+ sha256 = "1ypj9saprjaxx60fxjl9ab2lb4x9s8szkh3mj23iininx1bxp4wm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools";
@@ -73520,12 +71889,12 @@
virtualenvwrapper = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "virtualenvwrapper";
- version = "20161002.1515";
+ version = "20171022.1831";
src = fetchFromGitHub {
owner = "porterjamesj";
repo = "virtualenvwrapper.el";
- rev = "5649028ea0c049cb7dfa2105285dee9c00d189fb";
- sha256 = "1xcjjs394vlaz94xh52kqaq94gkbmmjqmxlg7wly8vfn9vh34mws";
+ rev = "b4fd61aa5fddd47d33b147ffa1c873d8b20db724";
+ sha256 = "04qhxg2gghb9bbvabrjbwj89jl154hhk00s07mzgg93js75ipx6z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/virtualenvwrapper";
@@ -73685,25 +72054,6 @@
license = lib.licenses.free;
};
}) {};
- vline = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "vline";
- version = "20120108.445";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/vline.el?revision=17";
- sha256 = "1ys6928fgk8mswa4gv10cxggir8acck27g78cw1z3pdz5gakbgnj";
- name = "vline.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/aa860c2ccbaeb19d8b866919cdc45549d9cf9537/recipes/vline";
- sha256 = "0p59xhyrv7fmcn3qi51sp8v9v2y71ray2s756zbhzgzg63h3nbjp";
- name = "vline";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/vline";
- license = lib.licenses.free;
- };
- }) {};
vmd-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "vmd-mode";
@@ -73791,12 +72141,12 @@
vue-html-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "vue-html-mode";
- version = "20170904.1017";
+ version = "20170928.1057";
src = fetchFromGitHub {
owner = "AdamNiederer";
repo = "vue-html-mode";
- rev = "7358de66280435531dda4dd29dfbcef397edb628";
- sha256 = "0pqjlszacpwrkr41l27d8zlyjm25b38l94plqjy4qk4p5r2zivvg";
+ rev = "9218c61ff1ab2bdc6a6711d21ad760198d3511a8";
+ sha256 = "1xpbr2fajn0nk53abb2x9m0qs0ygxfl62gdxd2iqfcwj56fswj9y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/48588b163ab76204b9054340071e758045480e19/recipes/vue-html-mode";
@@ -73809,22 +72159,22 @@
license = lib.licenses.free;
};
}) {};
- vue-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode, ssass-mode, vue-html-mode }:
+ vue-mode = callPackage ({ edit-indirect, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode, ssass-mode, vue-html-mode }:
melpaBuild {
pname = "vue-mode";
- version = "20170712.930";
+ version = "20171029.1905";
src = fetchFromGitHub {
owner = "CodeFalling";
repo = "vue-mode";
- rev = "a680998d5e597e91be2e7e15e88bd83856a13c84";
- sha256 = "1hmqwv4xdjmly1l4s1hkx1n28navnqy5nplas39pwywik2dlh2cs";
+ rev = "a34f8a14fe6a680bb18cfa4519f7984d8071a4e3";
+ sha256 = "08c3sgd80aszfpc4zbh0rsn7717nwwjhr38lfbsbxmgmlvqalxzk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode";
sha256 = "0gy7a5sliaijq0666l55vbkg15anrw7k1828szdn1ppkraw14bn0";
name = "vue-mode";
};
- packageRequires = [ mmm-mode ssass-mode vue-html-mode ];
+ packageRequires = [ edit-indirect mmm-mode ssass-mode vue-html-mode ];
meta = {
homepage = "https://melpa.org/#/vue-mode";
license = lib.licenses.free;
@@ -73851,37 +72201,19 @@
license = lib.licenses.free;
};
}) {};
- w32browser-dlgopen = callPackage ({ fetchurl, lib, melpaBuild }:
+ w3m = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
- pname = "w32browser-dlgopen";
- version = "20170309.1433";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/w32browser-dlgopen.el?revision=25";
- sha256 = "1fkkrqwhkg58jjjsjf0fzwabaaxarjylp22zng1id6hqfsm7r1cd";
- name = "w32browser-dlgopen.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/w32browser-dlgopen";
- sha256 = "0dnvsnahnbnvjlhfmb0q6agzikv9d42fbnfrwsz6hni92937gz39";
- name = "w32browser-dlgopen";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/w32browser-dlgopen";
- license = lib.licenses.free;
- };
- }) {};
- w3m = callPackage ({ fetchcvs, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "w3m";
- version = "20170503.1331";
- src = fetchcvs {
- cvsRoot = ":pserver:anonymous@cvs.namazu.org:/storage/cvsroot";
- module = "emacs-w3m";
- sha256 = "6ef1dd834a16cf3b8a0ec7a7412ae7410f0392d616eb3329f78011039384fc6d";
+ version = "20171019.1734";
+ src = fetchFromGitHub {
+ owner = "emacsorphanage";
+ repo = "w3m";
+ rev = "e2e2c907f4fa575bec74803aab95af426cb37e6e";
+ sha256 = "13lzj1h6ib779fszmvlz3wamnjibivdrxl8hd5l3xhh7fkgbc8c8";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/8bbb18b0db057b9cca78ae7280674fd1beb56443/recipes/w3m";
- sha256 = "17mzs126fvlnsvxgfpbil9wmka0i87psblq49phky7dywcwz27lc";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/w3m";
+ sha256 = "0a4jql7ky62ickccbr2xnyggix5wf726d4pfz7mi3yxlw6i8m79s";
name = "w3m";
};
packageRequires = [];
@@ -73976,12 +72308,12 @@
wand = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "wand";
- version = "20170412.1315";
+ version = "20171031.1103";
src = fetchFromGitHub {
owner = "cmpitg";
repo = "wand";
- rev = "3674f2edaa6ac30c314a885b229204f978ddce14";
- sha256 = "1yylw7yn9k8li283d5r4x9i38wfdx24jmlzdivvffn0jkhjj6i4k";
+ rev = "3d0b459c4ae7e0240cb16bd9bd0a0a0dc39d8f99";
+ sha256 = "0wc1gmaz02bfbapwrmmc5r7rcfwqlfr52x3jqk6bhxpiav141yq4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/38be840bbb32094b753ec169b717a70817006655/recipes/wand";
@@ -74018,12 +72350,12 @@
wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }:
melpaBuild {
pname = "wanderlust";
- version = "20170627.2306";
+ version = "20171019.550";
src = fetchFromGitHub {
owner = "wanderlust";
repo = "wanderlust";
- rev = "770d54fafb1a0a140b449e6132db22e70b4d6aa9";
- sha256 = "1f6h5n42fwwby880wikh8fdlk2zqimkl7wdb8wvr5kq1nqfqpz3f";
+ rev = "15a8ca7a28d086066d148ca8bfbd454e32cc5f77";
+ sha256 = "1a7xm3x8zyax6crrj8fj932yicwds12774znv991yggjzw5kcwcd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust";
@@ -74249,12 +72581,12 @@
web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "web-mode";
- version = "20170906.214";
+ version = "20171017.1214";
src = fetchFromGitHub {
owner = "fxbois";
repo = "web-mode";
- rev = "80e6de3b249c565506e29b2f1eca4104867f989d";
- sha256 = "127z1968znc6m1c5b819wjhiaxq6l6wkdhra5cwxfic4wzghdvbi";
+ rev = "4754211f44e9fe1389e4378553ad538460282225";
+ sha256 = "0c1p8srr1zacpp697rwy83rjz51yhgff9w1sb4cv9wi5yzfsic56";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode";
@@ -74375,12 +72707,12 @@
webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
melpaBuild {
pname = "webpaste";
- version = "20170612.1352";
+ version = "20171025.956";
src = fetchFromGitHub {
owner = "etu";
repo = "webpaste.el";
- rev = "655a364fb1a6c9f3d49a0bbaf338bbf492b5b4d1";
- sha256 = "11dqcch0fcxkqnnfzk9hxmimxckimpj74fz7rx3b7bvkmrh9snyy";
+ rev = "f047313c656e0ea85033bacc564d02ae6f4605ff";
+ sha256 = "00mawa0n415dcnrldqmgwwjcj2rv59wblrbzkc2g9i388nl41rp5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste";
@@ -74732,12 +73064,12 @@
whizzml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "whizzml-mode";
- version = "20170525.818";
+ version = "20171015.938";
src = fetchFromGitHub {
owner = "whizzml";
repo = "whizzml-mode";
- rev = "92986cbb260642c129b049950036b2b6698a8bd9";
- sha256 = "01mxjyan8bbjxl055f8zbsydsn01iszk3qi3668aa6i1m3vsz60h";
+ rev = "9060fdce07c137abc2c494cb72641b9b9d6fbe22";
+ sha256 = "10yi3n6pyqirlzxdkv7nvp0d0n1fkjrgwhn0kp5i27dnp3fi0i2b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/11f26b15c326c3b8541bac510579b32493916042/recipes/whizzml-mode";
@@ -74771,34 +73103,15 @@
license = lib.licenses.free;
};
}) {};
- wid-edit-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "wid-edit-plus";
- version = "20170309.1434";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/wid-edit+.el";
- sha256 = "0w2hjahcq68inabjbdyh3a0wcxd6pdgsp81iqcikxzfvwpzm35a9";
- name = "wid-edit+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/wid-edit+";
- sha256 = "1wwrsk14hc0wrvy7hm94aw6zg50n2smlqwr6frwpi7yp8y394wiv";
- name = "wid-edit-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/wid-edit+";
- license = lib.licenses.free;
- };
- }) {};
wide-column = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "wide-column";
- version = "20120814.112";
+ version = "20170925.913";
src = fetchFromGitHub {
owner = "phillord";
repo = "wide-column";
- rev = "0b382e7a3ceecafcea6c9e7e742fb6d11641b04b";
- sha256 = "0bq39sfipad16skh5q26gp7z24kk93hgnaxb378dzfq1306kmn8q";
+ rev = "ce9ef4675485a7bea381077866368ef875226b10";
+ sha256 = "0qh8hy4jl59bfg4323a8h4q4a78gn4hsglfk2h23hqssbv4mhsp2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8d29def44ae42dc4b60c1d254a57572bd09faf51/recipes/wide-column";
@@ -74839,8 +73152,8 @@
src = fetchFromGitHub {
owner = "foretagsplatsen";
repo = "emacs-js";
- rev = "7bc9ba691c838650bd74848c7ebf0bc1ed6c3f2b";
- sha256 = "18wwp5pp6s18f253xy9z2dhkxv7z3fxkgc8ayr3ypp8fskv78l34";
+ rev = "b05d584a4b3e0db168c3b920ce4a270b3908d842";
+ sha256 = "0shgxd08da8a7ij37k5ybmvyqbqzq4nqxdyfbbpgnh1vgw61gr6c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs";
@@ -74916,25 +73229,6 @@
license = lib.licenses.free;
};
}) {};
- wimpy-del = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "wimpy-del";
- version = "20170309.1436";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/wimpy-del.el?revision=26";
- sha256 = "0impy9kp1xnhs0834azzndx93p8q53dxdqd9hz0n1mg0h8331c13";
- name = "wimpy-del.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/wimpy-del";
- sha256 = "10qw5lfq2392fr5sdz5a9bc6rvsg0j4dkrwvdhip1kqvajznw49x";
- name = "wimpy-del";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/wimpy-del";
- license = lib.licenses.free;
- };
- }) {};
win-switch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "win-switch";
@@ -75082,34 +73376,15 @@
license = lib.licenses.free;
};
}) {};
- window-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "window-plus";
- version = "20170309.1437";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/window+.el";
- sha256 = "1l6fwrd2f58xpf7cprp354bq2fz0hvl9bz73hrbrzyqvnd9kix61";
- name = "window+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/window+";
- sha256 = "0fhzb0ay9g9qgcaxpb2qaw15dh0lfmv3x4akyipi3zx11446d06j";
- name = "window-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/window+";
- license = lib.licenses.free;
- };
- }) {};
window-purpose = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, imenu-list, let-alist, lib, melpaBuild }:
melpaBuild {
pname = "window-purpose";
- version = "20170722.655";
+ version = "20171018.821";
src = fetchFromGitHub {
owner = "bmag";
repo = "emacs-purpose";
- rev = "00ddafcf4802e7430ca709769b888656a6eb421b";
- sha256 = "1c3jf1cxfvja1v323wkxkd67n9nwzb57c79x4m010h2700xim8vs";
+ rev = "2b8059256a90caf578ca5ba62205ca7f0d67a740";
+ sha256 = "1pv5sjsvm3xmhfbf0j2581ifp7yykgzhd8bml9cav242r1m2dnh7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5813120ab674f6db7d0a486433d8faa6cfec1727/recipes/window-purpose";
@@ -75171,8 +73446,8 @@
src = fetchFromGitHub {
owner = "dgtized";
repo = "winnow.el";
- rev = "cbc06fb51883212a5169d33a689d14cd7b0a7c34";
- sha256 = "1hprii3da7y758ihlv308hg9sbcn42jn2f6g4dzb30ql5g2vxcnr";
+ rev = "18cb6b94338f3b7b4f2cd0331dad22f82dd9e0d3";
+ sha256 = "1wp00zxxcibvl6vjwmvhkgcbi76dyb2g8c30wy4kp7876cpc8hgv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/58891c2057ec834f999e3bf82af15e0617a4d4cf/recipes/winnow";
@@ -75227,22 +73502,22 @@
license = lib.licenses.free;
};
}) {};
- winum = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ winum = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "winum";
- version = "20170430.1629";
+ version = "20171028.702";
src = fetchFromGitHub {
owner = "deb0ch";
repo = "emacs-winum";
- rev = "e950370d82cbb90ba291fc1c32de5d6f35068932";
- sha256 = "1p4b9gdrifjndk0irv735f8spy541x78chibdnr1i3qil2ib8xms";
+ rev = "c56d1cdb8d1723eb4c0d7a7eb3ecd2697739146c";
+ sha256 = "09jd5srlnd4060hs719qil84ssmnvq196bz7ywaswgapv1gs1h6r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c1caa7a54a910a44322fdee300e8cce6ddcde071/recipes/winum";
sha256 = "0yyvjmvqif6glh9ri6049nxcmgib9mxdhy6816kjhsaqr570f9pw";
name = "winum";
};
- packageRequires = [ cl-lib ];
+ packageRequires = [ cl-lib dash ];
meta = {
homepage = "https://melpa.org/#/winum";
license = lib.licenses.free;
@@ -75254,8 +73529,8 @@
version = "20160419.1232";
src = fetchhg {
url = "https://bitbucket.com/ArneBab/wisp";
- rev = "7ce954278aef";
- sha256 = "116cspnc4lhf6gk73yr9sy7013jp88vq5zayghzgnkbdlaw6zmz3";
+ rev = "7633b2a5133f";
+ sha256 = "0j6j9wkmq95dhx5cr3z2gpx5mvsqsgissp2060ij252ijc3l9k4a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";
@@ -75292,12 +73567,12 @@
with-editor = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "with-editor";
- version = "20170817.1240";
+ version = "20171006.352";
src = fetchFromGitHub {
owner = "magit";
repo = "with-editor";
- rev = "241726118dee067a8d9880d53c6a781d580ba8a1";
- sha256 = "0q06qfir64nib604f23gdmbzl23mcsnysfd0x36cx9nwik95wl0x";
+ rev = "ee39f232f2daf997498a4030d104c35ae397f457";
+ sha256 = "17m5b7g5sdh0iy6lpj2inv9akscyw83nyx9hl71disdk7diq15hn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor";
@@ -75338,8 +73613,8 @@
src = fetchFromGitHub {
owner = "DarwinAwardWinner";
repo = "with-simulated-input";
- rev = "d0f779594243fe85e330fd3f47caeb80068f7134";
- sha256 = "1iadgd99n1ilrdvybbrxj0f8n50sz76j3bji2nfpn3w32krj90w4";
+ rev = "af9a38ce28a741e6d8742750bef5d7b5afa13796";
+ sha256 = "0iann7zi9bgd3vmvxvg2n6x24hkyzbchbli1ymsmfrn8rif9byf7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e4ddf16e19f5018106a423327ddc7e7499cf9248/recipes/with-simulated-input";
@@ -75394,27 +73669,6 @@
license = lib.licenses.free;
};
}) {};
- wolfram-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "wolfram-mode";
- version = "20170221.120";
- src = fetchFromGitHub {
- owner = "kawabata";
- repo = "wolfram-mode";
- rev = "d27a0f23791abde2bdda22e50108b99f11c13ed7";
- sha256 = "0r82h3x1ggirgd0a03qr71pdcxgkc4s3307ggwy86j4asd308m79";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/299fe35d0a5a11d20f0b917bc8f406bd0f011c93/recipes/wolfram-mode";
- sha256 = "1bq95lamzz45macpklnq1kxw9ak4x4f41kx16f472dn650ff0zlf";
- name = "wolfram-mode";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/wolfram-mode";
- license = lib.licenses.free;
- };
- }) {};
wonderland = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi }:
melpaBuild {
pname = "wonderland";
@@ -75481,12 +73735,12 @@
worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper, zoutline }:
melpaBuild {
pname = "worf";
- version = "20170818.1105";
+ version = "20171002.1118";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "worf";
- rev = "bf812a47e44dfbf4e166dbdbed7a97197bc1fc1d";
- sha256 = "11miqpdg0v27fi6ksrqkqfyi2qrsgsv8jsqfw15nyhqmi3sgxzqh";
+ rev = "cf2f382b368bcb3c8ba4785a7fac8ee9300e80b5";
+ sha256 = "0rnvmwdks8m4f6dwnyinv9rli58mlvlnrg7swpdjfh0g3bqgr7w5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f00f8765e35c21dd1a4b5c01c239ed4d15170ab7/recipes/worf";
@@ -75607,12 +73861,12 @@
writegood-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "writegood-mode";
- version = "20160802.1405";
+ version = "20170925.647";
src = fetchFromGitHub {
owner = "bnbeckwith";
repo = "writegood-mode";
- rev = "a99896531a260db11acb931b68dbdc45030832d7";
- sha256 = "15g133ql8mgjchm6h255q77b6rks843lzva44kgjmfgwmgbfmc1b";
+ rev = "416453af5a44da52646052fa2ee3a63acfd7bf8a";
+ sha256 = "08z35gc3j25h02jmlkzsis4n7a6sy6zy2qykcnp8b3s8y51d0dg0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/75c5a4304999fc3f5a02235a1c2c904238d2ce4f/recipes/writegood-mode";
@@ -75800,8 +74054,8 @@
src = fetchFromGitHub {
owner = "jobbflykt";
repo = "x509-mode";
- rev = "a34584f310f3d8afe57dc1950db52b2d079242b8";
- sha256 = "07z0iyz7zgypqjv6izpdccllwrp7jgc86279rk0blf0vazj2927h";
+ rev = "240b5045dcce18190bdabd91d74f48d3610a6fe2";
+ sha256 = "0pi5hi0n6f2hif5hz1g04rk509rb4jlw6nrlhc8fg5k6x4n7ci3p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/27145423eb4e68e006ef96868a35b99d119a3099/recipes/x509-mode";
@@ -75901,12 +74155,12 @@
xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xah-fly-keys";
- version = "20170905.840";
+ version = "20171026.422";
src = fetchFromGitHub {
owner = "xahlee";
repo = "xah-fly-keys";
- rev = "0d0b3b96401af0d1e4ddea2713218bee08ab6a04";
- sha256 = "09iyf2xrp3scxr67jm3gl067kb8vsrnrqdwz2sv6la41n04s9lm3";
+ rev = "6130b10b0f133344d5e6afa7c083d400c8e780ca";
+ sha256 = "08shy433x5papxdbr6q2xsccpg1h0vym9vv6zcaz8vzqw33kr0w7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-fly-keys";
@@ -76087,6 +74341,27 @@
license = lib.licenses.free;
};
}) {};
+ xcode-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "xcode-project";
+ version = "20170922.612";
+ src = fetchFromGitHub {
+ owner = "nhojb";
+ repo = "xcode-project";
+ rev = "ec5d503a51430205daa6f5f382d921b6412b4b55";
+ sha256 = "0m3262mqqhjcpzw8m4n403kr75m561kxvwf8clzwmv0fvkf8aazk";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/49b866ebf7e707bc74525f83dd5038e6e860fcef/recipes/xcode-project";
+ sha256 = "0igp30f6ypmp4l8zmdfpa5bza4avm7mq2gj8v7b3ii655v91n6vi";
+ name = "xcode-project";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/xcode-project";
+ license = lib.licenses.free;
+ };
+ }) {};
xcscope = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xcscope";
@@ -76552,12 +74827,12 @@
yahtzee = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yahtzee";
- version = "20170617.20";
+ version = "20171022.712";
src = fetchFromGitHub {
owner = "drdv";
repo = "yahtzee";
- rev = "09b18f248c957f74d219a6d1127923e9c786d650";
- sha256 = "05hg6andy8wxrsxf939g77v6ml4rac239vkkfk0fh6723wgiz144";
+ rev = "5263fb8883d37d79a4ed34dd3216a8947d2ae4a0";
+ sha256 = "1qv8p3zpxkkp0ncq3cs8sq2bj4jrxs4s5jfc5hbs905a9z8bsnq9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/200169fdabce0ae3a2ecb6f4f3255c15ec3ed094/recipes/yahtzee";
@@ -76696,25 +74971,6 @@
license = lib.licenses.free;
};
}) {};
- yaoddmuse = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "yaoddmuse";
- version = "20170325.1752";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/yaoddmuse.el?revision=104";
- sha256 = "0vlllq3xmnlni0ws226pqxj68nshclbl5rgqv6y11i3yvzgiazr6";
- name = "yaoddmuse.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/yaoddmuse";
- sha256 = "1p68f3xjv55m8lnq5x27b8y87mq685hpm3n9kiga9qq8wxdf2rnf";
- name = "yaoddmuse";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/yaoddmuse";
- license = lib.licenses.free;
- };
- }) {};
yapfify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yapfify";
@@ -76844,12 +75100,12 @@
yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yasnippet";
- version = "20170828.1908";
+ version = "20170923.1646";
src = fetchFromGitHub {
owner = "joaotavora";
repo = "yasnippet";
- rev = "89eb7ab64d67e96646576dc0d551e8c23d50438a";
- sha256 = "1wr0d14yl3440hkdr436zxl9pk7nqhl76n9m3b3ia4lp6z5aj4jc";
+ rev = "35a4df769cbdebd10d043f16d680bdb16ee858ed";
+ sha256 = "0rkk39bm12d3d4gf8r99a2ipjaf1yb0b57rpg44bsqz5jada4a86";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet";
@@ -76865,12 +75121,12 @@
yasnippet-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "yasnippet-snippets";
- version = "20170908.435";
+ version = "20171031.617";
src = fetchFromGitHub {
owner = "AndreaCrotti";
repo = "yasnippet-snippets";
- rev = "5c3bb7ad8f659cb6651cc9c90709528672dd2ad0";
- sha256 = "1nbkgmqgrih99jgpzvmy0h8vdjgkrml9ck9wi19vw80d62b8m9p8";
+ rev = "120d35010a29d028634a1e4c6ec9d00c1bea5515";
+ sha256 = "1bd89d9d1m6647kpdsczj6c28r3zkjpqjj7p4qndcrwc9h37r4dv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/25b8d4efe2e7833eb95dfdf33aa3ecc34af7a687/recipes/yasnippet-snippets";
@@ -76904,6 +75160,25 @@
license = lib.licenses.free;
};
}) {};
+ yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
+ pname = "yatex";
+ version = "20171030.502";
+ src = fetchhg {
+ url = "https://www.yatex.org/hgrepos/yatex/";
+ rev = "16763e5b7481";
+ sha256 = "1mrcc9amz0kflm570bd2cprhin0z8lr668k2s56mj6shixb61dwh";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e28710244a1bef8f56156fe1c271520896a9c694/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";
@@ -76949,12 +75224,12 @@
ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, request, request-deferred, s }:
melpaBuild {
pname = "ycmd";
- version = "20170723.1458";
+ version = "20171027.1412";
src = fetchFromGitHub {
owner = "abingham";
repo = "emacs-ycmd";
- rev = "fd037efae08628e41480e9dad705dcc1f64e498d";
- sha256 = "06scz0d3jzgbr919lkjjfq9x1dyr5nqkhblvfpyk5bdp8l6j06d6";
+ rev = "d951afd8c1c2f25a5cbeef3acfcec5f72acfd6e4";
+ sha256 = "0k6z82a3xkk71lbnw3sxqmr8ixafglivmsb5y35q1jichzz6hail";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd";
@@ -77103,23 +75378,24 @@
license = lib.licenses.free;
};
}) {};
- zeitgeist = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
+ zel = callPackage ({ emacs, fetchFromGitHub, fetchurl, frecency, lib, melpaBuild }:
melpaBuild {
- pname = "zeitgeist";
- version = "20131228.1009";
- src = fetchgit {
- url = "https://anongit.freedesktop.org/git/zeitgeist/zeitgeist-datasources.git";
- rev = "cdd1c219ed3afa9500403c3c499f49583d599034";
- sha256 = "0xg67asvgav5js03i3bqmh7apndrn0jy5vai0bsh22pq8wgvq083";
+ pname = "zel";
+ version = "20171014.132";
+ src = fetchFromGitHub {
+ owner = "rudolfochrist";
+ repo = "zel";
+ rev = "9dae2d212224d1deae1f62561fa8e4d689fd09f2";
+ sha256 = "1518wp3zjfdvzz5r22cjgn735c4yxr345qzj40b5agww4dsxmwmp";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/zeitgeist";
- sha256 = "0zbpmdf7fq3qph70m13giir58y1n5z6q6kqixjll5j4fk98k6bkz";
- name = "zeitgeist";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/b48132eb4c0fd01b9fc31236c5c4701f8f83a806/recipes/zel";
+ sha256 = "14qf83n1wz8hg9wfmbh8b50c5xshc28x1xq6wh4g4lfqbfm7marh";
+ name = "zel";
};
- packageRequires = [];
+ packageRequires = [ emacs frecency ];
meta = {
- homepage = "https://melpa.org/#/zeitgeist";
+ homepage = "https://melpa.org/#/zel";
license = lib.licenses.free;
};
}) {};
@@ -77147,12 +75423,12 @@
zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "zenburn-theme";
- version = "20170511.1337";
+ version = "20171010.543";
src = fetchFromGitHub {
owner = "bbatsov";
repo = "zenburn-emacs";
- rev = "2f31ef9a954ec08202668a8d1b004db5a05831a2";
- sha256 = "0g4vgdzpbp0l734ajd1r9lj6qylljxaazk139lhzzyvmqd5dwaf9";
+ rev = "a26323ca3029d653f658b8236ae9528d242c885b";
+ sha256 = "0gx6yl3bl3z7rgl4m1np8bx8b53ywbni4wi2bhc716f4b96q658x";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/zenburn-theme";
@@ -77209,12 +75485,12 @@
zephir-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
melpaBuild {
pname = "zephir-mode";
- version = "20170906.320";
+ version = "20170917.2125";
src = fetchFromGitHub {
owner = "sergeyklay";
repo = "zephir-mode";
- rev = "6b54967c76244ba18040deffd52c03caa8fff49d";
- sha256 = "0a48p08m1kdz1wxmwdcvv8lbph0by3lmxz4ccr6jrfsw3gxnixff";
+ rev = "c2c6b7451667e68e29c353616f54ef9195c3fffd";
+ sha256 = "1h5iv0ggh4jzv180mg8lz72d91b6kcqwy6ypgy3rn50bk6pz06kg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5bd901c93ce7f64de6082e801327adbd18fd4517/recipes/zephir-mode";
@@ -77230,12 +75506,12 @@
zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }:
melpaBuild {
pname = "zerodark-theme";
- version = "20170830.57";
+ version = "20171016.59";
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "zerodark-theme";
- rev = "37ec068e6a744274daf1ecd1a64b75db6a7b8a0c";
- sha256 = "1yh1n6647a3fppjhhbs6ir7vgqn6nqhpghwnhlrl3amp74h6di78";
+ rev = "ccadcfba1a708352508d4c0857359df7425e7574";
+ sha256 = "1mg1dhda9zvdinxizckvz454633lrl62a382vdm838295gvc40wm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d00b78ead693e844e35c760fe2c39b8ed6cb0d81/recipes/zerodark-theme";
@@ -77248,6 +75524,27 @@
license = lib.licenses.free;
};
}) {};
+ zig-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "zig-mode";
+ version = "20170920.802";
+ src = fetchFromGitHub {
+ owner = "AndreaOrru";
+ repo = "zig-mode";
+ rev = "814657c5b6b0600ace78a7bbd216c3e90d611cfd";
+ sha256 = "0nhx2wsk3qpdplvwxmdzwlka9255x46ca9vcjb58zbpb5wbfckzx";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/33895b0ff559ffd18a62c04736597188f55419ee/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";
@@ -77416,63 +75713,24 @@
license = lib.licenses.free;
};
}) {};
- zones = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "zones";
- version = "20170802.1406";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/zones.el?revision=32";
- sha256 = "02vvkj2nx5ha1ad1zn5jd91jakxwx1pkrysj07a8y2sg657d7nkk";
- name = "zones.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/zones";
- sha256 = "1l4qilawlgvanrz4ny4aaqzg011dlqh65g06d44pf6ha586rvzp2";
- name = "zones";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/zones";
- license = lib.licenses.free;
- };
- }) {};
- zonokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ zoom = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
- pname = "zonokai-theme";
- version = "20160321.1925";
+ pname = "zoom";
+ version = "20171030.529";
src = fetchFromGitHub {
- owner = "ZehCnaS34";
- repo = "zonokai-emacs";
- rev = "38ee819b711e848437ba6d563594129a0ecac598";
- sha256 = "16ni0va1adpqdnrkiwmpxwrhyanxp5jwbknii2wnbhgq62s7gv43";
+ owner = "cyrus-and";
+ repo = "zoom";
+ rev = "d92ea444df6f6bb6cae92242f3269582d1b8ab40";
+ sha256 = "08riz3dd19c1dixm3c6j5dkkwjpgcib05pxq611w8z0mgsn0hsc5";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/80c7b1e01eb23f2f9b71fbeeea7d54ac36bae992/recipes/zonokai-theme";
- sha256 = "1hrpgh03mp7yynqamgzkw7fa70c5pmyjfmfblkfhspnsif8j4v29";
- name = "zonokai-theme";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe094c99756ad29eda9bc51f31bb70c4ddc4131/recipes/zoom";
+ sha256 = "09bk0nnfj72an2b3rravd6qp21gdgcm1m55qnf2r8rzbgqymq5ls";
+ name = "zoom";
};
- packageRequires = [];
+ packageRequires = [ emacs ];
meta = {
- homepage = "https://melpa.org/#/zonokai-theme";
- license = lib.licenses.free;
- };
- }) {};
- zoom-frm = callPackage ({ fetchurl, frame-cmds, frame-fns, lib, melpaBuild }:
- melpaBuild {
- pname = "zoom-frm";
- version = "20170309.1439";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/zoom-frm.el?revision=44";
- sha256 = "03f3clivm7nfgg16k9pcshdwbwmjaqk0lcdm9d0180dl1c1z2wvs";
- name = "zoom-frm.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/zoom-frm";
- sha256 = "111lr29zhj8w8j7dbzl58iisqxjhccxpw4spfxx08zxh4623g5mk";
- name = "zoom-frm";
- };
- packageRequires = [ frame-cmds frame-fns ];
- meta = {
- homepage = "https://melpa.org/#/zoom-frm";
+ homepage = "https://melpa.org/#/zoom";
license = lib.licenses.free;
};
}) {};
@@ -77605,11 +75863,11 @@
zpresent = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser, request }:
melpaBuild {
pname = "zpresent";
- version = "20170730.2055";
+ version = "20171008.2152";
src = fetchhg {
url = "https://bitbucket.com/zck/zpresent.el";
- rev = "33b840f663b7";
- sha256 = "1g9x257bg9mgg1impyk5s8lfhr4qmqf1fzc7iwfdzizvzmgdlas1";
+ rev = "eb6f5bf71b00";
+ sha256 = "1q3xz4gwqb7ac49w0nq7zvl4n790wk6r97by1kldv54y2fj0ja9g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae38ad54490fa650c832fb7d22e2c73b0fb060/recipes/zpresent";
diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 0eeeb5f97fda..51b9facd111d 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -548,12 +548,12 @@
ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "ac-php";
- version = "1.8";
+ version = "1.8.1";
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
- rev = "7a50b7debd149a30b84f0e2e57a4662926d96a24";
- sha256 = "15kmzkkgrhwind66kiyc2kpl27jrbzcs79i3w5s7fzzjjg9h18lb";
+ rev = "317ad1d023db6b2fe67444a2c075e656c35f5094";
+ sha256 = "1wyf93faq6z6wgcs3lxc6gv75bmxchg6kd98dza61zdyc0rj60wa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
@@ -569,12 +569,12 @@
ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }:
melpaBuild {
pname = "ac-php-core";
- version = "1.8";
+ version = "1.8.1";
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
- rev = "7a50b7debd149a30b84f0e2e57a4662926d96a24";
- sha256 = "15kmzkkgrhwind66kiyc2kpl27jrbzcs79i3w5s7fzzjjg9h18lb";
+ rev = "317ad1d023db6b2fe67444a2c075e656c35f5094";
+ sha256 = "1wyf93faq6z6wgcs3lxc6gv75bmxchg6kd98dza61zdyc0rj60wa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@@ -926,12 +926,12 @@
add-node-modules-path = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "add-node-modules-path";
- version = "1.1.0";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "codesuki";
repo = "add-node-modules-path";
- rev = "8eef7fa6765af1716fc21db08f19f3d3e9b68998";
- sha256 = "1dm2gdhs9zy5jqhbqipdgzfj24mrzxz064ax9l2dg0lqylk1dc0q";
+ rev = "6f7801b2c41e3711406b7e1654257ad5557f5bb3";
+ sha256 = "1pfgy1k7vp34k4zb9835y3x4jmf81na60vsf80wlgvfafwk170z6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/63e99d8fc0678d7b1831cae8940e9e6547780861/recipes/add-node-modules-path";
@@ -989,12 +989,12 @@
aes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "aes";
- version = "0.8";
+ version = "0.9";
src = fetchFromGitHub {
owner = "Sauermann";
repo = "emacs-aes";
- rev = "d78796facc034b09f379cda5f27090f3139305ec";
- sha256 = "1y9bw2vkl952pha2dsi18swyr94mihgwlcg5m8hg4d5bfg2fzcb2";
+ rev = "b7d5da89c3443292e4f0b1c9d254d459933cf5af";
+ sha256 = "0nz1lf77qr3vm90rm02d4inw8glav722rxsiqds76m4xsjrq02m7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/33ca3106852f82624b36c7e3f03f5c0c620f304f/recipes/aes";
@@ -1031,12 +1031,12 @@
aggressive-indent = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "aggressive-indent";
- version = "1.8.3";
+ version = "1.9.0";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "aggressive-indent-mode";
- rev = "998407f56009f441a7cb83d678118d4d8e68f661";
- sha256 = "0brggqlij0nacx0yjk10rkn045nk0z03r8llmnqkangjm47ffksr";
+ rev = "d6778ae89cd2d40949aa076a43e327f7acff59c3";
+ sha256 = "0xya19w1bwpqrrqvmms0lfhqb168iv7j6kvnn49zbynnf9dhgr9w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/aggressive-indent";
@@ -1073,12 +1073,12 @@
ahungry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ahungry-theme";
- version = "1.4.0";
+ version = "1.8.0";
src = fetchFromGitHub {
owner = "ahungry";
repo = "color-theme-ahungry";
- rev = "e3d7e22cb10582a443b0e245be68aca936cd6abf";
- sha256 = "0fsip64bxs55kkqmpfcg4nr391b6wsd8hiq4fxvwww7n52lwsn5s";
+ rev = "32ce7765c95559f6a0552cdaeedb6eb97bb7a476";
+ sha256 = "0c1xwqknhjx6y29fwca949r8d2fqb17mca5qc79pdxdlp3l606fg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/520295978fd7de3f4266dd69cc30d0b4fdf09db0/recipes/ahungry-theme";
@@ -1292,12 +1292,12 @@
anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }:
melpaBuild {
pname = "anaconda-mode";
- version = "0.1.8";
+ version = "0.1.9";
src = fetchFromGitHub {
owner = "proofit404";
repo = "anaconda-mode";
- rev = "95fdfab07600171daccb0e9e98fb91c11237fd48";
- sha256 = "0l5h6apjshr6drfak6j66m3rv26hkr2namj85k8isvalmn4dlrj2";
+ rev = "89fc16d50b889a17521084347b28f3011b84e113";
+ sha256 = "08wdci57vig88iy5kk57k5qjkzphbbzy8g7b87hxakfgdmcwpg3g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode";
@@ -1732,12 +1732,12 @@
apiwrap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "apiwrap";
- version = "0.2.1";
+ version = "0.3";
src = fetchFromGitHub {
owner = "vermiculus";
repo = "apiwrap.el";
- rev = "74b27a95429b3207d0005610d11223728039ba81";
- sha256 = "1vp5crdjk3pswn6ip3vgkkc49kqnpayfjgzivfi6fplvhz8klrr1";
+ rev = "5d25972192cd34553997ba193c09eab093a2b870";
+ sha256 = "1pp2gzw17k58s9akraf8p4jxbar8viym2a43rkc7agzy47qsybs0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap";
@@ -2662,12 +2662,12 @@
beacon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
melpaBuild {
pname = "beacon";
- version = "1.3.3";
+ version = "1.3.4";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "beacon";
- rev = "f1a3ff5ea8fecf9bf250205de66aedf0bf49c35b";
- sha256 = "0wr2ffwbi5w23a7hbdmn5ijfy5gmizrmy75zj6m1bz4mbw23ccvn";
+ rev = "729338b02a0e331a4faf475da9f54771a3470106";
+ sha256 = "0mypzfasclq7bmw0i8hfyp8c1ycd3kdgd5h1faygzh9r0phh7ciy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d09cfab21be800831644218e9c8c4433087951c0/recipes/beacon";
@@ -2722,6 +2722,27 @@
license = lib.licenses.free;
};
}) {};
+ benchstat = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "benchstat";
+ version = "1.0.0";
+ src = fetchFromGitHub {
+ owner = "Quasilyte";
+ repo = "benchstat.el";
+ rev = "b39a97f3072c2d3c1d3f86790b9e134d05b8d7e6";
+ sha256 = "0j508n860dp4in1psnkcriqck6by1jvnscalyff5na8hx6xgyysm";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d9180fbedf95f9b1f5810bbf4929dfee513f89e3/recipes/benchstat";
+ sha256 = "0h2zi4gh23bas1zfj7j2x994lwgd3xyys96ipg1vq7z2b06572k9";
+ name = "benchstat";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/benchstat";
+ license = lib.licenses.free;
+ };
+ }) {};
better-defaults = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "better-defaults";
@@ -2809,12 +2830,12 @@
bifocal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bifocal";
- version = "0.0.2";
+ version = "0.0.3";
src = fetchFromGitHub {
owner = "riscy";
repo = "bifocal-mode";
- rev = "5e89ad1a9a47e890ce080a79fd32c71eb128d1c4";
- sha256 = "1rwxw1wniws31gbmpxgglxbc2g4jag19dvsjrym0f43yy4w2mbpw";
+ rev = "a8b222b069a6bd64531b4780905989797bad8abe";
+ sha256 = "0c6vzh35lj3pg9wd4v2fy6xdmcg9kq3n5br6rp4lx257gxglzpwh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/79e71995bd8452bad2e717884f148ec74c9735fc/recipes/bifocal";
@@ -3166,12 +3187,12 @@
buffer-manage = callPackage ({ choice-program, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "buffer-manage";
- version = "0.5";
+ version = "0.6";
src = fetchFromGitHub {
owner = "plandes";
repo = "buffer-manage";
- rev = "1c63a3267bc7b790cebcea6308b64ca7ae08ef98";
- sha256 = "1g4qchgf7gcy8mhynxklz3bh2nlrhshczpq6yzh7gpvgcaf2zg32";
+ rev = "44b26d5c17a4ecea3484727fa46c3d734569a018";
+ sha256 = "0c9hz2532vcbn69am7pd2zyraqgw0q139qsck9hs1vfxnsj4v8dc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/28f8f376df810e6ebebba9fb2c93eabbe3526cc9/recipes/buffer-manage";
@@ -3310,6 +3331,27 @@
license = lib.licenses.free;
};
}) {};
+ build-status = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "build-status";
+ version = "0.0.2";
+ src = fetchFromGitHub {
+ owner = "sshaw";
+ repo = "build-status";
+ rev = "c29a0146c5d0be274f5e17921e01698f572c23a1";
+ sha256 = "03f0h7sp0sr9kjyhvcx7i34lvc26f5x8nikfidihgzhrqpprv2b6";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/23bbe012f313cf0cf4c45a66eb0bee9361ced564/recipes/build-status";
+ sha256 = "0ckyf0asll50gifx1v0qqzpimjms8i1rgw9bnqiyj861qn5hch92";
+ name = "build-status";
+ };
+ packageRequires = [ cl-lib ];
+ meta = {
+ homepage = "https://melpa.org/#/build-status";
+ license = lib.licenses.free;
+ };
+ }) {};
bundler = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
melpaBuild {
pname = "bundler";
@@ -3376,12 +3418,12 @@
buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "buttercup";
- version = "1.8";
+ version = "1.9";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "emacs-buttercup";
- rev = "e6f97d0ee4da1d061c2ff5f3e3984a30956a9fbc";
- sha256 = "1qizbnychsjv42h9r33l1jm0rylvkgddcwgwxxcckfkj6r75k9p5";
+ rev = "18a887957b0e22d3cc8873796bd27f06b2493a03";
+ sha256 = "0y0wg0yqmvqjyhjs4dx8yw44hl19k227krd9mds220w0dx8wmhay";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup";
@@ -3646,6 +3688,27 @@
license = lib.licenses.free;
};
}) {};
+ caml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "caml";
+ version = "4.6.0pre1";
+ src = fetchFromGitHub {
+ owner = "ocaml";
+ repo = "ocaml";
+ rev = "500625015d40f716e19278209faaa44216dcff58";
+ sha256 = "1s10wirx080yl0gd2n09lw5kj8yy1mbiipmcr8gpfyc8dq7kfjna";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml";
+ sha256 = "1ixs0626nsg1ilqdwj5rd8kicjy7mprswwy0kprppmpmc8y7xf7c";
+ name = "caml";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/caml";
+ license = lib.licenses.free;
+ };
+ }) {};
cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }:
melpaBuild {
pname = "cargo";
@@ -3733,12 +3796,12 @@
cask-package-toolset = callPackage ({ ansi, cl-lib ? null, commander, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
melpaBuild {
pname = "cask-package-toolset";
- version = "0.9.1";
+ version = "0.9.2";
src = fetchFromGitHub {
owner = "AdrieanKhisbe";
repo = "cask-package-toolset.el";
- rev = "1e972739dbdf3af5b60a250c99414e76db238f78";
- sha256 = "0padb1zfjkmx9kbqnqh744qvpd3ln0khwxifxld9cpcpdp5k04vc";
+ rev = "2c74cd827e88c7f8360581a841e45f0b794510e7";
+ sha256 = "1hk5q6p1j7cqg5srr3v21xfyy7aas4hfj1a66h21c2xvfjra3hxw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ed71e45389626e700b93b29d5e2659b6706274d8/recipes/cask-package-toolset";
@@ -3938,6 +4001,27 @@
license = lib.licenses.free;
};
}) {};
+ cframe = callPackage ({ buffer-manage, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "cframe";
+ version = "0.1";
+ src = fetchFromGitHub {
+ owner = "plandes";
+ repo = "cframe";
+ rev = "bb99672502046e87c8f029ce98c637f762a4fc54";
+ sha256 = "088px3wlvr4km913y7hajrjqnxnv6n325rk6353bkbah2d75vxq4";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6e39555b2538cc8a955766c5533871396e8fe712/recipes/cframe";
+ sha256 = "0pngdaflk1pk2xmwbij4b520b3mlacnjab4r3jby0phah44ziv4l";
+ name = "cframe";
+ };
+ packageRequires = [ buffer-manage dash emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/cframe";
+ license = lib.licenses.free;
+ };
+ }) {};
chapel-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "chapel-mode";
@@ -4088,12 +4172,12 @@
choice-program = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "choice-program";
- version = "0.2";
+ version = "0.4";
src = fetchFromGitHub {
owner = "plandes";
repo = "choice-program";
- rev = "5a803216d1d7a7ac6fd0f89f04ba4c126182a852";
- sha256 = "0iah71kcrzi22mi1jvyyaiflsx0ry24hqb0wd2w0nbgzc8s5ycqb";
+ rev = "27607ec1fe241c58fbc1f861454a8e2ec1fd7b15";
+ sha256 = "0q8krgsydrc2xc29y60qljifdvxfmxnvbncxsh64xhrzsnrgwmq5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6e39555b2538cc8a955766c5533871396e8fe712/recipes/choice-program";
@@ -4169,15 +4253,36 @@
license = lib.licenses.free;
};
}) {};
+ circadian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "circadian";
+ version = "0.3.0";
+ src = fetchFromGitHub {
+ owner = "GuidoSchmidt";
+ repo = "circadian.el";
+ rev = "feec308591b43e7869d7a018d5c6fc7e943d53ee";
+ sha256 = "0j8an9ny3jk9nmlpi360n064m20nhah9p8rj6wb9xbvnfrri5zjk";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3440905a20bc91bb2637a87c04ff8410379f150d/recipes/circadian";
+ sha256 = "13797y1w1636bibisz5i5p2xp0smd3apnhc1nx8ijm75smx679id";
+ name = "circadian";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/circadian";
+ license = lib.licenses.free;
+ };
+ }) {};
circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "circe";
- version = "2.5";
+ version = "2.6";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "circe";
- rev = "13c605e639194c3da0c2e685056fac685f8c76a0";
- sha256 = "0n7v0g332ml1ang2fjc8rjbi8h1f4bqazcqi8dlfn99vvv8kcd21";
+ rev = "59f1096238e6c30303a6fe9fc1c635f49e5946c6";
+ sha256 = "19h3983zy3f15cgs86irvbdzz55qyjm48qd7gjlzcxplr7vnnh0j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe";
@@ -4499,12 +4604,12 @@
closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "closql";
- version = "0.3.3";
+ version = "0.4.0";
src = fetchFromGitHub {
owner = "emacscollective";
repo = "closql";
- rev = "0bb0fa3dd1e545cbf025d42e253ddb00107156a3";
- sha256 = "1mpycmj88gi62rhzxdv4933l318j3llphbc00b7rvzms55sgpcz5";
+ rev = "66597831248bbe14ebc7bbf24b24cafebb5fd362";
+ sha256 = "0jxf7k95l2j6rjyafq3zj6bxaa2xn4zmi4zg1n04sachcdrcgh3l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/closql";
@@ -4583,12 +4688,12 @@
cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cmake-mode";
- version = "3.9.2";
+ version = "3.10.0pre4";
src = fetchFromGitHub {
owner = "Kitware";
repo = "CMake";
- rev = "ffa164736ec78f27583ca4515ff3dfc7a82fc702";
- sha256 = "09m6hwlzdrd884h8wcq8pfac098smk1xqjpqm3003bqs4aynm49p";
+ rev = "45da558742bad36be518e8d95dee0d0ec3793a64";
+ sha256 = "0qq7dhwcl290ymza5imc16cg3f9crxym1q6b4i7w9fax8x2vlc1m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -4622,6 +4727,27 @@
license = lib.licenses.free;
};
}) {};
+ cnfonts = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "cnfonts";
+ version = "0.9.1";
+ src = fetchFromGitHub {
+ owner = "tumashu";
+ repo = "cnfonts";
+ rev = "cbe1ddd49e33b790a568c55351146aa5b909f173";
+ sha256 = "11d44lf0m0kbzq1mvyqkl4aprys0xqaarp08nij57xnynin1rynx";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0d5787ffeeee68ffa41f3e777071815084e0ed7a/recipes/cnfonts";
+ sha256 = "1pryn08fkdrdj7w302205nj1qhfbk1jzqxx6717crrxakkdqmn9w";
+ name = "cnfonts";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/cnfonts";
+ license = lib.licenses.free;
+ };
+ }) {};
codic = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "codic";
@@ -4748,6 +4874,27 @@
license = lib.licenses.free;
};
}) {};
+ colormaps = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "colormaps";
+ version = "0.1.2";
+ src = fetchFromGitHub {
+ owner = "lepisma";
+ repo = "colormaps.el";
+ rev = "3a88961ba66b09a49ea5aa92b2b8776b2c92d68c";
+ sha256 = "083hks2zzalizdsgabiwc1kd114r748v5i3w3kfk8pv37i2gay35";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/f4c795d9e323b08bc8354a6933a061644705a2ec/recipes/colormaps";
+ sha256 = "16plhgpfz1wb58p6h8wxjhplhgv0mbj3f2xj34p6vydh44l8w8q2";
+ name = "colormaps";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/colormaps";
+ license = lib.licenses.free;
+ };
+ }) {};
commander = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "commander";
@@ -4790,6 +4937,27 @@
license = lib.licenses.free;
};
}) {};
+ comment-tags = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
+ melpaBuild {
+ pname = "comment-tags";
+ version = "0.1";
+ src = fetchFromGitHub {
+ owner = "vincekd";
+ repo = "comment-tags";
+ rev = "293a30026d7750f6657d6c2e6d6428abf1d7db5a";
+ sha256 = "06s0phgqpzkkv81gl0cm6x8rjs53lhs8b2j56xamflqiydq0fz7n";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6ac71f4ffc19bce4f571001f9270d5be855dfc3c/recipes/comment-tags";
+ sha256 = "13slv150zch0b7zpxa2dbqjzpqh0iy559m6rc0zs0dwdagzryp3i";
+ name = "comment-tags";
+ };
+ packageRequires = [ emacs pkg-info ];
+ meta = {
+ homepage = "https://melpa.org/#/comment-tags";
+ license = lib.licenses.free;
+ };
+ }) {};
commenter = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
melpaBuild {
pname = "commenter";
@@ -4898,12 +5066,12 @@
company-cabal = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "company-cabal";
- version = "0.1.1";
+ version = "0.2.1";
src = fetchFromGitHub {
owner = "iquiw";
repo = "company-cabal";
- rev = "a570559ff92522598b5ed40e21c4539fffb3e976";
- sha256 = "1pja44g15d11kl47abzykrp28j782nkbmb0db0ilpc96xf1fjlsw";
+ rev = "f458de88cad16ed48a605e8347e56433e73dcef8";
+ sha256 = "0ll9dxzsgrpy4psz3dqhzny990lfccn63swcyfvl8mnqgwbrq8k0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ee888b1ba57b6af3a3330607898810cd248862db/recipes/company-cabal";
@@ -5147,6 +5315,27 @@
license = lib.licenses.free;
};
}) {};
+ company-lsp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }:
+ melpaBuild {
+ pname = "company-lsp";
+ version = "1.0.0";
+ src = fetchFromGitHub {
+ owner = "tigersoldier";
+ repo = "company-lsp";
+ rev = "86fda23d29b732ba3987bf20901034da1515b077";
+ sha256 = "068lg2yrpnzq8cg73irnx7i41giww7m0ysnl2inc7hikhmm3a95y";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/5125f53307c1af3d9ccf2bae3c25e7d23dfe1932/recipes/company-lsp";
+ sha256 = "09nbi6vxw8l26gfgsc1k3bx4m8i1px1b0jxaywszky5bv4fdy03l";
+ name = "company-lsp";
+ };
+ packageRequires = [ company emacs lsp-mode s ];
+ meta = {
+ homepage = "https://melpa.org/#/company-lsp";
+ license = lib.licenses.free;
+ };
+ }) {};
company-math = callPackage ({ company, fetchFromGitHub, fetchurl, lib, math-symbol-lists, melpaBuild }:
melpaBuild {
pname = "company-math";
@@ -5213,12 +5402,12 @@
company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "company-php";
- version = "1.8";
+ version = "1.8.1";
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
- rev = "7a50b7debd149a30b84f0e2e57a4662926d96a24";
- sha256 = "15kmzkkgrhwind66kiyc2kpl27jrbzcs79i3w5s7fzzjjg9h18lb";
+ rev = "317ad1d023db6b2fe67444a2c075e656c35f5094";
+ sha256 = "1wyf93faq6z6wgcs3lxc6gv75bmxchg6kd98dza61zdyc0rj60wa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@@ -5513,12 +5702,12 @@
conda = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }:
melpaBuild {
pname = "conda";
- version = "0.0.7";
+ version = "0.0.8";
src = fetchFromGitHub {
owner = "necaris";
repo = "conda.el";
- rev = "6ba9ef5d72ef613f478e07e2ebf57b47066beee7";
- sha256 = "0mp6jzyvz3m41vb4kwwikyvcjgc8qgryyx71n1m50jr2i23s9nk2";
+ rev = "526be691824f4a32299f560a883913697bc4d847";
+ sha256 = "1jix3md6b02fypjm4y05av7acjkqryd1vqqz9wgxyinydlagrvh7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fcf762e34837975f5440a1d81a7f09699778123e/recipes/conda";
@@ -5639,12 +5828,12 @@
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";
+ version = "0.0.2";
src = fetchFromGitHub {
owner = "emacs-php";
repo = "emacs-auto-deployment";
- rev = "7b8e13cd3dcc12b247089a4530e08fd0ab3bc487";
- sha256 = "0nx9qlp1jl7hmwf19ifac8r0955vkdkscf0nmm92hdqbj83jdmv9";
+ rev = "fe78b4c9fdc261ce22a771765702ebe4d9437c84";
+ sha256 = "0vf6qp7fxqvgd02vfsbmm38vc8n2wvrfwv4wnsr15gd8y8zldlgs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/copy-file-on-save";
@@ -5741,22 +5930,22 @@
license = lib.licenses.free;
};
}) {};
- counsel-bbdb = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
+ counsel-bbdb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "counsel-bbdb";
- version = "0.0.1";
+ version = "0.0.2";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "counsel-bbdb";
- rev = "297d0c7e6e1eaafcd5e188724fea8e8f26b95555";
- sha256 = "14gw4d855v2nvqh06vs9rzs816pn1hp4rhfikb0wzg1ay6gdrwi7";
+ rev = "f95e4812cd17e5f8069c9209241396780d414680";
+ sha256 = "08zal6wyzxqqg9650xyj2gmhb5cr34zwjgpfmkiw610ypld1xr73";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0ed9bcdb1f25a6dd743c1dac2bb6cda73a5a5dc2/recipes/counsel-bbdb";
sha256 = "14d9mk44skpmyj0zkqwz97j80r630j7s5hfrrhlsafdpl5aafjxp";
name = "counsel-bbdb";
};
- packageRequires = [ emacs ivy ];
+ packageRequires = [];
meta = {
homepage = "https://melpa.org/#/counsel-bbdb";
license = lib.licenses.free;
@@ -5783,6 +5972,27 @@
license = lib.licenses.free;
};
}) {};
+ counsel-etags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "counsel-etags";
+ version = "1.2.0";
+ src = fetchFromGitHub {
+ owner = "redguardtoo";
+ repo = "counsel-etags";
+ rev = "5d7b51ce7806bbe7e1f75077b4dde2ac17a53c5d";
+ sha256 = "0v3b3gs4jy8cqkvchnakwpws3a0igiklchb9q3754lnmk8784dn8";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags";
+ sha256 = "1h3dlczm1m21d4h41vz9ngg5fi02g6f95qalfxdnsvz0d4w4yxk0";
+ name = "counsel-etags";
+ };
+ packageRequires = [ counsel emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/counsel-etags";
+ license = lib.licenses.free;
+ };
+ }) {};
counsel-gtags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "counsel-gtags";
@@ -6161,6 +6371,27 @@
license = lib.licenses.free;
};
}) {};
+ cwl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }:
+ melpaBuild {
+ pname = "cwl-mode";
+ version = "0.2.4";
+ src = fetchFromGitHub {
+ owner = "tom-tan";
+ repo = "cwl-mode";
+ rev = "c5110c1e035535a1133a7107c0d2d55e5fe3c5b9";
+ sha256 = "088998r78bpy77pb2rhbr6a2fks5mcy3qyvyzlqwwl0v2gnscl59";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/2309764cd56d9631dd97981a78b50b9fe793a280/recipes/cwl-mode";
+ sha256 = "0x8akxxmphpgsc2m78h6b0fs6vvcfvmi1q2jrz8hwlmai8f7zi9j";
+ name = "cwl-mode";
+ };
+ packageRequires = [ emacs yaml-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/cwl-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
cyberpunk-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cyberpunk-theme";
@@ -6206,12 +6437,12 @@
cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cython-mode";
- version = "0.26.1";
+ version = "0.27.2";
src = fetchFromGitHub {
owner = "cython";
repo = "cython";
- rev = "39c71d912af541229d24da17987d65e65731d2bf";
- sha256 = "02alpsgmm0csp9yfa4bhsf8yyhf0q9rc44yrss0020qg8n92xs06";
+ rev = "41b4a28d7c7c505d58502c9cf69bde2e33091de0";
+ sha256 = "04k534xyr8816821y0lf2dq24bzvb40v99ijdwgy5qhv4rjxbr18";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -6248,12 +6479,12 @@
dad-joke = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dad-joke";
- version = "1.3";
+ version = "1.4";
src = fetchFromGitHub {
owner = "davep";
repo = "dad-joke.el";
- rev = "92641503c7e93309db12380d5228f99dbe64a53c";
- sha256 = "063cz5k264qbkb5g87xr6z68fjjnw3j1hpckdn6nqy8cin4qhagc";
+ rev = "bee47e7b746b403228fa7d7361cb095de19ac9ba";
+ sha256 = "14snnnjs28jg6k8x6g90m3dbcx10306ipcd256d3l6czk9p17vpd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/484d571b2737f7c613816333afdde6460c64e635/recipes/dad-joke";
@@ -6290,12 +6521,12 @@
darcula-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "darcula-theme";
- version = "1.2";
+ version = "1.7";
src = fetchFromGitLab {
owner = "fommil";
repo = "emacs-darcula-theme";
- rev = "da9852867ac115a54ee350a750d4dae182706117";
- sha256 = "03059ydiw73a7kdvgn3namfqz87pqm2xfrnf87irkiv5pl9h482s";
+ rev = "25f179b9fb72c1b95a3907aa4b4a44f8d261e45a";
+ sha256 = "0x1amh0ycjvk218d6cyqizkak47b6r1wczakbfkvnbr0khgkgmr7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/23c8f10205187babb17e3abc3dc40eb1938e6640/recipes/darcula-theme";
@@ -6395,12 +6626,12 @@
dashboard = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, page-break-lines }:
melpaBuild {
pname = "dashboard";
- version = "1.2.3";
+ version = "1.2.4";
src = fetchFromGitHub {
owner = "rakanalh";
repo = "emacs-dashboard";
- rev = "f435fd394edc5ad9cf82065ef73b5821e3f93c58";
- sha256 = "0f0ipnij69z90qv9lzl6x9id3f6nayrgqxppbcf4gkxh25pi5nkw";
+ rev = "8594c4f55448148b720eda5b72d51667fb7a8a39";
+ sha256 = "1hhh1kfsz87qfmh45wjf2r93rz79rq0vbyxlfrsl02092zjbl1zr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e9a79341ccaa82a8c065e71c02fe6aee22007c66/recipes/dashboard";
@@ -6458,12 +6689,12 @@
datetime = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "datetime";
- version = "0.2.1";
+ version = "0.3";
src = fetchFromGitHub {
owner = "doublep";
repo = "datetime";
- rev = "3ecf9985250ecd441e91614b44cf12323af907c0";
- sha256 = "1x8kj6d9p42lffk15m0c955ibwxxvfxhihij43alwq5xab2l16bv";
+ rev = "082d2c7b0e38c26a8c46af9c9956a2e100d88e71";
+ sha256 = "0fdswqi53qx924lib7nd9dazn0916xf1ybrh3bcn3f8cn6b8ikg5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fff9f0748b0ef76130b24e85ed109325256f956e/recipes/datetime";
@@ -7085,6 +7316,27 @@
license = lib.licenses.free;
};
}) {};
+ diredfl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "diredfl";
+ version = "0.4";
+ src = fetchFromGitHub {
+ owner = "purcell";
+ repo = "diredfl";
+ rev = "45e9c46f58c655694758d4986b9195c8bb40ddf3";
+ sha256 = "1zb2lz7rp58zqvpniqcsmqabi7nqg2d8bfd0hgmq68bn2hd25b5z";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3da86e18d423198766455929da1dcb3a9a3be381/recipes/diredfl";
+ sha256 = "0cybq15yq07x2mnrnwapy020d598yymcy8y9wwf1m7f59p3h9hvn";
+ name = "diredfl";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/diredfl";
+ license = lib.licenses.free;
+ };
+ }) {};
diredful = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "diredful";
@@ -7172,12 +7424,12 @@
disable-mouse = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "disable-mouse";
- version = "0.2";
+ version = "0.3";
src = fetchFromGitHub {
owner = "purcell";
repo = "disable-mouse";
- rev = "d1c52d80ed2149d0751afd948ffc2d9f80f589ac";
- sha256 = "1v1y5hf6k6ng7xsvgb27nh740d14m6l4krr0paccda8zgm4mw357";
+ rev = "81639930bcaeedadbcc19728e91719afcac84613";
+ sha256 = "0l6mai68ns3qw3rlvjvzsnqwdy7bxqiy0vdwflq0l1plxb1vazyc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dbbc396373212fdf731e135cde391f27708ff015/recipes/disable-mouse";
@@ -7347,12 +7599,12 @@
docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }:
melpaBuild {
pname = "docker-compose-mode";
- version = "0.3.5";
+ version = "1.0.0";
src = fetchFromGitHub {
owner = "meqif";
repo = "docker-compose-mode";
- rev = "372df2f0de34a4bd44d4a7274b9ab85117ac7392";
- sha256 = "14vgjhy2j60xhf38zm5nlkr4d3r455kw6paw0wff4mqmdjcg3pds";
+ rev = "ae25b0e01394f94995f4b0ceaab1e04eb4b9acbd";
+ sha256 = "14xri92dcj52vw1vhrnicibrn9y010zv8w7jw6j3q9lrpmr073lr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/37dd4c1fc11d22598c6faf03ccc860503a68b950/recipes/docker-compose-mode";
@@ -7578,12 +7830,12 @@
drupal-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode }:
melpaBuild {
pname = "drupal-mode";
- version = "0.7.1";
+ version = "0.7.3";
src = fetchFromGitHub {
owner = "arnested";
repo = "drupal-mode";
- rev = "1e6f973ed5dfdbbfda96c4ab266bd8ef3d6436d7";
- sha256 = "1c3krir3l04rwlyadnhra6kmbnmvdm95aj7iwspa6dssnry4vflj";
+ rev = "49ce63c659aa0af7a2daf0c9e74e58fbce6deb71";
+ sha256 = "1l2xc24y037b3z62yxmq2bx1x3qqv56d15bf3qmb3mpgm4gh85j6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/13e16af340868048eb1f51f9865dfc707e57abe8/recipes/drupal-mode";
@@ -7662,12 +7914,12 @@
dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
melpaBuild {
pname = "dumb-jump";
- version = "0.5.0";
+ version = "0.5.1";
src = fetchFromGitHub {
owner = "jacktasia";
repo = "dumb-jump";
- rev = "c96467b3079495353350a6b00fd2e6052b3a3fd0";
- sha256 = "04jhbapf84if54d648mx1fk7b9vwrnd0apyarwjv7p1azasm6vwl";
+ rev = "64c0759432334465ccea115d83600b468f86e3be";
+ sha256 = "00vhxd7z7fw2cwdzgvfbdzfp668dfaw83c95kkicmmdzlabiz50i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump";
@@ -7686,8 +7938,8 @@
version = "0.7";
src = fetchhg {
url = "https://bitbucket.com/harsman/dyalog-mode";
- rev = "56fa34ea25d4";
- sha256 = "1hk7i557m0m42zdg59z278cylglnp49dr8wa3zbdwzk2xzdg0m00";
+ rev = "9e446540a794";
+ sha256 = "0gyip843fdqp6cwwaqcrnpngf5a3iqcbd9h7rl5lbvxpkqvm7shi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode";
@@ -7868,15 +8120,36 @@
license = lib.licenses.free;
};
}) {};
+ eacl = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
+ melpaBuild {
+ pname = "eacl";
+ version = "1.0.2";
+ src = fetchFromGitHub {
+ owner = "redguardtoo";
+ repo = "eacl";
+ rev = "c7a8d705295dc51cc306cb4c2d8773e24c4c74f4";
+ sha256 = "1f3liqrw55v9wnf7g475iabx4pf7gbg2x82mqrf22hhkvxzi2b2b";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/8223bec7eed97f0bad300af9caa4c8207322d39a/recipes/eacl";
+ sha256 = "16afsf3diz498jb63q85lm5ifvm487clfl838qzagl1l4aywhlwr";
+ name = "eacl";
+ };
+ packageRequires = [ emacs ivy ];
+ meta = {
+ homepage = "https://melpa.org/#/eacl";
+ license = lib.licenses.free;
+ };
+ }) {};
easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "easy-hugo";
- version = "1.7.7";
+ version = "2.0.16";
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-easy-hugo";
- rev = "108cc2347507ff8c92b10a817de0850e9eb99ab2";
- sha256 = "1fcq6693cjl0lx67gwsk53lm20zznq9cc9widb3rzpwifns4x8ac";
+ rev = "d55472bdb08850fb3b2b27a373630c68f6cd2ac0";
+ sha256 = "168wz1638arypqz6i0mzj1pw6mzgp6x10i2wz2vpgkw5p79zw46i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
@@ -8165,12 +8438,12 @@
edit-indirect = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "edit-indirect";
- version = "0.1.4";
+ version = "0.1.5";
src = fetchFromGitHub {
owner = "Fanael";
repo = "edit-indirect";
- rev = "1d1dae842505e5ff09644529deec87c056e1b14e";
- sha256 = "145knahvvxbm8qmcdb69ilrg14w7130vav2pqjd7anr1l8n2i6gz";
+ rev = "032ac0ec690d4999d564fd882588c7a197efe8dd";
+ sha256 = "0by1x53pji39fjrj5bd446kz831nv0vdgw2jqasbym4pc1p2947r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/edit-indirect";
@@ -8614,12 +8887,12 @@
el2org = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "el2org";
- version = "0.5.0";
+ version = "0.6.0";
src = fetchFromGitHub {
owner = "tumashu";
repo = "el2org";
- rev = "c85837d56ed8fe1b31927755294db49ac46f443e";
- sha256 = "0znnvpngghd9z8a0cakpvrw261mnmxqa15lpjcxfm7w8wgb2d4f6";
+ rev = "4a33469cd305e581603d7ef63bc2a1f2156f2e2e";
+ sha256 = "0mzddqny6wpg1fv99xrvlv7rxmaifvmy5bvj4in4pldhm4cx4q1b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/el2org";
@@ -8950,12 +9223,12 @@
elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }:
melpaBuild {
pname = "elpy";
- version = "1.16.0";
+ version = "1.17.0";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "elpy";
- rev = "c33794ae03fa787c7f93b93cc9427d864b63e25f";
- sha256 = "1q8zjsl9zbgwqcbvzkdlqy28z4h1qr0kkhhrq037vab0w0l0zi6l";
+ rev = "99f0b6401bff25d40b9f58123533271f7870a286";
+ sha256 = "06n0vr8y5s8y7q9v96z030l1i9n29p622p36biyi5cjcmgf5h09j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy";
@@ -9251,12 +9524,12 @@
embrace = callPackage ({ cl-lib ? null, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "embrace";
- version = "0.1.3";
+ version = "0.1.4";
src = fetchFromGitHub {
owner = "cute-jumper";
repo = "embrace.el";
- rev = "a57b4be5d60daf8c176f9bd35770540c2d3963c9";
- sha256 = "0sn81a7f8g5i4q74byfkj0jlg4aj0rxpfvx9sqv8azcg6wq2f65l";
+ rev = "dd5da196e5bcc5e6d87e1937eca0c21da4334ef2";
+ sha256 = "1m0qyipkp5ydgcav8d0m58fbj1gilipbj7g8mg40iajr8wfqcjdc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e8f07e3b5ba4ec4b0b79fba5a2cca5a3986218b6/recipes/embrace";
@@ -9290,20 +9563,21 @@
license = lib.licenses.free;
};
}) {};
- emms = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
+ emms = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }:
+ melpaBuild {
pname = "emms";
- version = "4.3";
+ version = "4.4";
src = fetchgit {
url = "https://git.savannah.gnu.org/git/emms.git";
- rev = "4cb3ae341847e8e8586373a95a458a453469812d";
- sha256 = "0bmxlrk2p51bw5lgh2arkcz1v9bw6rpflwk778rdzn0rhzhvhp5b";
+ rev = "88fecd0234da595843ce6be4d3f9f2b755ff612d";
+ sha256 = "0ycm2lggljhzrb10r3c322c7bb580gk125x9nvpvjrvsp74p8im0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms";
sha256 = "1xpry8h96gvjnc0v8x0vk5dnmlq1r7m3ljpampdwv9pfwl95fh94";
name = "emms";
};
- packageRequires = [];
+ packageRequires = [ cl-lib ];
meta = {
homepage = "https://melpa.org/#/emms";
license = lib.licenses.free;
@@ -9574,12 +9848,12 @@
ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }:
melpaBuild {
pname = "ensime";
- version = "1.0.1";
+ version = "2.0.1";
src = fetchFromGitHub {
owner = "ensime";
repo = "ensime-emacs";
- rev = "2b4d4cd764b9fa4757738a6dae87f4d1e99686d6";
- sha256 = "0j7zd3qxh4m5gv5s8pvfacad2mkzwwz1xdrvg1sa035xaxahqsyx";
+ rev = "34c7719c9739d1e5d55c3f776e8f32a417b4eea6";
+ sha256 = "1dpj31krw0vwrb1pimpbpdm3k2ivqmr6kbgaw8p2dwwwqk1s6nbg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime";
@@ -9645,12 +9919,12 @@
epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "epkg";
- version = "2.3.0";
+ version = "3.0.0";
src = fetchFromGitHub {
owner = "emacscollective";
repo = "epkg";
- rev = "deb9affaadce11c356df53b6b62ab376ef652d16";
- sha256 = "1515gv9bhjwbmkbz6sivq5zhpalvfb0ias4qia9anz9npqfx24y0";
+ rev = "1768e91e02a2d6441c2d82a711912a9498d2316e";
+ sha256 = "02fknkqxqxzqdqa2vj7ql6swrl83v1xs5iym5r6yr6mpj69di8bd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg";
@@ -9875,12 +10149,12 @@
erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "erlang";
- version = "20.0.4";
+ version = "20.1.3";
src = fetchFromGitHub {
owner = "erlang";
repo = "otp";
- rev = "a230f26086b3db9097f06d4bb91fb3b2e9379c77";
- sha256 = "1g26vf7ab18r9knxa2ykn3j6vrhhiyqbg6jf3gfjxw2c94z51a9m";
+ rev = "a98379d0519c28f9bc9b673ed2c09fb1ad52456e";
+ sha256 = "1672yqqh7ql88c6ifv555wvqrj8nyn5a2nph43n2nc43h7hhz17c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -10081,6 +10355,27 @@
license = lib.licenses.free;
};
}) {};
+ eshell-bookmark = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "eshell-bookmark";
+ version = "2.0.0";
+ src = fetchFromGitHub {
+ owner = "Fuco1";
+ repo = "eshell-bookmark";
+ rev = "deda4b848b2fb979dbe73ead2cb866610e3596ed";
+ sha256 = "14dmsnixf9vqdhsixw693sml0fn80zcf0b37z049fb40cmppqxdw";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e7bf4702a907727990fcc676980f2b219e22ab0c/recipes/eshell-bookmark";
+ sha256 = "1bybxlq1h5chrjxqjb23kq8dmgw2xrjwkrnvpbphblqzpdy5ck0s";
+ name = "eshell-bookmark";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/eshell-bookmark";
+ license = lib.licenses.free;
+ };
+ }) {};
eshell-did-you-mean = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eshell-did-you-mean";
@@ -10123,6 +10418,27 @@
license = lib.licenses.free;
};
}) {};
+ eshell-prompt-extras = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "eshell-prompt-extras";
+ version = "0.96";
+ src = fetchFromGitHub {
+ owner = "hiddenlotus";
+ repo = "eshell-prompt-extras";
+ rev = "7581c109673c40aceff278cd524273f50ffe170d";
+ sha256 = "1m1jisjz974cfz89i6l2zq666yzhsqipc6dmqlrm8mw81fxsfm1h";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/eshell-prompt-extras";
+ sha256 = "0kh4lvjkayjdz5lqvdqmdcblxizxk9kwmigjwa68kx8z6ngmfwa5";
+ name = "eshell-prompt-extras";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/eshell-prompt-extras";
+ license = lib.licenses.free;
+ };
+ }) {};
eshell-up = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eshell-up";
@@ -10417,22 +10733,22 @@
license = lib.licenses.free;
};
}) {};
- evil = callPackage ({ fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
+ evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
melpaBuild {
pname = "evil";
- version = "1.2.12";
+ version = "1.2.13";
src = fetchFromGitHub {
owner = "emacs-evil";
repo = "evil";
- rev = "0ad4c2dae1249558f7b59a78a685e4f8092009c9";
- sha256 = "1z7ysn0h62i674pw47k905713m4ch7hrisk4834rf53zq3c9sabn";
+ rev = "427cf5faa57e8794ac93f594dc3d1972e687a25a";
+ sha256 = "02xc9zgrabnlwk3wlsxbzbhdzi3fm5fk8kimvgdcp8vsnpdcrhql";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil";
sha256 = "1d36r6mi5nvrwnk4a9338wmhr72fcbrwj0r8gmvivpjdngjy4k39";
name = "evil";
};
- packageRequires = [ goto-chg undo-tree ];
+ packageRequires = [ cl-lib emacs goto-chg undo-tree ];
meta = {
homepage = "https://melpa.org/#/evil";
license = lib.licenses.free;
@@ -10630,12 +10946,12 @@
evil-magit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
melpaBuild {
pname = "evil-magit";
- version = "0.4.1";
+ version = "0.4.2";
src = fetchFromGitHub {
owner = "emacs-evil";
repo = "evil-magit";
- rev = "077354f8ebd5da76937bf8f5df5d484f8a0ccc62";
- sha256 = "05llzcdbg84x04a98b6r7d0m8631hk83hjq33hwd4n8ixp85dg20";
+ rev = "a24186be7cc2cdab24b56f6dcc4665eeb8349c1a";
+ sha256 = "12hr2w5r2hgagb3hqbi59v73rxpjml5prc3m7dw3wzsm0rf1rwh3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/50315ec837d2951bf5b2bb75809a35dd7ffc8fe8/recipes/evil-magit";
@@ -10963,6 +11279,27 @@
license = lib.licenses.free;
};
}) {};
+ evil-test-helpers = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "evil-test-helpers";
+ version = "1.2.13";
+ src = fetchFromGitHub {
+ owner = "emacs-evil";
+ repo = "evil";
+ rev = "427cf5faa57e8794ac93f594dc3d1972e687a25a";
+ sha256 = "02xc9zgrabnlwk3wlsxbzbhdzi3fm5fk8kimvgdcp8vsnpdcrhql";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/87da8c50f9167ad9c3844b23becb6904f809611d/recipes/evil-test-helpers";
+ sha256 = "0l4skyznzgr76z518q22lf90ymlsfcs02w8vqkg8az1nfl3ch7fs";
+ name = "evil-test-helpers";
+ };
+ packageRequires = [ evil ];
+ meta = {
+ homepage = "https://melpa.org/#/evil-test-helpers";
+ license = lib.licenses.free;
+ };
+ }) {};
evil-text-object-python = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-text-object-python";
@@ -11050,12 +11387,12 @@
evil-visual-replace = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-visual-replace";
- version = "0.0.4";
+ version = "0.0.5";
src = fetchFromGitHub {
owner = "troyp";
repo = "evil-visual-replace";
- rev = "9bfbaf71898294e25d588a887fb4753641edfbe9";
- sha256 = "00mhqb9rn4hq90x5i44jyq51lg351bv8hdj4c443nxrbldi73k9s";
+ rev = "163fc827a1ffc106475da470c37fb26f4cc9b008";
+ sha256 = "1gfyrq7xfzmzh3x8k5f08n027dlbwi0pkkxf9c39fkxp4jngibsz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-visual-replace";
@@ -11301,12 +11638,12 @@
eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eziam-theme";
- version = "0.4.4";
+ version = "0.4.5";
src = fetchFromGitHub {
owner = "thblt";
repo = "eziam-theme-emacs";
- rev = "63395a2367d1d48983a9363d2d0bf518177297bd";
- sha256 = "15vgv0z4vzdnc3vb98j2hy4bv5x83f4c1dzgx49r61vka7p5is0q";
+ rev = "4a79230739cfaa607f39fbfe53339692b83c3933";
+ sha256 = "0cdaayp2ca6wcqh11snmc50p4gl6sika58jxvn5dklsipzxv75v8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme";
@@ -11406,12 +11743,12 @@
fancy-narrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fancy-narrow";
- version = "0.9.4";
+ version = "0.9.5";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "fancy-narrow";
- rev = "cd381c1acd5e0d9b6acd7f3e76c3b1de21e8b6df";
- sha256 = "10ds6nlzm1s5xsp53a52qlzrnph7in6gib67qhgnwpj33wp8gs91";
+ rev = "c0f70b4333d4764323b7154e37a378adb1610ab7";
+ sha256 = "0vcr1gnqawvc1yclqs23jvxm6bqix8kpflf1c7znb0wzxmz9kx7y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/fancy-narrow";
@@ -11871,6 +12208,27 @@
license = lib.licenses.free;
};
}) {};
+ flex-compile = callPackage ({ buffer-manage, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "flex-compile";
+ version = "0.1";
+ src = fetchFromGitHub {
+ owner = "plandes";
+ repo = "flex-compile";
+ rev = "4ca317883404a14c1b4920d7b3e6f0bffb04a8f2";
+ sha256 = "08ax91bdf4dwky8zp0cwmk53wqyqs893j7q1jah5cimnhgi82ksz";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/259caeebc317e81ab9d532a371ea85656c2b1619/recipes/flex-compile";
+ sha256 = "1hlh4k7qgln87xajnjjhf1yyg6bgdwd0iczhlfw8gdwfj5xpjd38";
+ name = "flex-compile";
+ };
+ packageRequires = [ buffer-manage dash emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/flex-compile";
+ license = lib.licenses.free;
+ };
+ }) {};
floobits = callPackage ({ fetchFromGitHub, fetchurl, highlight, json ? null, lib, melpaBuild }:
melpaBuild {
pname = "floobits";
@@ -11958,12 +12316,12 @@
flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
melpaBuild {
pname = "flycheck";
- version = "30";
+ version = "31";
src = fetchFromGitHub {
owner = "flycheck";
repo = "flycheck";
- rev = "9c063965e893f0cc7c97fabb810ac41ec22f82fb";
- sha256 = "1vyncqicafmy9av2nsawywn56ay50zdyjba9r55vv11baklabg8w";
+ rev = "401b115d10e202a1b31f57340438420081af21ce";
+ sha256 = "141i6wzqlb0dslmca6930cal7q4y5wbwzmxrpjk3hgm6nxz483p8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck";
@@ -12210,12 +12568,12 @@
flycheck-joker = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-joker";
- version = "1.0.0";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "candid82";
repo = "flycheck-joker";
- rev = "e7964140cbb0ee7badfc3d67c6412f5c3a461f76";
- sha256 = "0mqnhcpkf86dxqj0y7g5mnn91m81jdvrsbwikyqvx46z1jpi0y37";
+ rev = "c34c3922a2e8bc918f250602e0ddf655cdcad456";
+ sha256 = "0fp7h0pmxk02x1kisqvnb9wkjjn9bl91capmnllrb7qmb24w6pd5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/599bf33a5d4a4a590b355001e532cab4e1ee9ef6/recipes/flycheck-joker";
@@ -12312,15 +12670,36 @@
license = lib.licenses.free;
};
}) {};
+ flycheck-nimsuggest = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, nim-mode }:
+ melpaBuild {
+ pname = "flycheck-nimsuggest";
+ version = "0.8.1";
+ src = fetchFromGitHub {
+ owner = "yuutayamada";
+ repo = "flycheck-nimsuggest";
+ rev = "8b1c69e9aa924368bc4dadd4cde818ff158cd3f0";
+ sha256 = "0vnwy7b3xs2smbr6ah6yk8hq7vvsciq7d6m1qr91nfnazdgvxmvg";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/cb4170f002dbcd1906e81836f3ce035b1e81c379/recipes/flycheck-nimsuggest";
+ sha256 = "099mlzramm6z66zyjb6ypn7qb0hpvwbbgk9ydsanj8sni0dd66hv";
+ name = "flycheck-nimsuggest";
+ };
+ packageRequires = [ emacs flycheck nim-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/flycheck-nimsuggest";
+ license = lib.licenses.free;
+ };
+ }) {};
flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-objc-clang";
- version = "1.1.0";
+ version = "2.0.0";
src = fetchFromGitHub {
owner = "GyazSquare";
repo = "flycheck-objc-clang";
- rev = "b16b77f95e4e53a8951ebee6209a5de311748447";
- sha256 = "0lda99wscj89vhzg9wq7akm3dx1zlf90m91ifr627vcw2mzj4wkh";
+ rev = "29a9eb320d62400564360986f7ad400b74070d8e";
+ sha256 = "0b4vwbxzhds9vb4nknfdywvfpr1gkk86vsbbq6f5ds0pfk75x022";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang";
@@ -12441,12 +12820,12 @@
flycheck-pycheckers = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-pycheckers";
- version = "0.2";
+ version = "0.4";
src = fetchFromGitHub {
owner = "msherry";
repo = "flycheck-pycheckers";
- rev = "220c551df591792d08fc9d149ab3329171743cb9";
- sha256 = "0q1sz28nlnamcm4l587q94b7cyak9d4wpgpr33a05m9lw4a6z74i";
+ rev = "a3d39139dbe5cdaa64dda90907bb8653f196c71e";
+ sha256 = "1i1kliy0n9b7b0rby419030n35f59xb8952widaszz4z8qb7xw9k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/af36dca316b318d25d65c9e842f15f736e19ea63/recipes/flycheck-pycheckers";
@@ -12546,12 +12925,12 @@
flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-swift3";
- version = "1.1.0";
+ version = "2.0.0";
src = fetchFromGitHub {
owner = "GyazSquare";
repo = "flycheck-swift3";
- rev = "6b0b7c6fffc86809d0535afebd6b0972059992d5";
- sha256 = "0d411idv9ib1jhmdbjb8ycc8clmm1ygpwapaka3d50gkgrmfin4q";
+ rev = "756833425f51baa9eb0a2fa7493df6e68612c88d";
+ sha256 = "1hvrg717q0nlz4r8wby82gs3vdx8fdhf38rg4j77j3fqfmxdd3fi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3";
@@ -13299,27 +13678,6 @@
license = lib.licenses.free;
};
}) {};
- forecast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "forecast";
- version = "0.6.2";
- src = fetchFromGitHub {
- owner = "cadadr";
- repo = "forecast.el";
- rev = "1eb60db1760572e3b1b87f6d672e3aa0812d6d94";
- sha256 = "1imrn4wc744fdcm1pkfjk8gmilzcrjzawbcg6mhdkzsz5cnb7klb";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/e6ff6a4ee29b96bccb2e4bc0644f2bd2e51971ee/recipes/forecast";
- sha256 = "0whag2n1120384w304g0w4bqr7svdxxncdhnz4rznfpxlgiw2rsc";
- name = "forecast";
- };
- packageRequires = [ emacs ];
- meta = {
- homepage = "https://melpa.org/#/forecast";
- license = lib.licenses.free;
- };
- }) {};
foreman-mode = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "foreman-mode";
@@ -13491,12 +13849,12 @@
fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, pos-tip, s }:
melpaBuild {
pname = "fsharp-mode";
- version = "1.9.8";
+ version = "1.9.11";
src = fetchFromGitHub {
owner = "rneatherway";
repo = "emacs-fsharp-mode-bin";
- rev = "9766952bd7830cb0d319736961af8e42e67d42fe";
- sha256 = "1krncbzdhp6kpypaqdn6fhvxhhc1pvy2ayn4w4ljmsd7wx6zazyi";
+ rev = "5504550605354146842c8f5c34482ece778b7b31";
+ sha256 = "0hjqgyjch8fdz54akcpw5kmx2z1yvck6k8qyc0mzzmb54iiayf5a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dc45611e2b629d8bc5f74555368f964420b79541/recipes/fsharp-mode";
@@ -13601,6 +13959,27 @@
license = lib.licenses.free;
};
}) {};
+ futhark-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "futhark-mode";
+ version = "0.1.0";
+ src = fetchFromGitHub {
+ owner = "HIPERFIT";
+ repo = "futhark";
+ rev = "2a7d824f7265a35bb928bf4de8e46d02e0a56a12";
+ sha256 = "0dkx9xl39k0bcspyx37410rb5ngphw9svinwjw1kgq0pqhc2qxdf";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode";
+ sha256 = "1k22xkg6vd60hk58zkxhmsw2gs6ikzmidvxcdglnr46m6x7r7pnq";
+ name = "futhark-mode";
+ };
+ packageRequires = [ cl-lib ];
+ meta = {
+ homepage = "https://melpa.org/#/futhark-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
fuzzy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fuzzy";
@@ -14003,12 +14382,12 @@
ghub-plus = callPackage ({ apiwrap, emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }:
melpaBuild {
pname = "ghub-plus";
- version = "0.1.5";
+ version = "0.2";
src = fetchFromGitHub {
owner = "vermiculus";
repo = "ghub-plus";
- rev = "f315677e3d35951021e1f10cc7b4f629814a13f0";
- sha256 = "1k2583dnj9did2pnd3ma4rfrd2n6r83yjccf403sgxzi1p054yl4";
+ rev = "e04050f81106029c342deb7adbfc67b2a888ec58";
+ sha256 = "0ydd6aiy8x878jlzp88gi30yslhkcin0rbdjirj2vjs88cfvcjq6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/03a412fd25218ff6f302734e078a699ff0234e36/recipes/ghub+";
@@ -15218,6 +15597,27 @@
license = lib.licenses.free;
};
}) {};
+ goto-chg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "goto-chg";
+ version = "1.7";
+ src = fetchFromGitHub {
+ owner = "emacs-evil";
+ repo = "goto-chg";
+ rev = "171b1331022caf12d8c3593e9b5075f87ee958d4";
+ sha256 = "1jcnrin4j1x8p63fd9r37dq1vr5a7a1nvzk6kp0bdsgn9vbjmapc";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/cf1fc176430fe3ab55ce537a0efc59780bb812be/recipes/goto-chg";
+ sha256 = "1yd4jq4zql4av9nr1sdk4nsnnk54c3brgjhpczndy1ipiaxlnydy";
+ name = "goto-chg";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/goto-chg";
+ license = lib.licenses.free;
+ };
+ }) {};
goto-gem = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "goto-gem";
@@ -15547,12 +15947,12 @@
green-is-the-new-black-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "green-is-the-new-black-theme";
- version = "0.0.1";
+ version = "0.0.3";
src = fetchFromGitHub {
owner = "fredcamps";
repo = "green-is-the-new-black-emacs";
- rev = "2b1011836fc04940d542e9a783b99670a08b308b";
- sha256 = "16v7l4ynj4p1hq243rqckfgppmj8cvm0lyybjjqaqblqjd1ki90d";
+ rev = "b9cdecd04691311c30c94ad4ec81124e63b9b122";
+ sha256 = "124q733rirc8a2d9xfparphcjrrbxhp4wxf070l8hqp3p2764bka";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3e42528d5677fd90515cad47266c07ea3d4363fb/recipes/green-is-the-new-black-theme";
@@ -15734,12 +16134,12 @@
gscholar-bibtex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gscholar-bibtex";
- version = "0.3.2";
+ version = "0.3.3";
src = fetchFromGitHub {
owner = "cute-jumper";
repo = "gscholar-bibtex";
- rev = "655bccf0b12c9d95ec992ee4bfb5c7c9a4d0c99b";
- sha256 = "1ivdq3mgym14v5hpv938248vifw1xk9z16d2f38d9xj01icik522";
+ rev = "ba4ce159e385d695d8560e8b06b3cbe48424861c";
+ sha256 = "0idnfhk17avp0r4706grjqqkz0xl98gs0bx7wrkvwym3y2gadlz2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9fa546d3dce59b07a623ee83e3befe139dc10481/recipes/gscholar-bibtex";
@@ -15881,12 +16281,12 @@
hackernews = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
melpaBuild {
pname = "hackernews";
- version = "0.3.1";
+ version = "0.4.0";
src = fetchFromGitHub {
owner = "clarete";
repo = "hackernews.el";
- rev = "452e939211ebc0af7256a2f0e8cdad5c426694e6";
- sha256 = "1c49lfm5saafxks591qyy2nilymxz3aqlxpsmnad5d0kfhvjr47z";
+ rev = "22a15dc57dd6aab7793c0f9c2b72e161e0bee00c";
+ sha256 = "0bpbiadv4bf3lllsm0w1jcw8nc7c9zl97m972hbxb1dgv90gvs5b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c43a342e47e5ede468bcf51a60d4dea3926f51bd/recipes/hackernews";
@@ -16174,12 +16574,12 @@
hasky-stack = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }:
melpaBuild {
pname = "hasky-stack";
- version = "0.5.0";
+ version = "0.6.0";
src = fetchFromGitHub {
owner = "hasky-mode";
repo = "hasky-stack";
- rev = "38a33e2ed02d57afb6b38bf36741f5bf7e38e45b";
- sha256 = "03zg58hrka2q7sqm3f14xgcs2mjxhlyybkf9w6pp8icr4wdsih4z";
+ rev = "a3f890fb8570369898ee9718b128d4e7123a6585";
+ sha256 = "0bc5i4s7aclwrsh8yrhfwwlfbcs5hdbzm31glikd487asv30jq9c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c3faf544872478c3bccf2fe7dc51d406031e4d80/recipes/hasky-stack";
@@ -16237,12 +16637,12 @@
helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
melpaBuild {
pname = "helm";
- version = "2.8.4";
+ version = "2.8.5";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
- rev = "0fc89c212b8a90ea8de0401f8d1b446ef9a24d93";
- sha256 = "0yava3cn0g382mgnczgqmc1fhd2nbdr16n48vjlvk8bsb3n4va1m";
+ rev = "2385b81edc706f7efc74f2aff4854399254cde17";
+ sha256 = "02qhjyaqxh18g23lbcfpygz1ng7skifbqb6xkgh5wii1qykqxy6m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -16573,12 +16973,12 @@
helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "helm-core";
- version = "2.8.4";
+ version = "2.8.5";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
- rev = "0fc89c212b8a90ea8de0401f8d1b446ef9a24d93";
- sha256 = "0yava3cn0g382mgnczgqmc1fhd2nbdr16n48vjlvk8bsb3n4va1m";
+ rev = "2385b81edc706f7efc74f2aff4854399254cde17";
+ sha256 = "02qhjyaqxh18g23lbcfpygz1ng7skifbqb6xkgh5wii1qykqxy6m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -17224,12 +17624,12 @@
helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
melpaBuild {
pname = "helm-org-rifle";
- version = "1.4.1";
+ version = "1.4.2";
src = fetchFromGitHub {
owner = "alphapapa";
repo = "helm-org-rifle";
- rev = "93df6808dda8f50da4f435c47763733703905119";
- sha256 = "1zyl8x03n9n9sc7bys2nqdmzadl5qrwi01qn1gy48jrkfhgiva6g";
+ rev = "26749ff9f34b2abddf7c47ff71b1046942e38398";
+ sha256 = "1q969rlqj706wdzd3s54pqpfpqkg18bzl5srl7xkw43cfzxpcpj2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle";
@@ -17623,12 +18023,12 @@
helm-smex = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, smex }:
melpaBuild {
pname = "helm-smex";
- version = "0.2";
+ version = "0.3";
src = fetchFromGitHub {
owner = "ptrv";
repo = "helm-smex";
- rev = "7af4e4b44671f739b39584fc50c20084700701ac";
- sha256 = "1dhzglpd48mb47iyii8igb1dldvnr4alg18m7g8xb529dx8z9wni";
+ rev = "2269375dfa452b88b5170d1a5d5849ebb2c1e413";
+ sha256 = "0n2ki7g0hygsq4bi5zkhp3v772ld7niiajfznxmv11dgn949a52s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/85568bd732da952053148e07b95e53f7caf5f62c/recipes/helm-smex";
@@ -17812,12 +18212,12 @@
helpful = callPackage ({ dash, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "helpful";
- version = "0.1";
+ version = "0.2";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "helpful";
- rev = "a5d8bc41e43177953d8ba3972a83755ddd4e1073";
- sha256 = "0sr31df42cbrhzqxjvx1fcbafwq30jslqf715scrzyiziddf83zq";
+ rev = "b9a06978b6ffcd7f0ea213a6f534fa39318f0050";
+ sha256 = "1czqvmlca3w7n28c04dl3ljn8gbvfc565lysxlrhvgmv08iagnxm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful";
@@ -17896,12 +18296,12 @@
hierarchy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hierarchy";
- version = "0.6.0";
+ version = "0.7.0";
src = fetchFromGitHub {
owner = "DamienCassou";
repo = "hierarchy";
- rev = "a6a01cd4688fc9264fd36c279c0249f16704132b";
- sha256 = "0b6g9j76zd5wdqg4xkw34a6sijf8jsdvnnr7hbix7zf8cxrr2gqr";
+ rev = "4ab1372c252847c316f8978a81e2fe92ff79579e";
+ sha256 = "1kykbb1sil5cycfa5aj8dhsxc5yrx1641i2np5kwdjid6ahdlz5r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7aea238a2d14e9f58c0474251984b6c617b6854d/recipes/hierarchy";
@@ -18064,12 +18464,12 @@
hindent = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hindent";
- version = "5.2.3";
+ version = "5.2.4";
src = fetchFromGitHub {
owner = "chrisdone";
repo = "hindent";
- rev = "abe2933e3d1f82e4eecfba11ffed27f7f52ca469";
- sha256 = "12f1mmkapjf5l6ka3k09s4i3qg5pk1cr0mv182657n0rvdn041d4";
+ rev = "e18ec3f55e288883f8042065190572e91651733d";
+ sha256 = "0iq4hs2r56rnsxfjda5acd0s2wrza7jd5jsawnzbyix1vnbgp98z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent";
@@ -19177,12 +19577,12 @@
import-js = callPackage ({ emacs, fetchFromGitHub, fetchurl, grizzl, lib, melpaBuild }:
melpaBuild {
pname = "import-js";
- version = "1.0.0";
+ version = "2.0.0";
src = fetchFromGitHub {
owner = "Galooshi";
repo = "emacs-import-js";
- rev = "15d395126f57408d770a72db2e5f43271f90fa52";
- sha256 = "1ipbfacjx9vqqhvsf9sgfci8vqx0plks510w1gsjj0xwrpqn1f6l";
+ rev = "0a1032894445062b87dbe4e2c8cdba35ac25c250";
+ sha256 = "0vx2k4k8ig1k74ifxaxvhbkmfmba683qza7f9pp08daa43mgr1r3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/import-js";
@@ -19258,22 +19658,22 @@
license = lib.licenses.free;
};
}) {};
- indium = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }:
melpaBuild {
pname = "indium";
- version = "0.28";
+ version = "1.0";
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "Indium";
- rev = "83ad172b96bb011bb705add136a7571b08f6c4c2";
- sha256 = "16l17sldq68492xa2nbkr956hcpncalmjr1spbf1avi9z910d17l";
+ rev = "db3b727c9deedcf9afa13e07cd25734cbf7305a2";
+ sha256 = "1cm6zm8d7rywvlhzf1vpblqb1kgn6c7bwk9q2mjz7f5gdcsx1jp5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium";
sha256 = "024ljx7v8xahmr8jm41fiy8i5jbg48ybqp5n67k4jwg819cz8wvl";
name = "indium";
};
- packageRequires = [];
+ packageRequires = [ company emacs js2-mode seq websocket ];
meta = {
homepage = "https://melpa.org/#/indium";
license = lib.licenses.free;
@@ -19533,12 +19933,12 @@
intellij-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "intellij-theme";
- version = "1.2";
+ version = "1.3";
src = fetchFromGitLab {
owner = "fommil";
repo = "emacs-intellij-theme";
- rev = "2bbabe3f2f87716b10ccdfcacbf51016ecc32d54";
- sha256 = "0b3615lbm8fv4svv3g72dz62h9rv18m68b656lwl2ba9sn465rsl";
+ rev = "1bbfff8e6742d18e9b77ed796f44da3b7bd10606";
+ sha256 = "0ml1gi2cn6h3xm5c78vxwv327r0rgimia1vqqi9jb09yb6lckbgj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cfe86071b2e84929476a771da99341f4a73cfd06/recipes/intellij-theme";
@@ -19659,12 +20059,12 @@
irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
melpaBuild {
pname = "irony";
- version = "1.1.0";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "Sarcasm";
repo = "irony-mode";
- rev = "72e1e73f3c9da2ad04286e13bfc8fc401626b7a9";
- sha256 = "155wvzsmhb8vz30jcd3xj91z74268pq7szax7jwd725ndx6x7ny8";
+ rev = "78b06aa2df5251adaabb6c749febc1f1bd2ad605";
+ sha256 = "0nhjrnlmss535jbshjjd30vydbr8py21vkx4p294w6d8vg2rssf8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony";
@@ -19698,6 +20098,27 @@
license = lib.licenses.free;
};
}) {};
+ iter2 = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "iter2";
+ version = "0.9.4";
+ src = fetchFromGitHub {
+ owner = "doublep";
+ repo = "iter2";
+ rev = "a0e41b2f55d50c08c59ffcc6e83a977c141bcc55";
+ sha256 = "0ccr9qjhc35wi07yckd9y26synihhsg8zwkxgqyzkx7avxkqfyhn";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d94316660051ee0ba0c12e380e6203986440368f/recipes/iter2";
+ sha256 = "0kl3z2wwpvk2ddsb3798g41pv0xycsf9dclhv00snpzsr61d9v65";
+ name = "iter2";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/iter2";
+ license = lib.licenses.free;
+ };
+ }) {};
ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ivy";
@@ -20158,6 +20579,27 @@
license = lib.licenses.free;
};
}) {};
+ jetbrains = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "jetbrains";
+ version = "0.0.2";
+ src = fetchFromGitHub {
+ owner = "emacs-php";
+ repo = "jetbrains.el";
+ rev = "38e136079f3f2ddbe0e8b7dec01cf6b515e897d8";
+ sha256 = "1ji64qip5raf0lbv7fv36rd4fwa33zn0xi7sa0zrgf0kcsr0qasb";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/00dd4626e261d9831fc62d866d50b7257ee418c4/recipes/jetbrains";
+ sha256 = "0254dkzf2x5dj3j549xjash0lsadkn0bdcyjkjlrv8hqvdr1f1m7";
+ name = "jetbrains";
+ };
+ packageRequires = [ cl-lib emacs f ];
+ meta = {
+ homepage = "https://melpa.org/#/jetbrains";
+ license = lib.licenses.free;
+ };
+ }) {};
jinja2-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "jinja2-mode";
@@ -20221,6 +20663,27 @@
license = lib.licenses.free;
};
}) {};
+ js-auto-format-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "js-auto-format-mode";
+ version = "1.0.2";
+ src = fetchFromGitHub {
+ owner = "ybiquitous";
+ repo = "js-auto-format-mode";
+ rev = "e0b7ae9d1d70fa74abd91bb6f901bd46db5a22eb";
+ sha256 = "1z5vi8681afm7jsqwifnb35sja1s4b2j123b3pn0bv1j6b8iaq9j";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/2d3be16771b5b5fde639da3ee97890620354ee7a/recipes/js-auto-format-mode";
+ sha256 = "1gxf7xz1j3ga2pk5w8cgny7l8kid59zap2a97lhb50w1qczfqqzs";
+ name = "js-auto-format-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/js-auto-format-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "js-comint";
@@ -20452,6 +20915,27 @@
license = lib.licenses.free;
};
}) {};
+ jsonnet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "jsonnet-mode";
+ version = "0.0.1";
+ src = fetchFromGitHub {
+ owner = "mgyucht";
+ repo = "jsonnet-mode";
+ rev = "efe768fdcff25d746674fbbf229b9e1a7efea4f1";
+ sha256 = "1a52266y83z9i3sg7hhc8sw7rhjy5i9wdy2bv7s2fv00lnngaj29";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ba17372732723f73e8eeb6e7c47abc0edeb20da4/recipes/jsonnet-mode";
+ sha256 = "1aadys887szlc924qr645lby9f8vzvxkwhq6byhppk1b01h911ia";
+ name = "jsonnet-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/jsonnet-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
jsx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "jsx-mode";
@@ -20620,24 +21104,24 @@
license = lib.licenses.free;
};
}) {};
- kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
- pname = "kaolin-theme";
- version = "0.6";
+ pname = "kaolin-themes";
+ version = "1.0";
src = fetchFromGitHub {
- owner = "0rdy";
- repo = "kaolin-theme";
- rev = "041cc6637a58a3a24086d1c2b8c3eb113434127e";
- sha256 = "1qx6568s8wj6ha8wfy8hih1qwwcdiybdb83w3fr9lqwh0lyhjp0f";
+ owner = "ogdenwebb";
+ repo = "emacs-kaolin-themes";
+ rev = "720762a42ad4cb4b325f78a9d41af380b8783501";
+ sha256 = "104prgkjqnnv1bqgpcl0di1q9sqkfnj4ibqvrk6ls32hw75shvdh";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/d2abf9d914cdc210bbd47ea92d0dac76683e21f0/recipes/kaolin-theme";
- sha256 = "1316sn1xpli9aqbhn8sldyvsc2fwk1ql9aw4l0rgkfbivvcklp7c";
- name = "kaolin-theme";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes";
+ sha256 = "1pd2v54d578f1wbwvqzplkdz1qvy8w8s6na511b0v5y9sksgm2xw";
+ name = "kaolin-themes";
};
- packageRequires = [ emacs ];
+ packageRequires = [ autothemer cl-lib emacs ];
meta = {
- homepage = "https://melpa.org/#/kaolin-theme";
+ homepage = "https://melpa.org/#/kaolin-themes";
license = lib.licenses.free;
};
}) {};
@@ -21617,12 +22101,12 @@
live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "live-py-mode";
- version = "2.16.0";
+ version = "2.18.1";
src = fetchFromGitHub {
owner = "donkirkby";
repo = "live-py-plugin";
- rev = "96f22fe5892775b8a9a081898e1a4f00fbb8a674";
- sha256 = "005g84acwjns587lawgms63b9840xswpqj0ccgdaqj6g9p0ynmqa";
+ rev = "145d21d65b5469e682ef464ae8f4e0e3d8c0f04b";
+ sha256 = "1h188cprka13bd1prfj1w86m5z8c1nfaz4dw18g88jf6b0gyazhz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@@ -21784,12 +22268,12 @@
logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "logview";
- version = "0.8.1";
+ version = "0.8.2";
src = fetchFromGitHub {
owner = "doublep";
repo = "logview";
- rev = "134b41557ab539219d9e3a1b3c8939df93676726";
- sha256 = "1jfdm64r6rj7pl6270v084fvaga5csa4snvbfjdlhs5bshn1d0v2";
+ rev = "72b6c5349206172a146b2c730b8ac040a92ebc3f";
+ sha256 = "1f93iyxf8v0jazzh6jljrm7r28z00nn14wr90qrh9y9chyq72n63";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview";
@@ -22001,12 +22485,12 @@
magit-annex = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
melpaBuild {
pname = "magit-annex";
- version = "1.3.1";
+ version = "1.4.0";
src = fetchFromGitHub {
owner = "magit";
repo = "magit-annex";
- rev = "ae6250aead8f283eac8d6951a249cfc7d85e0b40";
- sha256 = "0n6dhc92z5w67rcfngjzprzbdn42ja263gdqa7fncqq9p66slccq";
+ rev = "895c229c2b0d822a4debb302d8638105ecb4ee20";
+ sha256 = "0316csgc95dalqmkxj6qlb7inzcg4csfs9n3im1ygswcswpdaajh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-annex";
@@ -22106,12 +22590,12 @@
magit-gitflow = callPackage ({ fetchFromGitHub, fetchurl, lib, magit, magit-popup, melpaBuild }:
melpaBuild {
pname = "magit-gitflow";
- version = "2.2.2";
+ version = "2.2.3";
src = fetchFromGitHub {
owner = "jtatarik";
repo = "magit-gitflow";
- rev = "5bdcfe0a7bf4f5bb9a927baa4880233bf11a4a6b";
- sha256 = "12pi6aw44lnzzcw0zgz5rxvcf4p700fkz4q2skbapwmds8gw3fg9";
+ rev = "cc41b561ec6eea947fe9a176349fb4f771ed865b";
+ sha256 = "0jz69wrrzvqadaphmjrr146nzvmphsbl7rmc3ccnpw1gw6gnz81f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dfaeb33dec2c75d21733b6e51d063664c6544e4d/recipes/magit-gitflow";
@@ -22596,12 +23080,12 @@
marshal = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, ht, json ? null, lib, melpaBuild }:
melpaBuild {
pname = "marshal";
- version = "0.7.0";
+ version = "0.8.2";
src = fetchFromGitHub {
owner = "sigma";
repo = "marshal.el";
- rev = "92caeddbb3c3de61707d12db62b9915e271807b7";
- sha256 = "0fajz4k3p2ki237jz0c3wfab5272fvvw9vzxzfivpmpcnws6gbn6";
+ rev = "d714219aeb388ded88582c47940f2c6febae333c";
+ sha256 = "1mr5p2yiad1k15byrlk0a784kj7rvibpn4li5phk4rnm0zg1xy9s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/203f2061c5c7d4aefab3175de5e0538f12158ee3/recipes/marshal";
@@ -22890,12 +23374,12 @@
merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "merlin";
- version = "3.0.2";
+ version = "3.0.3";
src = fetchFromGitHub {
owner = "the-lambda-church";
repo = "merlin";
- rev = "b53e4beeeb8da6d7cb035990a7e805fea5da0de6";
- sha256 = "1lw0s78zwr8rd4q4pg34m9q8yd5swh1fff3c5p992a2qlzfb0hax";
+ rev = "a5dbf8e321ff162476555e62264468dd6f55c279";
+ sha256 = "0mq4ddr3g64dd4bhq812hb5xvlkswfmib1nw34f3m8sghmaxcd5z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin";
@@ -22908,6 +23392,27 @@
license = lib.licenses.free;
};
}) {};
+ meson-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "meson-mode";
+ version = "0.1";
+ src = fetchFromGitHub {
+ owner = "wentasah";
+ repo = "meson-mode";
+ rev = "212d9f38a08074f1cb6e914e12b60bc52dcb8bee";
+ sha256 = "1kv7413y5530frs1nrp0nl40h9j0idwp7vlg761r260200m8sl3v";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/4702a31ffd6b9c34f96d151f2611a1bfb25baa88/recipes/meson-mode";
+ sha256 = "16yg217ghx6pvlxha2swznkg12c2a9hhyi0hnsbqdj2ijcdzca80";
+ name = "meson-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/meson-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
meta-presenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "meta-presenter";
@@ -23414,12 +23919,12 @@
monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "monokai-theme";
- version = "3.3.0";
+ version = "3.4.0";
src = fetchFromGitHub {
owner = "oneKelvinSmith";
repo = "monokai-emacs";
- rev = "46fe076b5943ccc6fdc9cdacc7e8ad02b64bcd36";
- sha256 = "03aw9ab54a5fljhwygg62hr2n9kk82xfwcdq17ln5z0951gqi99r";
+ rev = "019e07947426f0192fc3458f3f72c19031b607de";
+ sha256 = "0id35345zp0fchbcz8qk2lg71jyln91k56vfama27ss3nzy3f9kz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme";
@@ -23831,6 +24336,27 @@
license = lib.licenses.free;
};
}) {};
+ mustache = callPackage ({ dash, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
+ melpaBuild {
+ pname = "mustache";
+ version = "0.23";
+ src = fetchFromGitHub {
+ owner = "Wilfred";
+ repo = "mustache.el";
+ rev = "b0ea352813592424164520a49e86c04600242752";
+ sha256 = "1n2ymd92qpvsby6ms0l3kjhdzzc47rri2aiscc6bs07hm4mjpr9q";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d1bcf9599ca6d2c29333071a80f96808d4ab52e2/recipes/mustache";
+ sha256 = "1pjr00xx77mlfw1myxaz6i3y2gbivhbiq5hyjxxbjlfrkm1vxc8g";
+ name = "mustache";
+ };
+ packageRequires = [ dash ht s ];
+ meta = {
+ homepage = "https://melpa.org/#/mustache";
+ license = lib.licenses.free;
+ };
+ }) {};
mustache-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mustache-mode";
@@ -24251,6 +24777,27 @@
license = lib.licenses.free;
};
}) {};
+ nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
+ melpaBuild {
+ pname = "nim-mode";
+ version = "0.4.1";
+ src = fetchFromGitHub {
+ owner = "nim-lang";
+ repo = "nim-mode";
+ rev = "86abed21b9b718ac65cc167f208e0bd5b92c79ed";
+ sha256 = "0h1paf9z6xvkay97ns74w2w9plwi46md5f2kik4jvjy74p57gxal";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ccb5f24b9d55c77eaa7952a9e6a2e0ed7be24/recipes/nim-mode";
+ sha256 = "1kzn3kkkj7jzs7fqhvib196sl3vp7kbhb4icqzmvvmv366lkaib6";
+ name = "nim-mode";
+ };
+ packageRequires = [ commenter emacs epc flycheck let-alist ];
+ meta = {
+ homepage = "https://melpa.org/#/nim-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
ninja-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ninja-mode";
@@ -24304,8 +24851,8 @@
sha256 = "1zpqpq6hd83prk80921nbjrvcmk0dykqrrr1mw3b29ppjma5zjiz";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/4c885d9d9f1a37f05c715f89fae51efb580faced/recipes/nix-mode";
- sha256 = "15xgqgrkypcplnfvl5j6w8abayzz8q0nw2wav01sdyx39ym005k3";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e1870d786dbfac3b14386c8030e06f2d13ab9da6/recipes/nix-mode";
+ sha256 = "10f3ly4860lkxzykw4fbvhn3i0c2hgj77jfjbhlk2c1jz9x4yyy5";
name = "nix-mode";
};
packageRequires = [ emacs ];
@@ -24338,12 +24885,12 @@
no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "no-littering";
- version = "0.5.10";
+ version = "0.5.11";
src = fetchFromGitHub {
owner = "emacscollective";
repo = "no-littering";
- rev = "227c2d175e95dbed6a5c6e37b12bb9a3fcf2de94";
- sha256 = "1wgfcghzhsa0siz1vf3rq69h1ilyblj5rsmijnyymp9fhxgyyll6";
+ rev = "a4b42b185b65e78bc3bb6523e23aefb1213eb3b2";
+ sha256 = "1yzcawvz3vbq6pgr0b3sk0qg24jx1fpkinwcmsdl283ib8msbc7g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering";
@@ -24481,12 +25028,12 @@
nov = callPackage ({ dash, emacs, esxml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "nov";
- version = "0.1.7";
+ version = "0.2.1";
src = fetchFromGitHub {
owner = "wasamasa";
repo = "nov.el";
- rev = "91c4329f64ddc9a598fa6c58e1d9264aee073e72";
- sha256 = "0x3ijjhjg2q8gdqf4hgr2d8wy32qhxy48kbz0slibkn9yik3pvlz";
+ rev = "19ab463864f137b43704b4f34173349c88e84d8e";
+ sha256 = "00f5hhw157nwdwy26yn6l3z2hgk6xxvx5xl0hasskj1l9rg0zgh2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cf543955ba2d5d0074fa2a5ba176f9415f6e006d/recipes/nov";
@@ -24712,12 +25259,12 @@
ob-http = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "ob-http";
- version = "0.1.0";
+ version = "0.2.0";
src = fetchFromGitHub {
owner = "zweifisch";
repo = "ob-http";
- rev = "9155a413e41d918042e9839399e3940aa0f8499c";
- sha256 = "1b39g0nifw0000s0x8ir0cfr716jypq6b5n2l1i4mrby6aw3bw1k";
+ rev = "20393dd8130d21a3f06d8514da14c5ffdd88ae44";
+ sha256 = "0xa7rgsb0d1d96h5bb0n0sy1hgmd2fg6r6g2aqp1c29ld4hpi7r7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/950b02f76a04f453992b8720032e8c4cec9a039a/recipes/ob-http";
@@ -24964,12 +25511,12 @@
olivetti = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "olivetti";
- version = "1.5.7";
+ version = "1.5.8";
src = fetchFromGitHub {
owner = "rnkn";
repo = "olivetti";
- rev = "e5153850ab626699109d93ab0afb6e3aea48f8b8";
- sha256 = "1bg1j8wi8smsbf4qmpcy3j3ihkg3gpnxa5bqgysbj7j9n11rjgl4";
+ rev = "9bd41082a593ba90f3e9e34d3ffc29bbb276b674";
+ sha256 = "0j33wn2kda5fi906h6y0zd5d0ygw0jg576kdndc3zyb4pxby96dn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti";
@@ -24985,12 +25532,12 @@
omni-kill = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "omni-kill";
- version = "0.2.3";
+ version = "0.6.0";
src = fetchFromGitHub {
owner = "AdrieanKhisbe";
repo = "omni-kill.el";
- rev = "8a1145b58b4736c9163bcd5b28c8fea80b2ea97b";
- sha256 = "07grj81alrr6qgs3jmqkjzphkvi26w6jm5hf1f5wyx7h6q293ady";
+ rev = "904549c8fd6ac3cf22b5d7111ca8944e179cffea";
+ sha256 = "1mlnh5pdqdv1qb8jvi0wvkgbpy74zq807gmp04bp6cpxdns9j63f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c24df34d2fa5d908223379e909148423ba327ae2/recipes/omni-kill";
@@ -25006,12 +25553,12 @@
omni-log = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
melpaBuild {
pname = "omni-log";
- version = "0.3.3";
+ version = "0.3.6";
src = fetchFromGitHub {
owner = "AdrieanKhisbe";
repo = "omni-log.el";
- rev = "e86c80065030306645e28badcb0c25c549560106";
- sha256 = "10nsl45z3a1mvagffcsqj501x8wk3avmsncyn9laq3k4z1hjgdz5";
+ rev = "20021eb788cbeec0371145468430b259686f519d";
+ sha256 = "1sf2zbhjaz5b9xmz6632338cga7d326ibgw8b8c6c6b4vk16yhqc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/47bb19bb7b4713c3fd82c1035a2fe66588c069e3/recipes/omni-log";
@@ -25048,12 +25595,12 @@
omni-scratch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "omni-scratch";
- version = "0.4.1";
+ version = "0.6.0";
src = fetchFromGitHub {
owner = "AdrieanKhisbe";
repo = "omni-scratch.el";
- rev = "0da549c1386f93ed4de201bf8779ba64ddc91347";
- sha256 = "0qfi54z2jqrkrdzriandwc9myzc27sxsx7nf20jf5qvcdgn13cl1";
+ rev = "636374c59c7d33c2f72c97ad8ba9fb4854f2324d";
+ sha256 = "0w62bk2m0gs4b605s691z4iap9baz1z6c8z4v9vb05917qlsx5xb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6ba3e128a7fe4476d82266506b18ba9984c37944/recipes/omni-scratch";
@@ -25094,8 +25641,8 @@
src = fetchFromGitHub {
owner = "OmniSharp";
repo = "omnisharp-emacs";
- rev = "b425270bed93b427ff519d6f51ad1d97531a0a92";
- sha256 = "0l9dk9idfsr21q0icx9fpgqyi4qlhnqal6sypak5zh8dgchrqif9";
+ rev = "906e29a702237f039f24c215fdb561a728a3df1b";
+ sha256 = "1l1rzl7y5j2wmlgx7ivivwvwvbn4h7pg5s7yqsk65n9kb59ha8s8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
@@ -25290,12 +25837,12 @@
org-autolist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-autolist";
- version = "0.13";
+ version = "0.14";
src = fetchFromGitHub {
owner = "calvinwyoung";
repo = "org-autolist";
- rev = "da332fadcd9be4c5eb21c5e98c392b89743750b2";
- sha256 = "0j6fqgzvbmvvdh0dgwsxq004wxys2zwnq9wa3idm087ynp2a2ani";
+ rev = "c82d1e83e982b5f0c106b8800e5b0cfd5f73fdc1";
+ sha256 = "0ykiafbdjb2iy0s1gr6l51gddjbk08iwj4v13hgm8b675bl0cw56";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ca8e2cdb282674b20881bf6b4fc49af42a5d09a7/recipes/org-autolist";
@@ -25647,12 +26194,12 @@
org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-journal";
- version = "1.12.1";
+ version = "1.12.2";
src = fetchFromGitHub {
owner = "bastibe";
repo = "org-journal";
- rev = "d9b5512994c54ebcbc0dcccbf1c779fbb8a89d3d";
- sha256 = "0s1b6lgr841iifznbwqn8r0chbfd0vph5v8n6cc0grak8n6nqgxr";
+ rev = "cda1980b013afabd299e7a2294517897f6442d98";
+ sha256 = "1y6idbp74vrr3g0r10n09znky8ih94kzf5fyil47sjkqyzzmpk3s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal";
@@ -25707,35 +26254,15 @@
license = lib.licenses.free;
};
}) {};
- org-mac-iCal = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "org-mac-iCal";
- version = "7.9.3.5";
- src = fetchgit {
- url = "git://orgmode.org/org-mode.git";
- rev = "592dc2ee7e4c80b9b61efb77117c8dc22d6cefd1";
- sha256 = "0rvsn085r1sgvv0gwvjlfgn7371bjd254hdzamc97m122pqr7cxr";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
- sha256 = "1ilzvmw1x5incagp1vf8d9v9mz0krlv7bpv428gg3gpqzpm6kksw";
- name = "org-mac-iCal";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/org-mac-iCal";
- license = lib.licenses.free;
- };
- }) {};
org-mime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-mime";
- version = "0.0.7";
+ version = "0.0.9";
src = fetchFromGitHub {
owner = "org-mime";
repo = "org-mime";
- rev = "dd1b9881af705b9e78f79791c9f933cabe59c125";
- sha256 = "0ndyqz2hpvnx6kykjz4d8nmngdjfavlwchl2dasi6m98b585liqa";
+ rev = "62791db188fa6a9a6b4e53c5c29fb4fa46582b98";
+ sha256 = "1l1fyyyyyi8nj4vpkyhpvz1yyqa2vn7042kp9443kqcswdfc9660";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime";
@@ -25751,12 +26278,12 @@
org-mru-clock = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-mru-clock";
- version = "0.1.1";
+ version = "0.1.2";
src = fetchFromGitHub {
owner = "unhammer";
repo = "org-mru-clock";
- rev = "096a7c514ab8487ec63def6281cf4dce24e3a626";
- sha256 = "1hmyqvi1dj5yrlish8kw4sdh3yy0b0w33smw4cbjagp4rs29p3fp";
+ rev = "10f6a7021c82dc6795f4020e89889a5a72eb8832";
+ sha256 = "00f4l5w6p0l1x5ghpvbp5934m9m012fabvzb7apazwdr5c7xbd7q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b36bf1c1faa4d7e38254416a293e56af96214136/recipes/org-mru-clock";
@@ -26139,12 +26666,12 @@
org-tfl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "org-tfl";
- version = "0.3.4";
+ version = "0.4.0";
src = fetchFromGitHub {
owner = "storax";
repo = "org-tfl";
- rev = "f0405e3ad62b90ea43489bdd6312adbd77edb9f3";
- sha256 = "0cznw60ivaz42ass35sf9i62x7mf9in6z8kr8wc5i1mb7hafy2hk";
+ rev = "f0d7d39106a1de5457f5160cddd98ab892b61066";
+ sha256 = "1rwdibiq0w4nzccmvdkpwnmfga70y35lfg2xlkqxd02x7bfl7j3m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d9e97f2fee577c7e3fb42e4ca9d4f422c8907faf/recipes/org-tfl";
@@ -26307,12 +26834,12 @@
org-vcard = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-vcard";
- version = "0.1.0";
+ version = "0.2.0";
src = fetchFromGitHub {
owner = "flexibeast";
repo = "org-vcard";
- rev = "5c4e17c166fb0406d5dfdc8876b0e182ba7af8fd";
- sha256 = "1qf4pqsg12y1qx7di0y5dp0f4slyp69h2q6y21hldzknhwxx4yy4";
+ rev = "a6ab82ab28fa78f7c985d3ea9c9fafdd17f7ea8b";
+ sha256 = "14l3xqahqmnfl3sskqcr33xpcsic8dm9cr9wmbv5la3xv14n10k7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/df860814a09c376c9a6a2c5e7f528bbae29810b2/recipes/org-vcard";
@@ -26367,6 +26894,36 @@
license = lib.licenses.free;
};
}) {};
+ org2web = callPackage ({ cl-lib ? null, dash, el2org, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }:
+ melpaBuild {
+ pname = "org2web";
+ version = "0.9.1";
+ src = fetchFromGitHub {
+ owner = "tumashu";
+ repo = "org2web";
+ rev = "5243b399927a4c474bb3b8d1c8a00799df1f27d7";
+ sha256 = "0wsvfn409a2ivbich8b8zqza78sprirg4bl7igx536ydqclmi0n7";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/2864959163442165b9b1cd5471dc2649508decde/recipes/org2web";
+ sha256 = "0lcqf0pgkd7jilasw1485fy45k269jxvyl7hl7qrcs94s6fy2vaf";
+ name = "org2web";
+ };
+ packageRequires = [
+ cl-lib
+ dash
+ el2org
+ ht
+ htmlize
+ mustache
+ org
+ simple-httpd
+ ];
+ meta = {
+ homepage = "https://melpa.org/#/org2web";
+ license = lib.licenses.free;
+ };
+ }) {};
orgbox = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "orgbox";
@@ -26706,12 +27263,12 @@
ox-epub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ox-epub";
- version = "0.2.1";
+ version = "0.2.4";
src = fetchFromGitHub {
owner = "ofosos";
repo = "ox-epub";
- rev = "113300ed2c66cca10624e6d7bf5ff0a72e05653a";
- sha256 = "1xj643jybrd6idn6bazp0canj8pm9v3gs199fa17hlag7151ancw";
+ rev = "4b4585264a28152f2eda0f7e5ceed132f9d23e16";
+ sha256 = "1k3lv4qqkp87piwlwl3gahac1zpjzv397f65g4khbpby2kgg8dpi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c3ac31dfef00e83fa6b716ea006f35afb5dc6cd5/recipes/ox-epub";
@@ -26724,15 +27281,36 @@
license = lib.licenses.free;
};
}) {};
+ ox-gfm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "ox-gfm";
+ version = "1.0";
+ src = fetchFromGitHub {
+ owner = "larstvei";
+ repo = "ox-gfm";
+ rev = "99f93011b069e02b37c9660b8fcb45dab086a07f";
+ sha256 = "0drdypmgxk3238hmkqw9s3cw9wv94cyfqar5ar0bv0k69s92pxj8";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/10e90430f29ce213fe57c507f06371ea0b29b66b/recipes/ox-gfm";
+ sha256 = "065ngmzfd3g2h8n903hc4d363hz4z5rrdgizh2xpz03kf3plca6q";
+ name = "ox-gfm";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/ox-gfm";
+ license = lib.licenses.free;
+ };
+ }) {};
ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ox-hugo";
- version = "0.1.2";
+ version = "0.4.1";
src = fetchFromGitHub {
owner = "kaushalmodi";
repo = "ox-hugo";
- rev = "a486141e4e2c3f9f67e799e20af150611d77f850";
- sha256 = "1srrkc0bajmhp614avk4yr51zsp0gnmn47r1wi7qxkr6ybxwx8k1";
+ rev = "c32359c71e7926c7f13039069d8d7481dfb9bc82";
+ sha256 = "1nw2dp6rn3hnnzzffvpr6yz7c154338h9i5ixxgh5vjxm9phzdml";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo";
@@ -27060,36 +27638,15 @@
license = lib.licenses.free;
};
}) {};
- paper-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, hexrgb, lib, melpaBuild }:
- melpaBuild {
- pname = "paper-theme";
- version = "1.0.0";
- src = fetchFromGitHub {
- owner = "cadadr";
- repo = "paper-theme";
- rev = "15af5e31492f79dc0d47787150ef39d6318a2608";
- sha256 = "1xh614czldjvfl66vhkyaai5k4qsg1l3mz6wd5b1w6kd45qrc54i";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a35a0888a7a27174b5de58d99b01554769041f46/recipes/paper-theme";
- sha256 = "04diqm2c9fm29zyms3hplkzb4kb7b2kyrxdsy0jxyjj5kabypd50";
- name = "paper-theme";
- };
- packageRequires = [ emacs hexrgb ];
- meta = {
- homepage = "https://melpa.org/#/paper-theme";
- license = lib.licenses.free;
- };
- }) {};
paradox = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, let-alist, lib, melpaBuild, seq, spinner }:
melpaBuild {
pname = "paradox";
- version = "2.5.1";
+ version = "2.5.2";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "paradox";
- rev = "17a6690d42a1e854ec270ed930c7494077570fc8";
- sha256 = "1vg5i4cxgn4a8cgx43i75w3cf0d8sb6ig6xxxdj3pvpzc81i53bc";
+ rev = "dfdfbec8b4a3b71966c134f00c3f5edfa87b6245";
+ sha256 = "1l0rs49lbclq4ayhnx6vi6bxn37a0h2ylk73fjcbar2lbr1dhf9r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/paradox";
@@ -27310,18 +27867,19 @@
license = lib.licenses.free;
};
}) {};
- password-store = callPackage ({ f, fetchgit, fetchurl, lib, melpaBuild, s }:
+ password-store = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "password-store";
version = "1.7.1";
- src = fetchgit {
- url = "https://git.zx2c4.com/password-store";
+ src = fetchFromGitHub {
+ owner = "zx2c4";
+ repo = "password-store";
rev = "38ec1c72e29c872ec0cdde82f75490640d4019bf";
sha256 = "04rqph353qfhnrwji6fmvrbk4yag8brqpbpaysq5z0c9l4p9ci87";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/ceff76206bd44d92c00adc931236c4ae15db5583/recipes/password-store";
- sha256 = "06l4xlvrjswy5kndn6h6swliqcp007nh4fyvma3jaac4f3x2qi65";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/207f8ec84572176749d328cb2bbc4e87c36f202c/recipes/password-store";
+ sha256 = "03r8j14l12yc42b51fzvn1jh8j85nyl1rg6c80r0a7ihwkj27jv6";
name = "password-store";
};
packageRequires = [ f s ];
@@ -27333,12 +27891,12 @@
password-store-otp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, s }:
melpaBuild {
pname = "password-store-otp";
- version = "0.1.3";
+ version = "0.1.5";
src = fetchFromGitHub {
owner = "volrath";
repo = "password-store-otp.el";
- rev = "2965da7d8edd32bd4ef62f487ea6bcd08c599c89";
- sha256 = "1svm6rlh4f0rjcl0fjy3x4bfakdn9npi8w7ak217ad2k08j44bzd";
+ rev = "a39a64a91de36e87b852339635bd3c5fb0e32441";
+ sha256 = "0gb48blvnn6ci2wl45z81p41ny7vbgl610hqy6b2hyr2171qjd60";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fc89d02554a6ff150ad42634879073892f3e88be/recipes/password-store-otp";
@@ -27772,12 +28330,12 @@
pfuture = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pfuture";
- version = "1.1";
+ version = "1.2";
src = fetchFromGitHub {
owner = "Alexander-Miller";
repo = "pfuture";
- rev = "a6c32c69abdb9b91baf8036b88cc4f477f611bd5";
- sha256 = "0ly38dzg754n4s2xs09kaisxs14ikm42d9sjhw9p9xirzqm7zd5j";
+ rev = "8b5cd8dfb8769d2b24484a313d3d21938afd3dfb";
+ sha256 = "1d63sfwy7qmldhq2xda9dglg91cy2kpjdr2rlmqb48w95wf0am3m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5fb70c9f56a58b5c7a2e8b69b191aa2fc7c9bcc8/recipes/pfuture";
@@ -27814,12 +28372,12 @@
phan = callPackage ({ composer, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "phan";
- version = "0.0.2";
+ version = "0.0.3";
src = fetchFromGitHub {
owner = "emacs-php";
repo = "phan.el";
- rev = "4e3528f490e77d3aa6d81729b30b569434ef679f";
- sha256 = "1aif1hshwpzi353k2gcpwk9s76jlmz3s5dyf357qfv14b5ddhw6l";
+ rev = "17b44a62580272bcf5ee91fb58098292e9de6f83";
+ sha256 = "002qak8jlim6pjj3ckikzzcc6n40mcqd5qvzakazi1q01z1ffsnd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/phan";
@@ -28313,6 +28871,36 @@
license = lib.licenses.free;
};
}) {};
+ pocket-reader = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, org-web-tools, ov, pocket-lib, rainbow-identifiers, s }:
+ melpaBuild {
+ pname = "pocket-reader";
+ version = "0.1.1";
+ src = fetchFromGitHub {
+ owner = "alphapapa";
+ repo = "pocket-reader.el";
+ rev = "e65a7e7529ece4fb7a738c062e73d5c07ace9574";
+ sha256 = "0bqxsvhmwvf0gpjmmh7pmzyw4lpcarj2prm52bgncch8x1f0gvnp";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/835a7bf2f72987183e9d15ada7ae747fb5715c11/recipes/pocket-reader";
+ sha256 = "0gcgmz4mhjgvqbh2gmv8v09sy80cnfccjym455m0fbl31b8dczhf";
+ name = "pocket-reader";
+ };
+ packageRequires = [
+ dash
+ emacs
+ kv
+ org-web-tools
+ ov
+ pocket-lib
+ rainbow-identifiers
+ s
+ ];
+ meta = {
+ homepage = "https://melpa.org/#/pocket-reader";
+ license = lib.licenses.free;
+ };
+ }) {};
point-pos = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "point-pos";
@@ -28858,6 +29446,27 @@
license = lib.licenses.free;
};
}) {};
+ projectile-trailblazer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }:
+ melpaBuild {
+ pname = "projectile-trailblazer";
+ version = "0.2.0";
+ src = fetchFromGitHub {
+ owner = "micdahl";
+ repo = "projectile-trailblazer";
+ rev = "79299498d74876f2ac3fe8075716b39a5bdd04cd";
+ sha256 = "1lkj9jdr3g7nl80fxvic6g5cn7vbkyxys7m3kcmd6xa9mq7nvci4";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/f9c6f2f92ff99e7a3241003dc396f978f3916c8a/recipes/projectile-trailblazer";
+ sha256 = "18cijb5c1ym5kn2g2apbijbfd3aqhrraki8vv9bk8rvi7wmm6qj4";
+ name = "projectile-trailblazer";
+ };
+ packageRequires = [ emacs f inf-ruby inflections projectile rake ];
+ meta = {
+ homepage = "https://melpa.org/#/projectile-trailblazer";
+ license = lib.licenses.free;
+ };
+ }) {};
projectile-variable = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "projectile-variable";
@@ -28945,12 +29554,12 @@
protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "protobuf-mode";
- version = "3.4.0";
+ version = "3.4.1";
src = fetchFromGitHub {
owner = "google";
repo = "protobuf";
- rev = "80a37e0782d2d702d52234b62dd4b9ec74fd2c95";
- sha256 = "0385j54kgr71h0cxh5vqr81qs57ack2g2k9mcdbq188v4ckjacyx";
+ rev = "b04e5cba356212e4e8c66c61bbe0c3a20537c5b9";
+ sha256 = "1lzxmbqlnmi34kymnf399azv86gmdbrf71xiad6wc24bzpkzqybb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -29068,22 +29677,22 @@
license = lib.licenses.free;
};
}) {};
- pug-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ pug-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pug-mode";
- version = "1.0.5";
+ version = "1.0.7";
src = fetchFromGitHub {
owner = "hlissner";
repo = "emacs-pug-mode";
- rev = "2f22d9c2e3ebb0230cee8836c5f5186e05a038dd";
- sha256 = "1fvq1vx7sg3dqc9zcqbsp0iq1y7c2cjag0ng3snssyj0qh8q6ib1";
+ rev = "96718f802dad3acd5a3f770b1452b81e39f77d92";
+ sha256 = "1jqj3qfc4686v09am869ls1k3jwy397646cql4a8dg7crjdpf023";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b3710aac9f3df3a23238af1f969c462b3692f260/recipes/pug-mode";
sha256 = "1njhr95y2rx7inpl9phxxz580844p2iadqlga1kj7xzvjz698x85";
name = "pug-mode";
};
- packageRequires = [ emacs ];
+ packageRequires = [ cl-lib emacs ];
meta = {
homepage = "https://melpa.org/#/pug-mode";
license = lib.licenses.free;
@@ -29323,12 +29932,12 @@
pyim = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, pyim-basedict }:
melpaBuild {
pname = "pyim";
- version = "1.6.1";
+ version = "1.6.4";
src = fetchFromGitHub {
owner = "tumashu";
repo = "pyim";
- rev = "f4dacfbac11d6d58f1fcbf766691e03b6983a9f6";
- sha256 = "0dy0y159fqcip805l86gmjbsgbcvj3hm5rfsc6slinmxsrl4nl9l";
+ rev = "d44db4cb74c1c0cf6f814ff14d0be8e733f8404a";
+ sha256 = "02b2aknx127xvl8amf74krvd7z33kyr049iw5h0665zkzsli4g8w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim";
@@ -29344,7 +29953,7 @@
pyim-basedict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pyim-basedict";
- version = "0.2";
+ version = "0.3.1";
src = fetchFromGitHub {
owner = "tumashu";
repo = "pyim-basedict";
@@ -29911,12 +30520,12 @@
rdf-prefix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rdf-prefix";
- version = "1.8";
+ version = "1.9";
src = fetchFromGitHub {
owner = "simenheg";
repo = "rdf-prefix";
- rev = "35129521d5b6035e5dd75d5b3481ce4971f46034";
- sha256 = "1iy9385n8a2b7ph4wdf8p92n81slirsxxckrc3khbk5zrpp62z5k";
+ rev = "25cc3c8902f16191496b549705b00ffc7dff51f1";
+ sha256 = "00ycsqzgn5rq8r4r86z1j43i2a7wj4r3c2vcggdaizyf4parmgmy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f083bd629697038ea6391c7a4eeedc909a5231/recipes/rdf-prefix";
@@ -29992,6 +30601,27 @@
license = lib.licenses.free;
};
}) {};
+ reason-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "reason-mode";
+ version = "0.3.0";
+ src = fetchFromGitHub {
+ owner = "reasonml-editor";
+ repo = "reason-mode";
+ rev = "6b53815a0405be1f364a082d22fe5c900409a01a";
+ sha256 = "1433bgakbfyf5d5vq69rwj4zg1h0xwjy9qsryvd9r1ssax2hzi7r";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/f9f1a18c13601f3a4fd7b1bbfe7d5da07746e492/recipes/reason-mode";
+ sha256 = "07sirgj8bs9yv7pbx1lahwslvjd2aadkzkz7lsyw6xflj5fxpggr";
+ name = "reason-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/reason-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
rebecca-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rebecca-theme";
@@ -30496,22 +31126,22 @@
license = lib.licenses.free;
};
}) {};
- rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
+ rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "rg";
- version = "1.3.1";
+ version = "1.4.0";
src = fetchFromGitHub {
owner = "dajva";
repo = "rg.el";
- rev = "081685a8c624220ece68d6dca8d60016585b04ff";
- sha256 = "094fy48h0mmih3g9dq7xhhdqq3dx3jbrg1x9qcq2szl3danndl6z";
+ rev = "5de611eae7787ecbc285fe7e31e412b9281a4e14";
+ sha256 = "18mhcipj5yywd5648pwm955wx3ipsnp9nwjyyl270qnn56hwkb6g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg";
sha256 = "0i78qvqdznh1z3b0mnzihv07j8b9r86dc1lsa1qlzacv6a2i9sbm";
name = "rg";
};
- packageRequires = [ cl-lib emacs s seq ];
+ packageRequires = [ cl-lib emacs s ];
meta = {
homepage = "https://melpa.org/#/rg";
license = lib.licenses.free;
@@ -30541,12 +31171,12 @@
rich-minority = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rich-minority";
- version = "1.0.1";
+ version = "1.0.2";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "rich-minority";
- rev = "311ac8ee54078f95b7279e532da6cf5a2afb4125";
- sha256 = "11hwf9y5ax207w6rwrsmi3pmn7pn7ap6iys0z8hni2f5zzxjrmx3";
+ rev = "3201f6e1769beb9f6cbbda392bef99fce337acf4";
+ sha256 = "1qa447k3qq2x1i2nxbm60wzr8kaysk3cifl09c13sv97n4yq3x2b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/rich-minority";
@@ -30625,12 +31255,12 @@
rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
melpaBuild {
pname = "rjsx-mode";
- version = "0.2.0";
+ version = "0.3.0";
src = fetchFromGitHub {
owner = "felipeochoa";
repo = "rjsx-mode";
- rev = "4a24c86a1873289538134fe431e544fa3e12e788";
- sha256 = "0yv622nnbcjnnaki49f7cz8cvrg13d0h9higadp83bl1lczhgw8j";
+ rev = "79bedb1d188e209be5cfef3bea8906df9c509ab8";
+ sha256 = "1dh76r9hy1d1f9xhdywslgv0w3c9nhsbwvpd8icgp300x5c6a3zh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode";
@@ -30877,12 +31507,12 @@
ruby-hash-syntax = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ruby-hash-syntax";
- version = "0.4";
+ version = "0.5";
src = fetchFromGitHub {
owner = "purcell";
repo = "ruby-hash-syntax";
- rev = "a0362c2dc449a1e67ef75ad736bcf8b03b083226";
- sha256 = "01n9j7sag49m4bdl6065jklnxnc5kck51izg884s1is459qgy86k";
+ rev = "bc05c3130a5d3237f04c6064297e56de5f73887d";
+ sha256 = "1jwvyj3kqchd40h37m75ydl0gjrbm873dhfn1grqg4sgk60hr414";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c7d21a43a4bf267507bdc746ec9d0fd82049c0af/recipes/ruby-hash-syntax";
@@ -31066,12 +31696,12 @@
s = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "s";
- version = "1.11.0";
+ version = "1.12.0";
src = fetchFromGitHub {
owner = "magnars";
repo = "s.el";
- rev = "a56f0d0fedf9754e1728067ac868100f2499357d";
- sha256 = "08vf62fcrnbmf2ppb759kzznjdz8x72fqdwbc4n8nbswrwgm2ikl";
+ rev = "12f116d58ac03706496bd682c6449b452681874e";
+ sha256 = "1g8mqd13llj007al4nlxxx4z2lcsg3wk970mgjn0avwrhjjgdmmv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/s";
@@ -31231,22 +31861,22 @@
license = lib.licenses.free;
};
}) {};
- sbt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ sbt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sbt-mode";
- version = "0.2";
+ version = "0.3";
src = fetchFromGitHub {
owner = "ensime";
repo = "emacs-sbt-mode";
- rev = "217d56bc2ec93a77a9e644233f4fb1815e437c61";
- sha256 = "1lvf7y1n63p8jvnp6ppwmxq2s6h9sk45319576f3s28ixsfa6cp2";
+ rev = "bdf31a1ffe637d1445b149804d5f5cc29333a1bd";
+ sha256 = "0ygp0c2hy4zp5x0ghplxf2fhrf16cn37sk2zf6i43zqz6gydzq8a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode";
sha256 = "0v0n70czgkdijnw5jd4na41vlrmqcshvr8gdpv0bv55ilqhiihc8";
name = "sbt-mode";
};
- packageRequires = [];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/sbt-mode";
license = lib.licenses.free;
@@ -31255,7 +31885,7 @@
scala-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "scala-mode";
- version = "0.23";
+ version = "1.0.0";
src = fetchFromGitHub {
owner = "ensime";
repo = "emacs-scala-mode";
@@ -31547,12 +32177,12 @@
sexy-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sexy-monochrome-theme";
- version = "2.1";
+ version = "3.1";
src = fetchFromGitHub {
owner = "voloyev";
repo = "sexy-monochrome-theme";
- rev = "d74cf7a50852c469ad13c634df74be2fcb3f3a96";
- sha256 = "14va3sy94vpkn4fc9g7gsxk3anl25jvp9a92c8ppndqzfisy7vgg";
+ rev = "f64714a176d9212c9fa82355dd8ec89587ce13f0";
+ sha256 = "17ahrdyk2v7vz13b4934xn8xjza4b7bfrkq8n42frq3pc8mgwqfd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dfd5ae9a93e036d11899c7adffdf6b63c2b21381/recipes/sexy-monochrome-theme";
@@ -31568,12 +32198,12 @@
shackle = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "shackle";
- version = "0.9.2";
+ version = "1.0.0";
src = fetchFromGitHub {
owner = "wasamasa";
repo = "shackle";
- rev = "979b021077655ca38749a60c9752c0817e8fd93e";
- sha256 = "11qp4gqxfi5d6krvxlqxfn58b1kcgsnldpi54r8lx6mis8l0f4wl";
+ rev = "55df581cdb3cfaf9ebf9c54d8849f8f5775cf74b";
+ sha256 = "1s59v6fnyzvgnbjcd1gpll4xp8316dqmdpi77382w0vjfcrsvbih";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/806e7d00f763f3fc4e3b8ebd483070ac6c5d0f21/recipes/shackle";
@@ -31946,12 +32576,12 @@
shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "shx";
- version = "0.0.9";
+ version = "0.0.10";
src = fetchFromGitHub {
owner = "riscy";
repo = "shx-for-emacs";
- rev = "8166b02ebbab43d8a33d47b8221a94b69fc63487";
- sha256 = "0n97iys2xyg1lzkn8bqsx0sgqpzci1pxg69v42cpzmyrz3h54bwp";
+ rev = "e53d798ba4a4c07a3ee1c194840c937b18c02087";
+ sha256 = "0sig9gpa2wn23skwny9jpvwxax0gbwp143anvgkc5gm87iw2jgrd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx";
@@ -32426,6 +33056,27 @@
license = lib.licenses.free;
};
}) {};
+ smart-semicolon = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "smart-semicolon";
+ version = "0.2.1";
+ src = fetchFromGitHub {
+ owner = "iquiw";
+ repo = "smart-semicolon";
+ rev = "c11096679dbed3875c37413337ee490ee7951b63";
+ sha256 = "1v6z3a1f6nxc62n7595qnji39ywdsz7xy5bkl2218v3y7gkbc518";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/fe339b95636b02ceb157294055d2f5f4c4b0b8cf/recipes/smart-semicolon";
+ sha256 = "1vq6l3vc615w0p640wy226z5i7dky666sgzczkngv07kag0iwqp0";
+ name = "smart-semicolon";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/smart-semicolon";
+ license = lib.licenses.free;
+ };
+ }) {};
smart-tabs-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "smart-tabs-mode";
@@ -32699,22 +33350,22 @@
license = lib.licenses.free;
};
}) {};
- snoopy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ snoopy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "snoopy";
- version = "0.1.1";
+ version = "0.2.0";
src = fetchFromGitHub {
owner = "anmonteiro";
repo = "snoopy-mode";
- rev = "8d2b7b1354414f261b237f2fed0d472803ba3909";
- sha256 = "05q407dg6jppmqdxpp1ba8xs6yjilsa74hga46dbhcc9nzj9850a";
+ rev = "ec4123bdebfe0bb7bf4feaac2dc02b59caffe386";
+ sha256 = "01l44lshw0zvykay9886s1vqryanagkd4ciw3ramchn0baqz11vl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4a882cd92964ac195a09469006c9a44dc202f000/recipes/snoopy";
sha256 = "1wa8jykqyj6rxqfhwbiyli6yh8s7n0pqv7fc9sfaymarda93zbgi";
name = "snoopy";
};
- packageRequires = [ emacs ];
+ packageRequires = [ cl-lib emacs ];
meta = {
homepage = "https://melpa.org/#/snoopy";
license = lib.licenses.free;
@@ -32807,12 +33458,12 @@
sotclojure = callPackage ({ cider, clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sotlisp }:
melpaBuild {
pname = "sotclojure";
- version = "1.2";
+ version = "1.3.1";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "speed-of-thought-clojure";
- rev = "8d879ef41c004726cca3c27a81b7543cc273c19b";
- sha256 = "13yn2yadkpmykaly3l3xsq1bhm4sxyk8k1px555y11qi0mfdcjhh";
+ rev = "ceac82aa691e8d98946471be6aaff9c9a4603c32";
+ sha256 = "1a6riq7ksk5m76dsgc75d8b992nyr50l48l8cpms9064m6b0r9jv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2ccef8af91eada4449d9cd4bda6bd28272722e/recipes/sotclojure";
@@ -32975,12 +33626,12 @@
sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sparql-mode";
- version = "2.1.1";
+ version = "3.0.0";
src = fetchFromGitHub {
owner = "ljos";
repo = "sparql-mode";
- rev = "262c46a282ce54ca4745b863cf323d9bf69e2faa";
- sha256 = "02ai86c15x0fbgg2bw6a9k3k825gkhl3hy9abq62dfgdwc0cqxmn";
+ rev = "e220a0c0c478fee0be3622442651981cdd82090c";
+ sha256 = "1k1ih6y9yq1fx13863yacx69v6f77b8xhkrx5i2dpm4h7wki1dg4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode";
@@ -33562,12 +34213,12 @@
suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }:
melpaBuild {
pname = "suggest";
- version = "0.4";
+ version = "0.5";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "suggest.el";
- rev = "5cb70e500df430cb9ffc8ae0ab67976c1d7d226f";
- sha256 = "1001z5zaj4ln05js08cz13lgc11dqxc6sgp1s35g19sfhip4xyim";
+ rev = "05beef9ecf94107d72d0070fa092a8392505b012";
+ sha256 = "008d9kk8vb90n8j5dvw1rslfny66q012022na03dzbnmq3f73k7a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest";
@@ -33706,22 +34357,22 @@
license = lib.licenses.free;
};
}) {};
- swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
melpaBuild {
pname = "swift-mode";
- version = "2.4.0";
+ version = "3.0";
src = fetchFromGitHub {
owner = "chrisbarrett";
repo = "swift-mode";
- rev = "50394e4ffa80cb395ddd3c3128f995644820e2bc";
- sha256 = "1dwrfbdfgndvv2rv4vl4vr82lzbkvk46z5fxbngd66yrx21rav24";
+ rev = "e8d9a5d7af59e8be25997b8b048d7c3e257cd0b0";
+ sha256 = "035478shf1crb1qnhk5rmz08xgn0z2p6fsw0yii1a4q5f3h85xrc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode";
sha256 = "1imr53f8agfza9zxs1h1mwyhg7yaywqqffd1lsvm1m84nvxvri2d";
name = "swift-mode";
};
- packageRequires = [ emacs ];
+ packageRequires = [ emacs seq ];
meta = {
homepage = "https://melpa.org/#/swift-mode";
license = lib.licenses.free;
@@ -34002,12 +34653,12 @@
systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "systemd";
- version = "1.5";
+ version = "1.6";
src = fetchFromGitHub {
owner = "holomorph";
repo = "systemd-mode";
- rev = "4c1b2befd0c853dcc7bca52d9b084933c3a08254";
- sha256 = "1sdrga3mmajai2jcf4zpcii0l2b9wch8rhdsbjlzx76ia5snp23l";
+ rev = "1e7567a9973bf80cab0d7e0355656a84bee7ca96";
+ sha256 = "0ylgnvpfindg4cxccbqy02ic7p0i9rygf1w16dm1filwhbqvjplq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ca810e512c357d1d0130aeeb9b46b38c595e3351/recipes/systemd";
@@ -34650,15 +35301,36 @@
license = lib.licenses.free;
};
}) {};
+ tickscript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "tickscript-mode";
+ version = "0.4";
+ src = fetchFromGitHub {
+ owner = "msherry";
+ repo = "tickscript-mode";
+ rev = "9acf389dd055ae77c92170802769838810472490";
+ sha256 = "1v60y244papzrirwqk9c2wcwgz4qp9h7m3887kvgr5ffn5imjss8";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/c60ee1839f728c5041bde1fe4fa62c4d41c746ef/recipes/tickscript-mode";
+ sha256 = "0wnck6j377idx7h7csmfdhp6napv3zs4sd24lknfclafhslllp54";
+ name = "tickscript-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/tickscript-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }:
melpaBuild {
pname = "tide";
- version = "2.5.2";
+ version = "2.5.3";
src = fetchFromGitHub {
owner = "ananthakumaran";
repo = "tide";
- rev = "f1daf10e931858ac8d6ff676cf02ca73d3c62558";
- sha256 = "1hj5mfpkfczy09ghmivkkzwmn6nawwv0ydm4ckz4mggps42hn0j1";
+ rev = "e5d1d3852aaf63cbfb0abaec1792a62bed024a72";
+ sha256 = "1kwssyzbjwl2vyll0p49l57z41yv6k1jnzbsdnh0d1h81nixg5wk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
@@ -34799,12 +35471,12 @@
tracking = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "tracking";
- version = "2.5";
+ version = "2.6";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "circe";
- rev = "13c605e639194c3da0c2e685056fac685f8c76a0";
- sha256 = "0n7v0g332ml1ang2fjc8rjbi8h1f4bqazcqi8dlfn99vvv8kcd21";
+ rev = "59f1096238e6c30303a6fe9fc1c635f49e5946c6";
+ sha256 = "19h3983zy3f15cgs86irvbdzz55qyjm48qd7gjlzcxplr7vnnh0j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking";
@@ -34820,12 +35492,12 @@
transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
melpaBuild {
pname = "transmission";
- version = "0.11.1";
+ version = "0.12";
src = fetchFromGitHub {
owner = "holomorph";
repo = "transmission";
- rev = "d465378a59e2eb91372564a56e60a9ab00e48f9c";
- sha256 = "0al0xz59lrqj97fxmyxiphblg1bvbzahc6srd8klg7s0378ybblw";
+ rev = "0de5a5fa2438890ae9c2ca61999042ab175df3e9";
+ sha256 = "1wqlbbm71s1hvglsdp1qs7nvj6gnkjkai4rr8hhp1lliiyd5vmia";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission";
@@ -34859,22 +35531,22 @@
license = lib.licenses.free;
};
}) {};
- treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pfuture, s }:
+ treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pfuture, s }:
melpaBuild {
pname = "treemacs";
- version = "1.10";
+ version = "1.11.8";
src = fetchFromGitHub {
owner = "Alexander-Miller";
repo = "treemacs";
- rev = "19723297eefdc9d3afef546f1839c88acfbeef9c";
- sha256 = "117644jkyfi0p050hqpy6x4rk85jxnnnldmslzvvr7yprpc04hbw";
+ rev = "4213045d59e19d0aac6246d5df5fc0a9b104d5bd";
+ sha256 = "0iwfk42l8wlwnbd6c2l201gfn0k4k0h5whbr21dp8ngr54p5w95z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/486f21e99856a77f470d246f3c71cd32d2e61ad6/recipes/treemacs";
sha256 = "07npjnhn9a0b537h1wmvy57bmicd2cji7bslp4wbnrfmmg2jdc3a";
name = "treemacs";
};
- packageRequires = [ ace-window cl-lib dash emacs f pfuture s ];
+ packageRequires = [ ace-window cl-lib dash emacs f hydra pfuture s ];
meta = {
homepage = "https://melpa.org/#/treemacs";
license = lib.licenses.free;
@@ -34883,12 +35555,12 @@
treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }:
melpaBuild {
pname = "treemacs-evil";
- version = "1.10";
+ version = "1.11.8";
src = fetchFromGitHub {
owner = "Alexander-Miller";
repo = "treemacs";
- rev = "19723297eefdc9d3afef546f1839c88acfbeef9c";
- sha256 = "117644jkyfi0p050hqpy6x4rk85jxnnnldmslzvvr7yprpc04hbw";
+ rev = "4213045d59e19d0aac6246d5df5fc0a9b104d5bd";
+ sha256 = "0iwfk42l8wlwnbd6c2l201gfn0k4k0h5whbr21dp8ngr54p5w95z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil";
@@ -34904,12 +35576,12 @@
treemacs-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, treemacs }:
melpaBuild {
pname = "treemacs-projectile";
- version = "1.10";
+ version = "1.11.8";
src = fetchFromGitHub {
owner = "Alexander-Miller";
repo = "treemacs";
- rev = "19723297eefdc9d3afef546f1839c88acfbeef9c";
- sha256 = "117644jkyfi0p050hqpy6x4rk85jxnnnldmslzvvr7yprpc04hbw";
+ rev = "4213045d59e19d0aac6246d5df5fc0a9b104d5bd";
+ sha256 = "0iwfk42l8wlwnbd6c2l201gfn0k4k0h5whbr21dp8ngr54p5w95z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b694918c94e6311745776d451aa2519924beef2d/recipes/treemacs-projectile";
@@ -35006,22 +35678,22 @@
license = lib.licenses.free;
};
}) {};
- tuareg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "tuareg";
- version = "2.0.10";
+ version = "2.1.0";
src = fetchFromGitHub {
owner = "ocaml";
repo = "tuareg";
- rev = "93b9c6cdba3a8f333cc817c3822fc76b71ff4dcd";
- sha256 = "14l0y7gahbz1l4ag5nvswj7cl4skchvzr6r7zc1a5k000skdmv69";
+ rev = "64537bc753094b2adc2e3e97625fa9c0a01f9ae6";
+ sha256 = "03d0n49p6d77p221majmbh0gjyrmh2z4cb2l2vi5xxfwc1fsxzmp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg";
sha256 = "0wx723dmjlpm86xdabl9n8p22zbbxpapyfn6ifz0b0pvhh49ip7q";
name = "tuareg";
};
- packageRequires = [];
+ packageRequires = [ caml ];
meta = {
homepage = "https://melpa.org/#/tuareg";
license = lib.licenses.free;
@@ -35456,12 +36128,12 @@
unify-opening = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "unify-opening";
- version = "1.1.0";
+ version = "2.0.0";
src = fetchFromGitHub {
owner = "DamienCassou";
repo = "unify-opening";
- rev = "2812e43029cab7183197ce5e3c9577856bfd22c5";
- sha256 = "1vbx10s2zmhpxjg26ik947bcg9f7w3g2w45wmm0shjp743fsdq8p";
+ rev = "fbe53b56e9629143a73c5da9e7797579508e0fbf";
+ sha256 = "0hr65nrywa9yijqymw902q02adyczbwzam2ahv8m2wzay5pcwg8a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0a2faab13744262ef4d12750f70b300b3afd2835/recipes/unify-opening";
@@ -35771,12 +36443,12 @@
vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine }:
melpaBuild {
pname = "vhdl-tools";
- version = "5.6";
+ version = "5.7";
src = fetchFromGitHub {
owner = "csantosb";
repo = "vhdl-tools";
- rev = "c08343904835cbae12f48e0758b0a6a014d76a74";
- sha256 = "1skh9p5s9nbl6jvljj9bfn19fdzjx8lvx1q6rzldld07xwaif4qb";
+ rev = "40d5e1020b1a2b6e8ff04cbd8c84bf7959e4e7af";
+ sha256 = "1ndrvwjgfjnmaw71y4452ck9aqlwnpxa7379ldsn7gfl0r67qhsi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools";
@@ -35999,6 +36671,27 @@
license = lib.licenses.free;
};
}) {};
+ vue-mode = callPackage ({ edit-indirect, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode, ssass-mode, vue-html-mode }:
+ melpaBuild {
+ pname = "vue-mode";
+ version = "0.3.1";
+ src = fetchFromGitHub {
+ owner = "CodeFalling";
+ repo = "vue-mode";
+ rev = "fe501dba780025066dcdcd2055e772d06c2abdbc";
+ sha256 = "0k67kzrh2fjhjiqcy1yq5cmcwjpx85yd2xxvkqvv4791q58f7c4z";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode";
+ sha256 = "0gy7a5sliaijq0666l55vbkg15anrw7k1828szdn1ppkraw14bn0";
+ name = "vue-mode";
+ };
+ packageRequires = [ edit-indirect mmm-mode ssass-mode vue-html-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/vue-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
w32-browser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "w32-browser";
@@ -36254,12 +36947,12 @@
webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
melpaBuild {
pname = "webpaste";
- version = "1.5.0";
+ version = "2.0.0";
src = fetchFromGitHub {
owner = "etu";
repo = "webpaste.el";
- rev = "77e6154ece15ffcc58db80dca48fe342376831aa";
- sha256 = "0zj1hhz7m0fxaj03aqjfd6jhcg2khi87l6742miwkdxxggwhdijj";
+ rev = "aed3e00b6332a068d53ce482f5139a95c3dcd245";
+ sha256 = "1p4sgn0rh8a5f0f6f1njq329zwgs6yp8j3zqs0yfz4kaikw1xw10";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste";
@@ -36506,12 +37199,12 @@
whizzml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "whizzml-mode";
- version = "0.2.1";
+ version = "0.2.2";
src = fetchFromGitHub {
owner = "whizzml";
repo = "whizzml-mode";
- rev = "662c60173cdb396fcb2386d7d7c774d26f16cd9f";
- sha256 = "1nyl1whhi3zrzb5b4vkmqdaggnxrqmzmw1amf7hbw0mvx5mpy9pa";
+ rev = "9060fdce07c137abc2c494cb72641b9b9d6fbe22";
+ sha256 = "10yi3n6pyqirlzxdkv7nvp0d0n1fkjrgwhn0kp5i27dnp3fi0i2b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/11f26b15c326c3b8541bac510579b32493916042/recipes/whizzml-mode";
@@ -36713,22 +37406,22 @@
license = lib.licenses.free;
};
}) {};
- winum = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ winum = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "winum";
- version = "1.0.2";
+ version = "2.0.0";
src = fetchFromGitHub {
owner = "deb0ch";
repo = "emacs-winum";
- rev = "8e886302c7e1d8fd521a95e0f00d6efab295a883";
- sha256 = "19rf806v3yv6qy6p8mf54g1whdrh7vc107z31kqaqdwq681fhi37";
+ rev = "c56d1cdb8d1723eb4c0d7a7eb3ecd2697739146c";
+ sha256 = "09jd5srlnd4060hs719qil84ssmnvq196bz7ywaswgapv1gs1h6r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c1caa7a54a910a44322fdee300e8cce6ddcde071/recipes/winum";
sha256 = "0yyvjmvqif6glh9ri6049nxcmgib9mxdhy6816kjhsaqr570f9pw";
name = "winum";
};
- packageRequires = [ cl-lib ];
+ packageRequires = [ cl-lib dash ];
meta = {
homepage = "https://melpa.org/#/winum";
license = lib.licenses.free;
@@ -36737,11 +37430,11 @@
wisp-mode = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "wisp-mode";
- version = "0.9.2";
+ version = "0.9.7";
src = fetchhg {
url = "https://bitbucket.com/ArneBab/wisp";
- rev = "7ce954278aef";
- sha256 = "116cspnc4lhf6gk73yr9sy7013jp88vq5zayghzgnkbdlaw6zmz3";
+ rev = "7633b2a5133f";
+ sha256 = "0j6j9wkmq95dhx5cr3z2gpx5mvsqsgissp2060ij252ijc3l9k4a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";
@@ -36778,12 +37471,12 @@
with-editor = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "with-editor";
- version = "2.6.0";
+ version = "2.7.0";
src = fetchFromGitHub {
owner = "magit";
repo = "with-editor";
- rev = "241726118dee067a8d9880d53c6a781d580ba8a1";
- sha256 = "0q06qfir64nib604f23gdmbzl23mcsnysfd0x36cx9nwik95wl0x";
+ rev = "99d3278b1c79718de16dd4f57dcc8c4aa31a4051";
+ sha256 = "1mcfinr1wv87hqn2787dcyn7lkgfni4xfgsji50pwj3zfgg0yqyr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor";
@@ -37090,6 +37783,27 @@
license = lib.licenses.free;
};
}) {};
+ xcode-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "xcode-project";
+ version = "1.0.0";
+ src = fetchFromGitHub {
+ owner = "nhojb";
+ repo = "xcode-project";
+ rev = "f5548a26a1afc0b0d873556c25f6d8b6b9c2aa8c";
+ sha256 = "0xb1cvjaw7zjnw6c5aq315vvlc3cncris62jis44jb8s5r8gxcrv";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/49b866ebf7e707bc74525f83dd5038e6e860fcef/recipes/xcode-project";
+ sha256 = "0igp30f6ypmp4l8zmdfpa5bza4avm7mq2gj8v7b3ii655v91n6vi";
+ name = "xcode-project";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/xcode-project";
+ license = lib.licenses.free;
+ };
+ }) {};
xcscope = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xcscope";
@@ -37468,6 +38182,25 @@
license = lib.licenses.free;
};
}) {};
+ yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
+ pname = "yatex";
+ version = "1.80";
+ src = fetchhg {
+ url = "https://www.yatex.org/hgrepos/yatex/";
+ rev = "16763e5b7481";
+ sha256 = "1mrcc9amz0kflm570bd2cprhin0z8lr668k2s56mj6shixb61dwh";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e28710244a1bef8f56156fe1c271520896a9c694/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";
@@ -37709,6 +38442,27 @@
license = lib.licenses.free;
};
}) {};
+ zoom = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "zoom";
+ version = "0.2.0";
+ src = fetchFromGitHub {
+ owner = "cyrus-and";
+ repo = "zoom";
+ rev = "d92ea444df6f6bb6cae92242f3269582d1b8ab40";
+ sha256 = "08riz3dd19c1dixm3c6j5dkkwjpgcib05pxq611w8z0mgsn0hsc5";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe094c99756ad29eda9bc51f31bb70c4ddc4131/recipes/zoom";
+ sha256 = "09bk0nnfj72an2b3rravd6qp21gdgcm1m55qnf2r8rzbgqymq5ls";
+ name = "zoom";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/zoom";
+ license = lib.licenses.free;
+ };
+ }) {};
zoom-window = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "zoom-window";
diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix
index a1cb0b7d4edc..a6108093933d 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 = "20170911";
+ version = "20171030";
src = fetchurl {
- url = "http://orgmode.org/elpa/org-20170911.tar";
- sha256 = "16d69g1qnfcj7d2q9ni5dz5wh9pid9mzhwyfg4z93s9xizzlnw64";
+ url = "http://orgmode.org/elpa/org-20171030.tar";
+ sha256 = "1g2dyzy1844lli2hhfjnbskn1mskccgaaf0mxb1cm0zhhas8bnfd";
};
packageRequires = [];
meta = {
@@ -14,10 +14,10 @@
}) {};
org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org-plus-contrib";
- version = "20170911";
+ version = "20171030";
src = fetchurl {
- url = "http://orgmode.org/elpa/org-plus-contrib-20170911.tar";
- sha256 = "0bgrsccar4v9viq99w2h4rjavql14zgdwkwaa1bprga3af78jr82";
+ url = "http://orgmode.org/elpa/org-plus-contrib-20171030.tar";
+ sha256 = "0pq2hs5d2i6s036pcs0jn6ld2p1ap08dmbjf17hsh899741mg9cj";
};
packageRequires = [];
meta = {
diff --git a/pkgs/applications/editors/emacs/clean-env.patch b/pkgs/applications/editors/emacs/clean-env.patch
new file mode 100644
index 000000000000..f80efeeef706
--- /dev/null
+++ b/pkgs/applications/editors/emacs/clean-env.patch
@@ -0,0 +1,15 @@
+Dump temacs in an empty environment to prevent -dev paths from ending
+up in the dumped image.
+
+diff -ru -x '*~' emacs-25.3/src/Makefile.in emacs-25.3-new/src/Makefile.in
+--- emacs-25.3/src/Makefile.in 2017-04-14 17:02:47.000000000 +0200
++++ emacs-25.3-new/src/Makefile.in 2017-09-25 19:03:02.173861038 +0200
+@@ -532,7 +532,7 @@
+ ifeq ($(CANNOT_DUMP),yes)
+ ln -f temacs$(EXEEXT) $@
+ else
+- LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump
++ env -i LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump
+ ifneq ($(PAXCTL_dumped),)
+ $(PAXCTL_dumped) $@
+ endif
diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix
index a00826b98214..af3298a5883e 100644
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/pkgs/applications/editors/emacs/default.nix
@@ -34,7 +34,11 @@ stdenv.mkDerivation rec {
sha256 = "02y00y9q42g1iqgz5qhmsja75hwxd88yrn9zp14lanay0zkwafi5";
};
- patches = (lib.optional stdenv.isDarwin ./at-fdcwd.patch);
+ enableParallelBuilding = true;
+
+ patches =
+ [ ./clean-env.patch ]
+ ++ lib.optional stdenv.isDarwin ./at-fdcwd.patch;
nativeBuildInputs = [ pkgconfig ]
++ lib.optionals srcRepo [ autoconf automake texinfo ]
diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix
index 421d0ddd9f69..70c723b40dae 100644
--- a/pkgs/applications/editors/emacs/macport.nix
+++ b/pkgs/applications/editors/emacs/macport.nix
@@ -6,7 +6,7 @@
stdenv.mkDerivation rec {
emacsVersion = "25.3";
emacsName = "emacs-${emacsVersion}";
- macportVersion = "6.7";
+ macportVersion = "6.8";
name = "emacs-mac-${emacsVersion}-${macportVersion}";
builder = ./builder.sh;
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
macportSrc = fetchurl {
url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${emacsName}-mac-${macportVersion}.tar.gz";
- sha256 = "0fivrasvigszr31w8wg8kb808hmqv2cc8klrm9n0hdxwg5fs5d0y";
+ sha256 = "167lgl76jz1bq6whb9ajshhw5v9bbw9ci4lji4qlmd5nrwnb7kqg";
};
hiresSrc = fetchurl {
diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix
index 28106cf876bd..10816e0a283f 100644
--- a/pkgs/applications/editors/focuswriter/default.nix
+++ b/pkgs/applications/editors/focuswriter/default.nix
@@ -1,25 +1,27 @@
-{ stdenv, fetchurl, qt4, qmake4Hook, pkgconfig, hunspell }:
+{ stdenv, fetchurl, pkgconfig, qmake, qttools, hunspell, qtbase, qtmultimedia }:
stdenv.mkDerivation rec {
name = "focuswriter-${version}";
- version = "1.5.3";
+ version = "1.6.7";
src = fetchurl {
- url = http://gottcode.org/focuswriter/focuswriter-1.5.3-src.tar.bz2;
- sha256 = "1i58jxbiy95ijf81g8c3gwxhcg3irzssna3wv7vhrd57g4lcfj0w";
+ url = "https://gottcode.org/focuswriter/focuswriter-${version}-src.tar.bz2";
+ sha256 = "10rqzinr6yd6ca06rklg34kdc08a3xgygfzmprsfg7gdsybfay5z";
};
- buildInputs = [ qt4 qmake4Hook pkgconfig hunspell ];
-
- qmakeFlags = [ "PREFIX=/" ];
+ nativeBuildInputs = [ pkgconfig qmake qttools ];
+ buildInputs = [ hunspell qtbase qtmultimedia ];
+ enableParallelBuilding = true;
+
+ qmakeFlags = [ "PREFIX=/" ];
installFlags = [ "INSTALL_ROOT=$(out)" ];
- meta = {
+ meta = with stdenv.lib; {
description = "Simple, distraction-free writing environment";
- license = stdenv.lib.licenses.gpl2;
- maintainers = [ stdenv.lib.maintainers.madjar ];
- platforms = stdenv.lib.platforms.all;
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ madjar ];
+ platforms = platforms.all;
homepage = https://gottcode.org/focuswriter/;
};
}
diff --git a/pkgs/applications/editors/gobby/default.nix b/pkgs/applications/editors/gobby/default.nix
index 32998700c23e..de1e5e4c64bc 100644
--- a/pkgs/applications/editors/gobby/default.nix
+++ b/pkgs/applications/editors/gobby/default.nix
@@ -15,7 +15,8 @@ in stdenv.mkDerivation rec {
sha256 = "165x0r668ma5blziisvbr8qig3jw9hf7i6w8r7wwvz3wsac3bswc";
};
- buildInputs = [ pkgconfig gtkmm2 gsasl gtksourceview libxmlxx libinf intltool ]
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtkmm2 gsasl gtksourceview libxmlxx libinf intltool ]
++ stdenv.lib.optional gnomeSupport gnome_vfs;
configureFlags = ''
diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 65721361cd6b..41ad3164d6a6 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -78,7 +78,7 @@ let
});
buildGogland = { name, version, src, license, description, wmClass, update-channel }:
- (mkJetBrainsProduct {
+ lib.overrideDerivation (mkJetBrainsProduct {
inherit name version src wmClass jdk;
product = "Gogland";
meta = with stdenv.lib; {
@@ -93,6 +93,13 @@ let
maintainers = [ maintainers.miltador ];
platforms = platforms.linux;
};
+ }) (attrs: {
+ postFixup = (attrs.postFixup or "") + ''
+ interp="$(cat $NIX_CC/nix-support/dynamic-linker)"
+ patchelf --set-interpreter $interp $out/gogland*/plugins/intellij-go-plugin/lib/dlv/linux/dlv
+
+ chmod +x $out/gogland*/plugins/intellij-go-plugin/lib/dlv/linux/dlv
+ '';
});
buildIdea = { name, version, src, license, description, wmClass, update-channel }:
@@ -219,12 +226,12 @@ in
clion = buildClion rec {
name = "clion-${version}";
- version = "2017.2.2"; /* updated by script */
+ version = "2017.2.3"; /* updated by script */
description = "C/C++ IDE. New. Intelligent. Cross-platform";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
- sha256 = "1rnncii7z44186jv9xl3ax179ws9wfwd6yndyf9pvnpcd4jcs6d0"; /* updated by script */
+ sha256 = "02hyndyfcrvfbi4q8vmmj0xh2bggwc2azggm24g3m03iffa7j6fx"; /* updated by script */
};
wmClass = "jetbrains-clion";
update-channel = "CLion_Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
@@ -245,12 +252,12 @@ in
gogland = buildGogland rec {
name = "gogland-${version}";
- version = "172.3968.45"; /* updated by script */
+ version = "173.2696.28"; /* updated by script */
description = "Up and Coming Go IDE";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/go/${name}.tar.gz";
- sha256 = "0nk9g28l414yp5ldyx1yl38qpp9s1pxkfxfwmw9yvlff3bi0kkyw"; /* updated by script */
+ sha256 = "07nz2pf7fnjxsvc82vihk2i880cji349czxzshr1dk50ixlydq7n"; /* updated by script */
};
wmClass = "jetbrains-gogland";
update-channel = "gogland_1.0_EAP";
@@ -258,12 +265,12 @@ in
idea-community = buildIdea rec {
name = "idea-community-${version}";
- version = "2017.2.4"; /* updated by script */
+ version = "2017.2.5"; /* updated by script */
description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
- sha256 = "179nqzgbb76pyr48faca6k69v32m5kvx66i2apih95g54sd1xgva"; /* updated by script */
+ sha256 = "01p63wsy60icy4673ci435rmzpjfkyz7a8w413vw45i2bm76skhr"; /* updated by script */
};
wmClass = "jetbrains-idea-ce";
update-channel = "IDEA_Release";
@@ -271,12 +278,12 @@ in
idea-ultimate = buildIdea rec {
name = "idea-ultimate-${version}";
- version = "2017.2.4"; /* updated by script */
+ version = "2017.2.5"; /* updated by script */
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz";
- sha256 = "1qwqk1r42llh8py0w2iq4w1ks3ipzsxkbdz0zkrd1572zngpk90m"; /* updated by script */
+ sha256 = "0pp49nck1cad6pz81bd95v4v55vmnvj7cbdzybmldglka1afqjb6"; /* updated by script */
};
wmClass = "jetbrains-idea";
update-channel = "IDEA_Release";
@@ -323,12 +330,12 @@ in
rider = buildRider rec {
name = "rider-${version}";
- version = "2017.1.1"; /* updated by script */
+ version = "2017.1.2"; /* updated by script */
description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/resharper/JetBrains.Rider-${version}.tar.gz";
- sha256 = "1h6p847izddard3227ifg3q5klwvdfixir63i6adkd2fvsqn5935"; /* updated by script */
+ sha256 = "0kphjxibrs4ss6hpxbssvs3n35xh9zzw7a1q09x79ibvvk73gwqh"; /* updated by script */
};
wmClass = "jetbrains-rider";
update-channel = "rider_2017_1";
diff --git a/pkgs/applications/editors/jucipp/default.nix b/pkgs/applications/editors/jucipp/default.nix
index ae4f1e6ad525..3d623d3f3bda 100644
--- a/pkgs/applications/editors/jucipp/default.nix
+++ b/pkgs/applications/editors/jucipp/default.nix
@@ -1,7 +1,7 @@
{ config, stdenv, fetchgit, makeWrapper, gnome3, at_spi2_core, libcxx,
boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkgconfig, pcre,
libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts,
- coreutils, glibc, dbus_libs, openssl, libxml2, gnumake, binutils, ctags }:
+ coreutils, glibc, dbus_libs, openssl, libxml2, gnumake, ctags }:
with stdenv.lib;
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
postInstall = ''
mv $out/bin/juci $out/bin/.juci
makeWrapper "$out/bin/.juci" "$out/bin/juci" \
- --set PATH "${stdenv.lib.makeBinPath [ ctags coreutils llvmPackages.clang.cc cmake gnumake binutils llvmPackages.clang ]}" \
+ --set PATH "${stdenv.lib.makeBinPath [ ctags coreutils llvmPackages.clang.cc cmake gnumake llvmPackages.clang.bintools llvmPackages.clang ]}" \
--set NO_AT_BRIDGE 1 \
--set ASPELL_CONF "dict-dir ${aspellDicts.en}/lib/aspell"
'';
diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix
index 9efe6a44716f..1a164ec08de9 100644
--- a/pkgs/applications/editors/kdevelop5/kdevelop.nix
+++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix
@@ -39,7 +39,7 @@ mkDerivation rec {
postInstall = ''
# The kdevelop! script (shell environment) needs qdbus and kioclient5 in PATH.
- wrapProgram "$out/bin/kdevelop!" --prefix PATH ":" "${qttools}/bin:${kde-cli-tools}/bin"
+ wrapProgram "$out/bin/kdevelop!" --prefix PATH ":" "${lib.makeBinPath [ qttools kde-cli-tools ]}"
# Fix the (now wrapped) kdevelop! to find things in right places:
# - Make KDEV_BASEDIR point to bin directory of kdevplatform.
diff --git a/pkgs/applications/editors/leafpad/default.nix b/pkgs/applications/editors/leafpad/default.nix
index 055816a798d3..dd3fb542da7c 100644
--- a/pkgs/applications/editors/leafpad/default.nix
+++ b/pkgs/applications/editors/leafpad/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "0b0az2wvqgvam7w0ns1j8xp2llslm1rx6h7zcsy06a7j0yp257cm";
};
- buildInputs = [ intltool pkgconfig gtk2 ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ intltool gtk2 ];
hardeningDisable = [ "format" ];
diff --git a/pkgs/applications/editors/mg/default.nix b/pkgs/applications/editors/mg/default.nix
index b8bfd40c079b..f4bdee830e19 100644
--- a/pkgs/applications/editors/mg/default.nix
+++ b/pkgs/applications/editors/mg/default.nix
@@ -1,33 +1,30 @@
-{ fetchurl, stdenv, ncurses, pkgconfig, libbsd }:
+{ stdenv, fetchurl, pkgconfig, libbsd, ncurses }:
+
stdenv.mkDerivation rec {
name = "mg-${version}";
- version = "20161005";
+ version = "20170828";
src = fetchurl {
url = "http://homepage.boetes.org/software/mg/${name}.tar.gz";
- sha256 = "0qaydk2cy765n9clghmi5gdnpwn15y2v0fj6r0jcm0v7d89vbz5p";
+ sha256 = "139nc58l5ifj3d3478nhqls0lic52skmxfxggznzxaz9camqd20z";
};
- NIX_CFLAGS_COMPILE = "-Wno-error";
-
- preConfigure = ''
- substituteInPlace GNUmakefile \
- --replace /usr/bin/pkg-config ${pkgconfig}/bin/pkg-config
- '';
+ enableParallelBuilding = true;
+
+ makeFlags = [ "PKG_CONFIG=${pkgconfig}/bin/pkg-config" ];
installPhase = ''
- mkdir -p $out/bin
- cp mg $out/bin
- mkdir -p $out/share/man/man1
- cp mg.1 $out/share/man/man1
+ install -m 555 -Dt $out/bin mg
+ install -m 444 -Dt $out/share/man/man1 mg.1
'';
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ ncurses libbsd ];
+
+ buildInputs = [ libbsd ncurses ];
meta = with stdenv.lib; {
- homepage = http://homepage.boetes.org/software/mg/;
description = "Micro GNU/emacs, a portable version of the mg maintained by the OpenBSD team";
+ homepage = "https://homepage.boetes.org/software/mg";
license = licenses.publicDomain;
platforms = platforms.all;
};
diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix
index 44c61d16ec8d..53ea9741c03c 100644
--- a/pkgs/applications/editors/monodevelop/default.nix
+++ b/pkgs/applications/editors/monodevelop/default.nix
@@ -34,10 +34,10 @@ stdenv.mkDerivation rec {
patchFlags = [ "-p2" ];
patches = [ ./git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch ];
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- autoconf automake pkgconfig shared_mime_info intltool
+ autoconf automake shared_mime_info intltool
mono gtk-sharp-2_0 gnome-sharp unzip
- pkgconfig
dotnetPackages.NUnit
dotnetPackages.NUnitRunners
dotnetPackages.Nuget
diff --git a/pkgs/applications/editors/nedit/default.nix b/pkgs/applications/editors/nedit/default.nix
index a15b557f0e57..39d96775ebcd 100644
--- a/pkgs/applications/editors/nedit/default.nix
+++ b/pkgs/applications/editors/nedit/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- homepage = http://sourceforge.net/projects/nedit;
+ homepage = https://sourceforge.net/projects/nedit;
platforms = with platforms; linux ++ darwin;
};
}
diff --git a/pkgs/applications/editors/notepadqq/default.nix b/pkgs/applications/editors/notepadqq/default.nix
index 9b3896e32d65..6d1bba8c4d5d 100644
--- a/pkgs/applications/editors/notepadqq/default.nix
+++ b/pkgs/applications/editors/notepadqq/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchgit, pkgconfig, which, qtbase, qtsvg, qttools, qtwebkit }:
+{ stdenv, fetchgit, pkgconfig, which, qtbase, qtsvg, qttools, qtwebkit}:
let
- version = "0.53.0";
+ version = "1.2.0";
in stdenv.mkDerivation {
name = "notepadqq-${version}";
src = fetchgit {
url = "https://github.com/notepadqq/notepadqq.git";
- rev = "3b0751277fb268ec72b466b37d0f0977c536bc1b";
- sha256 = "0hw94mn2xg2r58afvz1xg990jinv9aa33942zgwq54qwj61r93hi";
+ rev = "ab074d30e02d49e0fe6957c1523e7fed239aff7d";
+ sha256 = "0j8vqsdw314qpk5lrgccm9n7gbyr14ac3s65sl1qn87pxhrz1hpg";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix
new file mode 100644
index 000000000000..1a0e6e54fb3e
--- /dev/null
+++ b/pkgs/applications/editors/rednotebook/default.nix
@@ -0,0 +1,37 @@
+{ lib, buildPythonApplication, fetchFromGitHub
+, gdk_pixbuf, glib, gtk3, pango, webkitgtk
+, pygobject3, pyyaml
+}:
+
+buildPythonApplication rec {
+ name = "rednotebook-${version}";
+ version = "2.3";
+
+ src = fetchFromGitHub {
+ owner = "jendrikseipp";
+ repo = "rednotebook";
+ rev = "v${version}";
+ sha256 = "0zkfid104hcsf20r6829v11wxdghqkd3j1zbgyvd1s7q4nxjn5lj";
+ };
+
+ # We have not packaged tests.
+ doCheck = false;
+
+ propagatedBuildInputs = [
+ gdk_pixbuf glib gtk3 pango webkitgtk
+ pygobject3 pyyaml
+ ];
+
+ makeWrapperArgs = [
+ "--set GI_TYPELIB_PATH $GI_TYPELIB_PATH"
+ "--prefix XDG_DATA_DIRS : $out/share"
+ "--suffix XDG_DATA_DIRS : $XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+ ];
+
+ meta = with lib; {
+ homepage = http://rednotebook.sourceforge.net/;
+ description = "A modern journal that includes a calendar navigation, customizable templates, export functionality and word clouds";
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ orivej tstrobel ];
+ };
+}
diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix
index 930a18e39a62..b508521790bf 100644
--- a/pkgs/applications/editors/rstudio/default.nix
+++ b/pkgs/applications/editors/rstudio/default.nix
@@ -1,20 +1,23 @@
-{ stdenv, fetchurl, fetchpatch, makeDesktopItem, cmake, boost163, zlib, openssl,
-R, qt5, libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper, pandoc
+{ stdenv, fetchurl, fetchpatch, makeDesktopItem, cmake, boost, zlib, openssl
+, R, qtbase, qtwebkit, qtwebchannel, libuuid, hunspellDicts, unzip, ant, jdk
+, gnumake, makeWrapper, pandoc
}:
let
- version = "1.1.351";
+ version = "1.1.383";
ginVer = "1.5";
gwtVer = "2.7.0";
in
stdenv.mkDerivation rec {
name = "RStudio-${version}";
- buildInputs = [ cmake boost163 zlib openssl R qt5.full qt5.qtwebkit qt5.qtwebchannel libuuid unzip ant jdk makeWrapper pandoc ];
+ nativeBuildInputs = [ cmake unzip ant jdk makeWrapper pandoc ];
+
+ buildInputs = [ boost zlib openssl R qtbase qtwebkit qtwebchannel libuuid ];
src = fetchurl {
url = "https://github.com/rstudio/rstudio/archive/v${version}.tar.gz";
- sha256 = "0dpzmkq7jkdndidmmgdcr849q33ypmzkqwx22fraaqcy7w4f0pcn";
+ sha256 = "06680l9amq03b4jarmzfr605bijhb79fip9rk464zab6hgwqbp3f";
};
# Hack RStudio to only use the input R.
@@ -96,6 +99,8 @@ stdenv.mkDerivation rec {
cp ${pandoc}/bin/pandoc dependencies/common/pandoc/
'';
+ enableParallelBuilding = true;
+
cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" "-DQT_QMAKE_EXECUTABLE=$NIX_QT5_TMP/bin/qmake" ];
desktopItem = makeDesktopItem {
diff --git a/pkgs/applications/editors/supertux-editor/default.nix b/pkgs/applications/editors/supertux-editor/default.nix
index a9f236a57ae7..a6d624d4b1ec 100644
--- a/pkgs/applications/editors/supertux-editor/default.nix
+++ b/pkgs/applications/editors/supertux-editor/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "08y5haclgxvcii3hpdvn1ah8qd0f3n8xgxxs8zryj02b8n7cz3vx";
};
- buildInputs = [mono gtk-sharp-2_0 pkgconfig makeWrapper gnome2.libglade gtk2 ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [mono gtk-sharp-2_0 makeWrapper gnome2.libglade gtk2 ];
installPhase = ''
mkdir -p $out/bin $out/lib/supertux-editor
diff --git a/pkgs/applications/editors/textadept/default.nix b/pkgs/applications/editors/textadept/default.nix
index d1fa03c54796..4f1a29278be9 100644
--- a/pkgs/applications/editors/textadept/default.nix
+++ b/pkgs/applications/editors/textadept/default.nix
@@ -32,7 +32,7 @@ let
build_dir=$PWD
cd $TMPDIR
- local_path=$(basename ${store_path} .zip | sed -e 's/^[a-z0-9]*-//')
+ local_path=$(basename ${url} .zip)
cp -r ${store_path} $local_path
chmod u+rwX -R $local_path
@@ -112,8 +112,9 @@ stdenv.mkDerivation rec {
version = "9.3";
name = "textadept-${version}";
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- gtk2 glib pkgconfig unzip ncurses zip
+ gtk2 glib unzip ncurses zip
];
src = fetchhg {
diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix
index 0733bd796656..b20a6e5ec45c 100644
--- a/pkgs/applications/editors/typora/default.nix
+++ b/pkgs/applications/editors/typora/default.nix
@@ -3,18 +3,18 @@
stdenv.mkDerivation rec {
name = "typora-${version}";
- version = "0.9.31";
+ version = "0.9.38";
src =
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "https://www.typora.io/linux/typora_${version}_amd64.deb";
- sha256 = "786b5164d9c63ecc23eb427c5ff393285ce8fd540c5bfdd5c1464655fac87a42";
+ sha256 = "bf6a069c5da4a7dc289bdb3c8d27e7a81daeaee99488d4d3b512c6b673780557";
}
else
fetchurl {
url = "https://www.typora.io/linux/typora_${version}_i386.deb";
- sha256 = "a8fe53f8984d9f8c4e06c14affbb616be58a91cd2b475b9681fb18a6e21930d1";
+ sha256 = "edd092e96ebf69503cf6b39b77a61ec5e3185f8a1447da0bed063fa11861c1b9";
}
;
@@ -57,8 +57,10 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out
dpkg -x $src $out
- cp -av $out/usr/* $out
+ mv $out/usr/bin $out
+ mv $out/usr/share $out
rm $out/bin/typora
+ rmdir $out/usr
# Otherwise it looks "suspicious"
chmod -R g-w $out
@@ -81,9 +83,8 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A minimal Markdown reading & writing app";
homepage = https://typora.io;
- license = licenses.free;
- maintainers = with stdenv.lib.maintainers; [ jensbin ];
+ license = licenses.unfree;
+ maintainers = with maintainers; [ jensbin ];
platforms = [ "x86_64-linux" "i686-linux" ];
};
}
-
diff --git a/pkgs/applications/editors/vanubi/default.nix b/pkgs/applications/editors/vanubi/default.nix
index 876bd145b725..273ef33250fc 100644
--- a/pkgs/applications/editors/vanubi/default.nix
+++ b/pkgs/applications/editors/vanubi/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "145zxgaky5bcq5bxm4z7h0pvviq7k1nrgnf40q6nax6ik616ybjq";
};
- buildInputs = [ pkgconfig vala_0_26 which autoconf automake
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ vala_0_26 which autoconf automake
libtool glib gtk3 libwnck3 asciidoc
gnome3.gtksourceview gnome3.vte_290 python3Packages.pygments ];
diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix
index 1d661014c772..417f2d805163 100644
--- a/pkgs/applications/editors/vim/common.nix
+++ b/pkgs/applications/editors/vim/common.nix
@@ -1,12 +1,12 @@
{ lib, fetchFromGitHub }:
rec {
- version = "8.0.0442";
+ version = "8.0.1257";
src = fetchFromGitHub {
owner = "vim";
repo = "vim";
rev = "v${version}";
- sha256 = "1pyyrkb7k5vhm1ijrh4v2f50lxhrgga5mm0gvmz4v704z0h585yg";
+ sha256 = "1y4c7wn5gr7n4c2ni36kadr26aldydxlf06yj7nsmw22ywwg78ig";
};
enableParallelBuilding = true;
diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix
index bb265e90b770..144fb5428a51 100644
--- a/pkgs/applications/editors/vim/macvim.nix
+++ b/pkgs/applications/editors/vim/macvim.nix
@@ -17,8 +17,9 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- gettext ncurses pkgconfig luajit ruby tcl perl python
+ gettext ncurses luajit ruby tcl perl python
];
patches = [ ./macvim.patch ];
diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index f72af1908c50..23bcdae5fb21 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -2,7 +2,7 @@
makeWrapper, libXScrnSaver, libxkbfile, libsecret }:
let
- version = "1.16.1";
+ version = "1.17.2";
channel = "stable";
plat = {
@@ -12,9 +12,9 @@ let
}.${stdenv.system};
sha256 = {
- "i686-linux" = "1k06rish1a1hqrkvzy21lg05vmzd345aa65g3d08ikh6508mp100";
- "x86_64-linux" = "1l2xbdvjfmf05cqcjcj3w2450vi7wvkm5zdwkmfhh01fnvbrygnw";
- "x86_64-darwin" = "0bxv3qlhcqn5sb5l5pjhi5560vi1sl844hx3r5x48gmmgd8yziaj";
+ "i686-linux" = "04mnj74pqkgfgdacq4643qrd7ybka1366lr7mwn0f70lk05wb2h2";
+ "x86_64-linux" = "0y37wwvq6flaa2fh2r6b9cplbcszq726zrx6b8slzq6s5wl2lgmr";
+ "x86_64-darwin" = "1cqyir7ijwafy68d5vbw47cs1x2lqs1wjnvhhw15yi2d7c14fq7q";
}.${stdenv.system};
archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz";
diff --git a/pkgs/applications/editors/zed/default.nix b/pkgs/applications/editors/zed/default.nix
index 0170319871f0..bcf262957bc5 100644
--- a/pkgs/applications/editors/zed/default.nix
+++ b/pkgs/applications/editors/zed/default.nix
@@ -5,22 +5,16 @@ let
name = "zed-${version}";
version = "1.1.0";
- # When upgrading node.nix / node packages:
- # fetch package.json from Zed's repository
- # run `npm2nix package.json node.nix`
- # and replace node.nix with new one
- nodePackages = import ../../../../pkgs/top-level/node-packages.nix {
+ nodePackages = import ./node.nix {
inherit pkgs;
- inherit (pkgs) stdenv nodejs fetchurl fetchgit;
- neededNatives = [ pkgs.python ] ++ pkgs.lib.optional pkgs.stdenv.isLinux pkgs.utillinux;
- self = nodePackages;
- generated = ./node.nix;
+ system = stdenv.system;
};
node_env = buildEnv {
name = "node_env";
- paths = [ nodePackages."body-parser" nodePackages.express
- nodePackages.request nodePackages.tar nodePackages.ws ];
+ paths = [ nodePackages."body-parser-~1.6.3" nodePackages."express-~4.8.3"
+ nodePackages."request-~2.34.0" nodePackages."tar-~0.1.19"
+ nodePackages."ws-~0.4.32" ];
pathsToLink = [ "/lib" ];
ignoreCollisions = true;
};
@@ -78,11 +72,11 @@ in stdenv.mkDerivation rec {
ln -s ${zed_script} $out/bin/zed
'';
- meta = {
+ meta = with stdenv.lib; {
description = "A fully offline-capable, open source, keyboard-focused, text and code editor for power users";
- license = stdenv.lib.licenses.mit;
+ license = licenses.mit;
homepage = http://zedapp.org/;
- maintainers = [ stdenv.lib.maintainers.matejc ];
- platforms = stdenv.lib.platforms.linux;
+ maintainers = with maintainers; [ matejc ma27 ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/editors/zed/deps.json b/pkgs/applications/editors/zed/deps.json
new file mode 100644
index 000000000000..d3a7708d156f
--- /dev/null
+++ b/pkgs/applications/editors/zed/deps.json
@@ -0,0 +1,6 @@
+[ { "body-parser": "~1.6.3" }
+, { "express": "~4.8.3" }
+, { "request": "~2.34.0" }
+, { "tar": "~0.1.19" }
+, { "ws": "~0.4.32" }
+]
diff --git a/pkgs/applications/editors/zed/deps.sh b/pkgs/applications/editors/zed/deps.sh
new file mode 100755
index 000000000000..6d2bf29532e9
--- /dev/null
+++ b/pkgs/applications/editors/zed/deps.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -i bash -p nodePackages.node2nix
+
+node2nix -6 -i deps.json \
+ -e ../../../development/node-packages/node-env.nix \
+ --no-copy-node-env \
+ -c node.nix
diff --git a/pkgs/applications/editors/zed/node-packages.nix b/pkgs/applications/editors/zed/node-packages.nix
new file mode 100644
index 000000000000..5aaa75b6c914
--- /dev/null
+++ b/pkgs/applications/editors/zed/node-packages.nix
@@ -0,0 +1,877 @@
+# This file has been generated by node2nix 1.3.0. Do not edit!
+
+{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
+
+let
+ sources = {
+ "bytes-1.0.0" = {
+ name = "bytes";
+ packageName = "bytes";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz";
+ sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8";
+ };
+ };
+ "depd-0.4.4" = {
+ name = "depd";
+ packageName = "depd";
+ version = "0.4.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/depd/-/depd-0.4.4.tgz";
+ sha1 = "07091fae75f97828d89b4a02a2d4778f0e7c0662";
+ };
+ };
+ "iconv-lite-0.4.4" = {
+ name = "iconv-lite";
+ packageName = "iconv-lite";
+ version = "0.4.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.4.tgz";
+ sha1 = "e95f2e41db0735fc21652f7827a5ee32e63c83a8";
+ };
+ };
+ "media-typer-0.2.0" = {
+ name = "media-typer";
+ packageName = "media-typer";
+ version = "0.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/media-typer/-/media-typer-0.2.0.tgz";
+ sha1 = "d8a065213adfeaa2e76321a2b6dda36ff6335984";
+ };
+ };
+ "on-finished-2.1.0" = {
+ name = "on-finished";
+ packageName = "on-finished";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/on-finished/-/on-finished-2.1.0.tgz";
+ sha1 = "0c539f09291e8ffadde0c8a25850fb2cedc7022d";
+ };
+ };
+ "qs-2.2.2" = {
+ name = "qs";
+ packageName = "qs";
+ version = "2.2.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/qs/-/qs-2.2.2.tgz";
+ sha1 = "dfe783f1854b1ac2b3ade92775ad03e27e03218c";
+ };
+ };
+ "raw-body-1.3.0" = {
+ name = "raw-body";
+ packageName = "raw-body";
+ version = "1.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/raw-body/-/raw-body-1.3.0.tgz";
+ sha1 = "978230a156a5548f42eef14de22d0f4f610083d1";
+ };
+ };
+ "type-is-1.3.2" = {
+ name = "type-is";
+ packageName = "type-is";
+ version = "1.3.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/type-is/-/type-is-1.3.2.tgz";
+ sha1 = "4f2a5dc58775ca1630250afc7186f8b36309d1bb";
+ };
+ };
+ "ee-first-1.0.5" = {
+ name = "ee-first";
+ packageName = "ee-first";
+ version = "1.0.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ee-first/-/ee-first-1.0.5.tgz";
+ sha1 = "8c9b212898d8cd9f1a9436650ce7be202c9e9ff0";
+ };
+ };
+ "mime-types-1.0.2" = {
+ name = "mime-types";
+ packageName = "mime-types";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz";
+ sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce";
+ };
+ };
+ "accepts-1.0.7" = {
+ name = "accepts";
+ packageName = "accepts";
+ version = "1.0.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/accepts/-/accepts-1.0.7.tgz";
+ sha1 = "5b501fb4f0704309964ccdb048172541208dab1a";
+ };
+ };
+ "buffer-crc32-0.2.3" = {
+ name = "buffer-crc32";
+ packageName = "buffer-crc32";
+ version = "0.2.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.3.tgz";
+ sha1 = "bb54519e95d107cbd2400e76d0cab1467336d921";
+ };
+ };
+ "debug-1.0.4" = {
+ name = "debug";
+ packageName = "debug";
+ version = "1.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz";
+ sha1 = "5b9c256bd54b6ec02283176fa8a0ede6d154cbf8";
+ };
+ };
+ "escape-html-1.0.1" = {
+ name = "escape-html";
+ packageName = "escape-html";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz";
+ sha1 = "181a286ead397a39a92857cfb1d43052e356bff0";
+ };
+ };
+ "finalhandler-0.1.0" = {
+ name = "finalhandler";
+ packageName = "finalhandler";
+ version = "0.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.1.0.tgz";
+ sha1 = "da05bbc4f5f4a30c84ce1d91f3c154007c4e9daa";
+ };
+ };
+ "methods-1.1.0" = {
+ name = "methods";
+ packageName = "methods";
+ version = "1.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/methods/-/methods-1.1.0.tgz";
+ sha1 = "5dca4ee12df52ff3b056145986a8f01cbc86436f";
+ };
+ };
+ "parseurl-1.3.2" = {
+ name = "parseurl";
+ packageName = "parseurl";
+ version = "1.3.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz";
+ sha1 = "fc289d4ed8993119460c156253262cdc8de65bf3";
+ };
+ };
+ "path-to-regexp-0.1.3" = {
+ name = "path-to-regexp";
+ packageName = "path-to-regexp";
+ version = "0.1.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.3.tgz";
+ sha1 = "21b9ab82274279de25b156ea08fd12ca51b8aecb";
+ };
+ };
+ "proxy-addr-1.0.1" = {
+ name = "proxy-addr";
+ packageName = "proxy-addr";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.1.tgz";
+ sha1 = "c7c566d5eb4e3fad67eeb9c77c5558ccc39b88a8";
+ };
+ };
+ "range-parser-1.0.0" = {
+ name = "range-parser";
+ packageName = "range-parser";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/range-parser/-/range-parser-1.0.0.tgz";
+ sha1 = "a4b264cfe0be5ce36abe3765ac9c2a248746dbc0";
+ };
+ };
+ "send-0.8.5" = {
+ name = "send";
+ packageName = "send";
+ version = "0.8.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/send/-/send-0.8.5.tgz";
+ sha1 = "37f708216e6f50c175e74c69fec53484e2fd82c7";
+ };
+ };
+ "serve-static-1.5.4" = {
+ name = "serve-static";
+ packageName = "serve-static";
+ version = "1.5.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/serve-static/-/serve-static-1.5.4.tgz";
+ sha1 = "819fb37ae46bd02dd520b77fcf7fd8f5112f9782";
+ };
+ };
+ "vary-0.1.0" = {
+ name = "vary";
+ packageName = "vary";
+ version = "0.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/vary/-/vary-0.1.0.tgz";
+ sha1 = "df0945899e93c0cc5bd18cc8321d9d21e74f6176";
+ };
+ };
+ "cookie-0.1.2" = {
+ name = "cookie";
+ packageName = "cookie";
+ version = "0.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz";
+ sha1 = "72fec3d24e48a3432073d90c12642005061004b1";
+ };
+ };
+ "fresh-0.2.2" = {
+ name = "fresh";
+ packageName = "fresh";
+ version = "0.2.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/fresh/-/fresh-0.2.2.tgz";
+ sha1 = "9731dcf5678c7faeb44fb903c4f72df55187fa77";
+ };
+ };
+ "cookie-signature-1.0.4" = {
+ name = "cookie-signature";
+ packageName = "cookie-signature";
+ version = "1.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.4.tgz";
+ sha1 = "0edd22286e3a111b9a2a70db363e925e867f6aca";
+ };
+ };
+ "merge-descriptors-0.0.2" = {
+ name = "merge-descriptors";
+ packageName = "merge-descriptors";
+ version = "0.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.2.tgz";
+ sha1 = "c36a52a781437513c57275f39dd9d317514ac8c7";
+ };
+ };
+ "utils-merge-1.0.0" = {
+ name = "utils-merge";
+ packageName = "utils-merge";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz";
+ sha1 = "0294fb922bb9375153541c4f7096231f287c8af8";
+ };
+ };
+ "negotiator-0.4.7" = {
+ name = "negotiator";
+ packageName = "negotiator";
+ version = "0.4.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/negotiator/-/negotiator-0.4.7.tgz";
+ sha1 = "a4160f7177ec806738631d0d3052325da42abdc8";
+ };
+ };
+ "ms-0.6.2" = {
+ name = "ms";
+ packageName = "ms";
+ version = "0.6.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz";
+ sha1 = "d89c2124c6fdc1353d65a8b77bf1aac4b193708c";
+ };
+ };
+ "ipaddr.js-0.1.2" = {
+ name = "ipaddr.js";
+ packageName = "ipaddr.js";
+ version = "0.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.2.tgz";
+ sha1 = "6a1fd3d854f5002965c34d7bbcd9b4a8d4b0467e";
+ };
+ };
+ "destroy-1.0.3" = {
+ name = "destroy";
+ packageName = "destroy";
+ version = "1.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz";
+ sha1 = "b433b4724e71fd8551d9885174851c5fc377e2c9";
+ };
+ };
+ "mime-1.2.11" = {
+ name = "mime";
+ packageName = "mime";
+ version = "1.2.11";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz";
+ sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10";
+ };
+ };
+ "qs-0.6.6" = {
+ name = "qs";
+ packageName = "qs";
+ version = "0.6.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz";
+ sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107";
+ };
+ };
+ "json-stringify-safe-5.0.1" = {
+ name = "json-stringify-safe";
+ packageName = "json-stringify-safe";
+ version = "5.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz";
+ sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
+ };
+ };
+ "forever-agent-0.5.2" = {
+ name = "forever-agent";
+ packageName = "forever-agent";
+ version = "0.5.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz";
+ sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130";
+ };
+ };
+ "node-uuid-1.4.8" = {
+ name = "node-uuid";
+ packageName = "node-uuid";
+ version = "1.4.8";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz";
+ sha1 = "b040eb0923968afabf8d32fb1f17f1167fdab907";
+ };
+ };
+ "tough-cookie-2.3.3" = {
+ name = "tough-cookie";
+ packageName = "tough-cookie";
+ version = "2.3.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz";
+ sha1 = "0b618a5565b6dea90bf3425d04d55edc475a7561";
+ };
+ };
+ "form-data-0.1.4" = {
+ name = "form-data";
+ packageName = "form-data";
+ version = "0.1.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz";
+ sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12";
+ };
+ };
+ "tunnel-agent-0.3.0" = {
+ name = "tunnel-agent";
+ packageName = "tunnel-agent";
+ version = "0.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz";
+ sha1 = "ad681b68f5321ad2827c4cfb1b7d5df2cfe942ee";
+ };
+ };
+ "http-signature-0.10.1" = {
+ name = "http-signature";
+ packageName = "http-signature";
+ version = "0.10.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz";
+ sha1 = "4fbdac132559aa8323121e540779c0a012b27e66";
+ };
+ };
+ "oauth-sign-0.3.0" = {
+ name = "oauth-sign";
+ packageName = "oauth-sign";
+ version = "0.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz";
+ sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e";
+ };
+ };
+ "hawk-1.0.0" = {
+ name = "hawk";
+ packageName = "hawk";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz";
+ sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d";
+ };
+ };
+ "aws-sign2-0.5.0" = {
+ name = "aws-sign2";
+ packageName = "aws-sign2";
+ version = "0.5.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz";
+ sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63";
+ };
+ };
+ "punycode-1.4.1" = {
+ name = "punycode";
+ packageName = "punycode";
+ version = "1.4.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz";
+ sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
+ };
+ };
+ "combined-stream-0.0.7" = {
+ name = "combined-stream";
+ packageName = "combined-stream";
+ version = "0.0.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz";
+ sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f";
+ };
+ };
+ "async-0.9.2" = {
+ name = "async";
+ packageName = "async";
+ version = "0.9.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz";
+ sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d";
+ };
+ };
+ "delayed-stream-0.0.5" = {
+ name = "delayed-stream";
+ packageName = "delayed-stream";
+ version = "0.0.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz";
+ sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f";
+ };
+ };
+ "assert-plus-0.1.5" = {
+ name = "assert-plus";
+ packageName = "assert-plus";
+ version = "0.1.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz";
+ sha1 = "ee74009413002d84cec7219c6ac811812e723160";
+ };
+ };
+ "asn1-0.1.11" = {
+ name = "asn1";
+ packageName = "asn1";
+ version = "0.1.11";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz";
+ sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7";
+ };
+ };
+ "ctype-0.5.3" = {
+ name = "ctype";
+ packageName = "ctype";
+ version = "0.5.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz";
+ sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f";
+ };
+ };
+ "hoek-0.9.1" = {
+ name = "hoek";
+ packageName = "hoek";
+ version = "0.9.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz";
+ sha1 = "3d322462badf07716ea7eb85baf88079cddce505";
+ };
+ };
+ "boom-0.4.2" = {
+ name = "boom";
+ packageName = "boom";
+ version = "0.4.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz";
+ sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b";
+ };
+ };
+ "cryptiles-0.2.2" = {
+ name = "cryptiles";
+ packageName = "cryptiles";
+ version = "0.2.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz";
+ sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c";
+ };
+ };
+ "sntp-0.2.4" = {
+ name = "sntp";
+ packageName = "sntp";
+ version = "0.2.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz";
+ sha1 = "fb885f18b0f3aad189f824862536bceeec750900";
+ };
+ };
+ "block-stream-0.0.9" = {
+ name = "block-stream";
+ packageName = "block-stream";
+ version = "0.0.9";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz";
+ sha1 = "13ebfe778a03205cfe03751481ebb4b3300c126a";
+ };
+ };
+ "fstream-0.1.31" = {
+ name = "fstream";
+ packageName = "fstream";
+ version = "0.1.31";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz";
+ sha1 = "7337f058fbbbbefa8c9f561a28cab0849202c988";
+ };
+ };
+ "inherits-2.0.3" = {
+ name = "inherits";
+ packageName = "inherits";
+ version = "2.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz";
+ sha1 = "633c2c83e3da42a502f52466022480f4208261de";
+ };
+ };
+ "graceful-fs-3.0.11" = {
+ name = "graceful-fs";
+ packageName = "graceful-fs";
+ version = "3.0.11";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz";
+ sha1 = "7613c778a1afea62f25c630a086d7f3acbbdd818";
+ };
+ };
+ "mkdirp-0.5.1" = {
+ name = "mkdirp";
+ packageName = "mkdirp";
+ version = "0.5.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
+ sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
+ };
+ };
+ "rimraf-2.6.2" = {
+ name = "rimraf";
+ packageName = "rimraf";
+ version = "2.6.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz";
+ sha512 = "3kmrqh8xli7rzfm8wc6j9lp0c6vml172iv3z088an9xlwl1xvkvh3fn92za66ms4c9yww80qa5kan31k1z1ypqvkchmh1mznb09xdwn";
+ };
+ };
+ "natives-1.1.0" = {
+ name = "natives";
+ packageName = "natives";
+ version = "1.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/natives/-/natives-1.1.0.tgz";
+ sha1 = "e9ff841418a6b2ec7a495e939984f78f163e6e31";
+ };
+ };
+ "minimist-0.0.8" = {
+ name = "minimist";
+ packageName = "minimist";
+ version = "0.0.8";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
+ sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
+ };
+ };
+ "glob-7.1.2" = {
+ name = "glob";
+ packageName = "glob";
+ version = "7.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz";
+ sha512 = "08vjxzixc9dwc1hn5pd60yyij98krk2pr758aiga97r02ncvaqx1hidi95wk470k1v84gg4alls9bm52m77174z128bgf13b61x951h";
+ };
+ };
+ "fs.realpath-1.0.0" = {
+ name = "fs.realpath";
+ packageName = "fs.realpath";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz";
+ sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
+ };
+ };
+ "inflight-1.0.6" = {
+ name = "inflight";
+ packageName = "inflight";
+ version = "1.0.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz";
+ sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9";
+ };
+ };
+ "minimatch-3.0.4" = {
+ name = "minimatch";
+ packageName = "minimatch";
+ version = "3.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
+ sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8";
+ };
+ };
+ "once-1.4.0" = {
+ name = "once";
+ packageName = "once";
+ version = "1.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz";
+ sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
+ };
+ };
+ "path-is-absolute-1.0.1" = {
+ name = "path-is-absolute";
+ packageName = "path-is-absolute";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz";
+ sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f";
+ };
+ };
+ "wrappy-1.0.2" = {
+ name = "wrappy";
+ packageName = "wrappy";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz";
+ sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
+ };
+ };
+ "brace-expansion-1.1.8" = {
+ name = "brace-expansion";
+ packageName = "brace-expansion";
+ version = "1.1.8";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz";
+ sha1 = "c07b211c7c952ec1f8efd51a77ef0d1d3990a292";
+ };
+ };
+ "balanced-match-1.0.0" = {
+ name = "balanced-match";
+ packageName = "balanced-match";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz";
+ sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767";
+ };
+ };
+ "concat-map-0.0.1" = {
+ name = "concat-map";
+ packageName = "concat-map";
+ version = "0.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";
+ sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
+ };
+ };
+ "commander-2.1.0" = {
+ name = "commander";
+ packageName = "commander";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz";
+ sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781";
+ };
+ };
+ "nan-1.0.0" = {
+ name = "nan";
+ packageName = "nan";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/nan/-/nan-1.0.0.tgz";
+ sha1 = "ae24f8850818d662fcab5acf7f3b95bfaa2ccf38";
+ };
+ };
+ "tinycolor-0.0.1" = {
+ name = "tinycolor";
+ packageName = "tinycolor";
+ version = "0.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz";
+ sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164";
+ };
+ };
+ "options-0.0.6" = {
+ name = "options";
+ packageName = "options";
+ version = "0.0.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/options/-/options-0.0.6.tgz";
+ sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f";
+ };
+ };
+ };
+in
+{
+ "body-parser-~1.6.3" = nodeEnv.buildNodePackage {
+ name = "body-parser";
+ packageName = "body-parser";
+ version = "1.6.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/body-parser/-/body-parser-1.6.7.tgz";
+ sha1 = "82306becadf44543e826b3907eae93f0237c4e5c";
+ };
+ dependencies = [
+ sources."bytes-1.0.0"
+ sources."depd-0.4.4"
+ sources."iconv-lite-0.4.4"
+ sources."media-typer-0.2.0"
+ sources."on-finished-2.1.0"
+ sources."qs-2.2.2"
+ sources."raw-body-1.3.0"
+ sources."type-is-1.3.2"
+ sources."ee-first-1.0.5"
+ sources."mime-types-1.0.2"
+ ];
+ buildInputs = globalBuildInputs;
+ meta = {
+ description = "Node.js body parsing middleware";
+ homepage = https://github.com/expressjs/body-parser;
+ license = "MIT";
+ };
+ production = true;
+ };
+ "express-~4.8.3" = nodeEnv.buildNodePackage {
+ name = "express";
+ packageName = "express";
+ version = "4.8.8";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/express/-/express-4.8.8.tgz";
+ sha1 = "6aba348ccdfa87608040b12ca0010107a0aac28e";
+ };
+ dependencies = [
+ sources."accepts-1.0.7"
+ sources."buffer-crc32-0.2.3"
+ sources."debug-1.0.4"
+ sources."depd-0.4.4"
+ sources."escape-html-1.0.1"
+ sources."finalhandler-0.1.0"
+ sources."media-typer-0.2.0"
+ sources."methods-1.1.0"
+ sources."parseurl-1.3.2"
+ sources."path-to-regexp-0.1.3"
+ sources."proxy-addr-1.0.1"
+ sources."qs-2.2.2"
+ sources."range-parser-1.0.0"
+ sources."send-0.8.5"
+ sources."serve-static-1.5.4"
+ sources."type-is-1.3.2"
+ sources."vary-0.1.0"
+ sources."cookie-0.1.2"
+ sources."fresh-0.2.2"
+ sources."cookie-signature-1.0.4"
+ sources."merge-descriptors-0.0.2"
+ sources."utils-merge-1.0.0"
+ sources."mime-types-1.0.2"
+ sources."negotiator-0.4.7"
+ sources."ms-0.6.2"
+ sources."ipaddr.js-0.1.2"
+ sources."destroy-1.0.3"
+ sources."mime-1.2.11"
+ sources."on-finished-2.1.0"
+ sources."ee-first-1.0.5"
+ ];
+ buildInputs = globalBuildInputs;
+ meta = {
+ description = "Fast, unopinionated, minimalist web framework";
+ homepage = http://expressjs.com/;
+ license = "MIT";
+ };
+ production = true;
+ };
+ "request-~2.34.0" = nodeEnv.buildNodePackage {
+ name = "request";
+ packageName = "request";
+ version = "2.34.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/request/-/request-2.34.0.tgz";
+ sha1 = "b5d8b9526add4a2d4629f4d417124573996445ae";
+ };
+ dependencies = [
+ sources."qs-0.6.6"
+ sources."json-stringify-safe-5.0.1"
+ sources."forever-agent-0.5.2"
+ sources."node-uuid-1.4.8"
+ sources."mime-1.2.11"
+ sources."tough-cookie-2.3.3"
+ sources."form-data-0.1.4"
+ sources."tunnel-agent-0.3.0"
+ sources."http-signature-0.10.1"
+ sources."oauth-sign-0.3.0"
+ sources."hawk-1.0.0"
+ sources."aws-sign2-0.5.0"
+ sources."punycode-1.4.1"
+ sources."combined-stream-0.0.7"
+ sources."async-0.9.2"
+ sources."delayed-stream-0.0.5"
+ sources."assert-plus-0.1.5"
+ sources."asn1-0.1.11"
+ sources."ctype-0.5.3"
+ sources."hoek-0.9.1"
+ sources."boom-0.4.2"
+ sources."cryptiles-0.2.2"
+ sources."sntp-0.2.4"
+ ];
+ buildInputs = globalBuildInputs;
+ meta = {
+ description = "Simplified HTTP request client.";
+ homepage = https://github.com/mikeal/request;
+ license = "Apache, Version 2.0";
+ };
+ production = true;
+ };
+ "tar-~0.1.19" = nodeEnv.buildNodePackage {
+ name = "tar";
+ packageName = "tar";
+ version = "0.1.20";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/tar/-/tar-0.1.20.tgz";
+ sha1 = "42940bae5b5f22c74483699126f9f3f27449cb13";
+ };
+ dependencies = [
+ sources."block-stream-0.0.9"
+ sources."fstream-0.1.31"
+ sources."inherits-2.0.3"
+ sources."graceful-fs-3.0.11"
+ sources."mkdirp-0.5.1"
+ sources."rimraf-2.6.2"
+ sources."natives-1.1.0"
+ sources."minimist-0.0.8"
+ sources."glob-7.1.2"
+ sources."fs.realpath-1.0.0"
+ sources."inflight-1.0.6"
+ sources."minimatch-3.0.4"
+ sources."once-1.4.0"
+ sources."path-is-absolute-1.0.1"
+ sources."wrappy-1.0.2"
+ sources."brace-expansion-1.1.8"
+ sources."balanced-match-1.0.0"
+ sources."concat-map-0.0.1"
+ ];
+ buildInputs = globalBuildInputs;
+ meta = {
+ description = "tar for node";
+ homepage = https://github.com/isaacs/node-tar;
+ license = "BSD";
+ };
+ production = true;
+ };
+ "ws-~0.4.32" = nodeEnv.buildNodePackage {
+ name = "ws";
+ packageName = "ws";
+ version = "0.4.32";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ws/-/ws-0.4.32.tgz";
+ sha1 = "787a6154414f3c99ed83c5772153b20feb0cec32";
+ };
+ dependencies = [
+ sources."commander-2.1.0"
+ sources."nan-1.0.0"
+ sources."tinycolor-0.0.1"
+ sources."options-0.0.6"
+ ];
+ buildInputs = globalBuildInputs;
+ meta = {
+ description = "simple to use, blazing fast and thoroughly tested websocket client, server and console for node.js, up-to-date against RFC-6455";
+ homepage = https://github.com/einaros/ws;
+ };
+ production = true;
+ };
+}
\ No newline at end of file
diff --git a/pkgs/applications/editors/zed/node.nix b/pkgs/applications/editors/zed/node.nix
index e74ff1ec45f4..ff0bf1eb8056 100644
--- a/pkgs/applications/editors/zed/node.nix
+++ b/pkgs/applications/editors/zed/node.nix
@@ -1,1825 +1,16 @@
-{ self, fetchurl, fetchgit ? null, lib }:
+# This file has been generated by node2nix 1.3.0. Do not edit!
-{
- by-spec."accepts"."~1.2.7" =
- self.by-version."accepts"."1.2.7";
- by-version."accepts"."1.2.7" = lib.makeOverridable self.buildNodePackage {
- name = "accepts-1.2.7";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/accepts/-/accepts-1.2.7.tgz";
- name = "accepts-1.2.7.tgz";
- sha1 = "efea24e36e0b5b93d001a7598ac441c32ef56003";
- })
- ];
- buildInputs =
- (self.nativeDeps."accepts" or []);
- deps = {
- "mime-types-2.0.12" = self.by-version."mime-types"."2.0.12";
- "negotiator-0.5.3" = self.by-version."negotiator"."0.5.3";
- };
- peerDependencies = [
- ];
- passthru.names = [ "accepts" ];
- };
- by-spec."asn1"."0.1.11" =
- self.by-version."asn1"."0.1.11";
- by-version."asn1"."0.1.11" = lib.makeOverridable self.buildNodePackage {
- name = "asn1-0.1.11";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz";
- name = "asn1-0.1.11.tgz";
- sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7";
- })
- ];
- buildInputs =
- (self.nativeDeps."asn1" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "asn1" ];
- };
- by-spec."assert-plus"."^0.1.5" =
- self.by-version."assert-plus"."0.1.5";
- by-version."assert-plus"."0.1.5" = lib.makeOverridable self.buildNodePackage {
- name = "assert-plus-0.1.5";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz";
- name = "assert-plus-0.1.5.tgz";
- sha1 = "ee74009413002d84cec7219c6ac811812e723160";
- })
- ];
- buildInputs =
- (self.nativeDeps."assert-plus" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "assert-plus" ];
- };
- by-spec."async"."~0.9.0" =
- self.by-version."async"."0.9.2";
- by-version."async"."0.9.2" = lib.makeOverridable self.buildNodePackage {
- name = "async-0.9.2";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/async/-/async-0.9.2.tgz";
- name = "async-0.9.2.tgz";
- sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d";
- })
- ];
- buildInputs =
- (self.nativeDeps."async" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "async" ];
- };
- by-spec."aws-sign2"."~0.5.0" =
- self.by-version."aws-sign2"."0.5.0";
- by-version."aws-sign2"."0.5.0" = lib.makeOverridable self.buildNodePackage {
- name = "aws-sign2-0.5.0";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz";
- name = "aws-sign2-0.5.0.tgz";
- sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63";
- })
- ];
- buildInputs =
- (self.nativeDeps."aws-sign2" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "aws-sign2" ];
- };
- by-spec."balanced-match"."^0.2.0" =
- self.by-version."balanced-match"."0.2.0";
- by-version."balanced-match"."0.2.0" = lib.makeOverridable self.buildNodePackage {
- name = "balanced-match-0.2.0";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz";
- name = "balanced-match-0.2.0.tgz";
- sha1 = "38f6730c03aab6d5edbb52bd934885e756d71674";
- })
- ];
- buildInputs =
- (self.nativeDeps."balanced-match" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "balanced-match" ];
- };
- by-spec."block-stream"."*" =
- self.by-version."block-stream"."0.0.8";
- by-version."block-stream"."0.0.8" = lib.makeOverridable self.buildNodePackage {
- name = "block-stream-0.0.8";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/block-stream/-/block-stream-0.0.8.tgz";
- name = "block-stream-0.0.8.tgz";
- sha1 = "0688f46da2bbf9cff0c4f68225a0cb95cbe8a46b";
- })
- ];
- buildInputs =
- (self.nativeDeps."block-stream" or []);
- deps = {
- "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
- };
- peerDependencies = [
- ];
- passthru.names = [ "block-stream" ];
- };
- by-spec."body-parser"."^1.6.3" =
- self.by-version."body-parser"."1.12.4";
- by-version."body-parser"."1.12.4" = lib.makeOverridable self.buildNodePackage {
- name = "body-parser-1.12.4";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/body-parser/-/body-parser-1.12.4.tgz";
- name = "body-parser-1.12.4.tgz";
- sha1 = "090700c4ba28862a8520ef378395fdee5f61c229";
- })
- ];
- buildInputs =
- (self.nativeDeps."body-parser" or []);
- deps = {
- "bytes-1.0.0" = self.by-version."bytes"."1.0.0";
- "content-type-1.0.1" = self.by-version."content-type"."1.0.1";
- "debug-2.2.0" = self.by-version."debug"."2.2.0";
- "depd-1.0.1" = self.by-version."depd"."1.0.1";
- "iconv-lite-0.4.8" = self.by-version."iconv-lite"."0.4.8";
- "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1";
- "qs-2.4.2" = self.by-version."qs"."2.4.2";
- "raw-body-2.0.1" = self.by-version."raw-body"."2.0.1";
- "type-is-1.6.2" = self.by-version."type-is"."1.6.2";
- };
- peerDependencies = [
- ];
- passthru.names = [ "body-parser" ];
- };
- "body-parser" = self.by-version."body-parser"."1.12.4";
- by-spec."boom"."0.4.x" =
- self.by-version."boom"."0.4.2";
- by-version."boom"."0.4.2" = lib.makeOverridable self.buildNodePackage {
- name = "boom-0.4.2";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/boom/-/boom-0.4.2.tgz";
- name = "boom-0.4.2.tgz";
- sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b";
- })
- ];
- buildInputs =
- (self.nativeDeps."boom" or []);
- deps = {
- "hoek-0.9.1" = self.by-version."hoek"."0.9.1";
- };
- peerDependencies = [
- ];
- passthru.names = [ "boom" ];
- };
- by-spec."brace-expansion"."^1.0.0" =
- self.by-version."brace-expansion"."1.1.0";
- by-version."brace-expansion"."1.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "brace-expansion-1.1.0";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz";
- name = "brace-expansion-1.1.0.tgz";
- sha1 = "c9b7d03c03f37bc704be100e522b40db8f6cfcd9";
- })
- ];
- buildInputs =
- (self.nativeDeps."brace-expansion" or []);
- deps = {
- "balanced-match-0.2.0" = self.by-version."balanced-match"."0.2.0";
- "concat-map-0.0.1" = self.by-version."concat-map"."0.0.1";
- };
- peerDependencies = [
- ];
- passthru.names = [ "brace-expansion" ];
- };
- by-spec."bytes"."1.0.0" =
- self.by-version."bytes"."1.0.0";
- by-version."bytes"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "bytes-1.0.0";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz";
- name = "bytes-1.0.0.tgz";
- sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8";
- })
- ];
- buildInputs =
- (self.nativeDeps."bytes" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "bytes" ];
- };
- by-spec."bytes"."2.0.1" =
- self.by-version."bytes"."2.0.1";
- by-version."bytes"."2.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "bytes-2.0.1";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/bytes/-/bytes-2.0.1.tgz";
- name = "bytes-2.0.1.tgz";
- sha1 = "673743059be43d929f9c225dd7363ee0f8b15d97";
- })
- ];
- buildInputs =
- (self.nativeDeps."bytes" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "bytes" ];
- };
- by-spec."combined-stream"."~0.0.4" =
- self.by-version."combined-stream"."0.0.7";
- by-version."combined-stream"."0.0.7" = lib.makeOverridable self.buildNodePackage {
- name = "combined-stream-0.0.7";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz";
- name = "combined-stream-0.0.7.tgz";
- sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f";
- })
- ];
- buildInputs =
- (self.nativeDeps."combined-stream" or []);
- deps = {
- "delayed-stream-0.0.5" = self.by-version."delayed-stream"."0.0.5";
- };
- peerDependencies = [
- ];
- passthru.names = [ "combined-stream" ];
- };
- by-spec."commander"."~2.1.0" =
- self.by-version."commander"."2.1.0";
- by-version."commander"."2.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "commander-2.1.0";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/commander/-/commander-2.1.0.tgz";
- name = "commander-2.1.0.tgz";
- sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781";
- })
- ];
- buildInputs =
- (self.nativeDeps."commander" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "commander" ];
- };
- by-spec."concat-map"."0.0.1" =
- self.by-version."concat-map"."0.0.1";
- by-version."concat-map"."0.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "concat-map-0.0.1";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";
- name = "concat-map-0.0.1.tgz";
- sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
- })
- ];
- buildInputs =
- (self.nativeDeps."concat-map" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "concat-map" ];
- };
- by-spec."content-disposition"."0.5.0" =
- self.by-version."content-disposition"."0.5.0";
- by-version."content-disposition"."0.5.0" = lib.makeOverridable self.buildNodePackage {
- name = "content-disposition-0.5.0";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/content-disposition/-/content-disposition-0.5.0.tgz";
- name = "content-disposition-0.5.0.tgz";
- sha1 = "4284fe6ae0630874639e44e80a418c2934135e9e";
- })
- ];
- buildInputs =
- (self.nativeDeps."content-disposition" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "content-disposition" ];
- };
- by-spec."content-type"."~1.0.1" =
- self.by-version."content-type"."1.0.1";
- by-version."content-type"."1.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "content-type-1.0.1";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/content-type/-/content-type-1.0.1.tgz";
- name = "content-type-1.0.1.tgz";
- sha1 = "a19d2247327dc038050ce622b7a154ec59c5e600";
- })
- ];
- buildInputs =
- (self.nativeDeps."content-type" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "content-type" ];
- };
- by-spec."cookie"."0.1.2" =
- self.by-version."cookie"."0.1.2";
- by-version."cookie"."0.1.2" = lib.makeOverridable self.buildNodePackage {
- name = "cookie-0.1.2";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz";
- name = "cookie-0.1.2.tgz";
- sha1 = "72fec3d24e48a3432073d90c12642005061004b1";
- })
- ];
- buildInputs =
- (self.nativeDeps."cookie" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "cookie" ];
- };
- by-spec."cookie-signature"."1.0.6" =
- self.by-version."cookie-signature"."1.0.6";
- by-version."cookie-signature"."1.0.6" = lib.makeOverridable self.buildNodePackage {
- name = "cookie-signature-1.0.6";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz";
- name = "cookie-signature-1.0.6.tgz";
- sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c";
- })
- ];
- buildInputs =
- (self.nativeDeps."cookie-signature" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "cookie-signature" ];
- };
- by-spec."crc"."3.2.1" =
- self.by-version."crc"."3.2.1";
- by-version."crc"."3.2.1" = lib.makeOverridable self.buildNodePackage {
- name = "crc-3.2.1";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/crc/-/crc-3.2.1.tgz";
- name = "crc-3.2.1.tgz";
- sha1 = "5d9c8fb77a245cd5eca291e5d2d005334bab0082";
- })
- ];
- buildInputs =
- (self.nativeDeps."crc" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "crc" ];
- };
- by-spec."cryptiles"."0.2.x" =
- self.by-version."cryptiles"."0.2.2";
- by-version."cryptiles"."0.2.2" = lib.makeOverridable self.buildNodePackage {
- name = "cryptiles-0.2.2";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz";
- name = "cryptiles-0.2.2.tgz";
- sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c";
- })
- ];
- buildInputs =
- (self.nativeDeps."cryptiles" or []);
- deps = {
- "boom-0.4.2" = self.by-version."boom"."0.4.2";
- };
- peerDependencies = [
- ];
- passthru.names = [ "cryptiles" ];
- };
- by-spec."ctype"."0.5.3" =
- self.by-version."ctype"."0.5.3";
- by-version."ctype"."0.5.3" = lib.makeOverridable self.buildNodePackage {
- name = "ctype-0.5.3";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz";
- name = "ctype-0.5.3.tgz";
- sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f";
- })
- ];
- buildInputs =
- (self.nativeDeps."ctype" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "ctype" ];
- };
- by-spec."debug"."~2.2.0" =
- self.by-version."debug"."2.2.0";
- by-version."debug"."2.2.0" = lib.makeOverridable self.buildNodePackage {
- name = "debug-2.2.0";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/debug/-/debug-2.2.0.tgz";
- name = "debug-2.2.0.tgz";
- sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da";
- })
- ];
- buildInputs =
- (self.nativeDeps."debug" or []);
- deps = {
- "ms-0.7.1" = self.by-version."ms"."0.7.1";
- };
- peerDependencies = [
- ];
- passthru.names = [ "debug" ];
- };
- by-spec."delayed-stream"."0.0.5" =
- self.by-version."delayed-stream"."0.0.5";
- by-version."delayed-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage {
- name = "delayed-stream-0.0.5";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz";
- name = "delayed-stream-0.0.5.tgz";
- sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f";
- })
- ];
- buildInputs =
- (self.nativeDeps."delayed-stream" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "delayed-stream" ];
- };
- by-spec."depd"."~1.0.1" =
- self.by-version."depd"."1.0.1";
- by-version."depd"."1.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "depd-1.0.1";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/depd/-/depd-1.0.1.tgz";
- name = "depd-1.0.1.tgz";
- sha1 = "80aec64c9d6d97e65cc2a9caa93c0aa6abf73aaa";
- })
- ];
- buildInputs =
- (self.nativeDeps."depd" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "depd" ];
- };
- by-spec."destroy"."1.0.3" =
- self.by-version."destroy"."1.0.3";
- by-version."destroy"."1.0.3" = lib.makeOverridable self.buildNodePackage {
- name = "destroy-1.0.3";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz";
- name = "destroy-1.0.3.tgz";
- sha1 = "b433b4724e71fd8551d9885174851c5fc377e2c9";
- })
- ];
- buildInputs =
- (self.nativeDeps."destroy" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "destroy" ];
- };
- by-spec."ee-first"."1.1.0" =
- self.by-version."ee-first"."1.1.0";
- by-version."ee-first"."1.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "ee-first-1.1.0";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz";
- name = "ee-first-1.1.0.tgz";
- sha1 = "6a0d7c6221e490feefd92ec3f441c9ce8cd097f4";
- })
- ];
- buildInputs =
- (self.nativeDeps."ee-first" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "ee-first" ];
- };
- by-spec."escape-html"."1.0.1" =
- self.by-version."escape-html"."1.0.1";
- by-version."escape-html"."1.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "escape-html-1.0.1";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz";
- name = "escape-html-1.0.1.tgz";
- sha1 = "181a286ead397a39a92857cfb1d43052e356bff0";
- })
- ];
- buildInputs =
- (self.nativeDeps."escape-html" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "escape-html" ];
- };
- by-spec."etag"."~1.6.0" =
- self.by-version."etag"."1.6.0";
- by-version."etag"."1.6.0" = lib.makeOverridable self.buildNodePackage {
- name = "etag-1.6.0";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/etag/-/etag-1.6.0.tgz";
- name = "etag-1.6.0.tgz";
- sha1 = "8bcb2c6af1254c481dfc8b997c906ef4e442c207";
- })
- ];
- buildInputs =
- (self.nativeDeps."etag" or []);
- deps = {
- "crc-3.2.1" = self.by-version."crc"."3.2.1";
- };
- peerDependencies = [
- ];
- passthru.names = [ "etag" ];
- };
- by-spec."express"."^4.8.3" =
- self.by-version."express"."4.12.4";
- by-version."express"."4.12.4" = lib.makeOverridable self.buildNodePackage {
- name = "express-4.12.4";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/express/-/express-4.12.4.tgz";
- name = "express-4.12.4.tgz";
- sha1 = "8fec2510255bc6b2e58107c48239c0fa307c1aa2";
- })
- ];
- buildInputs =
- (self.nativeDeps."express" or []);
- deps = {
- "accepts-1.2.7" = self.by-version."accepts"."1.2.7";
- "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0";
- "content-type-1.0.1" = self.by-version."content-type"."1.0.1";
- "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
- "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6";
- "debug-2.2.0" = self.by-version."debug"."2.2.0";
- "depd-1.0.1" = self.by-version."depd"."1.0.1";
- "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
- "etag-1.6.0" = self.by-version."etag"."1.6.0";
- "finalhandler-0.3.6" = self.by-version."finalhandler"."0.3.6";
- "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
- "merge-descriptors-1.0.0" = self.by-version."merge-descriptors"."1.0.0";
- "methods-1.1.1" = self.by-version."methods"."1.1.1";
- "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1";
- "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
- "path-to-regexp-0.1.3" = self.by-version."path-to-regexp"."0.1.3";
- "proxy-addr-1.0.8" = self.by-version."proxy-addr"."1.0.8";
- "qs-2.4.2" = self.by-version."qs"."2.4.2";
- "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
- "send-0.12.3" = self.by-version."send"."0.12.3";
- "serve-static-1.9.3" = self.by-version."serve-static"."1.9.3";
- "type-is-1.6.2" = self.by-version."type-is"."1.6.2";
- "vary-1.0.0" = self.by-version."vary"."1.0.0";
- "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
- };
- peerDependencies = [
- ];
- passthru.names = [ "express" ];
- };
- "express" = self.by-version."express"."4.12.4";
- by-spec."finalhandler"."0.3.6" =
- self.by-version."finalhandler"."0.3.6";
- by-version."finalhandler"."0.3.6" = lib.makeOverridable self.buildNodePackage {
- name = "finalhandler-0.3.6";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.3.6.tgz";
- name = "finalhandler-0.3.6.tgz";
- sha1 = "daf9c4161b1b06e001466b1411dfdb6973be138b";
- })
- ];
- buildInputs =
- (self.nativeDeps."finalhandler" or []);
- deps = {
- "debug-2.2.0" = self.by-version."debug"."2.2.0";
- "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
- "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1";
- };
- peerDependencies = [
- ];
- passthru.names = [ "finalhandler" ];
- };
- by-spec."forever-agent"."~0.5.0" =
- self.by-version."forever-agent"."0.5.2";
- by-version."forever-agent"."0.5.2" = lib.makeOverridable self.buildNodePackage {
- name = "forever-agent-0.5.2";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz";
- name = "forever-agent-0.5.2.tgz";
- sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130";
- })
- ];
- buildInputs =
- (self.nativeDeps."forever-agent" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "forever-agent" ];
- };
- by-spec."form-data"."~0.1.0" =
- self.by-version."form-data"."0.1.4";
- by-version."form-data"."0.1.4" = lib.makeOverridable self.buildNodePackage {
- name = "form-data-0.1.4";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz";
- name = "form-data-0.1.4.tgz";
- sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12";
- })
- ];
- buildInputs =
- (self.nativeDeps."form-data" or []);
- deps = {
- "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
- "mime-1.2.11" = self.by-version."mime"."1.2.11";
- "async-0.9.2" = self.by-version."async"."0.9.2";
- };
- peerDependencies = [
- ];
- passthru.names = [ "form-data" ];
- };
- by-spec."forwarded"."~0.1.0" =
- self.by-version."forwarded"."0.1.0";
- by-version."forwarded"."0.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "forwarded-0.1.0";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz";
- name = "forwarded-0.1.0.tgz";
- sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363";
- })
- ];
- buildInputs =
- (self.nativeDeps."forwarded" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "forwarded" ];
- };
- by-spec."fresh"."0.2.4" =
- self.by-version."fresh"."0.2.4";
- by-version."fresh"."0.2.4" = lib.makeOverridable self.buildNodePackage {
- name = "fresh-0.2.4";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz";
- name = "fresh-0.2.4.tgz";
- sha1 = "3582499206c9723714190edd74b4604feb4a614c";
- })
- ];
- buildInputs =
- (self.nativeDeps."fresh" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "fresh" ];
- };
- by-spec."fstream"."~0.1.28" =
- self.by-version."fstream"."0.1.31";
- by-version."fstream"."0.1.31" = lib.makeOverridable self.buildNodePackage {
- name = "fstream-0.1.31";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz";
- name = "fstream-0.1.31.tgz";
- sha1 = "7337f058fbbbbefa8c9f561a28cab0849202c988";
- })
- ];
- buildInputs =
- (self.nativeDeps."fstream" or []);
- deps = {
- "graceful-fs-3.0.7" = self.by-version."graceful-fs"."3.0.7";
- "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
- "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
- "rimraf-2.3.4" = self.by-version."rimraf"."2.3.4";
- };
- peerDependencies = [
- ];
- passthru.names = [ "fstream" ];
- };
- by-spec."glob"."^4.4.2" =
- self.by-version."glob"."4.5.3";
- by-version."glob"."4.5.3" = lib.makeOverridable self.buildNodePackage {
- name = "glob-4.5.3";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/glob/-/glob-4.5.3.tgz";
- name = "glob-4.5.3.tgz";
- sha1 = "c6cb73d3226c1efef04de3c56d012f03377ee15f";
- })
- ];
- buildInputs =
- (self.nativeDeps."glob" or []);
- deps = {
- "inflight-1.0.4" = self.by-version."inflight"."1.0.4";
- "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
- "minimatch-2.0.8" = self.by-version."minimatch"."2.0.8";
- "once-1.3.2" = self.by-version."once"."1.3.2";
- };
- peerDependencies = [
- ];
- passthru.names = [ "glob" ];
- };
- by-spec."graceful-fs"."~3.0.2" =
- self.by-version."graceful-fs"."3.0.7";
- by-version."graceful-fs"."3.0.7" = lib.makeOverridable self.buildNodePackage {
- name = "graceful-fs-3.0.7";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.7.tgz";
- name = "graceful-fs-3.0.7.tgz";
- sha1 = "e935be4b3e57892d289dc3bef7be8c02779d2b54";
- })
- ];
- buildInputs =
- (self.nativeDeps."graceful-fs" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "graceful-fs" ];
- };
- by-spec."hawk"."~1.0.0" =
- self.by-version."hawk"."1.0.0";
- by-version."hawk"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "hawk-1.0.0";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz";
- name = "hawk-1.0.0.tgz";
- sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d";
- })
- ];
- buildInputs =
- (self.nativeDeps."hawk" or []);
- deps = {
- "hoek-0.9.1" = self.by-version."hoek"."0.9.1";
- "boom-0.4.2" = self.by-version."boom"."0.4.2";
- "cryptiles-0.2.2" = self.by-version."cryptiles"."0.2.2";
- "sntp-0.2.4" = self.by-version."sntp"."0.2.4";
- };
- peerDependencies = [
- ];
- passthru.names = [ "hawk" ];
- };
- by-spec."hoek"."0.9.x" =
- self.by-version."hoek"."0.9.1";
- by-version."hoek"."0.9.1" = lib.makeOverridable self.buildNodePackage {
- name = "hoek-0.9.1";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz";
- name = "hoek-0.9.1.tgz";
- sha1 = "3d322462badf07716ea7eb85baf88079cddce505";
- })
- ];
- buildInputs =
- (self.nativeDeps."hoek" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "hoek" ];
- };
- by-spec."http-signature"."~0.10.0" =
- self.by-version."http-signature"."0.10.1";
- by-version."http-signature"."0.10.1" = lib.makeOverridable self.buildNodePackage {
- name = "http-signature-0.10.1";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz";
- name = "http-signature-0.10.1.tgz";
- sha1 = "4fbdac132559aa8323121e540779c0a012b27e66";
- })
- ];
- buildInputs =
- (self.nativeDeps."http-signature" or []);
- deps = {
- "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5";
- "asn1-0.1.11" = self.by-version."asn1"."0.1.11";
- "ctype-0.5.3" = self.by-version."ctype"."0.5.3";
- };
- peerDependencies = [
- ];
- passthru.names = [ "http-signature" ];
- };
- by-spec."iconv-lite"."0.4.8" =
- self.by-version."iconv-lite"."0.4.8";
- by-version."iconv-lite"."0.4.8" = lib.makeOverridable self.buildNodePackage {
- name = "iconv-lite-0.4.8";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.8.tgz";
- name = "iconv-lite-0.4.8.tgz";
- sha1 = "c6019a7595f2cefca702eab694a010bcd9298d20";
- })
- ];
- buildInputs =
- (self.nativeDeps."iconv-lite" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "iconv-lite" ];
- };
- by-spec."inflight"."^1.0.4" =
- self.by-version."inflight"."1.0.4";
- by-version."inflight"."1.0.4" = lib.makeOverridable self.buildNodePackage {
- name = "inflight-1.0.4";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz";
- name = "inflight-1.0.4.tgz";
- sha1 = "6cbb4521ebd51ce0ec0a936bfd7657ef7e9b172a";
- })
- ];
- buildInputs =
- (self.nativeDeps."inflight" or []);
- deps = {
- "once-1.3.2" = self.by-version."once"."1.3.2";
- "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1";
- };
- peerDependencies = [
- ];
- passthru.names = [ "inflight" ];
- };
- by-spec."inherits"."2" =
- self.by-version."inherits"."2.0.1";
- by-version."inherits"."2.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "inherits-2.0.1";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz";
- name = "inherits-2.0.1.tgz";
- sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1";
- })
- ];
- buildInputs =
- (self.nativeDeps."inherits" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "inherits" ];
- };
- by-spec."inherits"."~2.0.0" =
- self.by-version."inherits"."2.0.1";
- by-spec."ipaddr.js"."1.0.1" =
- self.by-version."ipaddr.js"."1.0.1";
- by-version."ipaddr.js"."1.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "ipaddr.js-1.0.1";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.1.tgz";
- name = "ipaddr.js-1.0.1.tgz";
- sha1 = "5f38801dc73e0400fc7076386f6ed5215fbd8f95";
- })
- ];
- buildInputs =
- (self.nativeDeps."ipaddr.js" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "ipaddr.js" ];
- };
- by-spec."json-stringify-safe"."~5.0.0" =
- self.by-version."json-stringify-safe"."5.0.1";
- by-version."json-stringify-safe"."5.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "json-stringify-safe-5.0.1";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz";
- name = "json-stringify-safe-5.0.1.tgz";
- sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
- })
- ];
- buildInputs =
- (self.nativeDeps."json-stringify-safe" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "json-stringify-safe" ];
- };
- by-spec."media-typer"."0.3.0" =
- self.by-version."media-typer"."0.3.0";
- by-version."media-typer"."0.3.0" = lib.makeOverridable self.buildNodePackage {
- name = "media-typer-0.3.0";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz";
- name = "media-typer-0.3.0.tgz";
- sha1 = "8710d7af0aa626f8fffa1ce00168545263255748";
- })
- ];
- buildInputs =
- (self.nativeDeps."media-typer" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "media-typer" ];
- };
- by-spec."merge-descriptors"."1.0.0" =
- self.by-version."merge-descriptors"."1.0.0";
- by-version."merge-descriptors"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "merge-descriptors-1.0.0";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.0.tgz";
- name = "merge-descriptors-1.0.0.tgz";
- sha1 = "2169cf7538e1b0cc87fb88e1502d8474bbf79864";
- })
- ];
- buildInputs =
- (self.nativeDeps."merge-descriptors" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "merge-descriptors" ];
- };
- by-spec."methods"."~1.1.1" =
- self.by-version."methods"."1.1.1";
- by-version."methods"."1.1.1" = lib.makeOverridable self.buildNodePackage {
- name = "methods-1.1.1";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/methods/-/methods-1.1.1.tgz";
- name = "methods-1.1.1.tgz";
- sha1 = "17ea6366066d00c58e375b8ec7dfd0453c89822a";
- })
- ];
- buildInputs =
- (self.nativeDeps."methods" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "methods" ];
- };
- by-spec."mime"."1.3.4" =
- self.by-version."mime"."1.3.4";
- by-version."mime"."1.3.4" = lib.makeOverridable self.buildNodePackage {
- name = "mime-1.3.4";
- bin = true;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/mime/-/mime-1.3.4.tgz";
- name = "mime-1.3.4.tgz";
- sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53";
- })
- ];
- buildInputs =
- (self.nativeDeps."mime" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "mime" ];
- };
- by-spec."mime"."~1.2.11" =
- self.by-version."mime"."1.2.11";
- by-version."mime"."1.2.11" = lib.makeOverridable self.buildNodePackage {
- name = "mime-1.2.11";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz";
- name = "mime-1.2.11.tgz";
- sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10";
- })
- ];
- buildInputs =
- (self.nativeDeps."mime" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "mime" ];
- };
- by-spec."mime"."~1.2.9" =
- self.by-version."mime"."1.2.11";
- by-spec."mime-db"."~1.10.0" =
- self.by-version."mime-db"."1.10.0";
- by-version."mime-db"."1.10.0" = lib.makeOverridable self.buildNodePackage {
- name = "mime-db-1.10.0";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/mime-db/-/mime-db-1.10.0.tgz";
- name = "mime-db-1.10.0.tgz";
- sha1 = "e6308063c758ebd12837874c3d1ea9170766b03b";
- })
- ];
- buildInputs =
- (self.nativeDeps."mime-db" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "mime-db" ];
- };
- by-spec."mime-types"."~2.0.11" =
- self.by-version."mime-types"."2.0.12";
- by-version."mime-types"."2.0.12" = lib.makeOverridable self.buildNodePackage {
- name = "mime-types-2.0.12";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.12.tgz";
- name = "mime-types-2.0.12.tgz";
- sha1 = "87ae9f124e94f8e440c93d1a72d0dccecdb71135";
- })
- ];
- buildInputs =
- (self.nativeDeps."mime-types" or []);
- deps = {
- "mime-db-1.10.0" = self.by-version."mime-db"."1.10.0";
- };
- peerDependencies = [
- ];
- passthru.names = [ "mime-types" ];
- };
- by-spec."minimatch"."^2.0.1" =
- self.by-version."minimatch"."2.0.8";
- by-version."minimatch"."2.0.8" = lib.makeOverridable self.buildNodePackage {
- name = "minimatch-2.0.8";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/minimatch/-/minimatch-2.0.8.tgz";
- name = "minimatch-2.0.8.tgz";
- sha1 = "0bc20f6bf3570a698ef0ddff902063c6cabda6bf";
- })
- ];
- buildInputs =
- (self.nativeDeps."minimatch" or []);
- deps = {
- "brace-expansion-1.1.0" = self.by-version."brace-expansion"."1.1.0";
- };
- peerDependencies = [
- ];
- passthru.names = [ "minimatch" ];
- };
- by-spec."minimist"."0.0.8" =
- self.by-version."minimist"."0.0.8";
- by-version."minimist"."0.0.8" = lib.makeOverridable self.buildNodePackage {
- name = "minimist-0.0.8";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
- name = "minimist-0.0.8.tgz";
- sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
- })
- ];
- buildInputs =
- (self.nativeDeps."minimist" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "minimist" ];
- };
- by-spec."mkdirp"."0.5" =
- self.by-version."mkdirp"."0.5.1";
- by-version."mkdirp"."0.5.1" = lib.makeOverridable self.buildNodePackage {
- name = "mkdirp-0.5.1";
- bin = true;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
- name = "mkdirp-0.5.1.tgz";
- sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
- })
- ];
- buildInputs =
- (self.nativeDeps."mkdirp" or []);
- deps = {
- "minimist-0.0.8" = self.by-version."minimist"."0.0.8";
- };
- peerDependencies = [
- ];
- passthru.names = [ "mkdirp" ];
- };
- by-spec."ms"."0.7.1" =
- self.by-version."ms"."0.7.1";
- by-version."ms"."0.7.1" = lib.makeOverridable self.buildNodePackage {
- name = "ms-0.7.1";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/ms/-/ms-0.7.1.tgz";
- name = "ms-0.7.1.tgz";
- sha1 = "9cd13c03adbff25b65effde7ce864ee952017098";
- })
- ];
- buildInputs =
- (self.nativeDeps."ms" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "ms" ];
- };
- by-spec."nan"."~1.0.0" =
- self.by-version."nan"."1.0.0";
- by-version."nan"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "nan-1.0.0";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/nan/-/nan-1.0.0.tgz";
- name = "nan-1.0.0.tgz";
- sha1 = "ae24f8850818d662fcab5acf7f3b95bfaa2ccf38";
- })
- ];
- buildInputs =
- (self.nativeDeps."nan" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "nan" ];
- };
- by-spec."negotiator"."0.5.3" =
- self.by-version."negotiator"."0.5.3";
- by-version."negotiator"."0.5.3" = lib.makeOverridable self.buildNodePackage {
- name = "negotiator-0.5.3";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz";
- name = "negotiator-0.5.3.tgz";
- sha1 = "269d5c476810ec92edbe7b6c2f28316384f9a7e8";
- })
- ];
- buildInputs =
- (self.nativeDeps."negotiator" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "negotiator" ];
- };
- by-spec."node-uuid"."~1.4.0" =
- self.by-version."node-uuid"."1.4.3";
- by-version."node-uuid"."1.4.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-uuid-1.4.3";
- bin = true;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz";
- name = "node-uuid-1.4.3.tgz";
- sha1 = "319bb7a56e7cb63f00b5c0cd7851cd4b4ddf1df9";
- })
- ];
- buildInputs =
- (self.nativeDeps."node-uuid" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "node-uuid" ];
- };
- by-spec."oauth-sign"."~0.3.0" =
- self.by-version."oauth-sign"."0.3.0";
- by-version."oauth-sign"."0.3.0" = lib.makeOverridable self.buildNodePackage {
- name = "oauth-sign-0.3.0";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz";
- name = "oauth-sign-0.3.0.tgz";
- sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e";
- })
- ];
- buildInputs =
- (self.nativeDeps."oauth-sign" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "oauth-sign" ];
- };
- by-spec."on-finished"."~2.2.1" =
- self.by-version."on-finished"."2.2.1";
- by-version."on-finished"."2.2.1" = lib.makeOverridable self.buildNodePackage {
- name = "on-finished-2.2.1";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/on-finished/-/on-finished-2.2.1.tgz";
- name = "on-finished-2.2.1.tgz";
- sha1 = "5c85c1cc36299f78029653f667f27b6b99ebc029";
- })
- ];
- buildInputs =
- (self.nativeDeps."on-finished" or []);
- deps = {
- "ee-first-1.1.0" = self.by-version."ee-first"."1.1.0";
- };
- peerDependencies = [
- ];
- passthru.names = [ "on-finished" ];
- };
- by-spec."once"."^1.3.0" =
- self.by-version."once"."1.3.2";
- by-version."once"."1.3.2" = lib.makeOverridable self.buildNodePackage {
- name = "once-1.3.2";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/once/-/once-1.3.2.tgz";
- name = "once-1.3.2.tgz";
- sha1 = "d8feeca93b039ec1dcdee7741c92bdac5e28081b";
- })
- ];
- buildInputs =
- (self.nativeDeps."once" or []);
- deps = {
- "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1";
- };
- peerDependencies = [
- ];
- passthru.names = [ "once" ];
- };
- by-spec."options".">=0.0.5" =
- self.by-version."options"."0.0.6";
- by-version."options"."0.0.6" = lib.makeOverridable self.buildNodePackage {
- name = "options-0.0.6";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/options/-/options-0.0.6.tgz";
- name = "options-0.0.6.tgz";
- sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f";
- })
- ];
- buildInputs =
- (self.nativeDeps."options" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "options" ];
- };
- by-spec."parseurl"."~1.3.0" =
- self.by-version."parseurl"."1.3.0";
- by-version."parseurl"."1.3.0" = lib.makeOverridable self.buildNodePackage {
- name = "parseurl-1.3.0";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz";
- name = "parseurl-1.3.0.tgz";
- sha1 = "b58046db4223e145afa76009e61bac87cc2281b3";
- })
- ];
- buildInputs =
- (self.nativeDeps."parseurl" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "parseurl" ];
- };
- by-spec."path-to-regexp"."0.1.3" =
- self.by-version."path-to-regexp"."0.1.3";
- by-version."path-to-regexp"."0.1.3" = lib.makeOverridable self.buildNodePackage {
- name = "path-to-regexp-0.1.3";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.3.tgz";
- name = "path-to-regexp-0.1.3.tgz";
- sha1 = "21b9ab82274279de25b156ea08fd12ca51b8aecb";
- })
- ];
- buildInputs =
- (self.nativeDeps."path-to-regexp" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "path-to-regexp" ];
- };
- by-spec."proxy-addr"."~1.0.8" =
- self.by-version."proxy-addr"."1.0.8";
- by-version."proxy-addr"."1.0.8" = lib.makeOverridable self.buildNodePackage {
- name = "proxy-addr-1.0.8";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.8.tgz";
- name = "proxy-addr-1.0.8.tgz";
- sha1 = "db54ec878bcc1053d57646609219b3715678bafe";
- })
- ];
- buildInputs =
- (self.nativeDeps."proxy-addr" or []);
- deps = {
- "forwarded-0.1.0" = self.by-version."forwarded"."0.1.0";
- "ipaddr.js-1.0.1" = self.by-version."ipaddr.js"."1.0.1";
- };
- peerDependencies = [
- ];
- passthru.names = [ "proxy-addr" ];
- };
- by-spec."qs"."2.4.2" =
- self.by-version."qs"."2.4.2";
- by-version."qs"."2.4.2" = lib.makeOverridable self.buildNodePackage {
- name = "qs-2.4.2";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/qs/-/qs-2.4.2.tgz";
- name = "qs-2.4.2.tgz";
- sha1 = "f7ce788e5777df0b5010da7f7c4e73ba32470f5a";
- })
- ];
- buildInputs =
- (self.nativeDeps."qs" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "qs" ];
- };
- by-spec."qs"."~0.6.0" =
- self.by-version."qs"."0.6.6";
- by-version."qs"."0.6.6" = lib.makeOverridable self.buildNodePackage {
- name = "qs-0.6.6";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/qs/-/qs-0.6.6.tgz";
- name = "qs-0.6.6.tgz";
- sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107";
- })
- ];
- buildInputs =
- (self.nativeDeps."qs" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "qs" ];
- };
- by-spec."range-parser"."~1.0.2" =
- self.by-version."range-parser"."1.0.2";
- by-version."range-parser"."1.0.2" = lib.makeOverridable self.buildNodePackage {
- name = "range-parser-1.0.2";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz";
- name = "range-parser-1.0.2.tgz";
- sha1 = "06a12a42e5131ba8e457cd892044867f2344e549";
- })
- ];
- buildInputs =
- (self.nativeDeps."range-parser" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "range-parser" ];
- };
- by-spec."raw-body"."~2.0.1" =
- self.by-version."raw-body"."2.0.1";
- by-version."raw-body"."2.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "raw-body-2.0.1";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/raw-body/-/raw-body-2.0.1.tgz";
- name = "raw-body-2.0.1.tgz";
- sha1 = "2b70a3ffd1681c0521bae73454e0ccbc785d378e";
- })
- ];
- buildInputs =
- (self.nativeDeps."raw-body" or []);
- deps = {
- "bytes-2.0.1" = self.by-version."bytes"."2.0.1";
- "iconv-lite-0.4.8" = self.by-version."iconv-lite"."0.4.8";
- };
- peerDependencies = [
- ];
- passthru.names = [ "raw-body" ];
- };
- by-spec."request"."~2.34.0" =
- self.by-version."request"."2.34.0";
- by-version."request"."2.34.0" = lib.makeOverridable self.buildNodePackage {
- name = "request-2.34.0";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/request/-/request-2.34.0.tgz";
- name = "request-2.34.0.tgz";
- sha1 = "b5d8b9526add4a2d4629f4d417124573996445ae";
- })
- ];
- buildInputs =
- (self.nativeDeps."request" or []);
- deps = {
- "qs-0.6.6" = self.by-version."qs"."0.6.6";
- "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1";
- "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
- "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
- "mime-1.2.11" = self.by-version."mime"."1.2.11";
- "tough-cookie-1.1.0" = self.by-version."tough-cookie"."1.1.0";
- "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
- "tunnel-agent-0.3.0" = self.by-version."tunnel-agent"."0.3.0";
- "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
- "oauth-sign-0.3.0" = self.by-version."oauth-sign"."0.3.0";
- "hawk-1.0.0" = self.by-version."hawk"."1.0.0";
- "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
- };
- peerDependencies = [
- ];
- passthru.names = [ "request" ];
- };
- "request" = self.by-version."request"."2.34.0";
- by-spec."rimraf"."2" =
- self.by-version."rimraf"."2.3.4";
- by-version."rimraf"."2.3.4" = lib.makeOverridable self.buildNodePackage {
- name = "rimraf-2.3.4";
- bin = true;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/rimraf/-/rimraf-2.3.4.tgz";
- name = "rimraf-2.3.4.tgz";
- sha1 = "82d9bc1b2fcf31e205ac7b28138a025d08e9159a";
- })
- ];
- buildInputs =
- (self.nativeDeps."rimraf" or []);
- deps = {
- "glob-4.5.3" = self.by-version."glob"."4.5.3";
- };
- peerDependencies = [
- ];
- passthru.names = [ "rimraf" ];
- };
- by-spec."send"."0.12.3" =
- self.by-version."send"."0.12.3";
- by-version."send"."0.12.3" = lib.makeOverridable self.buildNodePackage {
- name = "send-0.12.3";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/send/-/send-0.12.3.tgz";
- name = "send-0.12.3.tgz";
- sha1 = "cd12dc58fde21e4f91902b39b2fda05a7a6d9bdc";
- })
- ];
- buildInputs =
- (self.nativeDeps."send" or []);
- deps = {
- "debug-2.2.0" = self.by-version."debug"."2.2.0";
- "depd-1.0.1" = self.by-version."depd"."1.0.1";
- "destroy-1.0.3" = self.by-version."destroy"."1.0.3";
- "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
- "etag-1.6.0" = self.by-version."etag"."1.6.0";
- "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
- "mime-1.3.4" = self.by-version."mime"."1.3.4";
- "ms-0.7.1" = self.by-version."ms"."0.7.1";
- "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1";
- "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
- };
- peerDependencies = [
- ];
- passthru.names = [ "send" ];
- };
- by-spec."serve-static"."~1.9.3" =
- self.by-version."serve-static"."1.9.3";
- by-version."serve-static"."1.9.3" = lib.makeOverridable self.buildNodePackage {
- name = "serve-static-1.9.3";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/serve-static/-/serve-static-1.9.3.tgz";
- name = "serve-static-1.9.3.tgz";
- sha1 = "5f8da07323ad385ff3dc541f1a7917b2e436eb57";
- })
- ];
- buildInputs =
- (self.nativeDeps."serve-static" or []);
- deps = {
- "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
- "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
- "send-0.12.3" = self.by-version."send"."0.12.3";
- "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
- };
- peerDependencies = [
- ];
- passthru.names = [ "serve-static" ];
- };
- by-spec."sntp"."0.2.x" =
- self.by-version."sntp"."0.2.4";
- by-version."sntp"."0.2.4" = lib.makeOverridable self.buildNodePackage {
- name = "sntp-0.2.4";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz";
- name = "sntp-0.2.4.tgz";
- sha1 = "fb885f18b0f3aad189f824862536bceeec750900";
- })
- ];
- buildInputs =
- (self.nativeDeps."sntp" or []);
- deps = {
- "hoek-0.9.1" = self.by-version."hoek"."0.9.1";
- };
- peerDependencies = [
- ];
- passthru.names = [ "sntp" ];
- };
- by-spec."tar"."~0.1.19" =
- self.by-version."tar"."0.1.20";
- by-version."tar"."0.1.20" = lib.makeOverridable self.buildNodePackage {
- name = "tar-0.1.20";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/tar/-/tar-0.1.20.tgz";
- name = "tar-0.1.20.tgz";
- sha1 = "42940bae5b5f22c74483699126f9f3f27449cb13";
- })
- ];
- buildInputs =
- (self.nativeDeps."tar" or []);
- deps = {
- "block-stream-0.0.8" = self.by-version."block-stream"."0.0.8";
- "fstream-0.1.31" = self.by-version."fstream"."0.1.31";
- "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
- };
- peerDependencies = [
- ];
- passthru.names = [ "tar" ];
- };
- "tar" = self.by-version."tar"."0.1.20";
- by-spec."tinycolor"."0.x" =
- self.by-version."tinycolor"."0.0.1";
- by-version."tinycolor"."0.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "tinycolor-0.0.1";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz";
- name = "tinycolor-0.0.1.tgz";
- sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164";
- })
- ];
- buildInputs =
- (self.nativeDeps."tinycolor" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "tinycolor" ];
- };
- by-spec."tough-cookie".">=0.12.0" =
- self.by-version."tough-cookie"."1.1.0";
- by-version."tough-cookie"."1.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "tough-cookie-1.1.0";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-1.1.0.tgz";
- name = "tough-cookie-1.1.0.tgz";
- sha1 = "126d2490e66ae5286b6863debd4a341076915954";
- })
- ];
- buildInputs =
- (self.nativeDeps."tough-cookie" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "tough-cookie" ];
- };
- by-spec."tunnel-agent"."~0.3.0" =
- self.by-version."tunnel-agent"."0.3.0";
- by-version."tunnel-agent"."0.3.0" = lib.makeOverridable self.buildNodePackage {
- name = "tunnel-agent-0.3.0";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz";
- name = "tunnel-agent-0.3.0.tgz";
- sha1 = "ad681b68f5321ad2827c4cfb1b7d5df2cfe942ee";
- })
- ];
- buildInputs =
- (self.nativeDeps."tunnel-agent" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "tunnel-agent" ];
- };
- by-spec."type-is"."~1.6.2" =
- self.by-version."type-is"."1.6.2";
- by-version."type-is"."1.6.2" = lib.makeOverridable self.buildNodePackage {
- name = "type-is-1.6.2";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/type-is/-/type-is-1.6.2.tgz";
- name = "type-is-1.6.2.tgz";
- sha1 = "694e83e5d110417e681cea278227f264ae406e33";
- })
- ];
- buildInputs =
- (self.nativeDeps."type-is" or []);
- deps = {
- "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0";
- "mime-types-2.0.12" = self.by-version."mime-types"."2.0.12";
- };
- peerDependencies = [
- ];
- passthru.names = [ "type-is" ];
- };
- by-spec."utils-merge"."1.0.0" =
- self.by-version."utils-merge"."1.0.0";
- by-version."utils-merge"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "utils-merge-1.0.0";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz";
- name = "utils-merge-1.0.0.tgz";
- sha1 = "0294fb922bb9375153541c4f7096231f287c8af8";
- })
- ];
- buildInputs =
- (self.nativeDeps."utils-merge" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "utils-merge" ];
- };
- by-spec."vary"."~1.0.0" =
- self.by-version."vary"."1.0.0";
- by-version."vary"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "vary-1.0.0";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/vary/-/vary-1.0.0.tgz";
- name = "vary-1.0.0.tgz";
- sha1 = "c5e76cec20d3820d8f2a96e7bee38731c34da1e7";
- })
- ];
- buildInputs =
- (self.nativeDeps."vary" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "vary" ];
- };
- by-spec."wrappy"."1" =
- self.by-version."wrappy"."1.0.1";
- by-version."wrappy"."1.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "wrappy-1.0.1";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz";
- name = "wrappy-1.0.1.tgz";
- sha1 = "1e65969965ccbc2db4548c6b84a6f2c5aedd4739";
- })
- ];
- buildInputs =
- (self.nativeDeps."wrappy" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "wrappy" ];
- };
- by-spec."ws"."~0.4.32" =
- self.by-version."ws"."0.4.32";
- by-version."ws"."0.4.32" = lib.makeOverridable self.buildNodePackage {
- name = "ws-0.4.32";
- bin = true;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/ws/-/ws-0.4.32.tgz";
- name = "ws-0.4.32.tgz";
- sha1 = "787a6154414f3c99ed83c5772153b20feb0cec32";
- })
- ];
- buildInputs =
- (self.nativeDeps."ws" or []);
- deps = {
- "commander-2.1.0" = self.by-version."commander"."2.1.0";
- "nan-1.0.0" = self.by-version."nan"."1.0.0";
- "tinycolor-0.0.1" = self.by-version."tinycolor"."0.0.1";
- "options-0.0.6" = self.by-version."options"."0.0.6";
- };
- peerDependencies = [
- ];
- passthru.names = [ "ws" ];
- };
- "ws" = self.by-version."ws"."0.4.32";
-}
+{pkgs ? import {
+ inherit system;
+ }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}:
+
+let
+ nodeEnv = import ../../../development/node-packages/node-env.nix {
+ inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+ inherit nodejs;
+ };
+in
+import ./node-packages.nix {
+ inherit (pkgs) fetchurl fetchgit;
+ inherit nodeEnv;
+}
\ No newline at end of file
diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix
index fc2e8aa03de3..7213b22c949b 100644
--- a/pkgs/applications/editors/zile/default.nix
+++ b/pkgs/applications/editors/zile/default.nix
@@ -1,15 +1,15 @@
{ fetchurl, stdenv, pkgconfig, ncurses, boehmgc, perl, help2man }:
stdenv.mkDerivation rec {
- name = "zile-2.4.13";
+ name = "zile-2.4.14";
src = fetchurl {
url = "mirror://gnu/zile/${name}.tar.gz";
- sha256 = "03mcg0bxkzprlsx8y6h22w924pzx4a9zr7zm3g11j8j3x9lz75f7";
+ sha256 = "0x3byaddms8l3g7igx6njycqsq98wgapysdb5c7lhcnajlkp8y3s";
};
- buildInputs = [ pkgconfig ncurses boehmgc ];
- nativeBuildInputs = [ perl ]
+ buildInputs = [ ncurses boehmgc ];
+ nativeBuildInputs = [ perl pkgconfig ]
# `help2man' wants to run Zile, which won't work when the
# newly-produced binary can't be run at build-time.
++ stdenv.lib.optional
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
doCheck = false;
# XXX: Work around cross-compilation-unfriendly `gl_FUNC_FSTATAT' macro.
- preConfigure = "export gl_cv_func_fstatat_zero_flag=yes";
+ gl_cv_func_fstatat_zero_flag="yes";
meta = with stdenv.lib; {
description = "Lightweight Emacs clone";
diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix
index 790997e328b4..3382bb3e56d7 100644
--- a/pkgs/applications/gis/grass/default.nix
+++ b/pkgs/applications/gis/grass/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation {
sha256 = "02qrdgn46gxr60amxwax4b8fkkmhmjxi6qh4yfvpbii6ai6diarf";
};
- buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite pkgconfig cairo
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite cairo
readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql mysql.client blas ]
++ (with python2Packages; [ python dateutil wxPython30 numpy ]);
@@ -71,5 +72,6 @@ stdenv.mkDerivation {
description = "GIS software suite used for geospatial data management and analysis, image processing, graphics and maps production, spatial modeling, and visualization";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.all;
+ broken = true;
};
}
diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix
index a3ea89e26687..a008835f59ff 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.12";
+ name = "qgis-2.18.13";
buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla
fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags ] ++
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://qgis.org/downloads/${name}.tar.bz2";
- sha256 = "0fh256j2d2kh9hjx6q1zdzxfqsgifg9dvgk214sv6zxzhsn0kxvs";
+ sha256 = "033l3wg3l7hv4642wmsdycjca1dw8p89sk9xyc51wpb3id17vgv2";
};
cmakeFlags = stdenv.lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}";
diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix
index cd99861ea7b6..973e7f88e800 100644
--- a/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -14,8 +14,8 @@ let
else throw "ImageMagick is not supported on this platform.";
cfg = {
- version = "7.0.6-4";
- sha256 = "0fvkx9lf8g0sa9bccd9s5qyhcy0g1mqnkbpqly55ryxyg1ywxqaz";
+ version = "7.0.7-9";
+ sha256 = "0p0879chcfrghcamwgxxcmaaj04xv0z91ris7hxi37qdw8c7836w";
patches = [];
};
in
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index 1cf08f286ef3..507912ee43ea 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -14,8 +14,8 @@ let
else throw "ImageMagick is not supported on this platform.";
cfg = {
- version = "6.9.9-7";
- sha256 = "1lwsz9b8clygdppgawv2hsry4aykgmawjlwhg3fj70rndv4a8rw4";
+ version = "6.9.9-21";
+ sha256 = "0241g3c207rawn61bz8rc5gz55k5mi2b0n3zlwa0jv9xczlkd6a9";
patches = [];
}
# Freeze version on mingw so we don't need to port the patch too often.
diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix
index 986e16834f76..2d42a479999b 100644
--- a/pkgs/applications/graphics/ahoviewer/default.nix
+++ b/pkgs/applications/graphics/ahoviewer/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "ahoviewer-${version}";
- version = "1.4.8";
+ version = "1.4.9";
src = fetchFromGitHub {
owner = "ahodesuka";
repo = "ahoviewer";
rev = version;
- sha256 = "0fsak22hpi2r8zqysswdyngaf3n635qvclqh1p0g0wrkfza4dbc4";
+ sha256 = "194h3k5zvd8gjrbs91qba7d9h7i30yh4rjk4w3aa1vwvv0qm2amx";
};
enableParallelBuilding = true;
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = https://github.com/ahodesuka/ahoviewer;
description = "A GTK2 image viewer, manga reader, and booru browser";
- maintainers = [ maintainers.skrzyp ];
+ maintainers = with maintainers; [ skrzyp xzfc ];
license = licenses.mit;
platforms = platforms.allBut [ "darwin" "cygwin" ];
};
diff --git a/pkgs/applications/graphics/ao/default.nix b/pkgs/applications/graphics/ao/default.nix
index 7396fdc045f1..990fee8cc37c 100644
--- a/pkgs/applications/graphics/ao/default.nix
+++ b/pkgs/applications/graphics/ao/default.nix
@@ -5,11 +5,13 @@
stdenv.mkDerivation rec {
version = "0.0pre20160820";
name = "ao-${version}";
+
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- cmake ninja boost libpng glfw3 epoxy guile pkgconfig mesa libX11
+ cmake ninja boost libpng glfw3 epoxy guile mesa libX11
libpthreadstubs libXau libXdmcp libXrandr libXext libXinerama libXxf86vm
libXcursor libXfixes
- ];
+ ];
src = fetchgit {
url = https://github.com/mkeeter/ao;
diff --git a/pkgs/applications/graphics/astah-community/default.nix b/pkgs/applications/graphics/astah-community/default.nix
new file mode 100644
index 000000000000..72d367d8fea2
--- /dev/null
+++ b/pkgs/applications/graphics/astah-community/default.nix
@@ -0,0 +1,63 @@
+{ stdenv, fetchurl, makeWrapper, makeDesktopItem, unzip, jre }:
+
+let
+
+ name = "astah-community";
+ version = "7.2.0";
+ postfix = "1ff236";
+ desktopIcon = fetchurl {
+ name = "${name}.png";
+ url = "https://aur.archlinux.org/cgit/aur.git/plain/astah_community.png?h=astah-community&id=94710b5a6aadcaf489022b0f0e61f8832ae6fa87";
+ sha256 = "0knlknwfqqnhg63sxxpia5ykn397id31gzr956wnn6yjj58k3ckm";
+ };
+ mimeXml = fetchurl {
+ name = "${name}.xml";
+ url = "https://aur.archlinux.org/cgit/aur.git/plain/astah_community.xml?h=astah-community&id=94710b5a6aadcaf489022b0f0e61f8832ae6fa87";
+ sha256 = "096n2r14ddm97r32i4sbp7v4qdmwn9sxy7lwphcx1nydppb0m97b";
+ };
+ desktopItem = makeDesktopItem {
+ name = name;
+ exec = "astah %U";
+ icon = "${desktopIcon}";
+ comment = "Lightweight, easy-to-use, and free UML2.x modeler";
+ desktopName = "Astah* Community";
+ genericName = "Astah* Community";
+ mimeType = "application/x-astah";
+ categories = "Application;Development;";
+ extraEntries = "NoDisplay=false";
+ };
+
+in
+
+stdenv.mkDerivation {
+ name = "${name}-${version}";
+
+ src = fetchurl {
+ url = "http://cdn.change-vision.com/files/${name}-${stdenv.lib.replaceStrings ["."] ["_"] version}-${postfix}.zip";
+ sha256 = "1lkl30jdjiarvh2ap9rjabvrq9qhrlmfrasv3vvkag22y9w4l499";
+ };
+
+ nativeBuildInputs = [ unzip makeWrapper ];
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/{bin,share}
+ cp -r . $out/share/astah
+ cp -r ${desktopItem}/share/applications $out/share/applications
+
+ install -D ${desktopIcon} $out/share/pixmaps/${name}.png
+ install -D ${mimeXml} $out/share/mime/packages/${name}.xml
+
+ makeWrapper ${jre}/bin/java $out/bin/astah \
+ --add-flags "-jar $out/share/astah/astah-community.jar"
+
+ runHook postInstall
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Lightweight, easy-to-use, and free UML2.x modeler";
+ homepage = http://astah.net/editions/community;
+ license = licenses.unfree;
+ };
+}
diff --git a/pkgs/applications/graphics/autotrace/default.nix b/pkgs/applications/graphics/autotrace/default.nix
index c0ce81b3b425..7af7c8986f2f 100644
--- a/pkgs/applications/graphics/autotrace/default.nix
+++ b/pkgs/applications/graphics/autotrace/default.nix
@@ -66,5 +66,59 @@ stdenv.mkDerivation rec {
platforms = platforms.unix;
maintainers = with maintainers; [ hodapp ];
license = licenses.gpl2;
+ knownVulnerabilities = [
+ "CVE-2013-1953"
+ "CVE-2016-7392"
+ "CVE-2017-9151"
+ "CVE-2017-9152"
+ "CVE-2017-9153"
+ "CVE-2017-9154"
+ "CVE-2017-9155"
+ "CVE-2017-9156"
+ "CVE-2017-9157"
+ "CVE-2017-9158"
+ "CVE-2017-9159"
+ "CVE-2017-9160"
+ "CVE-2017-9161"
+ "CVE-2017-9162"
+ "CVE-2017-9163"
+ "CVE-2017-9164"
+ "CVE-2017-9165"
+ "CVE-2017-9166"
+ "CVE-2017-9167"
+ "CVE-2017-9168"
+ "CVE-2017-9169"
+ "CVE-2017-9170"
+ "CVE-2017-9171"
+ "CVE-2017-9172"
+ "CVE-2017-9173"
+ "CVE-2017-9174"
+ "CVE-2017-9175"
+ "CVE-2017-9176"
+ "CVE-2017-9177"
+ "CVE-2017-9178"
+ "CVE-2017-9179"
+ "CVE-2017-9180"
+ "CVE-2017-9181"
+ "CVE-2017-9182"
+ "CVE-2017-9183"
+ "CVE-2017-9184"
+ "CVE-2017-9185"
+ "CVE-2017-9186"
+ "CVE-2017-9187"
+ "CVE-2017-9188"
+ "CVE-2017-9189"
+ "CVE-2017-9190"
+ "CVE-2017-9191"
+ "CVE-2017-9192"
+ "CVE-2017-9193"
+ "CVE-2017-9194"
+ "CVE-2017-9195"
+ "CVE-2017-9196"
+ "CVE-2017-9197"
+ "CVE-2017-9198"
+ "CVE-2017-9199"
+ "CVE-2017-9200"
+ ];
};
}
diff --git a/pkgs/applications/graphics/awesomebump/default.nix b/pkgs/applications/graphics/awesomebump/default.nix
index f1958ca35bec..f190b421b056 100644
--- a/pkgs/applications/graphics/awesomebump/default.nix
+++ b/pkgs/applications/graphics/awesomebump/default.nix
@@ -1,36 +1,49 @@
-{ lib, stdenv, fetchurl, qtbase, qmake, makeWrapper }:
+{ lib, stdenv, fetchgit, qtbase, qmake, makeWrapper, qtscript, gcc, flex, bison, qtdeclarative, gnutar }:
-stdenv.mkDerivation {
- name = "awesomebump-4.0";
- src = fetchurl {
- url = https://github.com/kmkolasinski/AwesomeBump/archive/Linuxv4.0.tar.gz;
- sha256 = "1rp4m4y2ld49hibzwqwy214cbiin80i882d9l0y1znknkdcclxf2";
+let
+ version = "5.1";
+
+ src = fetchgit {
+ url = "https://github.com/kmkolasinski/AwesomeBump.git";
+ rev = "Winx32v${version}";
+ sha256 = "1c8b9jki0v8kzkvsvyv7q1w3s7j40br6ph15hh2xi0a1mpwckq56";
+ fetchSubmodules = true;
};
- setSourceRoot = "sourceRoot=$(echo */Sources)";
-
- nativeBuildInputs = [ makeWrapper qmake ];
- buildInputs = [ qtbase ];
-
- enableParallelBuilding = true;
-
- installPhase =
- ''
- d=$out/libexec/AwesomeBump
- mkdir -p $d $out/bin
- cp AwesomeBump $d/
- cp -prd ../Bin/Configs ../Bin/Core $d/
-
- # AwesomeBump expects to find Core and Configs in its current
- # directory.
- makeWrapper $d/AwesomeBump $out/bin/AwesomeBump \
- --run "cd $d"
+ qtnproperty = stdenv.mkDerivation {
+ name = "qtnproperty";
+ inherit src;
+ sourceRoot = "AwesomeBump/Sources/utils/QtnProperty";
+ buildInputs = [ qtscript qtbase qtdeclarative ];
+ nativeBuildInputs = [ qmake flex bison ];
+ postInstall = ''
+ install -D bin-linux/QtnPEG $out/bin/QtnPEG
'';
+ };
+in stdenv.mkDerivation rec {
+ name = "awesomebump-${version}";
- # RPATH in /tmp hack
- preFixup = ''
- rm -r $NIX_BUILD_TOP/__nix_qt5__
+ inherit src;
+
+ buildInputs = [ qtbase qtscript qtdeclarative ];
+
+ nativeBuildInputs = [ qmake makeWrapper ];
+
+ preBuild = ''
+ ln -sf ${qtnproperty}/bin/QtnPEG Sources/utils/QtnProperty/bin-linux/QtnPEG
+ '';
+
+ postInstall = ''
+ d=$out/libexec/AwesomeBump
+
+ mkdir -p $d
+ cp -vr workdir/`cat workdir/current`/bin/AwesomeBump $d/
+ cp -prd Bin/Configs Bin/Core $d/
+
+ # AwesomeBump expects to find Core and Configs in its current directory.
+ makeWrapper $d/AwesomeBump $out/bin/AwesomeBump \
+ --run "cd $d"
'';
meta = {
diff --git a/pkgs/applications/graphics/digikam/0001-Disable-fno-operator-names.patch b/pkgs/applications/graphics/digikam/0001-Disable-fno-operator-names.patch
deleted file mode 100644
index 149a2b2b1aca..000000000000
--- a/pkgs/applications/graphics/digikam/0001-Disable-fno-operator-names.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From beb9ad0149adfe448acfa650fb3e171d5fdd7e27 Mon Sep 17 00:00:00 2001
-From: Moritz Ulrich
-Date: Wed, 22 Feb 2017 15:28:11 +0100
-Subject: [PATCH] Disable `-fno-operator-names`
-
----
- core/CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
-index 89e06827e6..01d0c88ea9 100644
---- a/core/CMakeLists.txt
-+++ b/core/CMakeLists.txt
-@@ -98,6 +98,8 @@ include(MacroOpenCV)
- include(MacroJPEG)
- include(MacroBoolTo01)
-
-+string(REPLACE "-fno-operator-names" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-+
- # ==================================================================================================
-
- option(ENABLE_OPENCV3 "Build digiKam with OpenCV3 instead OpenCV2 (default=OFF)" OFF)
---
-2.11.1
-
diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index 96b1ca54d558..a62940ff7038 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, fetchurl, cmake, extra-cmake-modules, wrapGAppsHook
+{ mkDerivation, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook
# For `digitaglinktree`
, perl, sqlite
@@ -8,6 +8,7 @@
, qtsvg
, qtwebkit
+, kcalcore
, kconfigwidgets
, kcoreaddons
, kdoctools
@@ -28,12 +29,15 @@
, lensfun
, libgphoto2
, libkipi
+, libksane
, liblqr1
, libqtav
, libusb1
, marble
+, mesa
, mysql
-, opencv
+, opencv3
+, pcre
, threadweaver
# For panorama and focus stacking
@@ -46,16 +50,14 @@
mkDerivation rec {
name = "digikam-${version}";
- version = "5.4.0";
+ version = "5.7.0";
src = fetchurl {
- url = "http://download.kde.org/stable/digikam/${name}.tar.xz";
- sha256 = "0dgsgji14l5zvxny36hrfsp889fsfrsbbn9bg57m18404xp903kg";
+ url = "mirror://kde/stable/digikam/${name}.tar.xz";
+ sha256 = "1xah079g47fih8l9qy1ifppfvmq5yms5y1z54nvxdyz8nsszy19n";
};
- nativeBuildInputs = [ cmake extra-cmake-modules kdoctools wrapGAppsHook ];
-
- patches = [ ./0001-Disable-fno-operator-names.patch ];
+ nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ];
buildInputs = [
bison
@@ -68,19 +70,21 @@ mkDerivation rec {
lensfun
libgphoto2
libkipi
+ libksane
liblqr1
libqtav
libusb1
+ mesa
mysql
- opencv
- ];
+ opencv3
+ pcre
- propagatedBuildInputs = [
qtbase
qtxmlpatterns
qtsvg
qtwebkit
+ kcalcore
kconfigwidgets
kcoreaddons
kfilemetadata
@@ -98,8 +102,6 @@ mkDerivation rec {
enableParallelBuilding = true;
cmakeFlags = [
- "-DLIBUSB_LIBRARIES=${libusb1.out}/lib"
- "-DLIBUSB_INCLUDE_DIR=${libusb1.dev}/include/libusb-1.0"
"-DENABLE_MYSQLSUPPORT=1"
"-DENABLE_INTERNALMYSQL=1"
"-DENABLE_MEDIAPLAYER=1"
diff --git a/pkgs/applications/graphics/exrdisplay/default.nix b/pkgs/applications/graphics/exrdisplay/default.nix
index f15730874744..3386d75e81e1 100644
--- a/pkgs/applications/graphics/exrdisplay/default.nix
+++ b/pkgs/applications/graphics/exrdisplay/default.nix
@@ -18,7 +18,8 @@ stdenv.mkDerivation {
make LDFLAGS="`fltk-config --ldflags` -lGL -lfltk_gl"
'';
- buildInputs = [ openexr fltk pkgconfig mesa openexr_ctl ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ openexr fltk mesa openexr_ctl ];
meta = {
description = "Application for viewing OpenEXR images on a display at various exposure settings";
diff --git a/pkgs/applications/graphics/exrtools/default.nix b/pkgs/applications/graphics/exrtools/default.nix
index d49110d00693..097062a8258a 100644
--- a/pkgs/applications/graphics/exrtools/default.nix
+++ b/pkgs/applications/graphics/exrtools/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0jpkskqs1yjiighab4s91jy0c0qxcscwadfn94xy2mm2bx2qwp4z";
};
- buildInputs = [ stdenv pkgconfig openexr libpng12 libjpeg ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ stdenv openexr libpng12 libjpeg ];
meta = with stdenv.lib; {
description = "Collection of utilities for manipulating OpenEXR images";
diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index f1b992bea1a0..b447fa7810f4 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.20";
+ version = "2.22.2";
src = fetchurl {
url = "https://feh.finalrewind.org/${name}.tar.bz2";
- sha256 = "02vhdv16nf4kjna4inpbfy4k3p40bhl7xpc4kh4xvily14146l2b";
+ sha256 = "1kcflv4jb4250g94nqn28i98xqvvci8w7vqpfr62gxlp16z1za05";
};
outputs = [ "out" "man" "doc" ];
diff --git a/pkgs/applications/graphics/gcolor2/default.nix b/pkgs/applications/graphics/gcolor2/default.nix
index b9cf229e8c86..3747b802e231 100644
--- a/pkgs/applications/graphics/gcolor2/default.nix
+++ b/pkgs/applications/graphics/gcolor2/default.nix
@@ -20,7 +20,8 @@ stdenv.mkDerivation {
[ ./gcolor2-amd64.patch ] else
[ ];
-buildInputs = [ gtk2 perl perlXMLParser pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+buildInputs = [ gtk2 perl perlXMLParser ];
meta = {
description = "Simple GTK+2 color selector";
diff --git a/pkgs/applications/graphics/gcolor3/default.nix b/pkgs/applications/graphics/gcolor3/default.nix
new file mode 100644
index 000000000000..afad1e6c3af0
--- /dev/null
+++ b/pkgs/applications/graphics/gcolor3/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, gnome3, libtool, intltool, pkgconfig, gtk3, hicolor_icon_theme, wrapGAppsHook } :
+
+let
+ version = "2.2";
+in stdenv.mkDerivation {
+ name = "gcolor3-${version}";
+
+ src = fetchFromGitHub {
+ owner = "hjdskes";
+ repo = "gcolor3";
+ rev = "v${version}";
+ sha256 = "1rbahsi33pfggpj5cigy6wy5333g3rpm8v2q0b35c6m7pwhmf2gr";
+ };
+
+ nativeBuildInputs = [ gnome3.gnome_common libtool intltool pkgconfig hicolor_icon_theme wrapGAppsHook ];
+
+ buildInputs = [ gtk3 ];
+
+ configureScript = "./autogen.sh";
+
+ # clang-4.0: error: argument unused during compilation: '-pthread'
+ NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isClang "-Wno-error=unused-command-line-argument";
+
+ meta = {
+ description = "A simple color chooser written in GTK3";
+ homepage = https://hjdskes.github.io/projects/gcolor3/;
+ license = stdenv.lib.licenses.gpl2;
+ maintainers = with stdenv.lib.maintainers; [ jtojnar ];
+ platforms = stdenv.lib.platforms.unix;
+ };
+}
diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix
index 9149e19819ff..1e8f0e209c06 100644
--- a/pkgs/applications/graphics/geeqie/default.nix
+++ b/pkgs/applications/graphics/geeqie/default.nix
@@ -15,8 +15,9 @@ stdenv.mkDerivation rec {
configureFlags = [ "--enable-gps" ];
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig autoconf automake gtk2 libpng exiv2 lcms intltool gettext
+ autoconf automake gtk2 libpng exiv2 lcms intltool gettext
];
postInstall = ''
diff --git a/pkgs/applications/graphics/giv/default.nix b/pkgs/applications/graphics/giv/default.nix
index 5c15c98e482b..92e6084ce673 100644
--- a/pkgs/applications/graphics/giv/default.nix
+++ b/pkgs/applications/graphics/giv/default.nix
@@ -25,7 +25,8 @@ stdenv.mkDerivation rec {
installPhase = "scons install";
- buildInputs = [ gdk_pixbuf pkgconfig gtk2 glib scons pcre cfitsio perl gob2 vala_0_23 libtiff
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gdk_pixbuf gtk2 glib scons pcre cfitsio perl gob2 vala_0_23 libtiff
json_glib ];
meta = {
diff --git a/pkgs/applications/graphics/gpicview/default.nix b/pkgs/applications/graphics/gpicview/default.nix
index 7e11c9dea3a7..86867cd1cca7 100644
--- a/pkgs/applications/graphics/gpicview/default.nix
+++ b/pkgs/applications/graphics/gpicview/default.nix
@@ -24,5 +24,6 @@ stdenv.mkDerivation {
platforms = platforms.unix;
};
- buildInputs = [ intltool pkgconfig gtk2 ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ intltool gtk2 ];
}
diff --git a/pkgs/applications/graphics/gqview/default.nix b/pkgs/applications/graphics/gqview/default.nix
index 801e9c5f502b..a892f98ac475 100644
--- a/pkgs/applications/graphics/gqview/default.nix
+++ b/pkgs/applications/graphics/gqview/default.nix
@@ -13,7 +13,8 @@ stdenv.mkDerivation {
sha256 = "0ilm5s7ps9kg4f5hzgjhg0xhn6zg0v9i7jnd67zrx9h7wsaa9zhj";
};
- buildInputs = [pkgconfig gtk2 libpng];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk2 libpng];
hardeningDisable = [ "format" ];
diff --git a/pkgs/applications/graphics/grafx2/default.nix b/pkgs/applications/graphics/grafx2/default.nix
index ee9df683c0a2..fd17ef69c992 100644
--- a/pkgs/applications/graphics/grafx2/default.nix
+++ b/pkgs/applications/graphics/grafx2/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "0svsy6rqmdj11b400c242i2ixihyz0hds0dgicqz6g6dcgmcl62q";
};
- buildInputs = [ SDL SDL_image SDL_ttf libpng zlib lua5 pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ SDL SDL_image SDL_ttf libpng zlib lua5 ];
preBuild = "cd src";
diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix
index 93894d0c6cb8..d9e0f42e53e3 100644
--- a/pkgs/applications/graphics/gthumb/default.nix
+++ b/pkgs/applications/graphics/gthumb/default.nix
@@ -6,12 +6,12 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "gthumb";
- version = "${major}.1";
+ version = "${major}.3";
major = "3.5";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${major}/${name}.tar.xz";
- sha256 = "1hxnjskrq57d5ycn2fyif7363n1bav931pkjvq1fr2r4yrj0d202";
+ sha256 = "0hka1b3l8mf94zsk7jff87wsb8bz4pj5pixjrs0w2j8jbsa9sggk";
};
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix
index 29e43a93c985..9acd8357cb71 100644
--- a/pkgs/applications/graphics/hugin/default.nix
+++ b/pkgs/applications/graphics/hugin/default.nix
@@ -5,11 +5,11 @@
}:
stdenv.mkDerivation rec {
- name = "hugin-2016.2.0";
+ name = "hugin-2017.0.0";
src = fetchurl {
url = "mirror://sourceforge/hugin/${name}.tar.bz2";
- sha256 = "058zd63vx29yrx2pphbbll7kzcxkai22q26lpw13rn4lvp41pasl";
+ sha256 = "02a6rlwp20jdn5jdsyg3c7liljr10c3jfdkxiv9mkf9jgyi6wr46";
};
buildInputs = [
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index 678ee79459be..889d710f043f 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -33,8 +33,9 @@ stdenv.mkDerivation rec {
--replace '"python-interpreter", "python"' '"python-interpreter", "${python2Env}/bin/python"'
'';
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig perl perlXMLParser libXft libpng zlib popt boehmgc
+ perl perlXMLParser libXft libpng zlib popt boehmgc
libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext
makeWrapper gsl poppler imagemagick libwpg librevenge
libvisio libcdr libexif potrace cmake python2Env
diff --git a/pkgs/applications/graphics/kgraphviewer/default.nix b/pkgs/applications/graphics/kgraphviewer/default.nix
index 6c2be6ea73c8..8f043816ba06 100644
--- a/pkgs/applications/graphics/kgraphviewer/default.nix
+++ b/pkgs/applications/graphics/kgraphviewer/default.nix
@@ -1,24 +1,38 @@
-{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
-, kdelibs4, boost, graphviz
+{ stdenv, mkDerivation, fetchurl, cmake, extra-cmake-modules, pkgconfig, wrapGAppsHook
+, kconfig, kcrash, kinit, kdoctools, kiconthemes, kio, kparts, kwidgetsaddons
+, qtbase, qtsvg
+, boost, graphviz
}:
-stdenv.mkDerivation rec {
+mkDerivation rec {
name = "kgraphviewer-${version}";
- version = "2.2.0";
+ version = "2.4.2";
src = fetchurl {
- url = "mirror://kde/stable/kgraphviewer/${version}/src/${name}.tar.xz";
- sha256 = "1vs5x539mx26xqdljwzkh2bj7s3ydw4cb1wm9nlhgs18siw4gjl5";
+ url = "mirror://kde/stable/kgraphviewer/${version}/${name}.tar.xz";
+ sha256 = "1jc5zfgy4narwgn7rscfwz7l5pjy0jghal6yb3kd4sfadi78nhs9";
};
- buildInputs = [ kdelibs4 boost graphviz ];
- nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
+ buildInputs = [
+ qtbase qtsvg
+ boost graphviz
+ ];
+
+ nativeBuildInputs = [
+ cmake extra-cmake-modules pkgconfig wrapGAppsHook
+ kdoctools
+ ];
+
+ propagatedBuildInputs = [
+ kconfig kinit kio kparts kwidgetsaddons
+ ];
+
+ enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "A Graphviz dot graph viewer for KDE";
- license = licenses.gpl2;
- platforms = platforms.linux;
- maintainers = [ maintainers.lethalman ];
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ lethalman ];
+ platforms = platforms.linux;
};
}
-
diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix
index 98f92413a767..a9c238ead3c1 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.2.1";
+ version = "3.3.2";
src = fetchurl {
- url = "http://download.kde.org/stable/krita/${version}/${name}.tar.gz";
- sha256 = "0fafy5ggplgq2rz85sqa42vmkzs2r9dq47qfrbnn2n6pfzkcw1pg";
+ url = https://download.kde.org/stable/krita/3.3.2/krita-3.3.2.1.tar.xz;
+ sha256 = "0i3l27cfi1h486m74xf4ynk0pwx32xaqraa91a0g1bpj1jxf2mg5";
};
nativeBuildInputs = [ cmake extra-cmake-modules ];
diff --git a/pkgs/applications/graphics/ktikz/default.nix b/pkgs/applications/graphics/ktikz/default.nix
index 5d0bbcad54fd..8817071e9843 100644
--- a/pkgs/applications/graphics/ktikz/default.nix
+++ b/pkgs/applications/graphics/ktikz/default.nix
@@ -63,7 +63,8 @@ stdenv.mkDerivation rec {
qmake PREFIX="$out" ./qtikz.pro
'';
- buildInputs = [ gettext qt5.full poppler_qt5 pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gettext qt5.full poppler_qt5 ];
enableParallelBuilding = true;
}
diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix
index 07789fce3a92..d73697673bfe 100644
--- a/pkgs/applications/graphics/meshlab/default.nix
+++ b/pkgs/applications/graphics/meshlab/default.nix
@@ -46,6 +46,6 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl2Plus;
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
- broken = stdenv.isLinux && stdenv.isi686;
+ broken = true;
};
}
diff --git a/pkgs/applications/graphics/mozjpeg/default.nix b/pkgs/applications/graphics/mozjpeg/default.nix
index 0ca997adb783..33785a279c7b 100644
--- a/pkgs/applications/graphics/mozjpeg/default.nix
+++ b/pkgs/applications/graphics/mozjpeg/default.nix
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
sed -i -e "s!/usr/bin/file!${file}/bin/file!g" configure
'';
- buildInputs = [ libpng pkgconfig nasm ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libpng nasm ];
meta = {
description = "Mozilla JPEG Encoder Project";
diff --git a/pkgs/applications/graphics/mtpaint/default.nix b/pkgs/applications/graphics/mtpaint/default.nix
index 51bfa603a055..8a2a218d9891 100644
--- a/pkgs/applications/graphics/mtpaint/default.nix
+++ b/pkgs/applications/graphics/mtpaint/default.nix
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
sha256 = "0bvf623g0n2ifijcxv1nw0z3wbs2vhhdky4n04ywsbjlykm44nd1";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig
freetype giflib gtk2 lcms2 libjpeg libpng libtiff openjpeg gifsicle
];
diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix
index 669e46c6a842..ac0060ec7f8e 100644
--- a/pkgs/applications/graphics/nomacs/default.nix
+++ b/pkgs/applications/graphics/nomacs/default.nix
@@ -30,7 +30,9 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- sourceRoot = "${name}-src/ImageLounge";
+ setSourceRoot = ''
+ sourceRoot=$(echo */ImageLounge)
+ '';
patches = [./fix-appdata-install.patch];
diff --git a/pkgs/applications/graphics/qiv/default.nix b/pkgs/applications/graphics/qiv/default.nix
index 9d147a635f3b..f1a58d4e21b8 100644
--- a/pkgs/applications/graphics/qiv/default.nix
+++ b/pkgs/applications/graphics/qiv/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation (rec {
sha256 = "1rlf5h67vhj7n1y7jqkm9k115nfnzpwngj3kzqsi2lg676srclv7";
};
- buildInputs = [ pkgconfig gtk2 imlib2 file lcms2 libexif ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk2 imlib2 file lcms2 libexif ];
preBuild=''
substituteInPlace Makefile --replace /usr/local "$out"
diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix
index 3edb97e3e209..91a34a505f2f 100644
--- a/pkgs/applications/graphics/rawtherapee/default.nix
+++ b/pkgs/applications/graphics/rawtherapee/default.nix
@@ -1,24 +1,25 @@
{ stdenv, fetchFromGitHub, pkgconfig, cmake, pixman, libpthreadstubs, gtkmm3, libXau
, libXdmcp, lcms2, libiptcdata, libcanberra_gtk3, fftw, expat, pcre, libsigcxx, wrapGAppsHook
+, lensfun
}:
stdenv.mkDerivation rec {
- version = "5.2";
+ version = "5.3";
name = "rawtherapee-" + version;
src = fetchFromGitHub {
owner = "Beep6581";
repo = "RawTherapee";
rev = version;
- sha256 = "0i3cr3335bw8yxxzn6kcdx6ccinlnxzrdbgl3ld1kym1w2n5449k";
+ sha256 = "1r6sx9zl1wkykgfx6k26268xadair6hzl15v5hmiri9sdhrn33q7";
};
- buildInputs = [
- pkgconfig cmake pixman libpthreadstubs gtkmm3 libXau libXdmcp
- lcms2 libiptcdata libcanberra_gtk3 fftw expat pcre libsigcxx
- ];
+ nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
- nativeBuildInputs = [ wrapGAppsHook ];
+ buildInputs = [
+ cmake pixman libpthreadstubs gtkmm3 libXau libXdmcp
+ lcms2 libiptcdata libcanberra_gtk3 fftw expat pcre libsigcxx lensfun
+ ];
cmakeFlags = [
"-DPROC_TARGET_NUMBER=2"
diff --git a/pkgs/applications/graphics/rawtherapee/dev.nix b/pkgs/applications/graphics/rawtherapee/dev.nix
index 71e41faaaef5..fb73feb4a099 100644
--- a/pkgs/applications/graphics/rawtherapee/dev.nix
+++ b/pkgs/applications/graphics/rawtherapee/dev.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
sha256 = "1nwb6b1qrpdyigwig7bvr42lf7na1ngm0q2cislcvb2v1nmk6nlz";
};
- buildInputs = [ pkgconfig cmake pixman libpthreadstubs gtkmm2 libXau libXdmcp
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ cmake pixman libpthreadstubs gtkmm2 libXau libXdmcp
lcms2 libiptcdata libcanberra_gtk2 fftw expat pcre libsigcxx ];
NIX_CFLAGS_COMPILE = "-std=gnu++11 -Wno-deprecated-declarations -Wno-unused-result";
diff --git a/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/pkgs/applications/graphics/sane/backends/brscan4/default.nix
index 7037e944f3f9..42d129e53887 100644
--- a/pkgs/applications/graphics/sane/backends/brscan4/default.nix
+++ b/pkgs/applications/graphics/sane/backends/brscan4/default.nix
@@ -10,17 +10,17 @@ let
udevRules = callPackage ./udev_rules_type1.nix {};
in stdenv.mkDerivation rec {
- name = "brscan4-0.4.4-2";
+ name = "brscan4-0.4.4-4";
src =
if stdenv.system == "i686-linux" then
fetchurl {
url = "http://download.brother.com/welcome/dlf006646/${name}.i386.deb";
- sha256 = "1rd6qmg49lvack8rg9kkqs3vxfvvqf2x45h93pkrhk8a4aj5c8ll";
+ sha256 = "13mhjbzf9nvpdzrc2s98684r7likg76zxs1wlz2h8w59fsqgx4k2";
}
else if stdenv.system == "x86_64-linux" then
fetchurl {
url = "http://download.brother.com/welcome/dlf006645/${name}.amd64.deb";
- sha256 = "1r3cq1k2a2bghibkckmk00x7y59ic31gv7jcsw7380szf1j3la59";
+ sha256 = "0xy5px96y1saq9l80vwvfn6anr2q42qlxdhm6ci2a0diwib5q9fd";
}
else throw "${name} is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)";
diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix
index de07a4f1a896..ad02e1a80231 100644
--- a/pkgs/applications/graphics/sane/xsane.nix
+++ b/pkgs/applications/graphics/sane/xsane.nix
@@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
chmod a+rX -R .
'';
- buildInputs = [libpng sane-backends sane-frontends libX11 gtk2 pkgconfig ]
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [libpng sane-backends sane-frontends libX11 gtk2 ]
++ (if libusb != null then [libusb] else [])
++ stdenv.lib.optional gimpSupport gimp_2_8;
diff --git a/pkgs/applications/graphics/screencloud/default.nix b/pkgs/applications/graphics/screencloud/default.nix
index 6f2b0e34cbb3..cffe485711f6 100644
--- a/pkgs/applications/graphics/screencloud/default.nix
+++ b/pkgs/applications/graphics/screencloud/default.nix
@@ -43,7 +43,9 @@ stdenv.mkDerivation rec {
"-DCONSUMER_SECRET_SCREENCLOUD=${consumerSecret}"
];
- sourceRoot = "screencloud-v${version}-src/screencloud";
+ setSourceRoot = ''
+ sourceRoot=$(echo */screencloud)
+ '';
preConfigure = ''
# This needs to be set in preConfigure instead of cmakeFlags in order to
diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix
index 3f31b86fe492..b0a6f7caf885 100644
--- a/pkgs/applications/graphics/shotwell/default.nix
+++ b/pkgs/applications/graphics/shotwell/default.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
version = "${major}.${minor}";
- major = "0.26";
- minor = "2";
+ major = "0.27";
+ minor = "1";
name = "shotwell-${version}";
src = fetchurl {
url = "mirror://gnome/sources/shotwell/${major}/${name}.tar.xz";
- sha256 = "0frjqa6nmh025clwnb74z2rzbdq65wjcp2lf9csgcbkpahyjhrag";
+ sha256 = "1jav7qv0s1v6wvd7x2ri85hjqnbswq883pnd228qhd6bhjbryp89";
};
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include";
diff --git a/pkgs/applications/graphics/shutter/default.nix b/pkgs/applications/graphics/shutter/default.nix
index 3d4e8c592abb..a8b4973203d1 100644
--- a/pkgs/applications/graphics/shutter/default.nix
+++ b/pkgs/applications/graphics/shutter/default.nix
@@ -11,21 +11,13 @@ let
];
in
stdenv.mkDerivation rec {
- name = "shutter-0.93.1";
+ name = "shutter-0.94";
src = fetchurl {
- url = "http://shutter-project.org/wp-content/uploads/releases/tars/${name}.tar.gz";
- sha256 = "09cn3scwy98wqxkrjhnmxhpfnnynlbb41856yn5m3zwzqrxiyvak";
+ url = "https://launchpad.net/shutter/0.9x/0.94/+download/shutter-0.94.tar.gz";
+ sha256 = "943152cdf9e1b2096d38e3da9622d8bf97956a08eda747c3e7fcc564a3f0f40d";
};
- patches = [
- (fetchpatch {
- url = "http://svnweb.mageia.org/packages/cauldron/shutter/current/SOURCES/CVE-2015-0854.patch?revision=880308&view=co";
- name = "CVE-2015-0854.patch";
- sha256 = "14r18sxz3ylf39cn9b85snjhjxdk6ngq4vnpljwghw2q5430nb12";
- })
- ];
-
buildInputs = [ perl makeWrapper gdk_pixbuf librsvg ] ++ perlModules;
installPhase = ''
diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix
index f8db30675b15..43d6229ab2bc 100644
--- a/pkgs/applications/graphics/solvespace/default.nix
+++ b/pkgs/applications/graphics/solvespace/default.nix
@@ -11,8 +11,9 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- cmake pkgconfig zlib libpng cairo freetype
+ cmake zlib libpng cairo freetype
json_c fontconfig gtkmm3 pangomm glew mesa_glu
xlibs.libpthreadstubs xlibs.libXdmcp pcre
];
@@ -34,7 +35,7 @@ stdenv.mkDerivation rec {
postInstall = ''
substituteInPlace $out/share/applications/solvespace.desktop \
- --replace /usr/bin/ $out/bin/ \
+ --replace /usr/bin/ $out/bin/
'';
meta = {
diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix
index 93bb5f151d94..68597a23ca65 100644
--- a/pkgs/applications/graphics/sxiv/default.nix
+++ b/pkgs/applications/graphics/sxiv/default.nix
@@ -23,6 +23,11 @@ stdenv.mkDerivation rec {
buildInputs = [ libX11 imlib2 giflib libexif ];
+ postInstall = ''
+ mkdir -p $out/share/applications/
+ cp -v sxiv.desktop $out/share/applications/
+ '';
+
meta = {
description = "Simple X Image Viewer";
homepage = https://github.com/muennich/sxiv;
diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix
index ea0d2338252a..930a7e686f8f 100644
--- a/pkgs/applications/graphics/synfigstudio/default.nix
+++ b/pkgs/applications/graphics/synfigstudio/default.nix
@@ -18,7 +18,7 @@ let
postUnpack = "sourceRoot=\${sourceRoot}/ETL/";
- buildInputs = [ autoreconfHook ];
+ nativeBuildInputs = [ autoreconfHook ];
};
synfig = stdenv.mkDerivation rec {
@@ -38,10 +38,12 @@ let
"--with-boost-libdir=${boost.out}/lib"
];
+ nativeBuildInputs = [ pkgconfig autoreconfHook gettext ];
buildInputs = [
- ETL boost cairo gettext glibmm mlt-qt5 libsigcxx libxmlxx pango
- pkgconfig autoreconfHook
+ ETL boost cairo glibmm mlt-qt5 libsigcxx libxmlxx pango
];
+
+ meta.broken = true;
};
in
stdenv.mkDerivation rec {
@@ -99,10 +101,11 @@ stdenv.mkDerivation rec {
preConfigure = "./bootstrap.sh";
+ nativeBuildInputs = [ pkgconfig autoreconfHook gettext ];
buildInputs = [
- ETL boost cairo gettext glibmm gtk3 gtkmm3 imagemagick intltool
- libjack2 libsigcxx libxmlxx makeWrapper mlt-qt5 pkgconfig
- synfig autoreconfHook which defaultIconTheme
+ ETL boost cairo glibmm gtk3 gtkmm3 imagemagick intltool
+ libjack2 libsigcxx libxmlxx makeWrapper mlt-qt5
+ synfig which defaultIconTheme
];
postInstall = ''
diff --git a/pkgs/applications/graphics/xzgv/default.nix b/pkgs/applications/graphics/xzgv/default.nix
index 999314429452..69ab67dffb73 100644
--- a/pkgs/applications/graphics/xzgv/default.nix
+++ b/pkgs/applications/graphics/xzgv/default.nix
@@ -1,24 +1,25 @@
-{ stdenv, fetchurl, gtk2, pkgconfig, texinfo }:
+{ stdenv, fetchurl, gtk2, libexif, pkgconfig, texinfo }:
stdenv.mkDerivation rec {
name = "xzgv-${version}";
- version = "0.9.1";
+ version = "0.9.2";
src = fetchurl {
url = "mirror://sourceforge/xzgv/xzgv-${version}.tar.gz";
- sha256 = "1rh432wnvzs434knzbda0fslhfx0gngryrrnqkfm6gwd2g5mxcph";
+ sha256 = "17l1xr9v07ggwga3vn0z1i4lnwjrr20rr8z1kjbw71aaijxl18i5";
};
- buildInputs = [ gtk2 pkgconfig texinfo ];
- patches = [ ./fix-linker-paths.patch ];
+ nativeBuildInputs = [ pkgconfig texinfo ];
+ buildInputs = [ gtk2 libexif ];
postPatch = ''
substituteInPlace config.mk \
--replace /usr/local $out
- substituteInPlace config.mk \
- --replace "CFLAGS=-O2 -Wall" "CFLAGS=-Wall"
substituteInPlace Makefile \
--replace "all: src man" "all: src man info"
'';
+ preInstall = ''
+ mkdir -p $out/share/{app-install/desktop,applications,info,pixmaps}
+ '';
meta = with stdenv.lib; {
- homepage = http://sourceforge.net/projects/xzgv/;
+ homepage = https://sourceforge.net/projects/xzgv/;
description = "Picture viewer for X with a thumbnail-based selector";
license = licenses.gpl2;
maintainers = [ maintainers.womfoo ];
diff --git a/pkgs/applications/graphics/xzgv/fix-linker-paths.patch b/pkgs/applications/graphics/xzgv/fix-linker-paths.patch
deleted file mode 100644
index c5b1ae0879b5..000000000000
--- a/pkgs/applications/graphics/xzgv/fix-linker-paths.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-taken from http://sourceforge.net/p/xzgv/code/53/tree//trunk/xzgv/src/Makefile?diff=514dada434309d2ec11f5eff:52
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -9,8 +9,10 @@
- # This gets definitions for CC, CFLAGS, BINDIR etc.
- include ../config.mk
-
--CFLAGS+=`pkg-config --cflags gtk+-2.0` `pkg-config --cflags gdk-pixbuf-2.0`
--LDFLAGS+=`pkg-config --libs gtk+-2.0` `pkg-config --libs gdk-pixbuf-2.0`
-+CFLAGS+=`pkg-config --cflags gtk+-2.0` `pkg-config --cflags gdk-pixbuf-2.0` \
-+ `pkg-config --cflags x11`
-+LDFLAGS+=`pkg-config --libs gtk+-2.0` `pkg-config --libs gdk-pixbuf-2.0` \
-+ `pkg-config --libs x11` -lm
-
- all: xzgv
-
-@@ -23,7 +25,7 @@
- backend.o
-
- xzgv: $(OBJS)
-- $(CC) $(LDFLAGS) -o xzgv $(OBJS)
-+ $(CC) -o xzgv $(OBJS) $(LDFLAGS)
-
- installdirs:
- /bin/sh ../mkinstalldirs $(BINDIR)
diff --git a/pkgs/applications/graphics/zgv/default.nix b/pkgs/applications/graphics/zgv/default.nix
index e06b76e35b12..1af165368363 100644
--- a/pkgs/applications/graphics/zgv/default.nix
+++ b/pkgs/applications/graphics/zgv/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "1fk4i9x0cpnpn3llam0zy2pkmhlr2hy3iaxhxg07v9sizd4dircj";
};
- buildInputs = [ SDL SDL_image pkgconfig libjpeg libpng libtiff ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ SDL SDL_image libjpeg libpng libtiff ];
hardeningDisable = [ "format" ];
diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix
index 013e2e63f599..fb631414838c 100644
--- a/pkgs/applications/kde/ark/default.nix
+++ b/pkgs/applications/kde/ark/default.nix
@@ -27,7 +27,7 @@ mkDerivation {
lib.makeBinPath
([ p7zip unzip zip ] ++ lib.optional unfreeEnableUnrar unrar);
in ''
- wrapProgram "$out/bin/ark" --prefix PATH: "${PATH}"
+ wrapProgram "$out/bin/ark" --prefix PATH : "${PATH}"
'';
meta = {
license = with lib.licenses;
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 2053d183ff1d..54a834cba002 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -101,6 +101,7 @@ let
kdepim-runtime = callPackage ./kdepim-runtime.nix {};
kdepim-apps-libs = callPackage ./kdepim-apps-libs {};
kdf = callPackage ./kdf.nix {};
+ keditbookmarks = callPackage ./keditbookmarks.nix {};
kgpg = callPackage ./kgpg.nix {};
khelpcenter = callPackage ./khelpcenter.nix {};
kholidays = callPackage ./kholidays.nix {};
@@ -124,6 +125,7 @@ let
korganizer = callPackage ./korganizer.nix {};
kpimtextedit = callPackage ./kpimtextedit.nix {};
kqtquickcharts = callPackage ./kqtquickcharts.nix {};
+ krdc = callPackage ./krdc.nix {};
krfb = callPackage ./krfb.nix {};
ktnef = callPackage ./ktnef.nix {};
kwalletmanager = callPackage ./kwalletmanager.nix {};
@@ -142,6 +144,7 @@ let
marble = callPackage ./marble.nix {};
mbox-importer = callPackage ./mbox-importer.nix {};
messagelib = callPackage ./messagelib.nix {};
+ minuet = callPackage ./minuet.nix {};
okteta = callPackage ./okteta.nix {};
okular = callPackage ./okular.nix {};
pimcommon = callPackage ./pimcommon.nix {};
diff --git a/pkgs/applications/kde/dolphin-plugins.nix b/pkgs/applications/kde/dolphin-plugins.nix
index eb823641ae44..5580952f40a0 100644
--- a/pkgs/applications/kde/dolphin-plugins.nix
+++ b/pkgs/applications/kde/dolphin-plugins.nix
@@ -14,4 +14,5 @@ mkDerivation {
propagatedBuildInputs = [
dolphin kdelibs4support ki18n kio kxmlgui
];
+ outputs = [ "out" "dev" ];
}
diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh
index 11cbfcfe5388..1542b9c25190 100644
--- a/pkgs/applications/kde/fetch.sh
+++ b/pkgs/applications/kde/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/applications/17.08.1/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/applications/17.08.3/ -A '*.tar.xz' )
diff --git a/pkgs/applications/kde/filelight.nix b/pkgs/applications/kde/filelight.nix
index 6eb219d8da96..a3be5be7f0a2 100644
--- a/pkgs/applications/kde/filelight.nix
+++ b/pkgs/applications/kde/filelight.nix
@@ -14,4 +14,5 @@ mkDerivation {
propagatedBuildInputs = [
kio kparts kxmlgui qtscript solid
];
+ outputs = [ "out" "dev" ];
}
diff --git a/pkgs/applications/kde/kde-locale-5.nix b/pkgs/applications/kde/kde-locale-5.nix
deleted file mode 100644
index 76d601cbdc0f..000000000000
--- a/pkgs/applications/kde/kde-locale-5.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-name: args:
-
-{ mkDerivation, cmake, extra-cmake-modules, gettext, kdoctools }:
-
-mkDerivation (args // {
- sname = "kde-l10n-${name}";
- name = "kde-l10n-${name}-qt5";
-
- outputs = [ "out" ];
-
- nativeBuildInputs =
- [ cmake extra-cmake-modules gettext kdoctools ]
- ++ (args.nativeBuildInputs or []);
-
- preConfigure = ''
- sed -e 's/add_subdirectory(4)//' -i CMakeLists.txt
- ${args.preConfigure or ""}
- '';
-
- preFixup = ''
- propagatedBuildInputs=
- propagatedNativeBuildInputs=
- '';
-})
diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix
index 854e346e2909..17d7da7b702c 100644
--- a/pkgs/applications/kde/kdenlive.nix
+++ b/pkgs/applications/kde/kdenlive.nix
@@ -2,7 +2,6 @@
, lib
, extra-cmake-modules
, kdoctools
-, qtscript
, kactivities
, kconfig
, kcrash
@@ -27,7 +26,10 @@
, kfilemetadata
, ffmpeg
, phonon-backend-gstreamer
+, qtdeclarative
, qtquickcontrols
+, qtscript
+, qtwebkit
}:
mkDerivation {
@@ -56,8 +58,10 @@ mkDerivation {
ktextwidgets
mlt
phonon-backend-gstreamer
+ qtdeclarative
qtquickcontrols
qtscript
+ qtwebkit
shared_mime_info
libv4l
ffmpeg
diff --git a/pkgs/applications/kde/keditbookmarks.nix b/pkgs/applications/kde/keditbookmarks.nix
new file mode 100644
index 000000000000..57741c03ad54
--- /dev/null
+++ b/pkgs/applications/kde/keditbookmarks.nix
@@ -0,0 +1,17 @@
+{
+ mkDerivation, lib,
+ extra-cmake-modules, kdoctools,
+ kio, kparts, kwindowsystem
+}:
+
+mkDerivation {
+ name = "keditbookmarks";
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [ kio kparts kwindowsystem ];
+ meta = with lib; {
+ homepage = http://www.kde.org;
+ license = with licenses; [ gpl2 lgpl21 fdl12 bsd3 ];
+ maintainers = with maintainers; [ peterhoeg ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/kde/krdc.nix b/pkgs/applications/kde/krdc.nix
new file mode 100644
index 000000000000..87204c1fe9fc
--- /dev/null
+++ b/pkgs/applications/kde/krdc.nix
@@ -0,0 +1,25 @@
+{
+ mkDerivation, lib,
+ extra-cmake-modules, kdoctools, makeWrapper,
+ kcmutils, kcompletion, kconfig, kdnssd, knotifyconfig, kwallet, kwidgetsaddons,
+ libvncserver, freerdp
+}:
+
+mkDerivation {
+ name = "krdc";
+ nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
+ buildInputs = [
+ kcmutils kcompletion kconfig kdnssd knotifyconfig kwallet kwidgetsaddons
+ freerdp libvncserver
+ ];
+ postFixup = ''
+ wrapProgram $out/bin/krdc \
+ --prefix PATH : ${lib.makeBinPath [ freerdp ]}
+ '';
+ meta = with lib; {
+ homepage = http://www.kde.org;
+ license = with licenses; [ gpl2 lgpl21 fdl12 bsd3 ];
+ maintainers = with maintainers; [ peterhoeg ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/kde/l10n.nix b/pkgs/applications/kde/l10n.nix
index 403db98c0f35..10a8472d5a9e 100644
--- a/pkgs/applications/kde/l10n.nix
+++ b/pkgs/applications/kde/l10n.nix
@@ -3,7 +3,6 @@
let
kdeLocale4 = import ./kde-locale-4.nix;
- kdeLocale5 = import ./kde-locale-5.nix;
in
diff --git a/pkgs/applications/kde/minuet.nix b/pkgs/applications/kde/minuet.nix
new file mode 100644
index 000000000000..fd628a7aacfd
--- /dev/null
+++ b/pkgs/applications/kde/minuet.nix
@@ -0,0 +1,22 @@
+{ mkDerivation
+, lib, extra-cmake-modules
+, drumstick, fluidsynth
+, kcoreaddons, kcrash, kdoctools
+, qtquickcontrols2, qtsvg, qttools
+}:
+
+mkDerivation {
+ name = "minuet";
+ meta = with lib; {
+ license = with licenses; [ lgpl21 gpl3 ];
+ maintainers = with maintainers; [ peterhoeg ];
+ };
+
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ propagatedBuildInputs = [
+ drumstick fluidsynth
+ kcoreaddons kcrash
+ qtquickcontrols2 qtsvg qttools
+ ];
+ enableParallelBuilding = true;
+}
diff --git a/pkgs/applications/kde/print-manager.nix b/pkgs/applications/kde/print-manager.nix
index 085b53de0f39..8ace4562cbd7 100644
--- a/pkgs/applications/kde/print-manager.nix
+++ b/pkgs/applications/kde/print-manager.nix
@@ -19,4 +19,5 @@ mkDerivation {
kconfig kconfigwidgets kdbusaddons kiconthemes kcmutils knotifications
kwidgetsaddons kitemviews kio kwindowsystem plasma-framework qtdeclarative
];
+ outputs = [ "out" "dev" ];
}
diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix
index f7b5ca0b31a2..2edfb0d79bb3 100644
--- a/pkgs/applications/kde/srcs.nix
+++ b/pkgs/applications/kde/srcs.nix
@@ -3,2235 +3,2235 @@
{
akonadi = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/akonadi-17.08.1.tar.xz";
- sha256 = "1nhjhgpigi8bhavh609lxnr76w9c0j7017haiv6g6j6zd5h0pp6w";
- name = "akonadi-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/akonadi-17.08.3.tar.xz";
+ sha256 = "01sn0c5b679v76djpd7rx3cgzn3idpsjc3m3wgrvjzfyqs18f2al";
+ name = "akonadi-17.08.3.tar.xz";
};
};
akonadi-calendar = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/akonadi-calendar-17.08.3.tar.xz";
+ sha256 = "1w14a27k0hw4i9vnv2bkh12jpvb6jh31i6jd4hxaxvvmmjwl68b6";
+ name = "akonadi-calendar-17.08.3.tar.xz";
};
};
akonadi-calendar-tools = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/akonadi-calendar-tools-17.08.3.tar.xz";
+ sha256 = "19b5my6svq32nwagkq5p0al7mzf844d4pp0764irgdcfk6ciakkw";
+ name = "akonadi-calendar-tools-17.08.3.tar.xz";
};
};
akonadiconsole = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/akonadiconsole-17.08.1.tar.xz";
- sha256 = "0xy8s23941rfh1yiz2c1v10m59jrd8hphzphckxa68zxb6cb7vws";
- name = "akonadiconsole-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/akonadiconsole-17.08.3.tar.xz";
+ sha256 = "1ccmdarzb60f22ypnfmr1gzrc7byw08c2h3zhni9g1jab327i2vk";
+ name = "akonadiconsole-17.08.3.tar.xz";
};
};
akonadi-contacts = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/akonadi-contacts-17.08.3.tar.xz";
+ sha256 = "0fh9rja4dlvambx6ig4gszgr26rrxfhmgdn0541fsg5hpkpifsx9";
+ name = "akonadi-contacts-17.08.3.tar.xz";
};
};
akonadi-import-wizard = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/akonadi-import-wizard-17.08.3.tar.xz";
+ sha256 = "1hza7bl6anzxp32dpw79v73lgqssmdw32qhkinnacws7x9kcvpag";
+ name = "akonadi-import-wizard-17.08.3.tar.xz";
};
};
akonadi-mime = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/akonadi-mime-17.08.3.tar.xz";
+ sha256 = "1374wvyh29ba5s60m8przch5rmxvxzc2kjfw1gxhkrl7k8hfi4k8";
+ name = "akonadi-mime-17.08.3.tar.xz";
};
};
akonadi-notes = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/akonadi-notes-17.08.3.tar.xz";
+ sha256 = "0bnr6j8pqqx6hg8hq51yzaky5hyym5lxyj9rwcsmm75x2c29wxb7";
+ name = "akonadi-notes-17.08.3.tar.xz";
};
};
akonadi-search = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/akonadi-search-17.08.3.tar.xz";
+ sha256 = "16d6v2d1irh02kd4dcvjhv17sqkps4xq4dpa4x1wb3q5qzxhmqcr";
+ name = "akonadi-search-17.08.3.tar.xz";
};
};
akregator = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/akregator-17.08.1.tar.xz";
- sha256 = "02p1vlxm91pyqhhwg3ggik9c8xw5ayz1w7bqpxmcb81gff75ha77";
- name = "akregator-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/akregator-17.08.3.tar.xz";
+ sha256 = "1jd48yj9sl4z46qfk3qkm98q33f1qblsyjdr7ff8znxkg2pw5xg6";
+ name = "akregator-17.08.3.tar.xz";
};
};
analitza = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/analitza-17.08.1.tar.xz";
- sha256 = "1kcyhim72g39ywq90hdd9ba6vwgq99xkbj82vbasy0il8xkkfcn4";
- name = "analitza-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/analitza-17.08.3.tar.xz";
+ sha256 = "1j0z63sfah2ypjb3szcr7dqndw18lcy8l9440q8kzq0gyl83cn3v";
+ name = "analitza-17.08.3.tar.xz";
};
};
ark = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/ark-17.08.1.tar.xz";
- sha256 = "019gz57c46lh5wz84r0swhbx7ywgw8s7yc1f589xh4nz18i9xi69";
- name = "ark-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/ark-17.08.3.tar.xz";
+ sha256 = "1qz333nd23x4ldx675cxs7ka2vz45xmkfsakdg8m3x26i7jnl86x";
+ name = "ark-17.08.3.tar.xz";
};
};
artikulate = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/artikulate-17.08.1.tar.xz";
- sha256 = "1dgr9ww0pm6k0rhb3lkvr65jx6pnwsck1v3sfwpyyf8rrwixbvyk";
- name = "artikulate-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/artikulate-17.08.3.tar.xz";
+ sha256 = "13hg9cjdwhfya57xan96ma55msani0lx7v55zh0hv0jab9fxgv1n";
+ name = "artikulate-17.08.3.tar.xz";
};
};
audiocd-kio = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/audiocd-kio-17.08.3.tar.xz";
+ sha256 = "0n1xfypn2m56iw65p52yfbbqn17c6kc1x8syh35ifg9c1147y8ar";
+ name = "audiocd-kio-17.08.3.tar.xz";
};
};
baloo-widgets = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/baloo-widgets-17.08.3.tar.xz";
+ sha256 = "031yhv8ivqzr63maylsin60hfv45awry6xigfy0kfqj06q63944g";
+ name = "baloo-widgets-17.08.3.tar.xz";
};
};
blinken = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/blinken-17.08.1.tar.xz";
- sha256 = "1nwdmhsyq1yzlr17mn98np0d3zg3rjyxsmlc7lyv1kszckhmb7qq";
- name = "blinken-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/blinken-17.08.3.tar.xz";
+ sha256 = "15nnsyqy73inqqys1r8khh1vvl24ljmgjpxlqg8vlfb6d8dsc8yx";
+ name = "blinken-17.08.3.tar.xz";
};
};
blogilo = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/blogilo-17.08.1.tar.xz";
- sha256 = "1c9dq7xwdwxwdch4ygyz7pds8q41xpb5661wa4alnpd06ra0bq0c";
- name = "blogilo-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/blogilo-17.08.3.tar.xz";
+ sha256 = "18vbvs5cih9vcxfqsia35q8bzc4ldzaajvnv9iqmisg060fxfwi9";
+ name = "blogilo-17.08.3.tar.xz";
};
};
bomber = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/bomber-17.08.1.tar.xz";
- sha256 = "1pcva9rgmvvkbbabwiw3aqv0aq0w2s6vxrw0gfxh6plgs42hpb24";
- name = "bomber-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/bomber-17.08.3.tar.xz";
+ sha256 = "1rmjlhyc46jxjsc303zl56c3k15q1qvp4yfl78v5l2pwmk8vdxzn";
+ name = "bomber-17.08.3.tar.xz";
};
};
bovo = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/bovo-17.08.1.tar.xz";
- sha256 = "0vn4q6qvig9rjq8ynwg53vzas8vxg0b55mvpg801ky6kp3ma3m6i";
- name = "bovo-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/bovo-17.08.3.tar.xz";
+ sha256 = "1npzzjgzhgbv7pnz3j9if2c5qa5b9ghzj7llp8yndf6dz31qibps";
+ name = "bovo-17.08.3.tar.xz";
};
};
calendarsupport = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/calendarsupport-17.08.1.tar.xz";
- sha256 = "1p1s5sn284j2lwzm09ifp6dj6gzg6p169hh7dv7k5bshi7kzf42v";
- name = "calendarsupport-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/calendarsupport-17.08.3.tar.xz";
+ sha256 = "1ii3h42jkskrizg29ii17jkdxgsqs3lwzsd7ypgw1k8gk9fyyqxh";
+ name = "calendarsupport-17.08.3.tar.xz";
};
};
cantor = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/cantor-17.08.1.tar.xz";
- sha256 = "1m6si2gy6n20z27sby7g7nqaxl067qpkj29l6b3qsyyx03w73n33";
- name = "cantor-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/cantor-17.08.3.tar.xz";
+ sha256 = "0yz71lxwzl5r9k2fzs4iyhyx811rc77m6n1lqagd2c29hnnchn9w";
+ name = "cantor-17.08.3.tar.xz";
};
};
cervisia = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/cervisia-17.08.1.tar.xz";
- sha256 = "13p5gs2cg939mcnq2hvvncj8v7vr7pcklq932xhy4qfwhqbhkxp1";
- name = "cervisia-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/cervisia-17.08.3.tar.xz";
+ sha256 = "0272zf51rn1a9k796fspp456zq6j21bddfn7r350pd6ra19ay7j8";
+ name = "cervisia-17.08.3.tar.xz";
};
};
dolphin = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/dolphin-17.08.1.tar.xz";
- sha256 = "04b9vq03m6s5mrv7q4na65kv9hpx7i4v45g6ls7pcyxi6ziszr3q";
- name = "dolphin-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/dolphin-17.08.3.tar.xz";
+ sha256 = "02bb66411jy03s4wicalnsl6sxmslhdb3wxsqh7sdyh63llna5b5";
+ name = "dolphin-17.08.3.tar.xz";
};
};
dolphin-plugins = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/dolphin-plugins-17.08.3.tar.xz";
+ sha256 = "1s2rjrvfs5i87gx3fsz0mqdr7106ds5747wq6n2sfzjkvippygay";
+ name = "dolphin-plugins-17.08.3.tar.xz";
};
};
dragon = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/dragon-17.08.1.tar.xz";
- sha256 = "143x7x07z5af0z7za8r3jiq5id33rmb62ygp84af905lm2gf2yk0";
- name = "dragon-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/dragon-17.08.3.tar.xz";
+ sha256 = "0fxzwfg0l7lnsswb51h8gmh4wngmng9sgm5nhn6wmwhfbhbzgagq";
+ name = "dragon-17.08.3.tar.xz";
};
};
eventviews = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/eventviews-17.08.1.tar.xz";
- sha256 = "1av86sbldkrgsdybxqzgda1pnd4y27ygxsibr76w6y8fnk66zrg7";
- name = "eventviews-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/eventviews-17.08.3.tar.xz";
+ sha256 = "0j1r833kzf9sparvqnfn8r7klf4j0z8jwrgclf87rggmx0dn2v4y";
+ name = "eventviews-17.08.3.tar.xz";
};
};
ffmpegthumbs = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/ffmpegthumbs-17.08.1.tar.xz";
- sha256 = "1lgi8rs3zbrwlcxbhq9qys8w0yh4f0rbalig0y020igbplkn9ccs";
- name = "ffmpegthumbs-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/ffmpegthumbs-17.08.3.tar.xz";
+ sha256 = "19bkpc316wlhswgrbszpj65lrzsdp443c1174hqknm0srvp6fbvv";
+ name = "ffmpegthumbs-17.08.3.tar.xz";
};
};
filelight = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/filelight-17.08.1.tar.xz";
- sha256 = "0wi0j55z8h58slbq4hinhfycpjb69m5g4ilk0csjw8syxhmy1jhl";
- name = "filelight-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/filelight-17.08.3.tar.xz";
+ sha256 = "06j6api909shraflfpn0cyvxaa57s2dq178kshkfv5yppxjpfpja";
+ name = "filelight-17.08.3.tar.xz";
};
};
granatier = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/granatier-17.08.1.tar.xz";
- sha256 = "0panmz171ba3vfvdgjcwg1nxwv52qsh6qazagz7p5bv0hkf6y94n";
- name = "granatier-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/granatier-17.08.3.tar.xz";
+ sha256 = "1z2gs73k8ymz09x72hvyylwqs6pxbnivz86hbb9pb1mlb7x5fgvs";
+ name = "granatier-17.08.3.tar.xz";
};
};
grantlee-editor = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/grantlee-editor-17.08.3.tar.xz";
+ sha256 = "1cb77qmzzk64mkbzvywksvpfqw88mwmg7sqrni4apsasvg9mvygx";
+ name = "grantlee-editor-17.08.3.tar.xz";
};
};
grantleetheme = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/grantleetheme-17.08.1.tar.xz";
- sha256 = "0l6ycr609wvxad1dwgy56blcnag5pr30gj59d5dcnq0iqcs9v5w9";
- name = "grantleetheme-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/grantleetheme-17.08.3.tar.xz";
+ sha256 = "0zag5gmaqi068hw8s71ascj7s8clg1sickrfpzjf3nhcf6y669rp";
+ name = "grantleetheme-17.08.3.tar.xz";
};
};
gwenview = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/gwenview-17.08.1.tar.xz";
- sha256 = "1f5c78007sqy3iq0rx8cskma8rjzinaahy26r054l59gq6b0d3v7";
- name = "gwenview-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/gwenview-17.08.3.tar.xz";
+ sha256 = "05c96y5yrdgh7228bw3agn344g02hylnb2fw8crjcdapsiya4v1w";
+ name = "gwenview-17.08.3.tar.xz";
};
};
incidenceeditor = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/incidenceeditor-17.08.1.tar.xz";
- sha256 = "0axwkhwqgmdnh9qn6j87j44x24vqb5bhch2pscrifdni05j99wzx";
- name = "incidenceeditor-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/incidenceeditor-17.08.3.tar.xz";
+ sha256 = "0qfcycivlgzjx8j4b2bd4qjp3x8wbiax477bmz56sfv7q0vp1dgm";
+ name = "incidenceeditor-17.08.3.tar.xz";
};
};
jovie = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/jovie-17.08.1.tar.xz";
- sha256 = "19zhm6iqq505bwdd6f57rkzc9fmqqmw60071n679khrcgmsyx7ac";
- name = "jovie-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/jovie-17.08.3.tar.xz";
+ sha256 = "1a4v97p3yfwr5zn5qkfkw1ln7liz47f3bnhdb6yzzi03s5xfrk1z";
+ name = "jovie-17.08.3.tar.xz";
};
};
juk = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/juk-17.08.1.tar.xz";
- sha256 = "1r3igqgw2ani4500sndbqnxcbyjg8l0lcd0l0r6wmqs9cgf1w5d5";
- name = "juk-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/juk-17.08.3.tar.xz";
+ sha256 = "0735rdrn80akfb8viq8y77kxa28y1rg5infp26q7cy5cd4r6fvsi";
+ name = "juk-17.08.3.tar.xz";
};
};
k3b = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/k3b-17.08.1.tar.xz";
- sha256 = "1pv8fpalqr7fpcy7dypzjp91h82scvzfk5g0mpzjpqlmn99hgfj1";
- name = "k3b-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/k3b-17.08.3.tar.xz";
+ sha256 = "0kshb3j4djb9npkia0m0ffyrwja3drsyxw7hpgyxxswik6kwbvgk";
+ name = "k3b-17.08.3.tar.xz";
};
};
kaccessible = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kaccessible-17.08.1.tar.xz";
- sha256 = "13j1c9l8qhll0a8fcny9nibr858w5cjpahccxgkh9v54iy3f243s";
- name = "kaccessible-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kaccessible-17.08.3.tar.xz";
+ sha256 = "0sfrs57npp4y1yyw16chgrvyp6bnf4jymffblj5h7pb4bv0xlsmk";
+ name = "kaccessible-17.08.3.tar.xz";
};
};
kaccounts-integration = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kaccounts-integration-17.08.3.tar.xz";
+ sha256 = "0cir87m7f8sf70vvr8sxfhklgxigvv6npijphbbim7fnzc4z37m0";
+ name = "kaccounts-integration-17.08.3.tar.xz";
};
};
kaccounts-providers = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kaccounts-providers-17.08.3.tar.xz";
+ sha256 = "1y3ykj4q6m14q2lskliv0qy0ml0j9i9svhq06g2j25zd5wwlhbp5";
+ name = "kaccounts-providers-17.08.3.tar.xz";
};
};
kaddressbook = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kaddressbook-17.08.1.tar.xz";
- sha256 = "0qf3wfjgbzjxrvhnwa702yhp54m8f4wk8d67jsgrlpvq3lizrzrf";
- name = "kaddressbook-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kaddressbook-17.08.3.tar.xz";
+ sha256 = "1dq3lgrvg7s65mc2x2sgkwpz623ygb0by0y571dqjaz219j03955";
+ name = "kaddressbook-17.08.3.tar.xz";
};
};
kajongg = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kajongg-17.08.1.tar.xz";
- sha256 = "10bymw4bwqxjppvynwcx600ybr02kyd9m2ya0pi2208kj2s317m5";
- name = "kajongg-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kajongg-17.08.3.tar.xz";
+ sha256 = "00xb764nxzihz9kh7a82cm7slrj78zjl3s5qb90s03y375q4bha6";
+ name = "kajongg-17.08.3.tar.xz";
};
};
kalarm = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kalarm-17.08.1.tar.xz";
- sha256 = "0nxkln40bwlfdn2fp5a2a55x40zakq5nrir9bi920jpp78ivx2mf";
- name = "kalarm-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kalarm-17.08.3.tar.xz";
+ sha256 = "0rmdxx59iykn6f746dw9p0dyk96wds4kqr6w2y8fscp889i05g2a";
+ name = "kalarm-17.08.3.tar.xz";
};
};
kalarmcal = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kalarmcal-17.08.1.tar.xz";
- sha256 = "1dvv1rbh67c2vxcls8jv8chcgbp7q8c2jdjsr2cx2lmiasz0lqlf";
- name = "kalarmcal-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kalarmcal-17.08.3.tar.xz";
+ sha256 = "0g4vxkjkc38p2aigmfr2q2qd6x8pr4fj53jkvjq314vqg9sbak9c";
+ name = "kalarmcal-17.08.3.tar.xz";
};
};
kalgebra = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kalgebra-17.08.1.tar.xz";
- sha256 = "07l3gff8la0cjd3aszm2v0gykfb2ws6k5hix0ck9q62kz1h6zd8d";
- name = "kalgebra-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kalgebra-17.08.3.tar.xz";
+ sha256 = "0hcrl205z2m5108g1kgxnmkrrg6x2m2p59cmdkbsd0ly0jnfc9w2";
+ name = "kalgebra-17.08.3.tar.xz";
};
};
kalzium = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kalzium-17.08.1.tar.xz";
- sha256 = "15rvpjni1a1fhr52awivzdc6v575510fs5mxxk05wqzsffa67i1f";
- name = "kalzium-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kalzium-17.08.3.tar.xz";
+ sha256 = "142lcm1d7v8xknmqg00cgdz3iaydr6c9wblpij3wykffd53x7ind";
+ name = "kalzium-17.08.3.tar.xz";
};
};
kamera = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kamera-17.08.1.tar.xz";
- sha256 = "044mn0k18ffxhc9nnbpqhcjlzkj4657nxqwdfl65k689y1l2bff1";
- name = "kamera-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kamera-17.08.3.tar.xz";
+ sha256 = "0zrny1f27z0drsna2lpw9sr4y7z479lys3vzcysgf1fv8b8jdjdh";
+ name = "kamera-17.08.3.tar.xz";
};
};
kanagram = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kanagram-17.08.1.tar.xz";
- sha256 = "07gykmv9r1ikaw4l3zz27rc7a23q2nizszblm1ygv2nlyj6lilgf";
- name = "kanagram-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kanagram-17.08.3.tar.xz";
+ sha256 = "1v5k67dw47i3n8635w1sc63n7f63hd9wvb44yxaw88clk46acn0k";
+ name = "kanagram-17.08.3.tar.xz";
};
};
kapman = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kapman-17.08.1.tar.xz";
- sha256 = "1r7r13yfgf64jfarqjiirfbhmrg6d04ija5sgl8aiib8rwnbs2lb";
- name = "kapman-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kapman-17.08.3.tar.xz";
+ sha256 = "0gici0v3ya16nk0b33cm5n95gdfhjqpy8wjg5y8bj12dby1d0n2w";
+ name = "kapman-17.08.3.tar.xz";
};
};
kapptemplate = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kapptemplate-17.08.1.tar.xz";
- sha256 = "0dcgsh4ns3749yybzz2jgdbjskxyzlnr2c0f5wzh9ilkz3yp7lq2";
- name = "kapptemplate-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kapptemplate-17.08.3.tar.xz";
+ sha256 = "16j1lx6rp0lqmcd8fyaishc0i2670v0map270z9575101338cyvm";
+ name = "kapptemplate-17.08.3.tar.xz";
};
};
kate = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kate-17.08.1.tar.xz";
- sha256 = "0z71s9g66ivbchrd2ps3j16ickjnky7ws484y04akjjs7sryzd0l";
- name = "kate-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kate-17.08.3.tar.xz";
+ sha256 = "1yjzhf0a1skxz6iipac3z1p2wswn8bfjfr3k8qb6lhwlhbapc33x";
+ name = "kate-17.08.3.tar.xz";
};
};
katomic = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/katomic-17.08.1.tar.xz";
- sha256 = "04k29x2hvcqc22cm763aflpwzb6gqqbnpd6dknd34985fqrrcdp4";
- name = "katomic-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/katomic-17.08.3.tar.xz";
+ sha256 = "0y00la43lc1352fipzglyvaf1cqalf0vkygg8r9vizm8vycp7hp9";
+ name = "katomic-17.08.3.tar.xz";
};
};
kblackbox = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kblackbox-17.08.1.tar.xz";
- sha256 = "1n1rxh86qcaa8dm5qcs43pdxjndzssy4pdyn90anw6bqsw1mn7q0";
- name = "kblackbox-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kblackbox-17.08.3.tar.xz";
+ sha256 = "18lz0nb8zp95higssscgcr2cj1ni71bckk1wazyryxkmmmqk2rdn";
+ name = "kblackbox-17.08.3.tar.xz";
};
};
kblocks = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kblocks-17.08.1.tar.xz";
- sha256 = "0bx5j1kahyspbmrw2falkw037d1lkj6f1yppwdlh2l4zn7xbgx78";
- name = "kblocks-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kblocks-17.08.3.tar.xz";
+ sha256 = "1nf3ws0dzzwqc87v6jqi1x5zm7w56cgfingr5plpp3cj8wv8jnvw";
+ name = "kblocks-17.08.3.tar.xz";
};
};
kblog = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kblog-17.08.1.tar.xz";
- sha256 = "0kdwv2ym3xba7n0qslrgdlmanw1zqanv5ycjnl54gf1xlbdwbpv2";
- name = "kblog-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kblog-17.08.3.tar.xz";
+ sha256 = "0cnbn0wmva8xm2i05w5pdikw5mbx3z6mim3k98v2r954qml7xqdk";
+ name = "kblog-17.08.3.tar.xz";
};
};
kbounce = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kbounce-17.08.1.tar.xz";
- sha256 = "0bl1pm8h547gwzx1pbc340711fp5scfa1dql7b1yjjpfg56flccm";
- name = "kbounce-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kbounce-17.08.3.tar.xz";
+ sha256 = "12yj5jmpvhj5cxr4i818lp9cbcrdrvq9r7s202nzx5znxs11bbf6";
+ name = "kbounce-17.08.3.tar.xz";
};
};
kbreakout = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kbreakout-17.08.1.tar.xz";
- sha256 = "021hzg4m6aqvvavdx63ydj2s71shml6x1rrd9lyyw23harh7402h";
- name = "kbreakout-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kbreakout-17.08.3.tar.xz";
+ sha256 = "14d4cx91vv8bvvpjwbrwcvjczzs8j58yzazsfgqwhrj47cwhya43";
+ name = "kbreakout-17.08.3.tar.xz";
};
};
kbruch = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kbruch-17.08.1.tar.xz";
- sha256 = "110iar2p5wlil4b8j5gw37mizajvhc9j7fww7dmvffq1yn4m5ac2";
- name = "kbruch-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kbruch-17.08.3.tar.xz";
+ sha256 = "0jxlybkmzs24482fmy7hhk2apyq26fpdblpnpdbqnydz95707475";
+ name = "kbruch-17.08.3.tar.xz";
};
};
kcachegrind = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kcachegrind-17.08.1.tar.xz";
- sha256 = "0pgc00y7l98fws7qfc9i92a9mizgkkvap48pi12r9ajj5bhy792b";
- name = "kcachegrind-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kcachegrind-17.08.3.tar.xz";
+ sha256 = "0xmnpbli7ndlv0532hpnqgvbkpw8y176jydhs6hy73ywwm416mvs";
+ name = "kcachegrind-17.08.3.tar.xz";
};
};
kcalc = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kcalc-17.08.1.tar.xz";
- sha256 = "177mr533r71jpa64bvkbl349lkf2yzanrjh22d4rii7lqma63z4k";
- name = "kcalc-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kcalc-17.08.3.tar.xz";
+ sha256 = "0ck1hjv1v9fj7ckl4blpmfxzjx61ihc6av71m710nk7iv6gncsfm";
+ name = "kcalc-17.08.3.tar.xz";
};
};
kcalcore = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kcalcore-17.08.1.tar.xz";
- sha256 = "084gj40lssh6lsjn7xpvzlhlfcc6vcdk6ygv47wvf8y0yipppspw";
- name = "kcalcore-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kcalcore-17.08.3.tar.xz";
+ sha256 = "0iy6dwzrcwzhjcz8yajp4mvbxr6vkxp4bnbnh9k2zvxgmg4y63h5";
+ name = "kcalcore-17.08.3.tar.xz";
};
};
kcalutils = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kcalutils-17.08.1.tar.xz";
- sha256 = "04nn5lv2x15352p42589zyh1w2fxbijkq9wmbcr51fb4nphx007l";
- name = "kcalutils-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kcalutils-17.08.3.tar.xz";
+ sha256 = "1vs6qnv31s01i7wb7kz86v17z0wrymcclmwx2hj7vl4jqr532zdq";
+ name = "kcalutils-17.08.3.tar.xz";
};
};
kcharselect = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kcharselect-17.08.1.tar.xz";
- sha256 = "1w6ydp7acf5ha0kag60m1anksj7fy2kk8bghpw14lv8bxzrjwdam";
- name = "kcharselect-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kcharselect-17.08.3.tar.xz";
+ sha256 = "1ib3rqd43yprnp07vvmg029a44dimisycv030j3qd87r3yw06phs";
+ name = "kcharselect-17.08.3.tar.xz";
};
};
kcolorchooser = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kcolorchooser-17.08.1.tar.xz";
- sha256 = "1zmzd919crj25ngcv085pp4w213x4bra54npfw4z11cmc30zz57i";
- name = "kcolorchooser-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kcolorchooser-17.08.3.tar.xz";
+ sha256 = "17aa2k8z7i7ds2s3ampkci4n0003rsbx4fj3l773ylb11fyl3b2f";
+ name = "kcolorchooser-17.08.3.tar.xz";
};
};
kcontacts = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kcontacts-17.08.1.tar.xz";
- sha256 = "0iqpvsnwbnzczdcvbqlrgmx2czjqgl4ag4b09vhkj1s7gs8cracy";
- name = "kcontacts-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kcontacts-17.08.3.tar.xz";
+ sha256 = "0dsx0bgf6rcqrl31xcklh368lr93pn2ylipw81svpnqya1ry31dk";
+ name = "kcontacts-17.08.3.tar.xz";
};
};
kcron = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kcron-17.08.1.tar.xz";
- sha256 = "0yzv068jsxyag68fix421z5qfvpxm1i9v1q3pw3ksvq07ai740f3";
- name = "kcron-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kcron-17.08.3.tar.xz";
+ sha256 = "0xmd25dfhpkaa6zzmc7xdfn4fv0awfqjv2r166hmqd32gnx70bry";
+ name = "kcron-17.08.3.tar.xz";
};
};
kdav = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kdav-17.08.1.tar.xz";
- sha256 = "1m9pcydg2fwz95mym7k7wdavbw4nz18ihhrhfmcda7m61x6y8z9q";
- name = "kdav-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kdav-17.08.3.tar.xz";
+ sha256 = "1v7xclq8qz4pmvp1asavammlfwi2pg1y0fabapqpnglx194rbwic";
+ name = "kdav-17.08.3.tar.xz";
};
};
kdebugsettings = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kdebugsettings-17.08.1.tar.xz";
- sha256 = "0jxy68fs45hwkd3hjl5rknwznsihk0nszmskw3hy3y64p2vvvzyf";
- name = "kdebugsettings-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kdebugsettings-17.08.3.tar.xz";
+ sha256 = "1gfcnwpmx6dd12d9kycf0khi5s85932b1wvyw1mr5dhlqyyqf1s4";
+ name = "kdebugsettings-17.08.3.tar.xz";
};
};
kde-dev-scripts = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-dev-scripts-17.08.3.tar.xz";
+ sha256 = "1dydd198jfcjm58m5qk071kx18gbgnbwf9mcx20ibanq17cdh3px";
+ name = "kde-dev-scripts-17.08.3.tar.xz";
};
};
kde-dev-utils = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-dev-utils-17.08.3.tar.xz";
+ sha256 = "184sx4i5k8rnx5572460v2jnd0abdr2i5gp74khbjlgagkdvcj07";
+ name = "kde-dev-utils-17.08.3.tar.xz";
};
};
kdeedu-data = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kdeedu-data-17.08.3.tar.xz";
+ sha256 = "12vy656ng14gq93cw30bwdg15jvwr6qvlsjk0vfmljvcbc9171ww";
+ name = "kdeedu-data-17.08.3.tar.xz";
};
};
kdegraphics-mobipocket = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kdegraphics-mobipocket-17.08.3.tar.xz";
+ sha256 = "1rfi44lh25knc0jf02fazh6s4wy1h8m76i9njcjxbjrz7x518cfj";
+ name = "kdegraphics-mobipocket-17.08.3.tar.xz";
};
};
kdegraphics-thumbnailers = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kdegraphics-thumbnailers-17.08.3.tar.xz";
+ sha256 = "0irsa4x6pi5jq36yz1kgkdv8946w05mr19afydpz1jpa2knhkc6i";
+ name = "kdegraphics-thumbnailers-17.08.3.tar.xz";
};
};
kde-l10n-ar = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ar-17.08.3.tar.xz";
+ sha256 = "0j06r39gam92bxm25vc8x7bxm6143pww42d9ala13akh3gh56wmy";
+ name = "kde-l10n-ar-17.08.3.tar.xz";
};
};
kde-l10n-ast = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ast-17.08.3.tar.xz";
+ sha256 = "1kmv0ajbd9dws1al4qx9k2hnsqf2dwkj2ww12xn3flrqg71kgnpb";
+ name = "kde-l10n-ast-17.08.3.tar.xz";
};
};
kde-l10n-bg = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-bg-17.08.3.tar.xz";
+ sha256 = "0dv2hdki9mbc6kq6b1gzpqijgq31ffz4la9aprzj57mk4l14vkp1";
+ name = "kde-l10n-bg-17.08.3.tar.xz";
};
};
kde-l10n-bs = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-bs-17.08.3.tar.xz";
+ sha256 = "0makcag2kjns6528ldrjr52r412yi1y947lqq5db8ya6i8bxlsl2";
+ name = "kde-l10n-bs-17.08.3.tar.xz";
};
};
kde-l10n-ca = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ca-17.08.3.tar.xz";
+ sha256 = "13n0y9rmcnaka5hnmjp6x99pdvx19bb5f7m0wmnkkq0v8xs0cr53";
+ name = "kde-l10n-ca-17.08.3.tar.xz";
};
};
kde-l10n-ca_valencia = {
- version = "ca_valencia-17.08.1";
+ version = "ca_valencia-17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ca@valencia-17.08.3.tar.xz";
+ sha256 = "0h4iznjvzy4lvb91vpb4f7jlrvi3a9z56i7j3xm0ihf1qmgxxzmj";
+ name = "kde-l10n-ca_valencia-17.08.3.tar.xz";
};
};
kde-l10n-cs = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-cs-17.08.3.tar.xz";
+ sha256 = "0dadsgmg7pvagpq0nj4hs889zvk2lw085wlv2mw6jfminjav4c2d";
+ name = "kde-l10n-cs-17.08.3.tar.xz";
};
};
kde-l10n-da = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-da-17.08.3.tar.xz";
+ sha256 = "04w1clqk3p0zkv01406iwkwp572vwfpn94x8g7hxraaz2rzs2qnf";
+ name = "kde-l10n-da-17.08.3.tar.xz";
};
};
kde-l10n-de = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-de-17.08.3.tar.xz";
+ sha256 = "1cxpdwvpymf1yqgs54v6f8hgxwyblv0i0zpm5w5wrimmg8lnbrc8";
+ name = "kde-l10n-de-17.08.3.tar.xz";
};
};
kde-l10n-el = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-el-17.08.3.tar.xz";
+ sha256 = "1csskz68dsrlvkr5iri8w0wx2g5h7db18dpnlcmbl076l9ds9nmv";
+ name = "kde-l10n-el-17.08.3.tar.xz";
};
};
kde-l10n-en_GB = {
- version = "en_GB-17.08.1";
+ version = "en_GB-17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-en_GB-17.08.3.tar.xz";
+ sha256 = "1vf6h68biiqr9vzqlig34z47clkdk6ncr3mhan7rajsk1dlp6qwy";
+ name = "kde-l10n-en_GB-17.08.3.tar.xz";
};
};
kde-l10n-eo = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-eo-17.08.3.tar.xz";
+ sha256 = "0a7wk6xfhq7zj02zjadnp7ml97r5vvgjvlm5yajz6l4q5l0vsdnn";
+ name = "kde-l10n-eo-17.08.3.tar.xz";
};
};
kde-l10n-es = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-es-17.08.3.tar.xz";
+ sha256 = "1b7jzccicb58s3v796x0k2fwyfq8qmqyb5b26y5x9xknk7mv3fkz";
+ name = "kde-l10n-es-17.08.3.tar.xz";
};
};
kde-l10n-et = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-et-17.08.3.tar.xz";
+ sha256 = "1d10yq8d5fjhgc0zvz3izl1c15i9g8vw5kgs2mvciwhaj6sqgk78";
+ name = "kde-l10n-et-17.08.3.tar.xz";
};
};
kde-l10n-eu = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-eu-17.08.3.tar.xz";
+ sha256 = "1r6nyjibagqfk4s1c2sylxlsq3jv7vhc01bbwpdl314rhcv67lkq";
+ name = "kde-l10n-eu-17.08.3.tar.xz";
};
};
kde-l10n-fa = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-fa-17.08.3.tar.xz";
+ sha256 = "0slrrsp8wgh33zv779mqdf3km4h88mzqfzdds08g8hr3mimp8ibj";
+ name = "kde-l10n-fa-17.08.3.tar.xz";
};
};
kde-l10n-fi = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-fi-17.08.3.tar.xz";
+ sha256 = "10axj320my3bgfqn1rpwpn4nii3bh39afsvqkbz6xh01sci4z47w";
+ name = "kde-l10n-fi-17.08.3.tar.xz";
};
};
kde-l10n-fr = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-fr-17.08.3.tar.xz";
+ sha256 = "0gqmq0hwxmj2awjyhhy81nwrks4mlqdnbfinxsrsj1kmklsx8pdg";
+ name = "kde-l10n-fr-17.08.3.tar.xz";
};
};
kde-l10n-ga = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ga-17.08.3.tar.xz";
+ sha256 = "0p7jy5sh2x1fc6mfacs1f5brq86hw6xk7bccc30k5c8b0kfbvdf4";
+ name = "kde-l10n-ga-17.08.3.tar.xz";
};
};
kde-l10n-gl = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-gl-17.08.3.tar.xz";
+ sha256 = "185yw84i04llag4kpi3lmmy9niis2z3rd5ch2x7y4jyq3kdpwhi4";
+ name = "kde-l10n-gl-17.08.3.tar.xz";
};
};
kde-l10n-he = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-he-17.08.3.tar.xz";
+ sha256 = "0dx0mvl4vapkyir8a0a1dgv2h1hjsr5n2ykjihk21ykf7axvqqd4";
+ name = "kde-l10n-he-17.08.3.tar.xz";
};
};
kde-l10n-hi = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-hi-17.08.3.tar.xz";
+ sha256 = "0f6p7bwvvqj7jdaqsn4nxjsb5cdna9q4cp59wfy05ppi685qqp4v";
+ name = "kde-l10n-hi-17.08.3.tar.xz";
};
};
kde-l10n-hr = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-hr-17.08.3.tar.xz";
+ sha256 = "0yd4sqfa59ca57ig55x46fp59pjxby6ha5bhkzhcd1d2baa4a672";
+ name = "kde-l10n-hr-17.08.3.tar.xz";
};
};
kde-l10n-hu = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-hu-17.08.3.tar.xz";
+ sha256 = "1s3vgjslnffxivrx69dnz4c2iyjf2awv51k8bbbfjw271422wvfg";
+ name = "kde-l10n-hu-17.08.3.tar.xz";
};
};
kde-l10n-ia = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ia-17.08.3.tar.xz";
+ sha256 = "1jpvla8h5ji9lcdhk7rinixkyr6wax30wp9wvqqqd8p9dp18i0cp";
+ name = "kde-l10n-ia-17.08.3.tar.xz";
};
};
kde-l10n-id = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-id-17.08.3.tar.xz";
+ sha256 = "191x45jv4bzkglyng7fp3fblcbirp9k94h9r54sk32idwqkiwngx";
+ name = "kde-l10n-id-17.08.3.tar.xz";
};
};
kde-l10n-is = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-is-17.08.3.tar.xz";
+ sha256 = "1h3pw9rnssf6wh1n5r01gqnz7riqz6hismndd67xw4pnq7vqpjkm";
+ name = "kde-l10n-is-17.08.3.tar.xz";
};
};
kde-l10n-it = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-it-17.08.3.tar.xz";
+ sha256 = "0n4ivcyjcb47h3455wnzhnlkf26h29r2f9j1dgw9rw32aczb8l68";
+ name = "kde-l10n-it-17.08.3.tar.xz";
};
};
kde-l10n-ja = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ja-17.08.3.tar.xz";
+ sha256 = "0qxf7c8l61xwkhn81phyw4849frzrc032fnbphlgq1nc9kqygara";
+ name = "kde-l10n-ja-17.08.3.tar.xz";
};
};
kde-l10n-kk = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-kk-17.08.3.tar.xz";
+ sha256 = "0wlzv9kgpa2ah2j8dd4vn5gr9jkbmzl6ph3lm5mr7rf0pl14qws2";
+ name = "kde-l10n-kk-17.08.3.tar.xz";
};
};
kde-l10n-km = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-km-17.08.3.tar.xz";
+ sha256 = "07arvlwxq59xjlgmf348rdrm1gfbzx9yds6qj667mrbk7h1n5ibr";
+ name = "kde-l10n-km-17.08.3.tar.xz";
};
};
kde-l10n-ko = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ko-17.08.3.tar.xz";
+ sha256 = "0cw6v0iqq79hc4llw37s630gf36npc7ngsihqlia4y3pn4mzabwf";
+ name = "kde-l10n-ko-17.08.3.tar.xz";
};
};
kde-l10n-lt = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-lt-17.08.3.tar.xz";
+ sha256 = "0mv31nqdxp9wcnwch0sqrgz5pp1y3gmv25p8jvbrfrivpbkmhwv3";
+ name = "kde-l10n-lt-17.08.3.tar.xz";
};
};
kde-l10n-lv = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-lv-17.08.3.tar.xz";
+ sha256 = "0lyh2lj1h5ihhy22hh0is3s3qd8x88wgbwrqkq9802vksy7f587l";
+ name = "kde-l10n-lv-17.08.3.tar.xz";
};
};
kde-l10n-mr = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-mr-17.08.3.tar.xz";
+ sha256 = "1zpciw63xk0s6jpkw4fpw0d17fcc4h1fdl6v1d3w3c1rs7dmmw9y";
+ name = "kde-l10n-mr-17.08.3.tar.xz";
};
};
kde-l10n-nb = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-nb-17.08.3.tar.xz";
+ sha256 = "024ii25iz8lf2g6k1nrr1lmian3wzq4ljx3y8ss1vz244m047xss";
+ name = "kde-l10n-nb-17.08.3.tar.xz";
};
};
kde-l10n-nds = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-nds-17.08.3.tar.xz";
+ sha256 = "0bp9ap276z86mxldasq6cdskrwkh48z9yfrblgffhh94941i0gcn";
+ name = "kde-l10n-nds-17.08.3.tar.xz";
};
};
kde-l10n-nl = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-nl-17.08.3.tar.xz";
+ sha256 = "00mzrk682r30i8x3navpad3b9jm15h5mp81v92q5cmcmblvvaw0l";
+ name = "kde-l10n-nl-17.08.3.tar.xz";
};
};
kde-l10n-nn = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-nn-17.08.3.tar.xz";
+ sha256 = "0d45g2n7hvk7p2n84674fqdnsz26hk0scczr6w3kzb2zk95x5734";
+ name = "kde-l10n-nn-17.08.3.tar.xz";
};
};
kde-l10n-pa = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-pa-17.08.3.tar.xz";
+ sha256 = "0sg35fmw0rs3nzyrhkfvh8b5nm86w5qkjgic4ymrib0grjxbdjcj";
+ name = "kde-l10n-pa-17.08.3.tar.xz";
};
};
kde-l10n-pl = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-pl-17.08.3.tar.xz";
+ sha256 = "0sk19zh9ykldm66d51k8pkmyql5cfxvgpzp8q3c3n9g60cdx510x";
+ name = "kde-l10n-pl-17.08.3.tar.xz";
};
};
kde-l10n-pt = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-pt-17.08.3.tar.xz";
+ sha256 = "135g0wq2cfkgvwv1y1w9wnnz2bsdf5sdijqnvazkb6j3is4fz2pw";
+ name = "kde-l10n-pt-17.08.3.tar.xz";
};
};
kde-l10n-pt_BR = {
- version = "pt_BR-17.08.1";
+ version = "pt_BR-17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-pt_BR-17.08.3.tar.xz";
+ sha256 = "0ww3rhijqs1h9ihszkqvxdi0d4185zpm336837741nwqg601dik0";
+ name = "kde-l10n-pt_BR-17.08.3.tar.xz";
};
};
kde-l10n-ro = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ro-17.08.3.tar.xz";
+ sha256 = "1d45j7xx1mzzgjwqw5svhkcb5v0hqbbzcwg1x1j7xqcggdlx4075";
+ name = "kde-l10n-ro-17.08.3.tar.xz";
};
};
kde-l10n-ru = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ru-17.08.3.tar.xz";
+ sha256 = "10py3cz4mpgcaskrsbbr26arg01c3im26zqmjcdwjnkgp8s780pj";
+ name = "kde-l10n-ru-17.08.3.tar.xz";
};
};
kde-l10n-sk = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-sk-17.08.3.tar.xz";
+ sha256 = "01607982ms2smr05nslp79x6fjqhvlpjdkkv8fs4vwxvii9wd77w";
+ name = "kde-l10n-sk-17.08.3.tar.xz";
};
};
kde-l10n-sl = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-sl-17.08.3.tar.xz";
+ sha256 = "10ljgz3jrgbgb06ijq1sp46qc3d7dbyz8dql56zcgz1pbv6pyxqz";
+ name = "kde-l10n-sl-17.08.3.tar.xz";
};
};
kde-l10n-sr = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-sr-17.08.3.tar.xz";
+ sha256 = "1m12x7w0m4n97crmy9ad6szx92z3cqsvm6fbh99naaaf033962jn";
+ name = "kde-l10n-sr-17.08.3.tar.xz";
};
};
kde-l10n-sv = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-sv-17.08.3.tar.xz";
+ sha256 = "1qqry4xakc4qp140jr5306xfp58d33rxp44mrvmdngzh30bqs6g2";
+ name = "kde-l10n-sv-17.08.3.tar.xz";
};
};
kde-l10n-tr = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-tr-17.08.3.tar.xz";
+ sha256 = "1as31vjsig32s31qxnx6ykfgpyya3s362ml576ndiyrj84znzby0";
+ name = "kde-l10n-tr-17.08.3.tar.xz";
};
};
kde-l10n-ug = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ug-17.08.3.tar.xz";
+ sha256 = "1jx2g5xczybfz9915py30g9rqds0191bsaywnj241nzqizy20csz";
+ name = "kde-l10n-ug-17.08.3.tar.xz";
};
};
kde-l10n-uk = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-uk-17.08.3.tar.xz";
+ sha256 = "14c30x7j8inswccjfb3yslwxjp0ispp1wzq6j4nl5zzj24lkicf8";
+ name = "kde-l10n-uk-17.08.3.tar.xz";
};
};
kde-l10n-wa = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-wa-17.08.3.tar.xz";
+ sha256 = "0mz0g6hf4z59vb4i0zkvmyx85mxz7fpwi6yyng03iqzlbpdq0qj7";
+ name = "kde-l10n-wa-17.08.3.tar.xz";
};
};
kde-l10n-zh_CN = {
- version = "zh_CN-17.08.1";
+ version = "zh_CN-17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-zh_CN-17.08.3.tar.xz";
+ sha256 = "1l60z9wicf5ka9ik5b85qh0z3n7g9msjv3ckwzm2kj41q9r30559";
+ name = "kde-l10n-zh_CN-17.08.3.tar.xz";
};
};
kde-l10n-zh_TW = {
- version = "zh_TW-17.08.1";
+ version = "zh_TW-17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-zh_TW-17.08.3.tar.xz";
+ sha256 = "1br778qbxnbsrdpvd34g2m3xc1v725ib4689kw5g36pm1jlf55h0";
+ name = "kde-l10n-zh_TW-17.08.3.tar.xz";
};
};
kdelibs = {
- version = "4.14.36";
+ version = "4.14.38";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kdelibs-4.14.36.tar.xz";
- sha256 = "08x5frbbgib9agn9ixslpx41wki8ky4l1r60xrl2pmywmwld4ag1";
- name = "kdelibs-4.14.36.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kdelibs-4.14.38.tar.xz";
+ sha256 = "1zn3yb09sd22bm54is0rn98amj0398zybl550dp406419sil7z9p";
+ name = "kdelibs-4.14.38.tar.xz";
};
};
kdenetwork-filesharing = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kdenetwork-filesharing-17.08.3.tar.xz";
+ sha256 = "0vy2cyd9ifxrqw9zk4hyidiprd7730q7hm1gc44l6b4siimxyb4x";
+ name = "kdenetwork-filesharing-17.08.3.tar.xz";
};
};
kdenlive = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kdenlive-17.08.1.tar.xz";
- sha256 = "0cj618pjkack3wj66nbq4src460la5qryylblswg2nzm0svqawqh";
- name = "kdenlive-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kdenlive-17.08.3.tar.xz";
+ sha256 = "1nh6cmxkr47zlpvcrjm8dfylsdmncb5qhyvb86rypr1qqmbifg5x";
+ name = "kdenlive-17.08.3.tar.xz";
};
};
kdepim-addons = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kdepim-addons-17.08.3.tar.xz";
+ sha256 = "1r0qgrliw2g82vgj63l00x0visjclxh2fafngl8ga4dk411nfg4x";
+ name = "kdepim-addons-17.08.3.tar.xz";
};
};
kdepim-apps-libs = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kdepim-apps-libs-17.08.3.tar.xz";
+ sha256 = "0706ndzw315szab2qg30x7a6f50iv439rrpdpy321q7ay5fm0f2p";
+ name = "kdepim-apps-libs-17.08.3.tar.xz";
};
};
kdepim-runtime = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kdepim-runtime-17.08.3.tar.xz";
+ sha256 = "0qc6kkc5rsg9l5plciass6p1ym7arlp6yk7x5ycy53k7fbsh4ak7";
+ name = "kdepim-runtime-17.08.3.tar.xz";
};
};
kde-runtime = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-runtime-17.08.3.tar.xz";
+ sha256 = "15nfkfz2wwlr1rp93sl1kmxl35wpnlf86225ihl43nhwn6pihb38";
+ name = "kde-runtime-17.08.3.tar.xz";
};
};
kdesdk-kioslaves = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kdesdk-kioslaves-17.08.3.tar.xz";
+ sha256 = "11akksc09mzxnjiqcsxwgwcxzcjpw50cr277lp7p6rx1hdbwlk7a";
+ name = "kdesdk-kioslaves-17.08.3.tar.xz";
};
};
kdesdk-thumbnailers = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kdesdk-thumbnailers-17.08.3.tar.xz";
+ sha256 = "1hhsskrhkq3z6phjkvc43gzsmx0apcpr4sjr9zqqfy847zqsvfm2";
+ name = "kdesdk-thumbnailers-17.08.3.tar.xz";
};
};
kdf = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kdf-17.08.1.tar.xz";
- sha256 = "09sjv6z5565mvgnicwaykisgrh859m7h8wfggmqs3rgldsi3iy0p";
- name = "kdf-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kdf-17.08.3.tar.xz";
+ sha256 = "1s291c4g51y92wplrqkl528py83xfviyvv1qjyp3c7nyf6g2jvwq";
+ name = "kdf-17.08.3.tar.xz";
};
};
kdialog = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kdialog-17.08.1.tar.xz";
- sha256 = "1j5ahq4xksl0jrxcisai0mnk6vr126qbabd9hnwq491f419l3zh1";
- name = "kdialog-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kdialog-17.08.3.tar.xz";
+ sha256 = "1n6n06sqgq1s2781pnsbfyczc68l5xx6l0idymj3pmniz3q4svp8";
+ name = "kdialog-17.08.3.tar.xz";
};
};
kdiamond = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kdiamond-17.08.1.tar.xz";
- sha256 = "07is91glcffrznsg72drmyqmz3lyki62g6ijc14x5i7k8v26nlhi";
- name = "kdiamond-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kdiamond-17.08.3.tar.xz";
+ sha256 = "1czhmxs3k7mx82r1k88h8riwn9jxlz6w60mi4jx8b29qcm532f53";
+ name = "kdiamond-17.08.3.tar.xz";
};
};
keditbookmarks = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/keditbookmarks-17.08.1.tar.xz";
- sha256 = "1k18if8ssjwj8mgp2jgxxwa8hh6x5w402i8fb2nsc7b4khw02y9q";
- name = "keditbookmarks-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/keditbookmarks-17.08.3.tar.xz";
+ sha256 = "115ys7703m611dw6ap2kqv4rgzxp15dsscg1y2gx09afc8fg2i62";
+ name = "keditbookmarks-17.08.3.tar.xz";
};
};
kfilereplace = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kfilereplace-17.08.1.tar.xz";
- sha256 = "1ra01im1yp5k73m2hyz72d73qhwv3by1zyipn4l1m2m4r62kwjcr";
- name = "kfilereplace-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kfilereplace-17.08.3.tar.xz";
+ sha256 = "1ksv9igzq65wgsam6ynbbzzyriacbk7y48dzh190p8k2bdf6gij6";
+ name = "kfilereplace-17.08.3.tar.xz";
};
};
kfind = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kfind-17.08.1.tar.xz";
- sha256 = "114l6b081ddxx51ndkqjl9jnvy00nyydn245y1kskfbzk2yry1jb";
- name = "kfind-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kfind-17.08.3.tar.xz";
+ sha256 = "16f27ykh52vphq6wjyi1vy6vrzshj0cawmc8fy7y1j5yzzdkx1hk";
+ name = "kfind-17.08.3.tar.xz";
};
};
kfloppy = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kfloppy-17.08.1.tar.xz";
- sha256 = "1afnlbk42g6sm7y7xkqnxr24mz2s95qkaap2s3zqc469gj1vlnxa";
- name = "kfloppy-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kfloppy-17.08.3.tar.xz";
+ sha256 = "1d5xn0rxc92k60hc1860mji8dzq932gg4by42gylwldcvgdija14";
+ name = "kfloppy-17.08.3.tar.xz";
};
};
kfourinline = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kfourinline-17.08.1.tar.xz";
- sha256 = "12cy3sarcy361wivlbpx2cxc2yaffr2xfy4dwz3iz6vzx49mhyky";
- name = "kfourinline-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kfourinline-17.08.3.tar.xz";
+ sha256 = "1bxzlx55i6vbk8cmpx38g1xdx0swqwd73lw5z584affw464ps1n9";
+ name = "kfourinline-17.08.3.tar.xz";
};
};
kgeography = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kgeography-17.08.1.tar.xz";
- sha256 = "1mjfacc850pqsgylwfcvp7yv0c4f1qgk0y7pgwrx2nspf8i1wwhc";
- name = "kgeography-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kgeography-17.08.3.tar.xz";
+ sha256 = "19k39rjm9lwbv3p6iifam80li5bhw4xf2g4i4hj0h7gyrj9gb1mp";
+ name = "kgeography-17.08.3.tar.xz";
};
};
kget = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kget-17.08.1.tar.xz";
- sha256 = "182l5hd5hfbpl88p9yzc54n8m0mi2fffp19sjdhhadmyx142inc1";
- name = "kget-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kget-17.08.3.tar.xz";
+ sha256 = "01z3ij4iv3kgwy0fcnrf4qpfgapflx1pgv2hiaykgsj6ij24fx6a";
+ name = "kget-17.08.3.tar.xz";
};
};
kgoldrunner = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kgoldrunner-17.08.1.tar.xz";
- sha256 = "0rzhg7hk07yaghflskiz4wh5d3jdfvhzig3zyyhimwir90lj1gxx";
- name = "kgoldrunner-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kgoldrunner-17.08.3.tar.xz";
+ sha256 = "1k09pw7lm17702p0lliyl767zwk4n3gkkzj441cq3fqjnwm93lx4";
+ name = "kgoldrunner-17.08.3.tar.xz";
};
};
kgpg = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kgpg-17.08.1.tar.xz";
- sha256 = "1hcg9zv4f2bj1210fahxap1fnyk7zdj3gfpfpdrww6qga5z4dzcy";
- name = "kgpg-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kgpg-17.08.3.tar.xz";
+ sha256 = "1g06n6i9qqvalmpg2zan7qg7j7dp4rn152pashs3jxij29n1bw7h";
+ name = "kgpg-17.08.3.tar.xz";
};
};
khangman = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/khangman-17.08.1.tar.xz";
- sha256 = "17xk64lclbw2gcpnfpzi9sqryr8wl8g1v19gqrplvq4zw7qfanr5";
- name = "khangman-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/khangman-17.08.3.tar.xz";
+ sha256 = "1fny78d3vaaz67css4i14pnvkm5p586ib8mwrs2rglc931c89dqq";
+ name = "khangman-17.08.3.tar.xz";
};
};
khelpcenter = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/khelpcenter-17.08.1.tar.xz";
- sha256 = "1js7sk1hdp3k7d4gjk8rzq5rw1al8bh0ap5irw5551kvbagm5dp4";
- name = "khelpcenter-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/khelpcenter-17.08.3.tar.xz";
+ sha256 = "089aahdr1yibff4y0l78m0wzz7m0mc090g4fp4aj4gp56wz6i5jn";
+ name = "khelpcenter-17.08.3.tar.xz";
};
};
kholidays = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kholidays-17.08.1.tar.xz";
- sha256 = "0gsvidakx0q0wqy2bgwq339hwghdcl882nvzj445hnmy10r2d6jk";
- name = "kholidays-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kholidays-17.08.3.tar.xz";
+ sha256 = "17razwvskf6i5hidlfp98bmfrijp8hn5gxrqcjxc49wpkhlj70jm";
+ name = "kholidays-17.08.3.tar.xz";
};
};
kidentitymanagement = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kidentitymanagement-17.08.1.tar.xz";
- sha256 = "1ippkav5nvfckp4145gcwa2hdl7zjw8bcaq6af5kcxqmvlcndvwv";
- name = "kidentitymanagement-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kidentitymanagement-17.08.3.tar.xz";
+ sha256 = "0k926vwdhrk4ilpn0zhkcn26j1h7nqlzzi9mimybz1sp4fzxa83v";
+ name = "kidentitymanagement-17.08.3.tar.xz";
};
};
kig = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kig-17.08.1.tar.xz";
- sha256 = "0gzfdpi4qlmwg6hkx1slvnxlynsfgwv18a9law05hg35hs6zxzfk";
- name = "kig-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kig-17.08.3.tar.xz";
+ sha256 = "0wf03fm7fpph52ilxckz02ikn6mq486ps8p8byq2vvfwh6z0w6wg";
+ name = "kig-17.08.3.tar.xz";
};
};
kigo = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kigo-17.08.1.tar.xz";
- sha256 = "0c498rzvmfkl0q5hnhddlx38qwyzsz4lh05cy5v4zpq8idvnxzj5";
- name = "kigo-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kigo-17.08.3.tar.xz";
+ sha256 = "1k850vmsifvab14aaqkivgrw8794yhvn7d10c5ib2zf6447cl8m5";
+ name = "kigo-17.08.3.tar.xz";
};
};
killbots = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/killbots-17.08.1.tar.xz";
- sha256 = "0yay6pr83rh5slklmxvw3jr2bky7k5cgf55a8r6al5b4vsx2802r";
- name = "killbots-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/killbots-17.08.3.tar.xz";
+ sha256 = "0ds391xx2d792069kl998f84qym26964ph5bja6bwkhgvws84r9g";
+ name = "killbots-17.08.3.tar.xz";
};
};
kimagemapeditor = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kimagemapeditor-17.08.1.tar.xz";
- sha256 = "158vrszvz2acnbzvmjprg1j2knarffvg8awwjcfg3zn2i6arwwsg";
- name = "kimagemapeditor-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kimagemapeditor-17.08.3.tar.xz";
+ sha256 = "0clzk2d63hy1vvkdpxa1j5pp7y28x467wd9zfvv6k2vw703ghqlx";
+ name = "kimagemapeditor-17.08.3.tar.xz";
};
};
kimap = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kimap-17.08.1.tar.xz";
- sha256 = "1vch7y153jg010mcz7qjxjp6f3gfxrczbfh3bvx8q70cqfmx7ssm";
- name = "kimap-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kimap-17.08.3.tar.xz";
+ sha256 = "0c5inldmlwc5x2q1vhvj0wv61h6986m068a2k4xrrbirpb4pcwls";
+ name = "kimap-17.08.3.tar.xz";
};
};
kio-extras = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kio-extras-17.08.3.tar.xz";
+ sha256 = "0gq187435yd0251znqicpcn0r89aar7a64bjpf6x0zhdlli8n9jc";
+ name = "kio-extras-17.08.3.tar.xz";
};
};
kiriki = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kiriki-17.08.1.tar.xz";
- sha256 = "0cxmxxwn6ps00kf64z61r3k7iyr5falrbzmf6gz19m535b79drhi";
- name = "kiriki-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kiriki-17.08.3.tar.xz";
+ sha256 = "1cbijn0358gpr21yfab84gybf5vqxwilwbhfl6nj8qmppp2bpjqd";
+ name = "kiriki-17.08.3.tar.xz";
};
};
kiten = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kiten-17.08.1.tar.xz";
- sha256 = "1yp2r5linfkknvn5dx4vf2f6vxg3kzrpiqsrg34q957wvfsc91qm";
- name = "kiten-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kiten-17.08.3.tar.xz";
+ sha256 = "0v00q9hs94p5r6x7s7i12814pfydd5y1bzp6sm5x0vx1ixdnkx89";
+ name = "kiten-17.08.3.tar.xz";
};
};
kjumpingcube = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kjumpingcube-17.08.1.tar.xz";
- sha256 = "161px7wad80a3p6hr27dj0990jb7j143q77q7ca308qysmffghnz";
- name = "kjumpingcube-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kjumpingcube-17.08.3.tar.xz";
+ sha256 = "13ifm6drw4m1dzssfalazmnsr5f8z9gla3aypb9ny1xm9ahlgfwh";
+ name = "kjumpingcube-17.08.3.tar.xz";
};
};
kldap = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kldap-17.08.1.tar.xz";
- sha256 = "11j0ai0y022xxgiw7ac5cgv8vqb3qa1dbh7n9jqz9lg8rhjch2ix";
- name = "kldap-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kldap-17.08.3.tar.xz";
+ sha256 = "0bnx5fc48ppsykpqwjgsqjd7s4azgzk82k9xgaw566nxqqvgpzsv";
+ name = "kldap-17.08.3.tar.xz";
};
};
kleopatra = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kleopatra-17.08.1.tar.xz";
- sha256 = "1z32xwlsslhzqzsq8ngdws1ry56myvx8j56b973scbhd29z15www";
- name = "kleopatra-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kleopatra-17.08.3.tar.xz";
+ sha256 = "0vglphfxq37pxdrrchgzkdlzlzr18qlfwy9g64njyddnsv48pfx8";
+ name = "kleopatra-17.08.3.tar.xz";
};
};
klettres = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/klettres-17.08.1.tar.xz";
- sha256 = "0s7n83smr4mrrs91bpyr3hk2s1sl3ix73scnllb6spb6gx5hhr13";
- name = "klettres-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/klettres-17.08.3.tar.xz";
+ sha256 = "14jxbvil45hc2kqky7yhxrgzpv4094lk9ri0j05i1av6784s9555";
+ name = "klettres-17.08.3.tar.xz";
};
};
klickety = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/klickety-17.08.1.tar.xz";
- sha256 = "0zp836x7ssgk7y5fcni7ya9cfdc28ywgvlzc01f7bi7pwh57q50x";
- name = "klickety-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/klickety-17.08.3.tar.xz";
+ sha256 = "01hqf41m8pviziq1x562rd85357kkfgd0x0ba1vasimjddg6v6qa";
+ name = "klickety-17.08.3.tar.xz";
};
};
klines = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/klines-17.08.1.tar.xz";
- sha256 = "069igz40zrwbnyvw53d59rksn2n3dxycysb9fakb165qr27kb42h";
- name = "klines-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/klines-17.08.3.tar.xz";
+ sha256 = "1s0krcqbqii9fqrymm4bb9ssznzyv8bijk5lcngwgxs24igl0g4d";
+ name = "klines-17.08.3.tar.xz";
};
};
klinkstatus = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/klinkstatus-17.08.1.tar.xz";
- sha256 = "11fakg10rlf4finznc2i5h1lbh1qq37wvzd93yc8vdwax98pps44";
- name = "klinkstatus-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/klinkstatus-17.08.3.tar.xz";
+ sha256 = "0bv5ahcnss6ziccx9mmvf5bdsff9drjqpmq9ln51524bjn4x58ic";
+ name = "klinkstatus-17.08.3.tar.xz";
};
};
kmag = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kmag-17.08.1.tar.xz";
- sha256 = "1y69rsdl9pz11xrbfg8p0ihm1691y3blb5jay0v228prbwsy2gn3";
- name = "kmag-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kmag-17.08.3.tar.xz";
+ sha256 = "0dadzzrmd982y7apjk783wm5q302y03ydai74pzyqy0awnjdm09d";
+ name = "kmag-17.08.3.tar.xz";
};
};
kmahjongg = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kmahjongg-17.08.1.tar.xz";
- sha256 = "17f57shs79pbwdaqblb4i9ibs3b4psy38ys69i8k5j04v7mam48s";
- name = "kmahjongg-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kmahjongg-17.08.3.tar.xz";
+ sha256 = "09j2pmqc66zi851fsl4ijrcgq3y35arx9272p6z07bg0z9ja5vgb";
+ name = "kmahjongg-17.08.3.tar.xz";
};
};
kmail = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kmail-17.08.1.tar.xz";
- sha256 = "1c3yds59nssnqi0pxb6fjajq6yaj6ki7l83gj59wlmpsyc1nm15d";
- name = "kmail-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kmail-17.08.3.tar.xz";
+ sha256 = "1ibpq0alnk70ha1smfyw8gc91k5q4x1gw7zddwgzw1pjr4v1bqdc";
+ name = "kmail-17.08.3.tar.xz";
};
};
kmail-account-wizard = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kmail-account-wizard-17.08.3.tar.xz";
+ sha256 = "0mkw6skpf9kc2h34ww85g18cljln77n5dsg5cyfyqc3i52m1halk";
+ name = "kmail-account-wizard-17.08.3.tar.xz";
};
};
kmailtransport = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kmailtransport-17.08.1.tar.xz";
- sha256 = "1r8xbccijiw5v92qq18rccvsdn87m8mwc6g53k8gxpjx37vxrba8";
- name = "kmailtransport-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kmailtransport-17.08.3.tar.xz";
+ sha256 = "0cfyzvsn5x03i6kprqm7y6j6qsfys4yz2s3f4wb5igpdm25nclq1";
+ name = "kmailtransport-17.08.3.tar.xz";
};
};
kmbox = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kmbox-17.08.1.tar.xz";
- sha256 = "0bgjj69by4c11z7j7v7inx4gzcsn6106r28n1ds6lc1k0vv8zw2d";
- name = "kmbox-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kmbox-17.08.3.tar.xz";
+ sha256 = "0mf0005fs15vgmmikdsa44ig4hxrnysl13mrn168crk96h3sk8qi";
+ name = "kmbox-17.08.3.tar.xz";
};
};
kmime = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kmime-17.08.1.tar.xz";
- sha256 = "178bx5pasrrlqwzjz85ba06gs9r40prwk7z4v6ar6fr9q4pa088c";
- name = "kmime-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kmime-17.08.3.tar.xz";
+ sha256 = "17ziw8g1wdys4iy2yqavqy7wj4kw617m80fg77zlf1cscswhg23d";
+ name = "kmime-17.08.3.tar.xz";
};
};
kmines = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kmines-17.08.1.tar.xz";
- sha256 = "1al98mzy8jrp17vq4j7np1bl5j9sd79drh78zd0343mrcqa7js28";
- name = "kmines-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kmines-17.08.3.tar.xz";
+ sha256 = "14b0klnlbxkvln3q9fliw6cijc2xmsfmvm6sfikdzzgj59jcylzp";
+ name = "kmines-17.08.3.tar.xz";
};
};
kmix = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kmix-17.08.1.tar.xz";
- sha256 = "1w783p49zgsj52cy3mv4zgvh8f55mdij2drzgk3qr510wsyf0cg5";
- name = "kmix-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kmix-17.08.3.tar.xz";
+ sha256 = "0fd38banrbgpp8g5gz09w6wny8mdi9szvddl1rv7yx67zf112g67";
+ name = "kmix-17.08.3.tar.xz";
};
};
kmousetool = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kmousetool-17.08.1.tar.xz";
- sha256 = "09rjvnp7f16d6cg3d5p1ah184j7710mziiiz5r0zxq7vdnkvxzlh";
- name = "kmousetool-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kmousetool-17.08.3.tar.xz";
+ sha256 = "0y2zavs442wpz438p1kyzrqlv9qgvxd4l5gw1pmmx8lkvjjdi91v";
+ name = "kmousetool-17.08.3.tar.xz";
};
};
kmouth = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kmouth-17.08.1.tar.xz";
- sha256 = "07s3fqybprw7gprksc271pspnh81yawm5prrz0lif2awvc7wp7pm";
- name = "kmouth-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kmouth-17.08.3.tar.xz";
+ sha256 = "0gzc6apskfpvih7aap5mfv45q3pg70nfis1vh5ywidia36wbf26i";
+ name = "kmouth-17.08.3.tar.xz";
};
};
kmplot = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kmplot-17.08.1.tar.xz";
- sha256 = "1gxhfkjdsrf8klqhqji6yzv9g4sdjcjhmyvx5j71wmrdc6pdpkpf";
- name = "kmplot-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kmplot-17.08.3.tar.xz";
+ sha256 = "1ann38zzzd5pds889mc5vw8xw80qlpm9l9nmkczkqyhkfvwxd605";
+ name = "kmplot-17.08.3.tar.xz";
};
};
knavalbattle = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/knavalbattle-17.08.1.tar.xz";
- sha256 = "187n5kn5ri87a98rybsf4g5jcwvyxdnb4601iaaf4jb6rg3yf2pm";
- name = "knavalbattle-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/knavalbattle-17.08.3.tar.xz";
+ sha256 = "1zj6pki0v3p4xg25ivl45mb877p5xh47d066442pahkf8l3wnsh5";
+ name = "knavalbattle-17.08.3.tar.xz";
};
};
knetwalk = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/knetwalk-17.08.1.tar.xz";
- sha256 = "10kjsw94yzz82af3adk9shm67kbg8f8p0xmh60jr97cm1lvz5186";
- name = "knetwalk-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/knetwalk-17.08.3.tar.xz";
+ sha256 = "0i32f54z5hinafy1v5s1j8ahnbw30721lxa2mvh5qcbr21fan3mc";
+ name = "knetwalk-17.08.3.tar.xz";
};
};
knotes = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/knotes-17.08.1.tar.xz";
- sha256 = "0654fxaiyvhfxjyfaw9hgvv352xkix2ls7wlvyw5b15d9iqa5cl0";
- name = "knotes-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/knotes-17.08.3.tar.xz";
+ sha256 = "0ly9gpji3nl3i53nzqd5z27li8qnc1asfv1d1kawchz077da02xy";
+ name = "knotes-17.08.3.tar.xz";
};
};
kolf = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kolf-17.08.1.tar.xz";
- sha256 = "0cmqpyd157b3n3x18d6wiijyvjaavxp65nagw2r0prjz9dckd1cl";
- name = "kolf-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kolf-17.08.3.tar.xz";
+ sha256 = "1wc6x1hgkniwzb53bcph3alk0fxlb91s6j39blhync6713x8b4g0";
+ name = "kolf-17.08.3.tar.xz";
};
};
kollision = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kollision-17.08.1.tar.xz";
- sha256 = "00chxdib0ym5x94pzgfg3zx2lixf9h5b7sfcbg0chvjlc8imfv2b";
- name = "kollision-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kollision-17.08.3.tar.xz";
+ sha256 = "14ama8cfi4d7whgck0gywm7869gpargq1lrkq8ik4k914pharkzi";
+ name = "kollision-17.08.3.tar.xz";
};
};
kolourpaint = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kolourpaint-17.08.1.tar.xz";
- sha256 = "18cf856r66gwdf149zyam53p0sqvm0bf5f0k0n62mkp80z76kbvm";
- name = "kolourpaint-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kolourpaint-17.08.3.tar.xz";
+ sha256 = "1y44q14f6brdmccnmf8143kjjqais8ps15z31dpx2935qzjxw8sc";
+ name = "kolourpaint-17.08.3.tar.xz";
};
};
kompare = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kompare-17.08.1.tar.xz";
- sha256 = "1whsbz99cdnivq6m7irvnj0vcq82s34z9mgzd4a50z3i7ms5hmvf";
- name = "kompare-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kompare-17.08.3.tar.xz";
+ sha256 = "0fi3s02rsaa3xl7j69lq2qvg9jn9hxdp44ns89q94s06rqkbjyr1";
+ name = "kompare-17.08.3.tar.xz";
};
};
konqueror = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/konqueror-17.08.1.tar.xz";
- sha256 = "1plq38ap1gdjq1s02s3km3pg8l2cgx0mkicb5jldz02qxj4z8rgy";
- name = "konqueror-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/konqueror-17.08.3.tar.xz";
+ sha256 = "1b2hs0fp0a51y87dl8rnv47b8kzjylsps9nczgi8zsipg03z9ja7";
+ name = "konqueror-17.08.3.tar.xz";
};
};
konquest = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/konquest-17.08.1.tar.xz";
- sha256 = "01ps82zkd95w06im3x7cazwbn2m4xbr80ky16gd71v3sdgg5zpw7";
- name = "konquest-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/konquest-17.08.3.tar.xz";
+ sha256 = "1k5s9cvlsx3j2774i6p6xx2sfg75aafj9a4imvm7mzvn3gvmkm3q";
+ name = "konquest-17.08.3.tar.xz";
};
};
konsole = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/konsole-17.08.1.tar.xz";
- sha256 = "00rrwk6i0ngg07md84bkfggdmmfknkpxiqbv37pb7xis1rvz9c8p";
- name = "konsole-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/konsole-17.08.3.tar.xz";
+ sha256 = "07v9nbikzpanpggglp07slkbn6h0cl2anz7735f9b0lg55fydv42";
+ name = "konsole-17.08.3.tar.xz";
};
};
kontact = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kontact-17.08.1.tar.xz";
- sha256 = "1z0mqnb6567xmx7shv7v60yb2cj6wh3ndqdd9nqxp12371mgm6i0";
- name = "kontact-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kontact-17.08.3.tar.xz";
+ sha256 = "1hj6vgvn73bzf43ckk4cm24m1n0a4c9c6p14q95hbfbcp5bdra1i";
+ name = "kontact-17.08.3.tar.xz";
};
};
kontactinterface = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kontactinterface-17.08.1.tar.xz";
- sha256 = "09mpmdc65lm14s6hg1yq68i1wrawss0hl002bg9apgy2rfdk34k1";
- name = "kontactinterface-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kontactinterface-17.08.3.tar.xz";
+ sha256 = "1ncy0fz0jyklckimm9jjfv2j88aibk49ismz5z6xlasn44vn7l9c";
+ name = "kontactinterface-17.08.3.tar.xz";
};
};
kopete = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kopete-17.08.1.tar.xz";
- sha256 = "1inbw80a2mwfc2id12qn0as4l52hz3wfcvzcz3n4p393g0qfz8an";
- name = "kopete-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kopete-17.08.3.tar.xz";
+ sha256 = "1v5gmh521si3zbxgcm9m4rcp0csqy52xgvpjpb8j7iq9m0fcqv7q";
+ name = "kopete-17.08.3.tar.xz";
};
};
korganizer = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/korganizer-17.08.1.tar.xz";
- sha256 = "0q35fyqxgwp5jv2qnpcjhfs1rkyp1jjrpmi28kqh93l04njmwvc0";
- name = "korganizer-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/korganizer-17.08.3.tar.xz";
+ sha256 = "1nsj03h1r5mnz2dvdmydvqz2fspgw2ybs5z05gg0f903sq1gz80l";
+ name = "korganizer-17.08.3.tar.xz";
};
};
kpat = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kpat-17.08.1.tar.xz";
- sha256 = "1bqqm5gb6mc1v8h524qnz2rfcplvz6v87gvc0jg3zcqjf2c4xn4y";
- name = "kpat-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kpat-17.08.3.tar.xz";
+ sha256 = "0l5s5rrn67lbf8hjqyyxvxij935pb1fd9x9dlskxyc2w7n6acmn2";
+ name = "kpat-17.08.3.tar.xz";
};
};
kpimtextedit = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kpimtextedit-17.08.1.tar.xz";
- sha256 = "16ymcccfn8pw098gr6b2k1xvwinhnx8c3npawy9fiqg138a4bkh9";
- name = "kpimtextedit-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kpimtextedit-17.08.3.tar.xz";
+ sha256 = "1xyfzvmsfikx2xnhgwx9wkdhvfq72f3mz67hlw2jsbm3ir889ysb";
+ name = "kpimtextedit-17.08.3.tar.xz";
};
};
kppp = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kppp-17.08.1.tar.xz";
- sha256 = "0783rn2gzgxscnfbins0drl8j8ka0lxyg3787v9778d5993fafpf";
- name = "kppp-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kppp-17.08.3.tar.xz";
+ sha256 = "00y19x306r3pnax1b2cv8bndd6vq1qp30r1hrgw8npy5mm4mn8jw";
+ name = "kppp-17.08.3.tar.xz";
};
};
kqtquickcharts = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kqtquickcharts-17.08.1.tar.xz";
- sha256 = "1zym0lcim41krv1irdfvkfb4simymairqq2cp2kiagrp3ssz28km";
- name = "kqtquickcharts-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kqtquickcharts-17.08.3.tar.xz";
+ sha256 = "0w8hlnhdgqrmad4ii07f9hsyx6vlaqnvlc54prnah1bqzymvc2ms";
+ name = "kqtquickcharts-17.08.3.tar.xz";
};
};
krdc = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/krdc-17.08.1.tar.xz";
- sha256 = "1lfh7w05b19bzdfmxydb0s55zgbizsh8j8vjblgsn2vihgm2f8lp";
- name = "krdc-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/krdc-17.08.3.tar.xz";
+ sha256 = "13rmn1p495dzx49d1y22na25vrpzk9mcc2axg412pv038iphf8id";
+ name = "krdc-17.08.3.tar.xz";
};
};
kremotecontrol = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kremotecontrol-17.08.1.tar.xz";
- sha256 = "1b146xb9dnq97lswb0qnppcgjbw5vwy1y9za2k0kl3bhfvxd4qj2";
- name = "kremotecontrol-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kremotecontrol-17.08.3.tar.xz";
+ sha256 = "1p23q7bvppv8fabvpwi793zplb4kry8njczma7c4nya4mkdk9370";
+ name = "kremotecontrol-17.08.3.tar.xz";
};
};
kreversi = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kreversi-17.08.1.tar.xz";
- sha256 = "17y2iihszjshln2hwxp6nqz30iln79mwmfv8yb2bydchdy05g807";
- name = "kreversi-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kreversi-17.08.3.tar.xz";
+ sha256 = "0ma0y1n38hw5rawzazlaqfa4vsawgvaq8j2pa5n7z23nwckh19wd";
+ name = "kreversi-17.08.3.tar.xz";
};
};
krfb = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/krfb-17.08.1.tar.xz";
- sha256 = "1dwyx0jdg0i64pxd7phm1kq7fyaj7jls8w08sfgq3730s4s59lfj";
- name = "krfb-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/krfb-17.08.3.tar.xz";
+ sha256 = "1k7rziw0l0bdjxi5i92w1zsjbakzbklc95dyn2jsnm36jljjqpv1";
+ name = "krfb-17.08.3.tar.xz";
};
};
kross-interpreters = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/kross-interpreters-17.08.3.tar.xz";
+ sha256 = "1pqlm14xr9p18dfh8pczg8fjskpvzxh5s5n7nxj9q31yz6kbxzrb";
+ name = "kross-interpreters-17.08.3.tar.xz";
};
};
kruler = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kruler-17.08.1.tar.xz";
- sha256 = "1qmlhc35vhbzfllz6wrssr62d3s3xdq15s5rkpm3w05a70bilpyq";
- name = "kruler-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kruler-17.08.3.tar.xz";
+ sha256 = "1qizjvysfnh5x3fa8hav3y9pyaiq8hpwi1grw9dd921cbb16cww4";
+ name = "kruler-17.08.3.tar.xz";
};
};
ksaneplugin = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/ksaneplugin-17.08.1.tar.xz";
- sha256 = "08zl04ly9wggcr8y0azz69nvjkr4c8gnajx4w8cwlb1dkn1b5is4";
- name = "ksaneplugin-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/ksaneplugin-17.08.3.tar.xz";
+ sha256 = "0y7f269wv0alcvx906nill92nzlld5b1sg6q3xki89b6b9fgliig";
+ name = "ksaneplugin-17.08.3.tar.xz";
};
};
kscd = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kscd-17.08.1.tar.xz";
- sha256 = "08mlbhbck68abj17mkaz76fpy4rcn0x4h4smwgxnhy88ddb15wa1";
- name = "kscd-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kscd-17.08.3.tar.xz";
+ sha256 = "08r9zhp7d7xf8iyi56hvlm5vyjqrjpj9dc8ynda0n7hyngxrbvm0";
+ name = "kscd-17.08.3.tar.xz";
};
};
kshisen = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kshisen-17.08.1.tar.xz";
- sha256 = "0rg465092qkzbshr0pj6z6d38nykdfz2alhzy50qi9i32r8iwy9m";
- name = "kshisen-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kshisen-17.08.3.tar.xz";
+ sha256 = "18nwnxn7i0p2b78cxv8ppsl4lrzdm4ck6hqqdf738npli271shq0";
+ name = "kshisen-17.08.3.tar.xz";
};
};
ksirk = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/ksirk-17.08.1.tar.xz";
- sha256 = "1v4xqjak0nf4vqsf7p7i37x5c08vbxq18nb63bhwjlb2fgnbg0yh";
- name = "ksirk-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/ksirk-17.08.3.tar.xz";
+ sha256 = "1601fh93jcy7x622hpvdrb9ddb262n9ivakxli054cz2bq3dbpim";
+ name = "ksirk-17.08.3.tar.xz";
};
};
ksnakeduel = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/ksnakeduel-17.08.1.tar.xz";
- sha256 = "105rjym6vkzi9m0dmzwwb6491lfmb5y1dfqax9y2gi993x0l5ihl";
- name = "ksnakeduel-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/ksnakeduel-17.08.3.tar.xz";
+ sha256 = "1a7xki783799ala0zx1jngvhsky994sk32xyza2lfir5ym1w0pkm";
+ name = "ksnakeduel-17.08.3.tar.xz";
};
};
kspaceduel = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kspaceduel-17.08.1.tar.xz";
- sha256 = "11g362hax9x8b99wvcndd4hz6q918dxcn8js16cflfxn1ry80wb6";
- name = "kspaceduel-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kspaceduel-17.08.3.tar.xz";
+ sha256 = "1wskg788mc51dh3hv0d7hrqyy14gnzzw2sqhc0pd65jj8hra7kh2";
+ name = "kspaceduel-17.08.3.tar.xz";
};
};
ksquares = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/ksquares-17.08.1.tar.xz";
- sha256 = "1lw9qlfqfsmyry5v6fvhyjh23l8dj71iyp1z3y0xikaybc4rbbi1";
- name = "ksquares-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/ksquares-17.08.3.tar.xz";
+ sha256 = "04bc3ppiai39v8dq02r7nzr4nvpzjj90glg6qssxqyxwrz18kk20";
+ name = "ksquares-17.08.3.tar.xz";
};
};
kstars = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kstars-17.08.1.tar.xz";
- sha256 = "1qr8y4m6lqiv3zb7f2ys7c6iw7iryk9ayibdscq113nq0blm59zs";
- name = "kstars-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kstars-17.08.3.tar.xz";
+ sha256 = "0i165snb4wnw2kzbhcawgwwqppgq5fmw23rqa4q2k3alaz9smcdn";
+ name = "kstars-17.08.3.tar.xz";
};
};
ksudoku = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/ksudoku-17.08.1.tar.xz";
- sha256 = "0fb9k5hdyq2alp42x17r1cfi5qz5hm9xzcwd3vz3c1kym4xavnjp";
- name = "ksudoku-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/ksudoku-17.08.3.tar.xz";
+ sha256 = "1dmqss272z7s7vbh71zg7s5drn66a2yyrv53f34yk3d93mhk8dq2";
+ name = "ksudoku-17.08.3.tar.xz";
};
};
ksystemlog = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/ksystemlog-17.08.1.tar.xz";
- sha256 = "0wiwak8dmdm9kih2zvw2xxg67qs94imp6s24dgfxgylqqpqirlnv";
- name = "ksystemlog-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/ksystemlog-17.08.3.tar.xz";
+ sha256 = "0smhbdpj2xf9q8l8cjhk4x80qq6apn6mmf7dna9hznp6nd6jrsgv";
+ name = "ksystemlog-17.08.3.tar.xz";
};
};
kteatime = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kteatime-17.08.1.tar.xz";
- sha256 = "08ripkkc6b3wi499kgsng4fzk2n7kbp3i6212q47h6bmgxs8a4zp";
- name = "kteatime-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kteatime-17.08.3.tar.xz";
+ sha256 = "0pp08b2rjz329kdaqq5a490r353n346ah0ag6wfxmpchqy11lr3r";
+ name = "kteatime-17.08.3.tar.xz";
};
};
ktimer = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/ktimer-17.08.1.tar.xz";
- sha256 = "116c61k99h5y0yph2x7cz0ff99rsfblgj3db7sczhn3hkbcimakx";
- name = "ktimer-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/ktimer-17.08.3.tar.xz";
+ sha256 = "15k1rfih9k7zpcsdyiwl60jmp1w1svwb8c6cykjzqpc9acyfpba5";
+ name = "ktimer-17.08.3.tar.xz";
};
};
ktnef = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/ktnef-17.08.1.tar.xz";
- sha256 = "07jflp67mf748vf0ph89dbzy2lifm8148kl957qw1z9i1h5sm869";
- name = "ktnef-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/ktnef-17.08.3.tar.xz";
+ sha256 = "0fh0ybb3nijhxhkwcmcygw413blkmra83az1jhkmlpp6q5459jin";
+ name = "ktnef-17.08.3.tar.xz";
};
};
ktouch = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/ktouch-17.08.1.tar.xz";
- sha256 = "19m8bp655ir9n2pz6vly9q2x42gdnpfjs47nkfiix28mg4y004qj";
- name = "ktouch-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/ktouch-17.08.3.tar.xz";
+ sha256 = "0z21wb82m3sds4sjkkadb48zxcfj1qbab07i3cs3g3a730zdj5ld";
+ name = "ktouch-17.08.3.tar.xz";
};
};
ktp-accounts-kcm = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/ktp-accounts-kcm-17.08.3.tar.xz";
+ sha256 = "17h75xkavyl2920j57nm6zp81l70ksyjndrrrqxv8clig1bqfc89";
+ name = "ktp-accounts-kcm-17.08.3.tar.xz";
};
};
ktp-approver = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/ktp-approver-17.08.3.tar.xz";
+ sha256 = "0dvwwpy50ixylacrxnfh4aqpsbc4nfsqkwr358917w5mambfji42";
+ name = "ktp-approver-17.08.3.tar.xz";
};
};
ktp-auth-handler = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/ktp-auth-handler-17.08.3.tar.xz";
+ sha256 = "0pm0bvivwlaq083sql74qq5wrlm7wix1k9i4cr3fck73am9h526b";
+ name = "ktp-auth-handler-17.08.3.tar.xz";
};
};
ktp-call-ui = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/ktp-call-ui-17.08.3.tar.xz";
+ sha256 = "1kwprh9g97hraywjcv2ppddaxh7cw6gsy4zs8mjvh0zpnn3cy7xm";
+ name = "ktp-call-ui-17.08.3.tar.xz";
};
};
ktp-common-internals = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/ktp-common-internals-17.08.3.tar.xz";
+ sha256 = "10r5flyy4vph1x39dp2mskqksnf5h0qvskl31ln65vz9m8zrhq3w";
+ name = "ktp-common-internals-17.08.3.tar.xz";
};
};
ktp-contact-list = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/ktp-contact-list-17.08.3.tar.xz";
+ sha256 = "04j2swlqwzppxsbqnwyrz60lgi9l8d7x8hf4xmmhrv1al6vzmb5q";
+ name = "ktp-contact-list-17.08.3.tar.xz";
};
};
ktp-contact-runner = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/ktp-contact-runner-17.08.3.tar.xz";
+ sha256 = "1sh0arsy3z413ng0b89sc6a4rh2rnh50k2mhkrdzcvfbwlf74bhw";
+ name = "ktp-contact-runner-17.08.3.tar.xz";
};
};
ktp-desktop-applets = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/ktp-desktop-applets-17.08.3.tar.xz";
+ sha256 = "03m834rh9v6ash8vm1cs2jpyxma6jaag61h5a51s3ykp0rgv984c";
+ name = "ktp-desktop-applets-17.08.3.tar.xz";
};
};
ktp-filetransfer-handler = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/ktp-filetransfer-handler-17.08.3.tar.xz";
+ sha256 = "0vpl977p9lv58p04v6f9v0g4fda7xkhdggf3n4sjnwhis3n0nnx6";
+ name = "ktp-filetransfer-handler-17.08.3.tar.xz";
};
};
ktp-kded-module = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/ktp-kded-module-17.08.3.tar.xz";
+ sha256 = "0mzzbi50ad2z11wi77957fhmwmqnqhfwjll4s7bj4fq6i3kpncmb";
+ name = "ktp-kded-module-17.08.3.tar.xz";
};
};
ktp-send-file = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/ktp-send-file-17.08.3.tar.xz";
+ sha256 = "1al9w5n0w6i3x0izylx2jviakj3j19izlys9j7phc2gnm99g8mfa";
+ name = "ktp-send-file-17.08.3.tar.xz";
};
};
ktp-text-ui = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/ktp-text-ui-17.08.3.tar.xz";
+ sha256 = "1ib9hskw3qdrpnb0caj12wqkzg0vh2i9wlx582zchn4k4hqkwsxw";
+ name = "ktp-text-ui-17.08.3.tar.xz";
};
};
ktuberling = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/ktuberling-17.08.1.tar.xz";
- sha256 = "04fsplvry85m596qkx2i7601l7pc9dag4x45sw4z325fkzvlzsx9";
- name = "ktuberling-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/ktuberling-17.08.3.tar.xz";
+ sha256 = "1jvyg09c5458m066sd0x6p2z41rpgbdvkgmw1f6wiybqwxg82h43";
+ name = "ktuberling-17.08.3.tar.xz";
};
};
kturtle = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kturtle-17.08.1.tar.xz";
- sha256 = "0nrsmhdmc1qdnpwsgrhs2gd91al8b0wrm85nwia2mmyxsfnbd45l";
- name = "kturtle-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kturtle-17.08.3.tar.xz";
+ sha256 = "1ral1y1s2jsc8zm1bwiliblywlpsb7q79cjqafz31r6cb72rkcs4";
+ name = "kturtle-17.08.3.tar.xz";
};
};
kubrick = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kubrick-17.08.1.tar.xz";
- sha256 = "07lxc4i92i08hca2y6gqq3wsyp4mn857vwmy6ja40c2wh8sl6bix";
- name = "kubrick-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kubrick-17.08.3.tar.xz";
+ sha256 = "02hzlkqrb55dc45zgqx3r58r7syb3kr2dfwws3s96j5i4q1bp5p8";
+ name = "kubrick-17.08.3.tar.xz";
};
};
kwalletmanager = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kwalletmanager-17.08.1.tar.xz";
- sha256 = "0dq8m160kwbrjmda4hvdgq5izdnr7nnlksb9l3cvbslpc685d8h0";
- name = "kwalletmanager-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kwalletmanager-17.08.3.tar.xz";
+ sha256 = "1ggrswys6ip3lxj6qjy32i36rlmzn2cxddjildlb2b2hk6c3k36r";
+ name = "kwalletmanager-17.08.3.tar.xz";
};
};
kwave = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kwave-17.08.1.tar.xz";
- sha256 = "097viq7k2l4hkj0w07hnyfzfmz3apnri2n1g69ir1h37wq59fw89";
- name = "kwave-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kwave-17.08.3.tar.xz";
+ sha256 = "0gxmmz5ry6gjfrxwksrxvqyff8f3p807q5s4rcpfh975f10ixqqi";
+ name = "kwave-17.08.3.tar.xz";
};
};
kwordquiz = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/kwordquiz-17.08.1.tar.xz";
- sha256 = "14l419ghf6xvdp2fnsdskflppzzvvhlbciwn6cicrkzmdr9zkawz";
- name = "kwordquiz-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kwordquiz-17.08.3.tar.xz";
+ sha256 = "0bzfil8pml6jmc0zgszxybyxvkdgzzq37l97z2qvhmjw8pfk0zsr";
+ name = "kwordquiz-17.08.3.tar.xz";
};
};
libgravatar = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/libgravatar-17.08.1.tar.xz";
- sha256 = "0fn860y88pvq6mdpw1jw8msvkdmknradfp037gj9kvd5ykiicbvh";
- name = "libgravatar-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/libgravatar-17.08.3.tar.xz";
+ sha256 = "0xx9xik5xcg9gs2hjf0z24v7bqqf5qk8x0743qlspyc35i8jq7hx";
+ name = "libgravatar-17.08.3.tar.xz";
};
};
libkcddb = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/libkcddb-17.08.1.tar.xz";
- sha256 = "06i8gm7rysbdlm89nw5pd3jgbvz9vy5schwyfyhk6jbvlm43sx7z";
- name = "libkcddb-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/libkcddb-17.08.3.tar.xz";
+ sha256 = "0yhs9acv87i8635dw79hpsiywgxcbnaa4vx0l95v50r3v2pknx7h";
+ name = "libkcddb-17.08.3.tar.xz";
};
};
libkcompactdisc = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/libkcompactdisc-17.08.1.tar.xz";
- sha256 = "1xrpbpg4w275afd4fbnsmjvp737v6z5nsdz5lrfxbqg8x97xb2fm";
- name = "libkcompactdisc-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/libkcompactdisc-17.08.3.tar.xz";
+ sha256 = "0r0w7qwi1pqcs9fv5rnpf7d2zjvaqd3yj2x12z2vc81qz4vrdr19";
+ name = "libkcompactdisc-17.08.3.tar.xz";
};
};
libkdcraw = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/libkdcraw-17.08.1.tar.xz";
- sha256 = "0r9prk1pnbm2hj5q93j7axb869lzr8v7msqhylpf3awghfmy32a0";
- name = "libkdcraw-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/libkdcraw-17.08.3.tar.xz";
+ sha256 = "0hnbphkdmz3yd0callcwk2bqnkr2i9ljck63rz6yn4adnfdclkad";
+ name = "libkdcraw-17.08.3.tar.xz";
};
};
libkdegames = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/libkdegames-17.08.1.tar.xz";
- sha256 = "12w8i91pqshgb2bx4h68yni3sj7ssbcxrcdybnicg18hpcf5fzpa";
- name = "libkdegames-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/libkdegames-17.08.3.tar.xz";
+ sha256 = "1sc6y01z0alxdgrm3rlki6n5a3gblrim7cbxj9xbsghy6s8s3pn0";
+ name = "libkdegames-17.08.3.tar.xz";
};
};
libkdepim = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/libkdepim-17.08.1.tar.xz";
- sha256 = "17pg8fwpcdkj04fwzyqgykh9a23xkmkz46mknk43b37n0bcjhxq0";
- name = "libkdepim-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/libkdepim-17.08.3.tar.xz";
+ sha256 = "19njszdhca7lk6cmkj4nnvj8zk7nakb9gq8bg34dqhhiq3nc6si5";
+ name = "libkdepim-17.08.3.tar.xz";
};
};
libkeduvocdocument = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/libkeduvocdocument-17.08.1.tar.xz";
- sha256 = "0kv7yirw7q953qv23f0z3m1nmdpax6f6vsrbncpdz2057p51fwf4";
- name = "libkeduvocdocument-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/libkeduvocdocument-17.08.3.tar.xz";
+ sha256 = "0q978wn4brcszlf47iqnc93fqgcsvfcw2292n2hapf0cv8j8vzbm";
+ name = "libkeduvocdocument-17.08.3.tar.xz";
};
};
libkexiv2 = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/libkexiv2-17.08.1.tar.xz";
- sha256 = "06qwd9lnl95vyzmj7nwgxflx82rvs5wkkwx4vnp408gya8w7cpjc";
- name = "libkexiv2-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/libkexiv2-17.08.3.tar.xz";
+ sha256 = "0j906k63j30sajb70kqglhz9lhai98bh9x2bcwma711b2f30q2r2";
+ name = "libkexiv2-17.08.3.tar.xz";
};
};
libkface = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/libkface-17.08.1.tar.xz";
- sha256 = "1w81dsmz9r2vx4aw5rkkg5s08jn4gqckgr1jscdxah6af354y052";
- name = "libkface-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/libkface-17.08.3.tar.xz";
+ sha256 = "0im9k72rxpk17m8ckl06rvylsxwjhgh3yxji1visvxljwkdscbmx";
+ name = "libkface-17.08.3.tar.xz";
};
};
libkgapi = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/libkgapi-17.08.1.tar.xz";
- sha256 = "04nww7rip0qpz9cky28ygd9chfmpp1kycpri4s84cqdicwg691bv";
- name = "libkgapi-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/libkgapi-17.08.3.tar.xz";
+ sha256 = "1yw00c16g2h59x5wzaaicv8b9dvdhbp0mqv49m8krnw07awh7isz";
+ name = "libkgapi-17.08.3.tar.xz";
};
};
libkgeomap = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/libkgeomap-17.08.1.tar.xz";
- sha256 = "0llh9ixa1wyafcvah48rfrbk4n897i97a6jrk3vnf0yrqhl8nps2";
- name = "libkgeomap-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/libkgeomap-17.08.3.tar.xz";
+ sha256 = "0k0ndgwwm78z8hybyi0clfpkvmrpaj9b3xyda57c410m73fbdr0m";
+ name = "libkgeomap-17.08.3.tar.xz";
};
};
libkipi = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/libkipi-17.08.1.tar.xz";
- sha256 = "089avdka9rvv5j137k42d6sz6kvqci771wb8433xksnnci8r52xb";
- name = "libkipi-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/libkipi-17.08.3.tar.xz";
+ sha256 = "0c0bhw0wpm6y21wj15cs73150dh0vxddl4lypj3xjpknxspiv32x";
+ name = "libkipi-17.08.3.tar.xz";
};
};
libkleo = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/libkleo-17.08.1.tar.xz";
- sha256 = "0d2rby5yfwpb1gy2j87kzffzn6hls3358886qhiq6pwpx2nq7chj";
- name = "libkleo-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/libkleo-17.08.3.tar.xz";
+ sha256 = "1nyf7c1q7dngk28852lkhz3h1cvi5xy4ydshkm376h32ps905yb7";
+ name = "libkleo-17.08.3.tar.xz";
};
};
libkmahjongg = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/libkmahjongg-17.08.1.tar.xz";
- sha256 = "11ciqd54isvjfccw3xc1xrdvjjmvacgvsdsxy3arcbivikmbmdqi";
- name = "libkmahjongg-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/libkmahjongg-17.08.3.tar.xz";
+ sha256 = "1w7fzvp44dl74m5pl206mrwxpj3fh4fd0fwfinxps616jx1q76fd";
+ name = "libkmahjongg-17.08.3.tar.xz";
};
};
libkomparediff2 = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/libkomparediff2-17.08.1.tar.xz";
- sha256 = "0vp33mkm52yn2gqy469m4wfmsrbzppl6hw1d842nm1q1csnva0v5";
- name = "libkomparediff2-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/libkomparediff2-17.08.3.tar.xz";
+ sha256 = "01bd04av3jnsc2kxirfi4d8k2baaskdk2kasmbih1gml2mw9sbff";
+ name = "libkomparediff2-17.08.3.tar.xz";
};
};
libksane = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/libksane-17.08.1.tar.xz";
- sha256 = "0k2sjz86yw7lfij0kgn1byps2vd8c9hlrd4lizppflzxi2ajmkd0";
- name = "libksane-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/libksane-17.08.3.tar.xz";
+ sha256 = "1skmqiw3j8jsdaj2haridslkx27wf55swjkzgjk4cxsk96j7y4ib";
+ name = "libksane-17.08.3.tar.xz";
};
};
libksieve = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/libksieve-17.08.1.tar.xz";
- sha256 = "01d573a415i2advgad0xzxkg8f6z5fbfmyb0iim79qqhzkbmf6bm";
- name = "libksieve-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/libksieve-17.08.3.tar.xz";
+ sha256 = "1nphwghis0mmmb92nr4f5d364nd5jyi1has9dc1hx6qz8p0wphwg";
+ name = "libksieve-17.08.3.tar.xz";
};
};
lokalize = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/lokalize-17.08.1.tar.xz";
- sha256 = "0gr1qj0ish0kp842654fli2irbrli77q1449xryik76frlyy16wj";
- name = "lokalize-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/lokalize-17.08.3.tar.xz";
+ sha256 = "0d4ym1vif1ggdlbs2k3ralc6lsm81xnlfp3z3mlkvg0vv77sfbra";
+ name = "lokalize-17.08.3.tar.xz";
};
};
lskat = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/lskat-17.08.1.tar.xz";
- sha256 = "1fhkg2vjy7xpp1rnx4cp9bpvxqc4i3nymyqgph92ankal0nnw2ai";
- name = "lskat-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/lskat-17.08.3.tar.xz";
+ sha256 = "07vhmk03z2jw6mlfv5mdhzafcqa06skzm6ssk70y3whkwkck385b";
+ name = "lskat-17.08.3.tar.xz";
};
};
mailcommon = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/mailcommon-17.08.1.tar.xz";
- sha256 = "0qw7hsy36r39l13x492mhfxj3x9inagd7fjsxvfblhgnh1c2ad0r";
- name = "mailcommon-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/mailcommon-17.08.3.tar.xz";
+ sha256 = "1zgy8sjng40w8m0b8fdy62p9sng7nld84py1k8zjw8mzhqqzqxs5";
+ name = "mailcommon-17.08.3.tar.xz";
};
};
mailimporter = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/mailimporter-17.08.1.tar.xz";
- sha256 = "0wwciyc8azx2sln5407gv4kqcx7zfl680szxgbw533iq9kccvl0z";
- name = "mailimporter-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/mailimporter-17.08.3.tar.xz";
+ sha256 = "0h3wsbca2lhw1zjv2l1q6fhdwnx9kznyiykcn7jgzsh6f7grzqa8";
+ name = "mailimporter-17.08.3.tar.xz";
};
};
marble = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/marble-17.08.1.tar.xz";
- sha256 = "1jlz37m3a0jhnac4y6ix6n3hhxkp808qdnvxpd3my1gvn715wa58";
- name = "marble-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/marble-17.08.3.tar.xz";
+ sha256 = "0qmzy9b1gd40xzw4i978315dxf1ay1937wplb9nc670gmlrqnzy2";
+ name = "marble-17.08.3.tar.xz";
};
};
mbox-importer = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/mbox-importer-17.08.3.tar.xz";
+ sha256 = "1nlzjvzwp4jalqbql39q9lszfxg9cba5bcbi4wgiv580pyq38h28";
+ name = "mbox-importer-17.08.3.tar.xz";
};
};
messagelib = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/messagelib-17.08.1.tar.xz";
- sha256 = "0srjcqbqzyk8ca9ssisrils9jwm9p6b62q4b7g9bya602cbrh38b";
- name = "messagelib-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/messagelib-17.08.3.tar.xz";
+ sha256 = "1nxi79dyavjvgn83bjjrdwg0ry298ib126dxyl7inx7qgc4nhddn";
+ name = "messagelib-17.08.3.tar.xz";
};
};
minuet = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/minuet-17.08.1.tar.xz";
- sha256 = "17vvsnvhvpqcyrb5qlchp4na1wk5f4qlkh7w8sj162jsd1lbxr9j";
- name = "minuet-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/minuet-17.08.3.tar.xz";
+ sha256 = "1jg47mb5wnpw60is5zmdrqhjwsq6bnd5vw0pfiiw1arws50rv2h6";
+ name = "minuet-17.08.3.tar.xz";
};
};
okteta = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/okteta-17.08.1.tar.xz";
- sha256 = "00wmkzjw7h99b1lmab0llwzlmh1m4xgv3yy506hjwb78z1c6wbq2";
- name = "okteta-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/okteta-17.08.3.tar.xz";
+ sha256 = "1zs0g5mnlj2fd0wipxgajnvbl5s24a37v6zdkixck5fmvlj6g14v";
+ name = "okteta-17.08.3.tar.xz";
};
};
okular = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/okular-17.08.1.tar.xz";
- sha256 = "027isffca4g98qm6yx7m69cp2xjplqhnh7gy00sr1b96hhnlc9c6";
- name = "okular-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/okular-17.08.3.tar.xz";
+ sha256 = "1zalj2v9fgxc50b339i3j4n3gpf87pjnnqbgvkmd041apsv6jbnk";
+ name = "okular-17.08.3.tar.xz";
};
};
palapeli = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/palapeli-17.08.1.tar.xz";
- sha256 = "0nnplg88xipmnb24qj2ki5m090g8cbinbb3azkqadwsjfc13xk06";
- name = "palapeli-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/palapeli-17.08.3.tar.xz";
+ sha256 = "1i689gycqlpi83wfy9l2dqzdypaizdx7cx069fbm4akv8r4xfjfz";
+ name = "palapeli-17.08.3.tar.xz";
};
};
parley = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/parley-17.08.1.tar.xz";
- sha256 = "034nc5qgiy50wpnkm3d8w3cf7svj6as23sarz0h5hks4ffw1bxhg";
- name = "parley-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/parley-17.08.3.tar.xz";
+ sha256 = "0crrf7k8p9rz72q4zfbyxxfza5dm0z4nhhc4jqafra8vvbjyja2j";
+ name = "parley-17.08.3.tar.xz";
};
};
picmi = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/picmi-17.08.1.tar.xz";
- sha256 = "14kbrbq59kmqz1rd7izrp57i1a6d6nm8i73rwcl80vyla8cnvika";
- name = "picmi-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/picmi-17.08.3.tar.xz";
+ sha256 = "0zj3ang96rwzpjr3y8lig1dhqxd2ipcs3q873plra0lxmlhnzq6b";
+ name = "picmi-17.08.3.tar.xz";
};
};
pimcommon = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/pimcommon-17.08.1.tar.xz";
- sha256 = "14vk8pnwbc4bvha26fxdfbyn0ipxj93qgan8f24kpxc7irjkr8ic";
- name = "pimcommon-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/pimcommon-17.08.3.tar.xz";
+ sha256 = "0d1avdhm78kfjvl8sybjqsmp7k1wl961bqlzgbxk9wq6411p9r8r";
+ name = "pimcommon-17.08.3.tar.xz";
};
};
pim-data-exporter = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/pim-data-exporter-17.08.3.tar.xz";
+ sha256 = "0afn6rjz7vmz9q16a487ssns6nj7sbqbz4ydbhh1i3c8xhlnxg1m";
+ name = "pim-data-exporter-17.08.3.tar.xz";
};
};
pim-sieve-editor = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/pim-sieve-editor-17.08.3.tar.xz";
+ sha256 = "0fw976hdrvw68025bs1bff47d4cs95ws7p4viacmz4na9m0cag7n";
+ name = "pim-sieve-editor-17.08.3.tar.xz";
};
};
poxml = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/poxml-17.08.1.tar.xz";
- sha256 = "17g62xp5g4icfmbd001rhypn34a9asj8pcgj301q5v9065z44mmn";
- name = "poxml-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/poxml-17.08.3.tar.xz";
+ sha256 = "0vgh77rdqp8pq5k20794fl8m12azx6r2pkl0rijmwar2ln5k0k25";
+ name = "poxml-17.08.3.tar.xz";
};
};
print-manager = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/print-manager-17.08.3.tar.xz";
+ sha256 = "0ncda47pk225hn45rv1wwibn0s974mm4s5fpi54hyanba6ganll5";
+ name = "print-manager-17.08.3.tar.xz";
};
};
rocs = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/rocs-17.08.1.tar.xz";
- sha256 = "18nygfbyiny8zpq2jm6mxs6r4b90c4dwxwzvs0a3vrc131fjc6bc";
- name = "rocs-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/rocs-17.08.3.tar.xz";
+ sha256 = "1nvwjxsfqccrig25m9qkivrjn302g6blb6h2p3q1qnlszcw8b9wd";
+ name = "rocs-17.08.3.tar.xz";
};
};
signon-kwallet-extension = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/signon-kwallet-extension-17.08.3.tar.xz";
+ sha256 = "0hpalgz4xfd9qh5mxgrs638v0as4x0a5133caci6lwaydrhgwrxg";
+ name = "signon-kwallet-extension-17.08.3.tar.xz";
};
};
spectacle = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/spectacle-17.08.1.tar.xz";
- sha256 = "07x01i629zk0l409kl85yv5gws7cw7mzmp1mlwxrjix153sr4jr9";
- name = "spectacle-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/spectacle-17.08.3.tar.xz";
+ sha256 = "18z0sqd38146nc73kmwvshjxl0wgm1fh4zzxai1hcp7yiipndzm6";
+ name = "spectacle-17.08.3.tar.xz";
};
};
step = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/step-17.08.1.tar.xz";
- sha256 = "11p9rdg0m42200g15lq61489zz0zkkhic2j6hyynb1z1lr9c2iga";
- name = "step-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/step-17.08.3.tar.xz";
+ sha256 = "1gnsfn2iz2lax30pdyqvm6s5b8zjsn4gs031dlr1xgsd98c1xq87";
+ name = "step-17.08.3.tar.xz";
};
};
svgpart = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/svgpart-17.08.1.tar.xz";
- sha256 = "0xr0axiyn49szwwflq50sf9wp8i5xd7qs3krwznrdzlc8jcann9j";
- name = "svgpart-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/svgpart-17.08.3.tar.xz";
+ sha256 = "07i3ny0bl1fjfia2rbrb7n4qycdpz4gjpvx6v540ghq58dy7nfgw";
+ name = "svgpart-17.08.3.tar.xz";
};
};
sweeper = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/sweeper-17.08.1.tar.xz";
- sha256 = "04gzc06p1fh7rnb3sbma2k8lav98v3w657k0sgscnv4dvsgbcqh9";
- name = "sweeper-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/sweeper-17.08.3.tar.xz";
+ sha256 = "0jymkz024ywss8y2xpyndpr7pk89v7bbgr5anpnywfkgx3lv06xn";
+ name = "sweeper-17.08.3.tar.xz";
};
};
syndication = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/syndication-17.08.1.tar.xz";
- sha256 = "0ihkway75n4r3zw18z07g5k2ggby5q1cz4cqi29cws1ay6s09qb9";
- name = "syndication-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/syndication-17.08.3.tar.xz";
+ sha256 = "0yakzq927prd9pd1g7gld90pz1cxjwzic2c2cw9bw17x19yr748h";
+ name = "syndication-17.08.3.tar.xz";
};
};
umbrello = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.1/src/umbrello-17.08.1.tar.xz";
- sha256 = "0xvxcncsxikmnxv98ar3gzcvxahsnja4jz1l23hiy2ib1lmcgcy7";
- name = "umbrello-17.08.1.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/umbrello-17.08.3.tar.xz";
+ sha256 = "1g149nkp02b1sgsq83r0p3vfii8jsc4kx79znglcjlf20dg89j70";
+ name = "umbrello-17.08.3.tar.xz";
};
};
zeroconf-ioslave = {
- version = "17.08.1";
+ version = "17.08.3";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.08.3/src/zeroconf-ioslave-17.08.3.tar.xz";
+ sha256 = "14prm7qjqh4xrgdxzbs8z8a8p2jjf2amcx7r1qx62fkhfbh6gw01";
+ name = "zeroconf-ioslave-17.08.3.tar.xz";
};
};
}
diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
index 79333e7d9fa1..153e29a56144 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -1,5 +1,5 @@
{ stdenv,
- fetchFromGitHub,
+ fetchgit,
rustPlatform,
cmake,
makeWrapper,
@@ -29,16 +29,19 @@ let
in
buildRustPackage rec {
- name = "alacritty-unstable-2017-09-02";
+ name = "alacritty-unstable-${version}";
+ version = "2017-10-31";
- src = fetchFromGitHub {
- owner = "jwilm";
- repo = "alacritty";
- rev = "22fa4260fc9210fbb5288090df79c92e7b3788e4";
- sha256 = "0jjvvm0fm25p1h1rgfqlnhq4bwrjdxpb2pgnmpik9pl7qwy3q7s1";
+ # At the moment we cannot handle git dependencies in buildRustPackage.
+ # This fork only replaces rust-fontconfig/libfontconfig with a git submodules.
+ src = fetchgit {
+ url = https://github.com/Mic92/alacritty.git;
+ rev = "rev-${version}";
+ sha256 = "1yybx23smwdkzb6byvxd6zxi7asmrzvp9h1ihmy6xlzwjfbsalj0";
+ fetchSubmodules = true;
};
- depsSha256 = "19lrj4i6vzmf22r6xg99zcwvzjpiar8pqin1m2nvv78xzxx5yvgb";
+ cargoSha256 = "14bmm1f7hqh8i4mpb6ljh7szrm4g6mplzpq9zbgjrgxnc01w3s0i";
buildInputs = [
cmake
@@ -54,14 +57,10 @@ buildRustPackage rec {
installPhase = ''
runHook preInstall
- mkdir -p $out/bin
- for f in $(find target/release -maxdepth 1 -type f); do
- cp $f $out/bin
- done;
+ install -D target/release/alacritty $out/bin/alacritty
patchelf --set-rpath "${stdenv.lib.makeLibraryPath rpathLibs}" $out/bin/alacritty
- mkdir -p $out/share/applications
- cp Alacritty.desktop $out/share/applications/alacritty.desktop
+ install -D Alacritty.desktop $out/share/applications/alacritty.desktop
runHook postInstall
'';
diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix
index 350a64ba3e41..f1d84a919724 100644
--- a/pkgs/applications/misc/apvlv/default.nix
+++ b/pkgs/applications/misc/apvlv/default.nix
@@ -15,17 +15,18 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler";
+ nativeBuildInputs = [
+ pkgconfig
+ wrapGAppsHook
+ ];
+
buildInputs = [
- pkgconfig cmake
+ cmake
poppler pcre libxkbcommon epoxy
freetype gtk3
libpthreadstubs libXdmcp libxshmfence # otherwise warnings in compilation
];
- nativeBuildInputs = [
- wrapGAppsHook
- ];
-
patches = [
(fetchpatch {
url = "https://github.com/naihe2010/apvlv/commit/d432635b9c5ea6c052a2ae1fb71aedec5c4ad57a.patch";
diff --git a/pkgs/applications/misc/artha/default.nix b/pkgs/applications/misc/artha/default.nix
index 3294d18e70b8..cfd4d6b32de3 100644
--- a/pkgs/applications/misc/artha/default.nix
+++ b/pkgs/applications/misc/artha/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0qr4ihl7ma3cq82xi1fpzvf74mm9vsg0j035xvmcp3r6rmw2fycx";
};
- buildInputs = [ dbus_glib gtk2 pkgconfig wordnet ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ dbus_glib gtk2 wordnet ];
meta = with stdenv.lib; {
description = "An offline thesaurus based on WordNet";
diff --git a/pkgs/applications/misc/bb/default.nix b/pkgs/applications/misc/bb/default.nix
new file mode 100644
index 000000000000..71196e919915
--- /dev/null
+++ b/pkgs/applications/misc/bb/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, aalib, ncurses, xorg, libmikmod }:
+
+stdenv.mkDerivation rec {
+ name = "bb-${version}";
+ version = "1.3rc1";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/aa-project/bb/${version}/${name}.tar.gz";
+ sha256 = "1i411glxh7g4pfg4gw826lpwngi89yrbmxac8jmnsfvrfb48hgbr";
+ };
+
+ buildInputs = [
+ aalib ncurses libmikmod
+ xorg.libXau xorg.libXdmcp xorg.libX11
+ ];
+
+ meta = with stdenv.lib; {
+ homepage = http://aa-project.sourceforge.net/bb;
+ description = "AA-lib demo";
+ license = licenses.gpl2;
+ maintainers = maintainers.rnhmjoj;
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/applications/misc/bitcoinarmory/default.nix b/pkgs/applications/misc/bitcoinarmory/default.nix
index 78ac55088a4c..a9d32d4b2522 100644
--- a/pkgs/applications/misc/bitcoinarmory/default.nix
+++ b/pkgs/applications/misc/bitcoinarmory/default.nix
@@ -7,9 +7,9 @@ let
version = "0.96.1";
sitePackages = pythonPackages.python.sitePackages;
- inherit (pythonPackages) mkPythonDerivation pyqt4 psutil twisted;
+ inherit (pythonPackages) buildPythonApplication pyqt4 psutil twisted;
-in mkPythonDerivation {
+in buildPythonApplication {
name = "bitcoinarmory-${version}";
@@ -21,11 +21,13 @@ in mkPythonDerivation {
sha256 = "0pjk5qx16n3kvs9py62666qkwp2awkgd87by4karbj7vk6p1l14h"; fetchSubmodules = true;
};
+ format = "other";
+
# FIXME bitcoind doesn't die on shutdown. Need some sort of patch to fix that.
#patches = [ ./shutdown-fix.patch ];
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig
autoreconfHook
swig
qt4
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 86b2ab6eb1ca..b348f253b350 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, stdenv_gcc5, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew
+{ stdenv, 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,7 +10,7 @@
with lib;
-(if cudaSupport then stdenv_gcc5 else stdenv).mkDerivation rec {
+stdenv.mkDerivation rec {
name = "blender-2.79";
src = fetchurl {
@@ -57,9 +57,8 @@ with lib;
++ optional jackaudioSupport "-DWITH_JACK=ON"
++ optionals cudaSupport
[ "-DWITH_CYCLES_CUDA_BINARIES=ON"
- # Disable the sm_20 architecture to work around a segfault in
- # ptxas, as suggested on #blendercoders.
- "-DCYCLES_CUDA_BINARIES_ARCH=sm_21;sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61"
+ # Disable architectures before sm_30 to support new CUDA toolkits.
+ "-DCYCLES_CUDA_BINARIES_ARCH=sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61"
]
++ optional colladaSupport "-DWITH_OPENCOLLADA=ON";
diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix
index a0955dcecedd..8aa191c0f3c2 100644
--- a/pkgs/applications/misc/buku/default.nix
+++ b/pkgs/applications/misc/buku/default.nix
@@ -1,14 +1,14 @@
{ stdenv, python3, fetchFromGitHub }:
with python3.pkgs; buildPythonApplication rec {
- version = "3.3.1";
+ version = "3.4";
name = "buku-${version}";
src = fetchFromGitHub {
owner = "jarun";
repo = "buku";
rev = "v${version}";
- sha256 = "1byq8jgv1rb67ygibk0vzgz5ri1il4q4hpg23z5q0ml27fif9hw3";
+ sha256 = "0v0wvsxw78g6yl606if25k1adghr5764chwy1kl7dsxvchqwvmg0";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index cd9a71729218..d81e9ed4bbef 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,12 +5,12 @@
}:
stdenv.mkDerivation rec {
- version = "3.7.0";
+ version = "3.12.0";
name = "calibre-${version}";
src = fetchurl {
url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
- sha256 = "1wb0ixx11q0p5dzcszq1n2lx9bcl5dynr87d7anfiz73mxdq20za";
+ sha256 = "0l7r5ny9a36yg22fqzz3as6wh1xqpa3hrlx2gy25yp649sbkd9vq";
};
patches = [
diff --git a/pkgs/applications/misc/cataract/build.nix b/pkgs/applications/misc/cataract/build.nix
index 05c058f8a83e..e48b32a783d7 100644
--- a/pkgs/applications/misc/cataract/build.nix
+++ b/pkgs/applications/misc/cataract/build.nix
@@ -19,7 +19,8 @@ stdenv.mkDerivation rec {
inherit sha256 rev;
};
- buildInputs = [ autoreconfHook glib pkgconfig libxml2 exiv2 imagemagick ];
+ nativeBuildInputs = [ autoreconfHook pkgconfig ];
+ buildInputs = [ glib libxml2 exiv2 imagemagick ];
installPhase = ''
mkdir $out/{bin,share} -p
diff --git a/pkgs/applications/misc/cbatticon/default.nix b/pkgs/applications/misc/cbatticon/default.nix
index 1aeb45f1e206..0c71b3ffb0ad 100644
--- a/pkgs/applications/misc/cbatticon/default.nix
+++ b/pkgs/applications/misc/cbatticon/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "cbatticon-${version}";
- version = "1.6.6";
+ version = "1.6.7";
src = fetchFromGitHub {
owner = "valr";
repo = "cbatticon";
rev = version;
- sha256 = "0gphijkjmg5q349ffhnx12dppg6hajkr90n0x5b6s9cad5b4q0kq";
+ sha256 = "0rm1rpq81cxjwd4f11c3ivg5hwsd08qm47vdn16yr1cmm2cw4r2d";
};
makeFlags = "PREFIX=$(out)";
diff --git a/pkgs/applications/misc/cgminer/default.nix b/pkgs/applications/misc/cgminer/default.nix
index d4884bb1709e..acd38d74dca4 100644
--- a/pkgs/applications/misc/cgminer/default.nix
+++ b/pkgs/applications/misc/cgminer/default.nix
@@ -11,8 +11,9 @@ stdenv.mkDerivation rec {
sha256 = "1xfzx91dpwjj1vmhas3v9ybs0p2i74lrhinijmpav15acfggm9fq";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- autoconf automake pkgconfig libtool curl ncurses amdappsdk amdadlsdk
+ autoconf automake libtool curl ncurses amdappsdk amdadlsdk
xorg.libX11 xorg.libXext xorg.libXinerama jansson
];
configureScript = "./autogen.sh";
diff --git a/pkgs/applications/misc/chirp/default.nix b/pkgs/applications/misc/chirp/default.nix
index 67d37489feb0..673ecdc85496 100644
--- a/pkgs/applications/misc/chirp/default.nix
+++ b/pkgs/applications/misc/chirp/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "chirp-daily-${version}";
- version = "20170311";
+ version = "20170714";
src = fetchurl {
url = "http://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz";
- sha256 = "0mvj650vm3bfk94b174gl99fj4jigrx38f1iciz1cp3gn8hcrcpj";
+ sha256 = "1pglsmc0pf50w7df4vv30z5hmdxy4aqjl3qrv8kfiax7rld21gcy";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/misc/cli-visualizer/default.nix b/pkgs/applications/misc/cli-visualizer/default.nix
index 860a1d186f71..8b24df1bee92 100644
--- a/pkgs/applications/misc/cli-visualizer/default.nix
+++ b/pkgs/applications/misc/cli-visualizer/default.nix
@@ -1,27 +1,29 @@
-{ stdenv, fetchFromGitHub, fftw, ncurses, libpulseaudio }:
+{ stdenv, fetchFromGitHub, fftw, ncurses5, libpulseaudio, makeWrapper }:
stdenv.mkDerivation rec {
- version = "1.5";
+ version = "1.6";
name = "cli-visualizer-${version}";
src = fetchFromGitHub {
owner = "dpayne";
repo = "cli-visualizer";
rev = version;
- sha256 = "18qv4ya64qmczq94dnynrnzn7pwhmzbn14r05qcvbbwv7r8gclzs";
+ sha256 = "0mirp8bk398di5xyq95iprmdyvplfghxqmrfj7jdnpy554vx7ppc";
};
postPatch = ''
sed '1i#include ' -i src/Transformer/SpectrumCircleTransformer.cpp
'';
- buildInputs = [ fftw ncurses libpulseaudio ];
+ buildInputs = [ fftw ncurses5 libpulseaudio makeWrapper ];
buildFlags = [ "ENABLE_PULSE=1" ];
installPhase = ''
mkdir -p $out/bin
cp build/vis $out/bin/vis
+ # See https://github.com/dpayne/cli-visualizer/issues/62#issuecomment-330738075
+ wrapProgram $out/bin/vis --set TERM rxvt-256color
'';
meta = {
diff --git a/pkgs/applications/misc/clipit/default.nix b/pkgs/applications/misc/clipit/default.nix
index 06ebaa7c12dd..d9ea487a83bb 100644
--- a/pkgs/applications/misc/clipit/default.nix
+++ b/pkgs/applications/misc/clipit/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0jrwn8qfgb15rwspdp1p8hb1nc0ngmpvgr87d4k3lhlvqg2cfqva";
};
- buildInputs = [ intltool pkgconfig gtk2 xdotool hicolor_icon_theme ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ intltool gtk2 xdotool hicolor_icon_theme ];
meta = with stdenv.lib; {
description = "Lightweight GTK+ Clipboard Manager";
diff --git a/pkgs/applications/misc/cmatrix/default.nix b/pkgs/applications/misc/cmatrix/default.nix
index c7a76ef00a6a..28f14cc1435f 100644
--- a/pkgs/applications/misc/cmatrix/default.nix
+++ b/pkgs/applications/misc/cmatrix/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
sha256 = "0k06fw2n8nzp1pcdynhajp5prba03gfgsbj91bknyjr5xb5fd9hz";
};
- buildInputs = [ pkgconfig ncurses ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ ncurses ];
meta = {
description = "Simulates the falling characters theme from The Matrix movie";
diff --git a/pkgs/applications/misc/copyq/cmake-modules.patch b/pkgs/applications/misc/copyq/cmake-modules.patch
deleted file mode 100644
index f21105763de9..000000000000
--- a/pkgs/applications/misc/copyq/cmake-modules.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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 4fd30c547b5c..37afea2bb6f6 100644
--- a/pkgs/applications/misc/copyq/default.nix
+++ b/pkgs/applications/misc/copyq/default.nix
@@ -1,27 +1,23 @@
-{ stdenv, fetchFromGitHub, cmake, qt5, libXfixes, libXtst, git
+{ stdenv, fetchFromGitHub, cmake, qtbase, qtscript, qtwebkit, libXfixes, libXtst, git
, webkitSupport ? true
}:
stdenv.mkDerivation rec {
name = "CopyQ-${version}";
- version = "3.0.3";
+ version = "3.1.2";
src = fetchFromGitHub {
owner = "hluk";
repo = "CopyQ";
rev = "v${version}";
- sha256 = "0wpxqrg4mn8xjsrwsmlhh731s2kr6afnzpqif1way0gi7fqr73jl";
+ sha256 = "0gdx1bqqqr4fk6wcrxqm9li6z48j1w84wjwyjpzp2cjzg96bp6bl";
};
- patches = [
- ./cmake-modules.patch
- ];
-
nativeBuildInputs = [ cmake ];
buildInputs = [
- git qt5.full libXfixes libXtst
- ] ++ stdenv.lib.optional webkitSupport qt5.qtwebkit;
+ git qtbase qtscript libXfixes libXtst
+ ] ++ stdenv.lib.optional webkitSupport qtwebkit;
meta = with stdenv.lib; {
homepage = https://hluk.github.io/CopyQ;
diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix
index 3fb669072955..1012f187497a 100644
--- a/pkgs/applications/misc/cura/default.nix
+++ b/pkgs/applications/misc/cura/default.nix
@@ -1,18 +1,18 @@
-{ mkDerivation, lib, fetchFromGitHub, cmake, python3, qtbase, curaengine }:
+{ mkDerivation, lib, fetchFromGitHub, cmake, python3, qtbase, qtquickcontrols, curaengine }:
mkDerivation rec {
name = "cura-${version}";
- version = "2.6.1";
+ version = "3.0.3";
src = fetchFromGitHub {
owner = "Ultimaker";
repo = "Cura";
rev = version;
- sha256 = "03rsw6nafg3y9if2dlnzsj6c9x3x7cv6gs4a1w84jaq4p1f8fcsd";
+ sha256 = "0ks8bb3mif6kyvb01ddhpn1c2l31s8fxivi70kmpm743sqv4kjaa";
};
- buildInputs = [ qtbase ];
- propagatedBuildInputs = with python3.pkgs; [ uranium zeroconf pyserial ];
+ buildInputs = [ qtbase qtquickcontrols ];
+ propagatedBuildInputs = with python3.pkgs; [ uranium zeroconf pyserial numpy-stl ];
nativeBuildInputs = [ cmake python3.pkgs.wrapPython ];
cmakeFlags = [ "-DURANIUM_DIR=${python3.pkgs.uranium.src}" ];
@@ -28,7 +28,7 @@ mkDerivation rec {
meta = with lib; {
description = "3D printer / slicing GUI built on top of the Uranium framework";
- homepage = https://github.com/Ultimaker/Cura;
+ homepage = "https://github.com/Ultimaker/Cura";
license = licenses.agpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix
index ce7109dd6fcd..575889ad2c6f 100644
--- a/pkgs/applications/misc/curaengine/default.nix
+++ b/pkgs/applications/misc/curaengine/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "curaengine-${version}";
- version = "2.6.1";
+ version = "3.0.3";
src = fetchFromGitHub {
owner = "Ultimaker";
repo = "CuraEngine";
rev = version;
- sha256 = "1vixxxpwrprcrma0v5ckjvcy45pj32rkf5pk4w7rans9k2ig66ic";
+ sha256 = "0x1ss3hppw6062rmmxh0dpnm5cg6r2mp01k0nxyw5riiljj59ydy";
};
nativeBuildInputs = [ cmake ];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A powerful, fast and robust engine for processing 3D models into 3D printing instruction";
- homepage = https://github.com/Ultimaker/CuraEngine;
+ homepage = "https://github.com/Ultimaker/CuraEngine";
license = licenses.agpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/applications/misc/deepin-terminal/default.nix b/pkgs/applications/misc/deepin-terminal/default.nix
index 1e024a16e81c..0ee52b740f24 100644
--- a/pkgs/applications/misc/deepin-terminal/default.nix
+++ b/pkgs/applications/misc/deepin-terminal/default.nix
@@ -14,7 +14,8 @@ stdenv.mkDerivation rec {
patchPhase = ''
substituteInPlace project_path.c --replace __FILE__ \"$out/share/deepin-terminal/\"
'';
- buildInputs = [ unzip gtk3 pkgconfig vala cmake vte gee wnck gettext libsecret json_glib ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ unzip gtk3 vala cmake vte gee wnck gettext libsecret json_glib ];
meta = {
description = "The default terminal emulation for Deepin";
diff --git a/pkgs/applications/misc/dump1090/default.nix b/pkgs/applications/misc/dump1090/default.nix
new file mode 100644
index 000000000000..3e9fe133d93c
--- /dev/null
+++ b/pkgs/applications/misc/dump1090/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, pkgconfig, libusb, rtl-sdr }:
+
+stdenv.mkDerivation rec {
+ name = "dump1090-${version}";
+ version = "2014-10-31";
+
+ src = fetchFromGitHub {
+ owner = "MalcolmRobb";
+ repo = "dump1090";
+ rev = "bff92c4ad772a0a8d433f788d39dae97e00e4dbe";
+ sha256 = "06aaj9gpz5v4qzvnp8xf18wdfclp0jvn3hflls79ly46gz2dh9hy";
+ };
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ buildInputs = [ libusb rtl-sdr ];
+
+ makeFlags = [ "PREFIX=$out" ];
+
+ installPhase = ''
+ mkdir -p $out/bin $out/share
+ cp -v dump1090 $out/bin/dump1090
+ cp -vr public_html $out/share/dump1090
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A simple Mode S decoder for RTLSDR devices";
+ homepage = https://github.com/MalcolmRobb/dump1090;
+ license = licenses.bsd3;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ earldouglas ];
+ };
+}
diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix
index 4b81bfd53f50..d83eb1ed86a7 100644
--- a/pkgs/applications/misc/eaglemode/default.nix
+++ b/pkgs/applications/misc/eaglemode/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1a2hzyck95g740qg4p4wd4fjwsmlknh75i9sbx5r5v9pyr4i3m4f";
};
- buildInputs = [ perl libX11 libjpeg libpng libtiff pkgconfig
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ perl libX11 libjpeg libpng libtiff
librsvg glib gtk2 libXxf86vm libXext poppler xineLib ];
# The program tries to dlopen both Xxf86vm and Xext, so we use the
@@ -37,6 +38,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3;
maintainers = with maintainers; [ viric ];
platforms = platforms.linux;
- hydraPlatforms = [];
+ broken = true;
};
}
diff --git a/pkgs/applications/misc/ebook2cw/configfile.patch b/pkgs/applications/misc/ebook2cw/configfile.patch
new file mode 100644
index 000000000000..c7aafe5227a5
--- /dev/null
+++ b/pkgs/applications/misc/ebook2cw/configfile.patch
@@ -0,0 +1,11 @@
+--- a/ebook2cw.c 2017-11-08 19:52:58.298131348 -0700
++++ b/ebook2cw.c 2017-11-08 19:53:02.588231067 -0700
+@@ -136,7 +136,7 @@
+ char isomap[256][4]; /* by these strings */
+ char utf8map[256][8];
+
+- char configfile[1025];
++ char configfile[2048];
+
+ char id3_author[80],
+ id3_title[80],
diff --git a/pkgs/applications/misc/ebook2cw/default.nix b/pkgs/applications/misc/ebook2cw/default.nix
new file mode 100644
index 000000000000..cce10258cf3b
--- /dev/null
+++ b/pkgs/applications/misc/ebook2cw/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchsvn, lame, libvorbis }:
+
+stdenv.mkDerivation rec {
+
+ name = "ebook2cw-${version}";
+ version = "0.8.2";
+
+ src = fetchsvn {
+ url = "svn://svn.fkurz.net/ebook2cw/tags/${name}";
+ sha256 = "1mvp3nz3k76v757792n9b7fcm5jm3jcwarl1k7cila9fi0c2rsiw";
+ };
+
+ buildInputs = [ lame libvorbis ];
+
+ patches = [ ./configfile.patch ];
+
+ postPatch = ''
+ substituteInPlace Makefile --replace gcc cc
+ '';
+
+ makeFlags = [ "DESTDIR=$(out)" ];
+
+ meta = with stdenv.lib; {
+ description = "Convert ebooks to Morse MP3s/OGGs";
+ homepage = http://fkurz.net/ham/ebook2cw.html;
+ license = licenses.gpl2;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ earldouglas ];
+ };
+
+}
diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix
new file mode 100644
index 000000000000..56c1a8168a82
--- /dev/null
+++ b/pkgs/applications/misc/electron-cash/default.nix
@@ -0,0 +1,66 @@
+{ stdenv, fetchurl, python2Packages }:
+
+python2Packages.buildPythonApplication rec {
+ version = "2.9.4";
+ name = "electron-cash-${version}";
+
+ src = fetchurl {
+ url = "https://electroncash.org/downloads/${version}/win-linux/Electron-Cash-${version}.tar.gz";
+ # Verified using official SHA-1 and signature from
+ # https://github.com/fyookball/keys-n-hashes
+ sha256 = "1y8mzwa6bb8zj4l92wm4c2icnr42wmhbfz6z5ymh356gwll914vh";
+ };
+
+ propagatedBuildInputs = with python2Packages; [
+ dns
+ ecdsa
+ jsonrpclib
+ pbkdf2
+ pyaes
+ pycrypto
+ pyqt4
+ pysocks
+ qrcode
+ requests
+ tlslite
+
+ # plugins
+ keepkey
+ trezor
+ ];
+
+ preBuild = ''
+ sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py
+ pyrcc4 icons.qrc -o gui/qt/icons_rc.py
+ # Recording the creation timestamps introduces indeterminism to the build
+ sed -i '/Created: .*/d' gui/qt/icons_rc.py
+ '';
+
+ postInstall = ''
+ # Despite setting usr_share above, these files are installed under
+ # $out/nix ...
+ mv $out/lib/python2.7/site-packages/nix/store"/"*/share $out
+ rm -rf $out/lib/python2.7/site-packages/nix
+
+ substituteInPlace $out/share/applications/electron-cash.desktop \
+ --replace "Exec=electron-cash %u" "Exec=$out/bin/electron-cash %u"
+ '';
+
+ doInstallCheck = true;
+ installCheckPhase = ''
+ $out/bin/electrum help >/dev/null
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A lightweight Bitcoin wallet";
+ longDescription = ''
+ An easy-to-use Bitcoin client featuring wallets generated from
+ mnemonic seeds (in addition to other, more advanced, wallet options)
+ and the ability to perform transactions without downloading a copy
+ of the blockchain.
+ '';
+ homepage = https://www.electroncash.org/;
+ maintainers = with maintainers; [ lassulus ];
+ license = licenses.mit;
+ };
+}
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index 0781617eb695..abe8d0dde84b 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -13,6 +13,7 @@ python2Packages.buildPythonApplication rec {
dns
ecdsa
jsonrpclib
+ matplotlib
pbkdf2
protobuf
pyaes
@@ -30,7 +31,6 @@ python2Packages.buildPythonApplication rec {
# TODO plugins
# amodem
# btchip
- # matplotlib
];
preBuild = ''
diff --git a/pkgs/applications/misc/et/default.nix b/pkgs/applications/misc/et/default.nix
index 4a77423bea80..40631b0a0dbf 100644
--- a/pkgs/applications/misc/et/default.nix
+++ b/pkgs/applications/misc/et/default.nix
@@ -2,23 +2,18 @@
stdenv.mkDerivation rec {
name = "et-${version}";
- version = "2017-03-04";
+ version = "0.1";
src = fetchFromGitHub {
owner = "geistesk";
repo = "et";
- rev = "151e9b6bc0d2d4f45bda8ced740ee99d0f2012f6";
- sha256 = "1a1jdnzmal05k506bbvzlwsj2f3kql6l5xc1gdabm79y6vaf4r7s";
+ rev = "${version}";
+ sha256 = "1d2hq6p1y2ynk0a3l35lwbm1fcl9kg7rpjcin8bx4xcdpbw42y94";
};
buildInputs = [ libnotify gdk_pixbuf ];
nativeBuildInputs = [ pkgconfig ];
- prePatch = ''
- substituteInPlace Makefile \
- --replace ' = gcc' ' ?= gcc'
- '';
-
installPhase = ''
mkdir -p $out/bin
cp et $out/bin
@@ -26,7 +21,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- description = "Minimal libnotify-based (egg) timer for GNU/Linux";
+ description = "Minimal libnotify-based (egg) timer";
homepage = https://github.com/geistesk/et;
license = licenses.gpl3;
platforms = platforms.unix;
diff --git a/pkgs/applications/misc/eterm/default.nix b/pkgs/applications/misc/eterm/default.nix
index 6344f40a2911..98b47990314d 100644
--- a/pkgs/applications/misc/eterm/default.nix
+++ b/pkgs/applications/misc/eterm/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
sha256 = "0g71szjklkiczxwzbjjfm59y6v9w4hp8mg7cy99z1g7qcjm0gfbj";
};
- buildInputs = [ libX11 libXext libXaw pkgconfig imlib2 ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libX11 libXext libXaw imlib2 ];
propagatedBuildInputs = [ libast ];
meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/evtest/default.nix b/pkgs/applications/misc/evtest/default.nix
index 10605b8b18da..73911bab6f66 100644
--- a/pkgs/applications/misc/evtest/default.nix
+++ b/pkgs/applications/misc/evtest/default.nix
@@ -3,7 +3,8 @@
stdenv.mkDerivation rec {
name = "evtest-1.33";
- buildInputs = [ autoreconfHook pkgconfig libxml2 ];
+ nativeBuildInputs = [ autoreconfHook pkgconfig ];
+ buildInputs = [ libxml2 ];
src = fetchgit {
url = "git://anongit.freedesktop.org/evtest";
diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix
index 1097780723ec..7bd876f1d4aa 100644
--- a/pkgs/applications/misc/far2l/default.nix
+++ b/pkgs/applications/misc/far2l/default.nix
@@ -1,29 +1,34 @@
{ stdenv, fetchFromGitHub, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash,
- xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick }:
+ xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick, darwin }:
+with stdenv.lib;
stdenv.mkDerivation rec {
- rev = "de5554dbc0ec69329b75777d4a3b2f01851fc5ed";
- build = "unstable-2017-07-13.git${builtins.substring 0 7 rev}";
+ rev = "1ecd3a37c7b866a4599c547ea332541de2a2af26";
+ build = "unstable-2017-09-30.git${builtins.substring 0 7 rev}";
name = "far2l-2.1.${build}";
src = fetchFromGitHub {
owner = "elfmz";
repo = "far2l";
rev = rev;
- sha256 = "07l8w9p6zxm9qgh9wlci584lgv8gd4aw742jaqh9acgkxy9caih8";
+ sha256 = "0mavg9z1n81b1hbkj320m36r8lpw28j07rl1d2hpg69y768yyq05";
};
nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ];
- buildInputs = [ wxGTK30 glib pcre ];
+ buildInputs = [ wxGTK30 glib pcre ]
+ ++ optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa;
patches = [ ./add-nix-syntax-highlighting.patch ];
- postPatch = ''
- echo 'echo ${build}' > far2l/bootstrap/scripts/vbuild.sh
-
- substituteInPlace far2l/bootstrap/open.sh \
+ postPatch = optionalString stdenv.isLinux ''
+ substituteInPlace far2l/bootstrap/open.sh \
--replace 'gvfs-trash' '${gvfs}/bin/gvfs-trash'
+ '' + optionalString stdenv.isDarwin ''
+ substituteInPlace far2l/CMakeLists.txt \
+ --replace "-framework System" -lSystem
+ '' + ''
+ echo 'echo ${build}' > far2l/bootstrap/scripts/vbuild.sh
substituteInPlace far2l/bootstrap/open.sh \
--replace 'xdg-open' '${xdg_utils}/bin/xdg-open'
substituteInPlace far2l/vtcompletor.cpp \
@@ -62,7 +67,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- meta = with stdenv.lib; {
+ meta = {
description = "An orthodox file manager";
homepage = https://github.com/elfmz/far2l;
license = licenses.gpl2;
diff --git a/pkgs/applications/misc/fbreader/default.nix b/pkgs/applications/misc/fbreader/default.nix
index 6cfd1e05279e..80f76bc27c89 100644
--- a/pkgs/applications/misc/fbreader/default.nix
+++ b/pkgs/applications/misc/fbreader/default.nix
@@ -9,8 +9,9 @@ stdenv.mkDerivation {
sha256 = "1sdq3vvwkq4bkyrvh0p884d66gaddz8hlab3m798ji9ixbak2z1x";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig bzip2 curl expat fribidi libunibreak
+ bzip2 curl expat fribidi libunibreak
qt4 sqlite zlib
];
diff --git a/pkgs/applications/misc/fehlstart/default.nix b/pkgs/applications/misc/fehlstart/default.nix
index 548679e4b47c..db78f2ec9204 100644
--- a/pkgs/applications/misc/fehlstart/default.nix
+++ b/pkgs/applications/misc/fehlstart/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation {
};
patches = [ ./use-nix-profiles.patch ];
- buildInputs = [ pkgconfig gtk2 keybinder ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk2 keybinder ];
preConfigure = ''
export PREFIX=$out
diff --git a/pkgs/applications/misc/fme/default.nix b/pkgs/applications/misc/fme/default.nix
index 301695885016..4e786bfb36f8 100644
--- a/pkgs/applications/misc/fme/default.nix
+++ b/pkgs/applications/misc/fme/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec{
sha256 = "d1c81a6a38c0faad02943ad65d6d0314bd205c6de841669a2efe43e4c503e63d";
};
- buildInputs = [ pkgconfig autoconf automake gettext fluxbox bc gtkmm2 glibmm libglademm libsigcxx ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ autoconf automake gettext fluxbox bc gtkmm2 glibmm libglademm libsigcxx ];
preConfigure = ''
./autogen.sh
diff --git a/pkgs/applications/misc/garmin-plugin/default.nix b/pkgs/applications/misc/garmin-plugin/default.nix
index db954a254630..b97b079ab663 100644
--- a/pkgs/applications/misc/garmin-plugin/default.nix
+++ b/pkgs/applications/misc/garmin-plugin/default.nix
@@ -6,7 +6,8 @@ stdenv.mkDerivation {
sha256 = "15gads1fj4sj970m5960dgnhys41ksi4cm53ldkf67wn8dc9i4k0";
};
sourceRoot = "GarminPlugin-0.3.26/src";
- buildInputs = [ garmintools libusb libgcrypt pkgconfig tinyxml zlib ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ garmintools libusb libgcrypt tinyxml zlib ];
configureFlags = [
"--with-libgcrypt-prefix=${libgcrypt.dev}"
"--with-garmintools-incdir=${garmintools}/include"
diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix
index cef8640d958f..b6bb3c2fd83d 100644
--- a/pkgs/applications/misc/girara/default.nix
+++ b/pkgs/applications/misc/girara/default.nix
@@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
--replace 'ifdef TPUT_AVAILABLE' 'ifneq ($(TPUT_AVAILABLE), 0)'
'';
- buildInputs = [ pkgconfig gtk gettext libintlOrEmpty ]
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk gettext libintlOrEmpty ]
++ stdenv.lib.optional stdenv.isDarwin libiconv;
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
diff --git a/pkgs/applications/misc/gmrun/default.nix b/pkgs/applications/misc/gmrun/default.nix
index 3be2704896ed..053da375ab15 100644
--- a/pkgs/applications/misc/gmrun/default.nix
+++ b/pkgs/applications/misc/gmrun/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
sha256 = "180z6hbax1qypy5cyy2z6nn7fzxla4ib47ck8mqwr714ag77na8p";
};
- buildInputs = [ glib gtk2 pkgconfig popt ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ glib gtk2 popt ];
doCheck = true;
diff --git a/pkgs/applications/misc/gnuradio-ais/default.nix b/pkgs/applications/misc/gnuradio-ais/default.nix
index eda95bc0c5e7..a67a8a44fced 100644
--- a/pkgs/applications/misc/gnuradio-ais/default.nix
+++ b/pkgs/applications/misc/gnuradio-ais/default.nix
@@ -16,8 +16,9 @@ stdenv.mkDerivation rec {
sha256 = "1vl3kk8xr2mh5lf31zdld7yzmwywqffffah8iblxdzblgsdwxfl6";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- cmake pkgconfig boost gnuradio makeWrapper cppunit gnuradio-osmosdr
+ cmake boost gnuradio makeWrapper cppunit gnuradio-osmosdr
] ++ stdenv.lib.optionals pythonSupport [ python swig ];
postInstall = ''
diff --git a/pkgs/applications/misc/gnuradio-gsm/default.nix b/pkgs/applications/misc/gnuradio-gsm/default.nix
index a47925cab90d..bbdc74510eaa 100644
--- a/pkgs/applications/misc/gnuradio-gsm/default.nix
+++ b/pkgs/applications/misc/gnuradio-gsm/default.nix
@@ -16,8 +16,9 @@ stdenv.mkDerivation rec {
sha256 = "13nnq927kpf91iqccr8db9ripy5czjl5jiyivizn6bia0bam2pvx";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- cmake pkgconfig boost gnuradio makeWrapper cppunit libosmocore gnuradio-osmosdr
+ cmake boost gnuradio makeWrapper cppunit libosmocore gnuradio-osmosdr
] ++ stdenv.lib.optionals pythonSupport [ python swig ];
postInstall = ''
diff --git a/pkgs/applications/misc/gnuradio-nacl/default.nix b/pkgs/applications/misc/gnuradio-nacl/default.nix
index 6298e083617f..cd3630c842c3 100644
--- a/pkgs/applications/misc/gnuradio-nacl/default.nix
+++ b/pkgs/applications/misc/gnuradio-nacl/default.nix
@@ -16,8 +16,9 @@ stdenv.mkDerivation rec {
sha256 = "0q28lgkndcw9921hm6cw5ilxd83n65hjajwl78j50mh6yc3bim35";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- cmake pkgconfig boost gnuradio uhd makeWrapper libsodium cppunit
+ cmake boost gnuradio uhd makeWrapper libsodium cppunit
] ++ stdenv.lib.optionals pythonSupport [ python swig ];
postInstall = ''
diff --git a/pkgs/applications/misc/gnuradio-osmosdr/default.nix b/pkgs/applications/misc/gnuradio-osmosdr/default.nix
index 5fc6eb2c2744..e2d3e808476e 100644
--- a/pkgs/applications/misc/gnuradio-osmosdr/default.nix
+++ b/pkgs/applications/misc/gnuradio-osmosdr/default.nix
@@ -15,8 +15,9 @@ stdenv.mkDerivation rec {
sha256 = "0vyzr4fhkblf2v3d7m0ch5hws4c493jw3ydl4y6b2dfbfzchhsz8";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- cmake pkgconfig boost gnuradio rtl-sdr uhd makeWrapper hackrf
+ cmake boost gnuradio rtl-sdr uhd makeWrapper hackrf
] ++ stdenv.lib.optionals pythonSupport [ python swig ];
postInstall = ''
diff --git a/pkgs/applications/misc/gnuradio-rds/default.nix b/pkgs/applications/misc/gnuradio-rds/default.nix
index 5e729a75557e..3d09441a7f03 100644
--- a/pkgs/applications/misc/gnuradio-rds/default.nix
+++ b/pkgs/applications/misc/gnuradio-rds/default.nix
@@ -15,8 +15,9 @@ stdenv.mkDerivation rec {
sha256 = "008284ya464q4h4fd0zvcn6g7bym231p8fl3kdxncz9ks4zsbsxs";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- cmake pkgconfig boost gnuradio makeWrapper
+ cmake boost gnuradio makeWrapper
] ++ stdenv.lib.optionals pythonSupport [ python swig ];
postInstall = ''
diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix
index e10cb30d1874..0156122ec79a 100644
--- a/pkgs/applications/misc/gnuradio/default.nix
+++ b/pkgs/applications/misc/gnuradio/default.nix
@@ -30,8 +30,9 @@ stdenv.mkDerivation rec {
sha256 = "1m2jf8lafr6pr2dlm40nbvr6az8gwjfkzpbs4fxzv3l5hcqvmnc7";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- cmake pkgconfig git boost cppunit fftw python swig2 orc lxml qt4
+ cmake git boost cppunit fftw python swig2 orc lxml qt4
qwt alsaLib SDL libusb1 uhd gsl makeWrapper
];
@@ -41,8 +42,14 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ postPatch = ''
+ substituteInPlace \
+ gr-fec/include/gnuradio/fec/polar_decoder_common.h \
+ --replace BOOST_CONSTEXPR_OR_CONST const
+ '';
+
preConfigure = ''
- export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-unused-variable"
+ export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-unused-variable -std=c++11"
'';
# - Ensure we get an interactive backend for matplotlib. If not the gr_plot_*
diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix
index 278c685b7cf7..f552a74f4c11 100644
--- a/pkgs/applications/misc/goldendict/default.nix
+++ b/pkgs/applications/misc/goldendict/default.nix
@@ -9,13 +9,12 @@ stdenv.mkDerivation rec {
sha256 = "1pizz39l61rbps0wby75fkvzyrah805257j33siqybwhsfiy1kmw";
};
+ nativeBuildInputs = [ pkgconfig qmake ];
buildInputs = [
- pkgconfig qtbase qtsvg qtwebkit qtx11extras qttools
+ qtbase qtsvg qtwebkit qtx11extras qttools
libXtst libvorbis hunspell libao ffmpeg libeb lzo xz libtiff
];
- nativeBuildInputs = [ qmake ];
-
qmakeFlags = [ "CONFIG+=zim_support" ];
meta = {
diff --git a/pkgs/applications/misc/googler/default.nix b/pkgs/applications/misc/googler/default.nix
new file mode 100644
index 000000000000..026457fb8571
--- /dev/null
+++ b/pkgs/applications/misc/googler/default.nix
@@ -0,0 +1,25 @@
+{stdenv, fetchFromGitHub, python}:
+
+stdenv.mkDerivation rec {
+ version = "3.3";
+ name = "googler-${version}";
+
+ src = fetchFromGitHub {
+ owner = "jarun";
+ repo = "googler";
+ rev = "v${version}";
+ sha256 = "0gkzgcf0qss7fskgswryk835vivlv1f99ym1pbxy3vv9wcwx6a43";
+ };
+
+ propagatedBuildInputs = [ python ];
+
+ makeFlags = "PREFIX=$(out)";
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/jarun/googler;
+ description = "Google Search, Google Site Search, Google News from the terminal";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ koral ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/applications/misc/gosmore/default.nix b/pkgs/applications/misc/gosmore/default.nix
index 5d13c18edc3e..8936d3f222f3 100644
--- a/pkgs/applications/misc/gosmore/default.nix
+++ b/pkgs/applications/misc/gosmore/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "Open Street Map viewer";
- homepage = http://sourceforge.net/projects/gosmore/;
+ homepage = https://sourceforge.net/projects/gosmore/;
maintainers = with maintainers; [
raskin
];
diff --git a/pkgs/applications/misc/gphoto2/gphotofs.nix b/pkgs/applications/misc/gphoto2/gphotofs.nix
index 230e0ff74142..6fa11667cf33 100644
--- a/pkgs/applications/misc/gphoto2/gphotofs.nix
+++ b/pkgs/applications/misc/gphoto2/gphotofs.nix
@@ -8,8 +8,9 @@ stdenv.mkDerivation rec {
sha256 = "1k23ncbsbh64r7kz050bg31jqamchyswgg9izhzij758d7gc8vk7";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- libgphoto2 fuse pkgconfig glib libtool
+ libgphoto2 fuse glib libtool
];
meta = {
diff --git a/pkgs/applications/misc/gpx-viewer/default.nix b/pkgs/applications/misc/gpx-viewer/default.nix
new file mode 100644
index 000000000000..a7485c4ee681
--- /dev/null
+++ b/pkgs/applications/misc/gpx-viewer/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, intltool, pkgconfig, gnome3, shared_mime_info, desktop_file_utils, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+ name = "gpx-viewer-${version}";
+ version = "0.4.0";
+
+ src = fetchurl {
+ url = "https://launchpad.net/gpx-viewer/trunk/${version}/+download/${name}.tar.gz";
+ sha256 = "956acfaf870ac436300cd9953dece630df7fd7dff8e4ae2577a6002884466f80";
+ };
+
+ patches = fetchurl {
+ url = "https://code.launchpad.net/~chkr/gpx-viewer/gtk3-bugfix/+merge/260766/+preview-diff/628965/+files/preview.diff";
+ sha256 = "1yl7jk7skkcx10nny5zdixswcymjd9s9c1zhm1i5y3aqhchvmfs7";
+ };
+ patchFlags = [ "-p0" ];
+
+ nativeBuildInputs = [
+ intltool pkgconfig
+ shared_mime_info # For update-mime-database
+ desktop_file_utils # For update-desktop-database
+ wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system
+ ];
+ buildInputs = with gnome3; [ gdl libchamplain defaultIconTheme ];
+
+ meta = with stdenv.lib; {
+ homepage = https://blog.sarine.nl/tag/gpxviewer/;
+ description = "Simple tool to visualize tracks and waypoints stored in a gpx file";
+ platforms = with platforms; linux;
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ dotlambda ];
+ };
+}
diff --git a/pkgs/applications/misc/gqrx/default.nix b/pkgs/applications/misc/gqrx/default.nix
index a0672f1810fb..27bda1e20928 100644
--- a/pkgs/applications/misc/gqrx/default.nix
+++ b/pkgs/applications/misc/gqrx/default.nix
@@ -8,13 +8,13 @@ assert pulseaudioSupport -> libpulseaudio != null;
stdenv.mkDerivation rec {
name = "gqrx-${version}";
- version = "2.7";
+ version = "2.8";
src = fetchFromGitHub {
owner = "csete";
repo = "gqrx";
rev = "v${version}";
- sha256 = "1dslb8l8ggj6vf9257c2bj0z8z1wy9c6sr2zksp5jdgf8m4j71im";
+ sha256 = "0niy4c05886mhbfmix93j2bnj4kzdh9bvrmymawl6z28glyz5d3c";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix
index 4dcb5be8a21d..8b66b23df01a 100644
--- a/pkgs/applications/misc/gramps/default.nix
+++ b/pkgs/applications/misc/gramps/default.nix
@@ -1,23 +1,31 @@
-{ stdenv, fetchurl, gtk3, pythonPackages, intltool,
- pango, gsettings_desktop_schemas }:
+{ stdenv, fetchFromGitHub, gtk3, pythonPackages, intltool,
+ pango, gsettings_desktop_schemas,
+# Optional packages:
+ enableOSM ? true, osm-gps-map
+ }:
let
inherit (pythonPackages) python buildPythonApplication;
in buildPythonApplication rec {
- version = "4.1.1";
+ version = "4.2.6";
name = "gramps-${version}";
- buildInputs = [ intltool gtk3 ];
+ buildInputs = [ intltool gtk3 ]
+ # Map support
+ ++ stdenv.lib.optional enableOSM osm-gps-map
+ ;
# Currently broken
doCheck = false;
- src = fetchurl {
- url = "mirror://sourceforge/gramps/Stable/${version}/${name}.tar.gz";
- sha256 = "0jdps7yx2mlma1hdj64wssvnqd824xdvw0bmn2dnal5fn3h7h060";
+ src = fetchFromGitHub {
+ owner = "gramps-project";
+ repo = "gramps";
+ rev = "v${version}";
+ sha256 = "0k0bx6msc2kvkg0nwa9v2mp3qy7lmnxjd97n6a1zdzlq8yzw29f1";
};
- pythonPath = with pythonPackages; [ pygobject3 pycairo ] ++ [ pango ];
+ pythonPath = with pythonPackages; [ bsddb3 PyICU pygobject3 pycairo ] ++ [ pango ];
# Same installPhase as in buildPythonApplication but without --old-and-unmanageble
# install flag.
diff --git a/pkgs/applications/misc/green-pdfviewer/default.nix b/pkgs/applications/misc/green-pdfviewer/default.nix
index 623cb12f9323..00421a2e0334 100644
--- a/pkgs/applications/misc/green-pdfviewer/default.nix
+++ b/pkgs/applications/misc/green-pdfviewer/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "0d0lv33flhgsxhc77kfp2avdz5gvml04r8l1j95yjz2rr096lzlj";
};
- buildInputs = [ poppler pkgconfig gdk_pixbuf SDL gtk2 ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ poppler gdk_pixbuf SDL gtk2 ];
patches = [
./gdk-libs.patch
diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix
index 85d95c7b3f92..cb407fca66cb 100644
--- a/pkgs/applications/misc/grip/default.nix
+++ b/pkgs/applications/misc/grip/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1zb6zpq7qmn6bflbgfwisyg3vrjr23yi1c1kqvwndl1f0shr8qyl";
};
- buildInputs = [ gtk2 glib pkgconfig libgnome libgnomeui vte curl cdparanoia
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk2 glib libgnome libgnomeui vte curl cdparanoia
libid3tag ncurses libtool ];
hardeningDisable = [ "format" ];
diff --git a/pkgs/applications/misc/gsimplecal/default.nix b/pkgs/applications/misc/gsimplecal/default.nix
index 9115fe026daa..7f3b3a8d6dc5 100644
--- a/pkgs/applications/misc/gsimplecal/default.nix
+++ b/pkgs/applications/misc/gsimplecal/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- buildInputs = [ pkgconfig automake autoconf gtk3 ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ automake autoconf gtk3 ];
preConfigure = "./autogen.sh";
diff --git a/pkgs/applications/misc/gtk2fontsel/default.nix b/pkgs/applications/misc/gtk2fontsel/default.nix
index ea3f4b8f2b92..347d76860ef1 100644
--- a/pkgs/applications/misc/gtk2fontsel/default.nix
+++ b/pkgs/applications/misc/gtk2fontsel/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0s2sj19n8ys92q9832hkn36ld91bb4qavicc6nygkry6qdpkkmjw";
};
- buildInputs = [ stdenv pkgconfig gtk ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ stdenv gtk ];
preferLocalBuild = true;
diff --git a/pkgs/applications/misc/gummi/default.nix b/pkgs/applications/misc/gummi/default.nix
new file mode 100644
index 000000000000..5fdb8985bbbb
--- /dev/null
+++ b/pkgs/applications/misc/gummi/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchFromGitHub, pkgs, makeWrapper
+, glib, gnome2, gnome3, gtk2-x11, gtkspell2, poppler
+, pkgconfig, intltool, autoreconfHook, wrapGAppsHook
+}:
+
+stdenv.mkDerivation rec {
+ version = "0.6.6";
+ name = "gummi-${version}";
+
+ src = pkgs.fetchFromGitHub {
+ owner = "alexandervdm";
+ repo = "gummi";
+ rev = "${version}";
+ sha256 = "1vw8rhv8qj82l6l22kpysgm9mxilnki2kjmvxsnajbqcagr6s7cn";
+ };
+
+ nativeBuildInputs = [
+ pkgconfig intltool autoreconfHook makeWrapper wrapGAppsHook
+ ];
+ buildInputs = [
+ glib gnome2.gtksourceview gnome2.pango gtk2-x11 gtkspell2 poppler
+ gnome3.defaultIconTheme
+ ];
+
+ preConfigure = ''
+ gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${pkgs.gnome2.gtksourceview}/share")
+ '';
+
+ postInstall = ''
+ install -Dpm644 COPYING $out/share/licenses/$name/COPYING
+ '';
+
+ meta = {
+ homepage = http://gummi.midnightcoding.org/;
+ description = "Simple LaTex editor for GTK users";
+ license = stdenv.lib.licenses.mit;
+ maintainers = with stdenv.lib.maintainers; [ flokli ];
+ platforms = with stdenv.lib.platforms; linux;
+ inherit version;
+ };
+}
diff --git a/pkgs/applications/misc/gxmessage/default.nix b/pkgs/applications/misc/gxmessage/default.nix
index 08ae34f97055..a61d532f1f8e 100644
--- a/pkgs/applications/misc/gxmessage/default.nix
+++ b/pkgs/applications/misc/gxmessage/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05";
};
- buildInputs = [ intltool gnome3.gtk pkgconfig texinfo ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ intltool gnome3.gtk texinfo ];
meta = {
description = "A GTK enabled dropin replacement for xmessage";
homepage = "http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage";
diff --git a/pkgs/applications/misc/gxneur/default.nix b/pkgs/applications/misc/gxneur/default.nix
index 1132f6b12f9b..f581b302c3f4 100644
--- a/pkgs/applications/misc/gxneur/default.nix
+++ b/pkgs/applications/misc/gxneur/default.nix
@@ -8,8 +8,9 @@ stdenv.mkDerivation {
sha256 = "f093428a479158247a7ff8424f0aec9af9f7b1d05b191cf30b7c534965a6839f";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- xorg.libX11 pkgconfig glib gtk2 xorg.libXpm xorg.libXt xorg.libXext xneur_0_13
+ xorg.libX11 glib gtk2 xorg.libXpm xorg.libXt xorg.libXext xneur_0_13
libglade GConf pcre
];
diff --git a/pkgs/applications/misc/hackrf/default.nix b/pkgs/applications/misc/hackrf/default.nix
index 1b8257ca5e59..6186ed6f8f41 100644
--- a/pkgs/applications/misc/hackrf/default.nix
+++ b/pkgs/applications/misc/hackrf/default.nix
@@ -10,8 +10,9 @@ stdenv.mkDerivation rec {
sha256 = "16hd61icvzaciv7s9jpgm9c8q6m4mwvj97gxrb20sc65p5gjb7hv";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- cmake pkgconfig libusb fftwSinglePrec
+ cmake libusb fftwSinglePrec
];
cmakeFlags = [ "-DUDEV_RULES_GROUP=plugdev" "-DUDEV_RULES_PATH=lib/udev/rules.d" ];
diff --git a/pkgs/applications/misc/hamster-time-tracker/default.nix b/pkgs/applications/misc/hamster-time-tracker/default.nix
index b8bd514c9ff3..51a14fb20d0b 100644
--- a/pkgs/applications/misc/hamster-time-tracker/default.nix
+++ b/pkgs/applications/misc/hamster-time-tracker/default.nix
@@ -31,6 +31,10 @@ pythonPackages.buildPythonApplication rec {
python waf build
'';
+ postFixup = ''
+ wrapPythonProgramsIn $out/lib/hamster-time-tracker "$out $pythonPath"
+ '';
+
installPhase = ''
python waf install
'';
diff --git a/pkgs/applications/misc/hello/default.nix b/pkgs/applications/misc/hello/default.nix
index 8a31c591b29b..6b090e84c3f2 100644
--- a/pkgs/applications/misc/hello/default.nix
+++ b/pkgs/applications/misc/hello/default.nix
@@ -1,11 +1,12 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchipfs }:
stdenv.mkDerivation rec {
name = "hello-2.10";
- src = fetchurl {
- url = "mirror://gnu/hello/${name}.tar.gz";
- sha256 = "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i";
+ src = fetchipfs {
+ url = "https://ftp.gnu.org/gnu/hello/hello-2.10.tar.gz";
+ ipfs = "QmWyj65ak3wd8kG2EvPCXKd6Tij15m4SwJz6g2yG2rQ7w8";
+ sha256 = "1im1gglfm4k10bh4mdaqzmx3lm3kivnsmxrvl6vyvmfqqzljq75l";
};
doCheck = true;
diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix
index ba04bd5c39de..3c4f409d18f1 100644
--- a/pkgs/applications/misc/hstr/default.nix
+++ b/pkgs/applications/misc/hstr/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, readline, ncurses }:
let
- version = "1.22";
+ version = "1.23";
in
stdenv.mkDerivation rec {
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/dvorka/hstr/releases/download/${version}/hh-${version}-src.tgz";
- sha256 = "09rh510x8qc5jbpnfzazbv9wc3bqmf5asydcl2wijpqm5bi21iqp";
+ sha256 = "1hnira256p7sdilx34mnkji7gi2jcl98zz4izqxsqmnzj8ghhzkv";
};
buildInputs = [ readline ncurses ];
diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix
new file mode 100644
index 000000000000..91cf494d2574
--- /dev/null
+++ b/pkgs/applications/misc/hubstaff/default.nix
@@ -0,0 +1,64 @@
+{ stdenv, fetchurl, unzip, makeWrapper, libX11, zlib, libSM, libICE, libXext
+, freetype, libXrender, fontconfig, libXft, libXinerama, libnotify, glib
+, gtk3, libappindicator-gtk3, curl }:
+
+let
+
+ version = "1.2.14-36df5e3";
+
+ rpath = stdenv.lib.makeLibraryPath
+ [ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft
+ libXinerama stdenv.cc.cc.lib libnotify glib gtk3 libappindicator-gtk3
+ curl ];
+
+in
+
+stdenv.mkDerivation {
+ name = "hubstaff-${version}";
+
+ src = fetchurl {
+ url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/${version}/Hubstaff-${version}.sh";
+ sha256 = "0yzhxk9zppj94llnf8naa6ca61f7c8jaj6b1m25zffnnz37m1sdb";
+ };
+
+ nativeBuildInputs = [ unzip makeWrapper ];
+
+ unpackCmd = ''
+ # MojoSetups have a ZIP file at the end. ZIP’s magic string is
+ # most often PK\x03\x04. This *should* work for future updates,
+ # but feel free to come up with something more reasonable.
+ dataZipOffset=$(grep --max-count=1 --byte-offset --only-matching --text $'PK\x03\x04' $curSrc | cut -d: -f1)
+ dd bs=$dataZipOffset skip=1 if=$curSrc of=data.zip 2>/dev/null
+ unzip -q data.zip "data/*"
+ rm data.zip
+ '';
+
+ dontBuild = true;
+
+ installPhase = ''
+ # TODO: handle 32-bit arch?
+ rm -r x86
+
+ opt=$out/opt/hubstaff
+ mkdir -p $out/bin $opt
+ cp -r . $opt/
+
+ prog=$opt/x86_64/HubstaffClient.bin.x86_64
+
+ patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) $prog
+ wrapProgram $prog --prefix LD_LIBRARY_PATH : ${rpath}
+
+ ln -s $prog $out/bin/HubstaffClient
+
+ # Why is this needed? SEGV otherwise.
+ ln -s $opt/data/resources $opt/x86_64/resources
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Time tracking software";
+ homepage = https://hubstaff.com/;
+ license = licenses.unfree;
+ platforms = [ "x86_64-linux" ];
+ maintainers = [ maintainers.michalrus ];
+ };
+}
diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index c69bb5bea3bd..0dfc725b9ea6 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.27.1";
+ version = "0.29";
goPackagePath = "github.com/gohugoio/hugo";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "gohugoio";
repo = "hugo";
rev = "v${version}";
- sha256 = "0vxzjwm9dsan314cz0gnj4spssg4w8y6ywsak8n9c6w0l45xf07p";
+ sha256 = "1vklws05534ig9rj55cqnxpqfsvns64kfdg6zjyrcpz7l0z07a33";
};
goDeps = ./deps.nix;
diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix
index 240983b3c716..35faf6b57047 100644
--- a/pkgs/applications/misc/hugo/deps.nix
+++ b/pkgs/applications/misc/hugo/deps.nix
@@ -26,6 +26,15 @@
sha256 = "13r896yy71i6jj1cwv2pjp53wjfxkg7bh884fggv6y79ly0qr63j";
};
}
+ {
+ goPackagePath = "github.com/alecthomas/chroma";
+ fetch = {
+ type = "git";
+ url = "https://github.com/alecthomas/chroma";
+ rev = "b0295f66bdb7c61d54906003d7649185794e21b4";
+ sha256 = "1hnvv13nphbzr9xm21fys7lgm0kd6qlbk58vc8fi802lxzsfmdis";
+ };
+ }
{
goPackagePath = "github.com/bep/gitmap";
fetch = {
@@ -40,8 +49,8 @@
fetch = {
type = "git";
url = "https://github.com/chaseadamsio/goorgeous";
- rev = "677defd0e024333503d8c946dd4ba3f32ad3e5d2";
- sha256 = "1mcncs3qdb62m9xwhkxy743ddvgsjfbmbl2djnhqmz1va05njna1";
+ rev = "098da33fde5f9220736531b3cb26a2dec86a8367";
+ sha256 = "1cwag5vzgrzy22rvcp12whzgqbgrmdmaxar0fl4nwqxdhy90s67k";
};
}
{
@@ -53,6 +62,15 @@
sha256 = "1a87v4cnd5y5whcdkjcqjpg1s5pxqhrspdxrsk2af49zsw9fsj9f";
};
}
+ {
+ goPackagePath = "github.com/danwakefield/fnmatch";
+ fetch = {
+ type = "git";
+ url = "https://github.com/danwakefield/fnmatch";
+ rev = "cbb64ac3d964b81592e64f957ad53df015803288";
+ sha256 = "0cbf511ppsa6hf59mdl7nbyn2b2n71y0bpkzbmfkdqjhanqh1lqz";
+ };
+ }
{
goPackagePath = "github.com/dchest/cssmin";
fetch = {
@@ -62,6 +80,15 @@
sha256 = "09sdijfx5d05z4cd5k6lhl7k3kbpdf2amzlngv15h5v0fff9qw4s";
};
}
+ {
+ goPackagePath = "github.com/dlclark/regexp2";
+ fetch = {
+ type = "git";
+ url = "https://github.com/dlclark/regexp2";
+ rev = "487489b64fb796de2e55f4e8a4ad1e145f80e957";
+ sha256 = "144s81ndviwhyy20ipxvvfvap8phv5p762glxrz6aqxprkxfarj5";
+ };
+ }
{
goPackagePath = "github.com/eknkc/amber";
fetch = {
@@ -206,15 +233,6 @@
sha256 = "0fxjgmwn9927wckl2xx8byv64cxgc0yxdwpfzval5n3wm5l5ij1i";
};
}
- {
- goPackagePath = "github.com/pelletier/go-buffruneio";
- fetch = {
- type = "git";
- url = "https://github.com/pelletier/go-buffruneio";
- rev = "c37440a7cf42ac63b919c752ca73a85067e05992";
- sha256 = "0l83p1gg6g5mmhmxjisrhfimhbm71lwn1r2w7d6siwwqm9q08sd2";
- };
- }
{
goPackagePath = "github.com/pelletier/go-toml";
fetch = {
diff --git a/pkgs/applications/misc/hyper/default.nix b/pkgs/applications/misc/hyper/default.nix
index 3c9eeac891db..9349c07a62e9 100644
--- a/pkgs/applications/misc/hyper/default.nix
+++ b/pkgs/applications/misc/hyper/default.nix
@@ -12,11 +12,11 @@ let
];
in
stdenv.mkDerivation rec {
- version = "1.4.3";
+ version = "1.4.8";
name = "hyper-${version}";
src = fetchurl {
url = "https://github.com/zeit/hyper/releases/download/${version}/hyper_${version}_amd64.deb";
- sha256 = "0f0qxhvwwcpsjnv1rgmdzdl5jwfprnd7fjnd6sb8liq250pij3ld";
+ sha256 = "0v31z3p5h3qr8likifbq9kk08fpfyf8g1hrz6f6v90z4b2yhkf51";
};
buildInputs = [ dpkg ];
unpackPhase = ''
diff --git a/pkgs/applications/misc/inspectrum/default.nix b/pkgs/applications/misc/inspectrum/default.nix
index 5097496d3992..e2232c4b2ec8 100644
--- a/pkgs/applications/misc/inspectrum/default.nix
+++ b/pkgs/applications/misc/inspectrum/default.nix
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
sha256 = "1fvnr8gca25i6s9mg9b2hyqs0zzr4jicw13mimc9dhrgxklrr1yv";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig
cmake
qt5.qtbase
fftwFloat
diff --git a/pkgs/applications/misc/ipmicfg/default.nix b/pkgs/applications/misc/ipmicfg/default.nix
new file mode 100644
index 000000000000..af67db3f654a
--- /dev/null
+++ b/pkgs/applications/misc/ipmicfg/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchzip }:
+
+stdenv.mkDerivation rec {
+ name = "ipmicfg-${version}";
+ version = "1.27.0";
+ buildVersion = "170620";
+
+ src = fetchzip {
+ url = "ftp://ftp.supermicro.com/utility/IPMICFG/IPMICFG_${version}_build.${buildVersion}.zip";
+ sha256 = "0jr2vih4hzymb62mbqyykwcrjhbhazf6wr1g0cq8ji586i3z3vw5";
+ };
+
+ installPhase = ''
+ mkdir -p "$out/bin" "$out/opt/ipmicfg"
+ cp Linux/64bit/* "$out/opt/ipmicfg"
+
+ patchelf "$out/opt/ipmicfg/IPMICFG-Linux.x86_64" \
+ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+ --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}"
+
+ ln -s "$out/opt/ipmicfg/IPMICFG-Linux.x86_64" "$out/bin/ipmicfg"
+ '';
+
+ dontPatchShebangs = true; # There are no scripts and it complains about null bytes.
+
+ meta = with stdenv.lib; {
+ description = "Supermicro IPMI configuration tool";
+ homepage = "http://www.supermicro.com/products/nfo/ipmi.cfm";
+ license = licenses.unfree;
+ platforms = [ "x86_64-linux" ];
+ maintainers = with maintainers; [ sorki ];
+ };
+}
diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index 8952b7edba4e..46263f7d83b8 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "josm-${version}";
- version = "12712";
+ version = "13053";
src = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
- sha256 = "0lpz4yzkvjpn5g36nibrkh773jnlkiqj6lghsx69i86h0xfb7gqf";
+ sha256 = "0czsmx0gsml3vqzx6940jw2xpmh16idypydw0d4147k4fi9gzyz6";
};
buildInputs = [ jre8 makeWrapper ];
diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix
index 587e6a588a73..015ef8760648 100644
--- a/pkgs/applications/misc/k2pdfopt/default.nix
+++ b/pkgs/applications/misc/k2pdfopt/default.nix
@@ -2,7 +2,7 @@
, zlib, libpng
, enableGSL ? true, gsl
, enableGhostScript ? true, ghostscript
-, enableMuPDF ? true, jbig2dec, openjpeg, freetype, harfbuzz, mupdf
+, enableMuPDF ? true, mupdf
, enableJPEG2K ? true, jasper
, enableDJVU ? true, djvulibre
, enableGOCR ? false, gocr # Disabled by default due to crashes
@@ -51,7 +51,19 @@ stdenv.mkDerivation rec {
url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=2c4e5867ee699b1081527bc6c6ea0e99a35a5c27";
sha256 = "14k7x47ifx82sds1c06ibzbmcparfg80719jhgwjk6w1vkh4r693";
})
+
+ (fetchpatch {
+ name = "mupdf-1.10a-shared_libs-1.patch";
+ url = "https://ftp.osuosl.org/pub/blfs/conglomeration/mupdf/mupdf-1.10a-shared_libs-1.patch";
+ sha256 = "0kg4vahp7hlyyj5hl18brk8s8xcbqrx19pqjzkfq6ha8mqa3k4ab";
+ })
];
+
+ # Override this since the jpeg directory was renamed libjpeg in mupdf 1.11
+ preConfigure = ''
+ # Don't remove mujs because upstream version is incompatible
+ rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,jpeg,openjpeg,zlib}
+ '';
});
leptonica_modded = leptonica.overrideAttrs (attrs: {
prePatch = ''
@@ -75,8 +87,8 @@ stdenv.mkDerivation rec {
[ zlib libpng ] ++
optional enableGSL gsl ++
optional enableGhostScript ghostscript ++
- optionals enableMuPDF [ jbig2dec openjpeg freetype harfbuzz mupdf_modded ] ++
- optionals enableJPEG2K [ jasper ] ++
+ optional enableMuPDF mupdf_modded ++
+ optional enableJPEG2K jasper ++
optional enableDJVU djvulibre ++
optional enableGOCR gocr ++
optionals enableTesseract [ leptonica_modded tesseract_modded ];
diff --git a/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch b/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch
index a393e30fc726..cf7e4896b803 100644
--- a/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch
+++ b/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch
@@ -17,11 +17,11 @@ index 4a2378b..502c477 100644
-# willus.h
-# HAVE_GSL_LIB
+pkg_check_modules(GSL gsl)
-+if(MUPDF_FOUND)
++if(GSL_FOUND)
+ set(HAVE_GSL_LIB 1)
+ include_directories(SYSTEM ${GSL_INCLUDEDIR})
+ set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${GSL_LDFLAGS})
-+endif(MUPDF_FOUND)
++endif(GSL_FOUND)
# libfreetype6 (>= 2.3.9), libjbig2dec0, libjpeg8 (>= 8c), libx11-6, libxext6, zlib1g (>= 1:1.2.0)
@@ -30,7 +30,7 @@ index 4a2378b..502c477 100644
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)
diff --git a/pkgs/applications/misc/kanboard/default.nix b/pkgs/applications/misc/kanboard/default.nix
index b37d12c362f5..7995c8875b82 100644
--- a/pkgs/applications/misc/kanboard/default.nix
+++ b/pkgs/applications/misc/kanboard/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "kanboard-${version}";
- version = "1.0.46";
+ version = "1.0.48";
src = fetchzip {
- url = "https://kanboard.net/${name}.zip";
- sha256 = "00fzzijibj7x8pz8xwc601fcrzvdwz5fv45f2zzmbygl86khp82a";
+ url = "https://github.com/kanboard/kanboard/releases/download/v${version}/${name}.zip";
+ sha256 = "0ipyijlfcnfqlz9n20wcnaf9pw404a675x404pm9h2n4ld8x6m5v";
};
dontBuild = true;
diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix
index 0d8db33bc178..a95dd6adbce6 100644
--- a/pkgs/applications/misc/kdeconnect/default.nix
+++ b/pkgs/applications/misc/kdeconnect/default.nix
@@ -5,6 +5,7 @@
, kcmutils
, kconfigwidgets
, kdbusaddons
+, kdoctools
, kiconthemes
, ki18n
, knotifications
@@ -15,34 +16,29 @@
}:
stdenv.mkDerivation rec {
- name = "kdeconnect-${version}";
- version = "1.0.3";
+ pname = "kdeconnect";
+ version = "1.2";
+ name = "${pname}-${version}";
src = fetchurl {
- url = "http://download.kde.org/stable/kdeconnect/${version}/src/kdeconnect-kde-${version}.tar.xz";
- sha256 = "0b40402adw7cqz19fh8zw70f6l7b5p400mw668n3wic4favn27r2";
+ url = "mirror://kde/stable/${pname}/${version}/src/${pname}-kde-${version}.tar.xz";
+ sha256 = "0w3rdldnr6md70r4ch255vk712d37vy63ml7ly2fhr4cfnk2i1ay";
};
buildInputs = [
- kcmutils
- kconfigwidgets
- kdbusaddons
- qca-qt5
- ki18n
- kiconthemes
- knotifications
- libfakekey
- libXtst
- qtx11extras
+ libfakekey libXtst
+ ki18n kiconthemes kcmutils kconfigwidgets kdbusaddons knotifications
+ qca-qt5 qtx11extras
];
- nativeBuildInputs = [ extra-cmake-modules ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
- meta = {
+ enableParallelBuilding = true;
+
+ meta = with lib; {
description = "KDE Connect provides several features to integrate your phone and your computer";
- license = with lib.licenses; [ gpl2 ];
- maintainers = with lib.maintainers; [ fridh ];
- homepage = https://community.kde.org/KDEConnect;
+ homepage = https://community.kde.org/KDEConnect;
+ license = with licenses; [ gpl2 ];
+ maintainers = with maintainers; [ fridh ];
};
-
}
diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix
index e36fbfa0f3f9..49e4711550da 100644
--- a/pkgs/applications/misc/keepass/default.nix
+++ b/pkgs/applications/misc/keepass/default.nix
@@ -8,11 +8,11 @@
# plugin derivations in the Nix store and nowhere else.
with builtins; buildDotnetPackage rec {
baseName = "keepass";
- version = "2.36";
+ version = "2.37";
src = fetchurl {
url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip";
- sha256 = "1j6qhy8h3z6higbpq3q9v04amvgbn90yj3kbsvj17azdkffkwzny";
+ sha256 = "1wfbpfjng1blzkbjnxsdnny544297bm9869ianbr6l0hrvcgv3qx";
};
sourceRoot = ".";
@@ -98,7 +98,7 @@ with builtins; buildDotnetPackage rec {
meta = {
description = "GUI password manager with strong cryptography";
homepage = http://www.keepass.info/;
- maintainers = with stdenv.lib.maintainers; [ amorsillo obadz jraygauthier ];
+ maintainers = with stdenv.lib.maintainers; [ amorsillo obadz joncojonathan jraygauthier ];
platforms = with stdenv.lib.platforms; all;
license = stdenv.lib.licenses.gpl2;
};
diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix
index 6ae86486b47b..72d9c7d2fb5d 100644
--- a/pkgs/applications/misc/keepassx/community.nix
+++ b/pkgs/applications/misc/keepassx/community.nix
@@ -6,14 +6,14 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "keepassx-community-${version}";
- version = "2.2.0";
+ name = "keepassxc-${version}";
+ version = "2.2.2";
src = fetchFromGitHub {
owner = "keepassxreboot";
repo = "keepassxc";
rev = "${version}";
- sha256 = "0gg75mjy2p7lyh8nnivmyn7bjp1zyx26zm8s1fak7d2di2r0mnjc";
+ sha256 = "01pqpa3vzk2q1vrj2lqayr7a3nzpnj176yhnqbrwlm3s9rga4wzn";
};
cmakeFlags = [
diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix
index 1334f2317b9d..91e583e2af4e 100644
--- a/pkgs/applications/misc/khal/default.nix
+++ b/pkgs/applications/misc/khal/default.nix
@@ -5,11 +5,11 @@ with python3Packages;
buildPythonApplication rec {
name = "${pname}-${version}";
pname = "khal";
- version = "0.9.7";
+ version = "0.9.8";
src = fetchPypi {
inherit pname version;
- sha256 = "0x1p62ff7ggb172rjr6sbdrjh1gl3ck3bwxsqlsix8i5wycwvnmv";
+ sha256 = "1blx3gxnv7sj302biqphfw7i6ilzl2xlmvzp130n3113scg9w17y";
};
LC_ALL = "en_US.UTF-8";
diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix
new file mode 100644
index 000000000000..e1afac735d8e
--- /dev/null
+++ b/pkgs/applications/misc/kitty/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, pkgs, python3Packages, glfw, libunistring, glew, fontconfig, zlib, pkgconfig, ncurses, imagemagick, makeWrapper }:
+
+with python3Packages;
+buildPythonApplication rec {
+ version = "0.4.2";
+ name = "kitty-${version}";
+ format = "other";
+
+ src = fetchFromGitHub {
+ owner = "kovidgoyal";
+ repo = "kitty";
+ rev = "v${version}";
+ sha256 = "058676r2b83mjggbfc701v3vlviaslf7qciz8sm8lcda82k01wfp";
+ };
+
+ buildInputs = [ glew fontconfig glfw ncurses libunistring ];
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ buildPhase = ''
+ python3 setup.py linux-package
+ '';
+
+ installPhase = ''
+ runHook preInstall
+ mkdir -p $out
+ cp -r linux-package/{bin,share,lib} $out
+ wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${stdenv.lib.makeBinPath [ imagemagick ]}"
+ runHook postInstall
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/kovidgoyal/kitty;
+ description = "A modern, hackable, featureful, OpenGL based terminal emulator";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ tex ];
+ };
+}
diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix
index c5b75a0be555..8479c4e16ace 100644
--- a/pkgs/applications/misc/kiwix/default.nix
+++ b/pkgs/applications/misc/kiwix/default.nix
@@ -62,8 +62,9 @@ stdenv.mkDerivation rec {
sha256 = "0577phhy2na59cpcqjgldvksp0jwczyg0l6c9ghnr19i375l7yqc";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- zip pkgconfig python zlib xapian which icu libmicrohttpd
+ zip python zlib xapian which icu libmicrohttpd
lzma zimlib ctpp2 aria2 wget bc libuuid makeWrapper pugixml
];
diff --git a/pkgs/applications/misc/lenmus/default.nix b/pkgs/applications/misc/lenmus/default.nix
index b78a226b6145..9018a5926424 100644
--- a/pkgs/applications/misc/lenmus/default.nix
+++ b/pkgs/applications/misc/lenmus/default.nix
@@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
})
];
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig
cmake boost
portmidi sqlite
freetype libpng pngpp zlib
diff --git a/pkgs/applications/misc/libosmocore/default.nix b/pkgs/applications/misc/libosmocore/default.nix
index 7a0eadf74e5a..47bcbb6fce91 100644
--- a/pkgs/applications/misc/libosmocore/default.nix
+++ b/pkgs/applications/misc/libosmocore/default.nix
@@ -12,8 +12,9 @@ stdenv.mkDerivation rec {
sha256 = "08mcpy9ljwb1i3l4cmlwn024q2psk5gg9f0ylgh99hy1ffx0n7am";
};
+ nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [
- autoreconfHook pcsclite pkgconfig
+ pcsclite
];
preConfigure = ''
diff --git a/pkgs/applications/misc/lighthouse/default.nix b/pkgs/applications/misc/lighthouse/default.nix
index f6bfe61e5aa2..7b5b40d65a36 100644
--- a/pkgs/applications/misc/lighthouse/default.nix
+++ b/pkgs/applications/misc/lighthouse/default.nix
@@ -13,8 +13,9 @@ stdenv.mkDerivation rec {
sha256 = "0v6ylm49f1b44zwq1y1gqxp2csyqblplr24ajllc2q3r0sc9m1ys";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig libX11 libxcb cairo gtk2 pango python27 python3
+ libX11 libxcb cairo gtk2 pango python27 python3
];
makeFlags = [ "PREFIX=\${out}" ];
diff --git a/pkgs/applications/misc/lilyterm/default.nix b/pkgs/applications/misc/lilyterm/default.nix
index 2fa4ba9ae644..3729978dddb0 100644
--- a/pkgs/applications/misc/lilyterm/default.nix
+++ b/pkgs/applications/misc/lilyterm/default.nix
@@ -35,7 +35,8 @@ stdenv.mkDerivation rec {
inherit (stuff) src version;
- buildInputs = [ pkgconfig autoconf automake intltool gettext gtk vte ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ autoconf automake intltool gettext gtk vte ];
preConfigure = "sh autogen.sh";
diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix
index ee06ea1ad6cf..837a221be946 100644
--- a/pkgs/applications/misc/llpp/default.nix
+++ b/pkgs/applications/misc/llpp/default.nix
@@ -6,18 +6,17 @@ assert lib.versionAtLeast (lib.getVersion ocaml) "4.02";
let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version;
in stdenv.mkDerivation rec {
name = "llpp-${version}";
- version = "25-git-2017-01-18";
+ version = "26b";
src = fetchgit {
url = "git://repo.or.cz/llpp.git";
- rev = "22740b9bca1c60ef18cf90538994ce4981539901";
- sha256 = "0yg8z2zwhg2f5il2i1clx3b7hl088ncpk686rfxlvwyjg3qs3mv4";
+ rev = "v${version}";
+ sha256 = "1w8g1fp1c20sl34cx20plhnbghbsx2fwgp4vyhd1x0za29lw62nj";
fetchSubmodules = false;
};
nativeBuildInputs = [ pkgconfig makeWrapper ninja ];
- buildInputs = [ ocaml findlib mupdf gtk3 jbig2dec # lablgl
- openjpeg mujs openssl freetype ncurses ];
+ buildInputs = [ ocaml findlib mupdf gtk3 jbig2dec openjpeg mujs openssl freetype ncurses ];
dontStrip = true;
@@ -32,7 +31,6 @@ in stdenv.mkDerivation rec {
buildPhase = ''
sh ./build.sh build
'';
-# --prefix CAML_LD_LIBRARY_PATH ":" "${lablgl}/lib/ocaml/${ocamlVersion}/site-lib/lablgl" \
installPhase = ''
install -d $out/bin $out/lib
diff --git a/pkgs/applications/misc/ltwheelconf/default.nix b/pkgs/applications/misc/ltwheelconf/default.nix
index 5450f5f2fc84..4972aa28e589 100644
--- a/pkgs/applications/misc/ltwheelconf/default.nix
+++ b/pkgs/applications/misc/ltwheelconf/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
sha256 = "1fsz7k73yln987gcx1jvb5irxfbp1x2c457a60a8yap27nkp5y2w";
};
- buildInputs = [ libusb1 pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libusb1 ];
installPhase = ''
mkdir -p $out/bin
diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix
index 964617e20f1e..e3c4943cb2fe 100644
--- a/pkgs/applications/misc/lyx/default.nix
+++ b/pkgs/applications/misc/lyx/default.nix
@@ -12,16 +12,12 @@ stdenv.mkDerivation rec {
};
# LaTeX is used from $PATH, as people often want to have it with extra pkgs
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig qtbase qtsvg python file/*for libmagic*/ bc
+ qtbase qtsvg python file/*for libmagic*/ bc
hunspell makeWrapper # enchant
];
- # bogus configure script tests
- preConfigure = ''
- NIX_CFLAGS_COMPILE+=" $(pkg-config --cflags Qt5Core)"
- '';
-
configureFlags = [
"--enable-qt5"
#"--without-included-boost"
diff --git a/pkgs/applications/misc/makeself/default.nix b/pkgs/applications/misc/makeself/default.nix
index 361ced02b7ed..8a752bbaf86e 100644
--- a/pkgs/applications/misc/makeself/default.nix
+++ b/pkgs/applications/misc/makeself/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchgit }:
+{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "makeself-2.2.0";
+ version = "2.3.1";
+ name = "makeself-${version}";
- src = fetchgit {
- url = "https://github.com/megastep/makeself.git";
- rev = "b836b9281ae99abe1865608b065551da56c80719";
- sha256 = "f7c97f0f8ad8128f2f1b54383319f2cc44cbb05b60ced222784debdf326f23ad";
+ src = fetchFromGitHub {
+ owner = "megastep";
+ repo = "makeself";
+ rev = "release-${version}";
+ sha256 = "01r7vb9vyb99s3g5cw0c04s1ahcingynk3ki17wknlk2asjrbc4p";
};
patchPhase = ''
diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix
new file mode 100644
index 000000000000..76d23f1a8f08
--- /dev/null
+++ b/pkgs/applications/misc/masterpdfeditor/default.nix
@@ -0,0 +1,52 @@
+{ stdenv, fetchurl, glibc, sane-backends, qtbase, qtsvg, libXext, libX11, libXdmcp, libXau, libxcb }:
+ let
+ version = "4.3.61";
+ in
+ stdenv.mkDerivation {
+ name = "masterpdfeditor-${version}";
+ src = fetchurl {
+ url = "http://get.code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz";
+ sha256 = "1g6mx8nch6ypf78h6xsb673wim19wn5ni5840armzg0pvi3sfknm";
+ };
+ libPath = stdenv.lib.makeLibraryPath [
+ stdenv.cc.cc
+ glibc
+ sane-backends
+ qtbase
+ qtsvg
+ libXext
+ libX11
+ libXdmcp
+ libXau
+ libxcb
+ ];
+ dontStrip = true;
+ installPhase = ''
+ p=$out/opt/masterpdfeditor
+ mkdir -p $out/bin $p $out/share/applications $out/share/pixmaps
+
+ substituteInPlace masterpdfeditor4.desktop \
+ --replace 'Exec=/opt/master-pdf-editor-4' "Exec=$out/bin" \
+ --replace 'Path=/opt/master-pdf-editor-4' "Path=$out/bin" \
+ --replace 'Icon=/opt/master-pdf-editor-4' "Icon=$out/share/pixmaps"
+ cp -v masterpdfeditor4.png $out/share/pixmaps/
+ cp -v masterpdfeditor4.desktop $out/share/applications
+
+ cp -v masterpdfeditor4 $p/
+ ln -s $p/masterpdfeditor4 $out/bin/masterpdfeditor4
+ cp -v -r stamps templates lang fonts $p
+
+ install -D license.txt $out/share/$name/LICENSE
+
+ patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+ --set-rpath $libPath \
+ $p/masterpdfeditor4
+ '';
+ meta = with stdenv.lib; {
+ description = "Master PDF Editor";
+ homepage = "https://code-industry.net/free-pdf-editor/";
+ license = licenses.unfreeRedistributable;
+ platforms = with platforms; [ "x86_64-linux" ];
+ maintainers = with maintainers; [ cmcdragonkai flokli ];
+ };
+ }
diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix
index 787f97ac1b11..0167132db789 100644
--- a/pkgs/applications/misc/mediainfo-gui/default.nix
+++ b/pkgs/applications/misc/mediainfo-gui/default.nix
@@ -2,11 +2,11 @@
, desktop_file_utils, libSM, imagemagick }:
stdenv.mkDerivation rec {
- version = "0.7.97";
+ version = "17.10";
name = "mediainfo-gui-${version}";
src = fetchurl {
- url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
- sha256 = "10hp23a9hdlqvrhskssd9g15f4n55yq48cmbpjwdqwzfrblj598n";
+ url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
+ sha256 = "1yvh4r19kk3bzzgnr4ikrjxqldr6860s35sh4bqr51c7l77k048c";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
@@ -15,13 +15,15 @@ stdenv.mkDerivation rec {
sourceRoot = "./MediaInfo/Project/GNU/GUI/";
+ enableParallelBuilding = true;
+
meta = with stdenv.lib; {
description = "Supplies technical and tag information about a video or audio file (GUI version)";
longDescription = ''
MediaInfo is a convenient unified display of the most relevant technical
and tag data for video and audio files.
'';
- homepage = http://mediaarea.net/;
+ homepage = https://mediaarea.net/;
license = licenses.bsd2;
platforms = platforms.linux;
maintainers = [ maintainers.devhell ];
diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix
index 38888b0ebdc6..e6175356348f 100644
--- a/pkgs/applications/misc/mediainfo/default.nix
+++ b/pkgs/applications/misc/mediainfo/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }:
stdenv.mkDerivation rec {
- version = "0.7.97";
+ version = "17.10";
name = "mediainfo-${version}";
src = fetchurl {
- url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
- sha256 = "10hp23a9hdlqvrhskssd9g15f4n55yq48cmbpjwdqwzfrblj598n";
+ url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
+ sha256 = "1yvh4r19kk3bzzgnr4ikrjxqldr6860s35sh4bqr51c7l77k048c";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
@@ -15,13 +15,15 @@ stdenv.mkDerivation rec {
configureFlags = [ "--with-libmediainfo=${libmediainfo}" ];
+ enableParallelBuilding = true;
+
meta = with stdenv.lib; {
description = "Supplies technical and tag information about a video or audio file";
longDescription = ''
MediaInfo is a convenient unified display of the most relevant technical
and tag data for video and audio files.
'';
- homepage = http://mediaarea.net/;
+ homepage = https://mediaarea.net/;
license = licenses.bsd2;
platforms = platforms.unix;
maintainers = [ maintainers.devhell ];
diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix
index a1744f7a2c03..d1befec34082 100644
--- a/pkgs/applications/misc/merkaartor/default.nix
+++ b/pkgs/applications/misc/merkaartor/default.nix
@@ -1,25 +1,27 @@
-{ stdenv, fetchFromGitHub, qt4, qmake4Hook, boost, proj, gdal, sqlite, pkgconfig }:
+{ stdenv, fetchFromGitHub, qmake, pkgconfig, boost, gdal, proj
+, qtbase, qtsvg, qtwebkit }:
stdenv.mkDerivation rec {
name = "merkaartor-${version}";
- version = "0.18.2";
+ version = "0.18.3";
src = fetchFromGitHub {
owner = "openstreetmap";
repo = "merkaartor";
rev = version;
- sha256 = "1a8kzrc9w0b2a2zgw9dbbi15jy9ynv6nf2sg3k4dbh7f1s2ajx9l";
+ sha256 = "0ls3q8m1hxiwyrypy6qca8wczhl4969ncl0sszfdwfv70rzxjk88";
};
- buildInputs = [ qt4 boost proj gdal sqlite ];
+ nativeBuildInputs = [ qmake pkgconfig ];
- nativeBuildInputs = [ qmake4Hook pkgconfig ];
+ buildInputs = [ boost gdal proj qtbase qtsvg qtwebkit ];
- meta = {
- description = "An openstreetmap editor";
- homepage = http://merkaartor.org/;
- license = stdenv.lib.licenses.gpl2Plus;
- maintainers = with stdenv.lib.maintainers; [viric];
- inherit (qt4.meta) platforms;
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ description = "OpenStreetMap editor";
+ homepage = http://merkaartor.be/;
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ viric ];
};
}
diff --git a/pkgs/applications/misc/milu/default.nix b/pkgs/applications/misc/milu/default.nix
index 9f98376a51bc..d8d1cff6040b 100644
--- a/pkgs/applications/misc/milu/default.nix
+++ b/pkgs/applications/misc/milu/default.nix
@@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
cp bin/milu $out/bin
'';
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig
glib
unzip
clang
diff --git a/pkgs/applications/misc/mrxvt/default.nix b/pkgs/applications/misc/mrxvt/default.nix
index 06f8b78c2bc9..3f7ce3cc5d5b 100644
--- a/pkgs/applications/misc/mrxvt/default.nix
+++ b/pkgs/applications/misc/mrxvt/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
Multitabbed lightweight terminal emulator based on rxvt.
Supports transparency, backgroundimages, freetype fonts, ...
";
- homepage = http://sourceforge.net/projects/materm;
+ homepage = https://sourceforge.net/projects/materm;
license = "GPL";
platforms = stdenv.lib.platforms.linux;
};
diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index da5f3c3bf128..b50d99466f89 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -1,6 +1,8 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig
-, zlib, freetype, libjpeg, jbig2dec, openjpeg
-, libX11, libXcursor, libXrandr, libXinerama, libXext, harfbuzz, mesa }:
+{ stdenv, lib, fetchurl, fetchpatch, pkgconfig
+, freetype, harfbuzz, openjpeg, jbig2dec, libjpeg
+, enableX11 ? true, libX11, libXext
+, enableCurl ? true, curl, openssl
+}:
stdenv.mkDerivation rec {
version = "1.11";
@@ -24,11 +26,43 @@ stdenv.mkDerivation rec {
url = "http://git.ghostscript.com/?p=mupdf.git;a=blobdiff_plain;f=platform/x11/jstest_main.c;h=f158d9628ed0c0a84e37fe128277679e8334422a;hp=13c3a0a3ba3ff4aae29f6882d23740833c1d842f;hb=06a012a42c9884e3cd653e7826cff1ddec04eb6e;hpb=34e18d127a02146e3415b33c4b67389ce1ddb614";
sha256 = "163bllvjrbm0gvjb25lv7b6sih4zr4g4lap3h0cbq8dvpjxx0jfc";
})
+
+ (fetchpatch {
+ name = "mupdf-1.11-shared_libs-1.patch";
+ url = "https://ftp.osuosl.org/pub/blfs/conglomeration/mupdf/mupdf-1.11-shared_libs-1.patch";
+ sha256 = "127x8jhyj3i9cn3mxw9mm5barw2yk43rvmghg54bhn4rjalx857j";
+ })
+
+ (fetchurl {
+ name = "mupdf-1.11-CVE-2017-14685.patch";
+ url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=ab1a420613dec93c686acbee2c165274e922f82a";
+ sha256 = "120xapwj0af333n3a32ypxk0jmjv2ia476jg8pzsfqk9a5qqkx46";
+ })
+
+ (fetchurl {
+ name = "mupdf-1.11-CVE-2017-14686.patch";
+ url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=0f0fbc07d9be31f5e83ec5328d7311fdfd8328b1";
+ sha256 = "0pkn7mfqhmnsyia4rh4mw4q435bzvlc22crqa1bxpaa0gcyky51c";
+ })
+
+ (fetchurl {
+ name = "mupdf-1.11-CVE-2017-14687.patch";
+ url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=2b16dbd8f73269cb15ca61ece75cf8d2d196ed28";
+ sha256 = "01v41cwrdnz3k32fcadk2gk4knqrm3mavzp6pxhn19nwgmqkshjd";
+ })
+
+ (fetchurl {
+ name = "mupdf-1.11-CVE-2017-15587.patch";
+ url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=82df2631d7d0446b206ea6b434ea609b6c28b0e8";
+ sha256 = "04kfww7y0wazg6372g44fa2k5kiiigq4616ihkvmp18rz86903n9";
+ })
];
makeFlags = [ "prefix=$(out)" ];
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ zlib libX11 libXcursor libXext harfbuzz mesa libXrandr libXinerama freetype libjpeg jbig2dec openjpeg ];
+ buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg ]
+ ++ lib.optionals enableX11 [ libX11 libXext ]
+ ++ lib.optionals enableCurl [ curl openssl ];
outputs = [ "bin" "dev" "out" "man" "doc" ];
preConfigure = ''
@@ -37,13 +71,6 @@ stdenv.mkDerivation rec {
'';
postInstall = ''
- for i in $out/lib/*.a; do
- so="''${i%.a}.so"
- gcc -shared -o $so.${version} -Wl,--whole-archive $i -Wl,--no-whole-archive
- ln -s $so.${version} $so
- rm $i
- done
-
mkdir -p "$out/lib/pkgconfig"
cat >"$out/lib/pkgconfig/mupdf.pc" <=[^"]*,psutil,g' \
-e 's,requests>=[^"]*,requests,g' \
-e 's,future>=[^"]*,future,g' \
+ -e 's,pyserial>=[^"]*,pyserial,g' \
+ -e 's,semantic_version>=[^"]*,semantic_version,g' \
setup.py
'';
diff --git a/pkgs/applications/misc/octoprint/m33-fio-one-library.patch b/pkgs/applications/misc/octoprint/m33-fio-one-library.patch
index 87b00f3ab705..24c9c4a80f5d 100644
--- a/pkgs/applications/misc/octoprint/m33-fio-one-library.patch
+++ b/pkgs/applications/misc/octoprint/m33-fio-one-library.patch
@@ -1,18 +1,18 @@
-From 0defcf6ec155899c414f66524b7df629f59327f0 Mon Sep 17 00:00:00 2001
+From 314bcebfcd1759981ce12255be29d8ae68cd400b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov
Date: Wed, 23 Nov 2016 00:40:48 +0300
Subject: [PATCH] Build and use one version of preprocessor library
---
- octoprint_m33fio/__init__.py | 67 ++----------------------------------------
- shared library source/Makefile | 62 +++-----------------------------------
- 2 files changed, 6 insertions(+), 123 deletions(-)
+ octoprint_m33fio/__init__.py | 73 ++----------------------------------------
+ shared library source/Makefile | 62 +++--------------------------------
+ 2 files changed, 6 insertions(+), 129 deletions(-)
diff --git a/octoprint_m33fio/__init__.py b/octoprint_m33fio/__init__.py
-index 4b43c59..d1259e4 100755
+index 054870a..4d5ecc1 100755
--- a/octoprint_m33fio/__init__.py
+++ b/octoprint_m33fio/__init__.py
-@@ -1062,71 +1062,8 @@ class M33FioPlugin(
+@@ -1189,78 +1189,9 @@ class M33FioPlugin(
# Check if using shared library or checking if it is usable
if self._settings.get_boolean(["UseSharedLibrary"]) or isUsable :
@@ -54,7 +54,9 @@ index 4b43c59..d1259e4 100755
-
- # Otherwise check if running on Windows and using an i386 or x86-64 device
- elif platform.uname()[0].startswith("Windows") and (platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64")) :
--
++ # Set shared library
++ self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/libpreprocessor.so")
+
- # Check if Python is running as 32-bit
- if platform.architecture()[0].startswith("32") :
-
@@ -81,11 +83,16 @@ index 4b43c59..d1259e4 100755
-
- # Set shared library
- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_x86-64.dylib")
-+ # Set shared library
-+ self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/libpreprocessor.so")
-
+-
+- # Otherwise check if running FreeBSD
+- elif platform.uname()[0].startswith("FreeBSD") :
+-
+- # TODO: Compile FreeBSD shared library pre-processors
+- pass
+-
# Check if shared library was set
if self.sharedLibrary :
+
diff --git a/shared library source/Makefile b/shared library source/Makefile
index 792b4f4..4c74f5c 100755
--- a/shared library source/Makefile
@@ -164,5 +171,5 @@ index 792b4f4..4c74f5c 100755
clean:
rm -f ../octoprint_m33fio/static/libraries/$(PROG)
--
-2.11.0
+2.14.1
diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix
index c09e8d2f5e66..0a1d26012a80 100644
--- a/pkgs/applications/misc/octoprint/plugins.nix
+++ b/pkgs/applications/misc/octoprint/plugins.nix
@@ -12,13 +12,13 @@ let
m33-fio = buildPlugin rec {
name = "M33-Fio-${version}";
- version = "1.20";
+ version = "1.21";
src = fetchFromGitHub {
owner = "donovan6000";
repo = "M33-Fio";
rev = "V${version}";
- sha256 = "1ng7lzlkqsjcr1w7wgzwsqkkvcvpajcj2cwqlffh95916sw8n767";
+ sha256 = "1la3611kkqn8yiwjn6cizc45ri8pnk6ckld1na4nk6mqk88jvjq7";
};
patches = [
diff --git a/pkgs/applications/misc/openbox-menu/default.nix b/pkgs/applications/misc/openbox-menu/default.nix
index 000af950bf12..8ff9a2f44d55 100644
--- a/pkgs/applications/misc/openbox-menu/default.nix
+++ b/pkgs/applications/misc/openbox-menu/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1hi4b6mq97y6ajq4hhsikbkk23aha7ikaahm92djw48mgj2f1w8l";
};
- buildInputs = [ pkgconfig glib gtk2 menu-cache ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ glib gtk2 menu-cache ];
patches = [ ./with-svg.patch ];
diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix
index 056649ad3d26..3420d6365b4b 100644
--- a/pkgs/applications/misc/opencpn/default.nix
+++ b/pkgs/applications/misc/opencpn/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
sha256 = "1m6fp9lf9ki9444h0dq6bj0vr7d0pcxkbjv3j2v76p0ksk2l8kw3";
};
- buildInputs = [ pkgconfig cmake gtk2 wxGTK30 libpulseaudio curl gettext
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ cmake gtk2 wxGTK30 libpulseaudio curl gettext
glib portaudio ];
cmakeFlags = [
diff --git a/pkgs/applications/misc/pcmanx-gtk2/default.nix b/pkgs/applications/misc/pcmanx-gtk2/default.nix
index 65366607c50c..060d4899f4c7 100644
--- a/pkgs/applications/misc/pcmanx-gtk2/default.nix
+++ b/pkgs/applications/misc/pcmanx-gtk2/default.nix
@@ -7,7 +7,8 @@ stdenv.mkDerivation {
sha256 = "2e5c59f6b568036f2ad6ac67ca2a41dfeeafa185451e507f9fb987d4ed9c4302";
};
- buildInputs = [ gtk2 libXft intltool automake autoconf libtool pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk2 libXft intltool automake autoconf libtool ];
preConfigure = ''
./autogen.sh
@@ -17,7 +18,7 @@ stdenv.mkDerivation {
homepage = http://pcman.ptt.cc;
license = licenses.gpl2;
description = "Telnet BBS browser with GTK+ interface";
- maintainers = [ maintainers.mingchuan ];
+ maintainers = [ maintainers.sifmelcara ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/misc/pdfmod/default.nix b/pkgs/applications/misc/pdfmod/default.nix
index ba4a57a191c3..691f3188b08c 100644
--- a/pkgs/applications/misc/pdfmod/default.nix
+++ b/pkgs/applications/misc/pdfmod/default.nix
@@ -18,8 +18,9 @@ stdenv.mkDerivation rec {
sha256 = "0fpz9ifr6476lqhd5rkb94dm68vlrwdq5w1aaxzgyjgdax9hxx81";
}) ];
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig gnome_doc_utils intltool mono gtk-sharp-2_0 gnome-sharp
+ gnome_doc_utils intltool mono gtk-sharp-2_0 gnome-sharp
hyena which makeWrapper wrapGAppsHook
];
diff --git a/pkgs/applications/misc/pell/default.nix b/pkgs/applications/misc/pell/default.nix
index f79d71ca2505..ad2ab147340e 100644
--- a/pkgs/applications/misc/pell/default.nix
+++ b/pkgs/applications/misc/pell/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "pell";
- version = "0.0.1";
+ version = "0.0.2";
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "ebzzry";
repo = pname;
- rev = "3f95341eb9439c7a6be1f3c6366c0552ab8208f0";
- sha256 = "183aj3ys080g2kahl8x8rkhzlsb6h5ls9xm1v2kasfbn1pi5i6nn";
+ rev = "ec14de0a9b666433954184167bf3b82cf21193f8";
+ sha256 = "0r2gbb4l9rr5x99m62zicknsp1gf9fr124xpyd8ak9izr5hvskn9";
};
installPhase = ''
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = https://github.com/ebzzry/pell;
- description = "A simple periodic host monitor using ping";
+ description = "A simple host availability monitor";
license = licenses.mit;
maintainers = [ maintainers.ebzzry ];
platforms = platforms.unix;
diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix
index 15313befb628..889f516f00b7 100644
--- a/pkgs/applications/misc/pgadmin/default.nix
+++ b/pkgs/applications/misc/pgadmin/default.nix
@@ -1,23 +1,32 @@
-{ stdenv, fetchurl, postgresql, wxGTK, libxml2, libxslt, openssl, zlib, makeDesktopItem }:
+{ stdenv, fetchurl, fetchpatch, postgresql, wxGTK, libxml2, libxslt, openssl, zlib, makeDesktopItem }:
stdenv.mkDerivation rec {
name = "pgadmin3-${version}";
- version = "1.22.1";
+ version = "1.22.2";
src = fetchurl {
- url = "http://ftp.postgresql.org/pub/pgadmin3/release/v${version}/src/pgadmin3-${version}.tar.gz";
- sha256 = "0gkqpj8cg6jd6yhssrij1cbh960rg9fkjbdzcpryi6axwv0ag7ki";
+ url = "http://ftp.postgresql.org/pub/pgadmin/pgadmin3/v${version}/src/pgadmin3-${version}.tar.gz";
+ sha256 = "1b24b356h8z188nci30xrb57l7kxjqjnh6dq9ws638phsgiv0s4v";
};
enableParallelBuilding = true;
buildInputs = [ postgresql wxGTK openssl zlib ];
+ patches = [
+ (fetchpatch {
+ sha256 = "09hp7s3zjz80rpx2j3xyznwswwfxzi70z7c05dzrdk74mqjjpkfk";
+ name = "843344.patch";
+ url = "https://sources.debian.net/data/main/p/pgadmin3/1.22.2-1/debian/patches/843344";
+ })
+ ];
+
preConfigure = ''
substituteInPlace pgadmin/ver_svn.sh --replace "bin/bash" "$shell"
'';
configureFlags = [
+ "--with-pgsql=${postgresql}"
"--with-libxml2=${libxml2.dev}"
"--with-libxslt=${libxslt.dev}"
];
diff --git a/pkgs/applications/misc/postage/default.nix b/pkgs/applications/misc/pgmanage/default.nix
similarity index 63%
rename from pkgs/applications/misc/postage/default.nix
rename to pkgs/applications/misc/pgmanage/default.nix
index eeb879ee6e48..fd66ce8fc31c 100644
--- a/pkgs/applications/misc/postage/default.nix
+++ b/pkgs/applications/misc/pgmanage/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, runCommand, postgresql, openssl } :
stdenv.mkDerivation rec {
- name = "postage-${version}";
- version = "3.2.18";
+ name = "pgmanage-${version}";
+ version = "10.0.2";
src = fetchFromGitHub {
- owner = "workflowproducts";
- repo = "postage";
- rev = "eV${version}";
- sha256 = "1kdg8pw2vxwkxw3b6dim4s740s60j3iyrh96524wi3lqkkq98krn";
+ owner = "pgManage";
+ repo = "pgManage";
+ rev = "v${version}";
+ sha256 = "0g9kvhs9b6kc1s7j90fqv71amiy9v0w5p906yfvl0j7pf3ayq35a";
};
buildInputs = [ postgresql openssl ];
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
the style of NGINX and Node.js. This heart makes Postage as fast as any
PostgreSQL interface can hope to be.
'';
- homepage = http://www.workflowproducts.com/postage.html;
- license = licenses.asl20;
+ homepage = https://github.com/pgManage/pgManage;
+ license = licenses.postgresql;
maintainers = [ maintainers.basvandijk ];
};
}
diff --git a/pkgs/applications/misc/pinfo/default.nix b/pkgs/applications/misc/pinfo/default.nix
index 86dbfc0c5fe1..6d0a348b1f76 100644
--- a/pkgs/applications/misc/pinfo/default.nix
+++ b/pkgs/applications/misc/pinfo/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation {
sha256 = "0p8wyrpz9npjcbx6c973jspm4c3xz4zxx939nngbq49xqah8088j";
};
- buildInputs = [ autoreconfHook gettext texinfo ncurses readline ];
+ nativeBuildInputs = [ autoreconfHook ];
+ buildInputs = [ gettext texinfo ncurses readline ];
configureFlags = [ "--with-curses=${ncurses.dev}" "--with-readline=${readline.dev}" ];
diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix
index b604905320b2..3f39a356312e 100644
--- a/pkgs/applications/misc/playonlinux/default.nix
+++ b/pkgs/applications/misc/playonlinux/default.nix
@@ -24,7 +24,7 @@
assert stdenv.isLinux;
let
- version = "4.2.10";
+ version = "4.2.12";
binpath = stdenv.lib.makeBinPath
[ cabextract
@@ -57,7 +57,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "https://www.playonlinux.com/script_files/PlayOnLinux/${version}/PlayOnLinux_${version}.tar.gz";
- sha256 = "0ws94hgxajaww450q8ivrp28ypv39mashs29ak41faxf29cr097m";
+ sha256 = "03k8v9dknc5hfrfzqw1nkpifz7wkixv3mvjl1vnp4fx8rj2xrjrq";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/misc/posterazor/default.nix b/pkgs/applications/misc/posterazor/default.nix
index 0cd0d29e2f3a..1347840ee674 100644
--- a/pkgs/applications/misc/posterazor/default.nix
+++ b/pkgs/applications/misc/posterazor/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
- buildInputs = [ cmake unzip pkgconfig libXpm fltk13 freeimage ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ cmake unzip libXpm fltk13 freeimage ];
unpackPhase = ''
unzip $src -d posterazor
diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix
index bc6b4e16a378..ecc4c341a686 100644
--- a/pkgs/applications/misc/pytrainer/default.nix
+++ b/pkgs/applications/misc/pytrainer/default.nix
@@ -1,38 +1,45 @@
-{ stdenv, fetchurl, pythonPackages, sqlite, gpsbabel }:
+{ stdenv, fetchFromGitHub, perl, python2Packages, sqlite, gpsbabel
+, withWebKit ? false }:
let
# Pytrainer needs a matplotlib with GTK backend. Also ensure we are
# using the pygtk with glade support as needed by pytrainer.
- matplotlibGtk = pythonPackages.matplotlib.override {
+ matplotlibGtk = python2Packages.matplotlib.override {
enableGtk2 = true;
- pygtk = pythonPackages.pyGtkGlade;
+ pygtk = python2Packages.pyGtkGlade;
};
in
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
name = "pytrainer-${version}";
- version = "1.10.0";
+ version = "1.11.0";
- src = fetchurl {
- url = "https://github.com/pytrainer/pytrainer/archive/v${version}.tar.gz";
- sha256 = "0l42p630qhymgrcvxgry8chrpzcp6nr3d1vd7vhifh2npfq9l09y";
+ src = fetchFromGitHub {
+ owner = "pytrainer";
+ repo = "pytrainer";
+ rev = "v${version}";
+ sha256 = "1x4f1ydjql0aisvxs5kyi9lx35b4q3768dx42fyzq1nxdwzaqyvy";
};
namePrefix = "";
- # The existing use of pywebkitgtk shows raw HTML text instead of
- # map. This patch solves the problems by showing the file from a
- # string, which allows setting an explicit MIME type.
- patches = [ ./pytrainer-webkit.patch ];
+ patches = [
+ # The test fails in the UTC timezone and C locale.
+ ./fix-test-tz.patch
- propagatedBuildInputs = with pythonPackages; [
- dateutil lxml matplotlibGtk pyGtkGlade pywebkitgtk
- sqlalchemy_migrate
+ # The existing use of pywebkitgtk shows raw HTML text instead of
+ # map. This patch solves the problems by showing the file from a
+ # string, which allows setting an explicit MIME type.
+ ./pytrainer-webkit.patch
];
- buildInputs = [ gpsbabel sqlite ];
+ propagatedBuildInputs = with python2Packages; [
+ dateutil lxml matplotlibGtk pyGtkGlade sqlalchemy_migrate
+ ] ++ stdenv.lib.optional withWebKit [ pywebkitgtk ];
+
+ buildInputs = [ perl gpsbabel sqlite ];
# This package contains no binaries to patch or strip.
dontPatchELF = true;
diff --git a/pkgs/applications/misc/pytrainer/fix-test-tz.patch b/pkgs/applications/misc/pytrainer/fix-test-tz.patch
new file mode 100644
index 000000000000..359e28c41c34
--- /dev/null
+++ b/pkgs/applications/misc/pytrainer/fix-test-tz.patch
@@ -0,0 +1,33 @@
+diff -Nurp pytrainer-v1.11.0-a/pytrainer/test/core/test_activity.py pytrainer-v1.11.0-b/pytrainer/test/core/test_activity.py
+--- pytrainer-v1.11.0-a/pytrainer/test/core/test_activity.py 1980-01-02 00:00:00.000000000 +0100
++++ pytrainer-v1.11.0-b/pytrainer/test/core/test_activity.py 2017-09-30 18:56:43.127016847 +0200
+@@ -69,7 +69,7 @@ class ActivityTest(unittest.TestCase):
+ self.assertEquals(self.activity.time, self.activity.duration)
+
+ def test_activity_starttime(self):
+- self.assertEquals(self.activity.starttime, '12:58:23 PM')
++ self.assertEquals(self.activity.starttime, '12:58:23')
+
+ def test_activity_time_tuple(self):
+ self.assertEquals(self.activity.time_tuple, (2, 3, 46))
+diff -Nurp pytrainer-v1.11.0-a/pytrainer/test/imports/test_garmintcxv2.py pytrainer-v1.11.0-b/pytrainer/test/imports/test_garmintcxv2.py
+--- pytrainer-v1.11.0-a/pytrainer/test/imports/test_garmintcxv2.py 1980-01-02 00:00:00.000000000 +0100
++++ pytrainer-v1.11.0-b/pytrainer/test/imports/test_garmintcxv2.py 2017-09-30 18:55:45.078128980 +0200
+@@ -23,7 +23,7 @@ class GarminTCXv2Test(unittest.TestCase)
+ self.fail()
+
+ def test_workout_summary(self):
+- summary = [(0, False, '2012-10-14T12:02:42', '10.12', '00:39:51', 'Running')]
++ summary = [(0, False, '2012-10-14T10:02:42', '10.12', '00:39:51', 'Running')]
+ try:
+ current_path = os.path.dirname(os.path.abspath(__file__))
+ data_path = os.path.dirname(os.path.dirname(os.path.dirname(current_path))) + "/"
+diff -Nurp pytrainer-v1.11.0-a/pytrainer/test/lib/test_date.py pytrainer-v1.11.0-b/pytrainer/test/lib/test_date.py
+--- pytrainer-v1.11.0-a/pytrainer/test/lib/test_date.py 1980-01-02 00:00:00.000000000 +0100
++++ pytrainer-v1.11.0-b/pytrainer/test/lib/test_date.py 2017-09-30 18:56:23.448720166 +0200
+@@ -45,4 +45,4 @@ class DateFunctionTest(unittest.TestCase
+ def test_getDateTime(self):
+ utctime, localtime = getDateTime('Tue Nov 24 17:29:05 UTC 2015')
+ self.assertEqual(datetime.datetime(2015, 11, 24, 17, 29, 5, tzinfo=tzutc()), utctime)
+- self.assertEqual(datetime.datetime(2015, 11, 24, 19, 29, 5, tzinfo=tzlocal()), localtime)
++ self.assertEqual(datetime.datetime(2015, 11, 24, 17, 29, 5, tzinfo=tzlocal()), localtime)
diff --git a/pkgs/applications/misc/qmapshack/default.nix b/pkgs/applications/misc/qmapshack/default.nix
new file mode 100644
index 000000000000..7330dfa4f199
--- /dev/null
+++ b/pkgs/applications/misc/qmapshack/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromBitbucket, cmake, qtscript, qtwebkit, gdal, proj, routino, quazip }:
+
+stdenv.mkDerivation rec {
+ name = "qmapshack-${version}";
+ version = "1.9.1";
+
+ src = fetchFromBitbucket {
+ owner = "maproom";
+ repo = "qmapshack";
+ rev = "V%20${version}";
+ sha256 = "1yswdq1s9jjhwb3wfiy3kkiiaqzagw28vjqvl13jxcnmq7y763sr";
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ buildInputs = [ qtscript qtwebkit gdal proj routino quazip ];
+
+ cmakeFlags = [
+ "-DROUTINO_XML_PATH=${routino}/share/routino"
+ "-DQUAZIP_INCLUDE_DIR=${quazip}/include/quazip"
+ "-DLIBQUAZIP_LIBRARY=${quazip}/lib/libquazip.so"
+ ];
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ homepage = https://bitbucket.org/maproom/qmapshack/wiki/Home;
+ description = "Plan your next outdoor trip";
+ license = licenses.gpl3;
+ maintainter = with maintainers; [ dotlambda ];
+ platforms = with platforms; linux;
+ };
+}
diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix
index 5cbf94114357..e3e7ff950b0c 100644
--- a/pkgs/applications/misc/qpdfview/default.nix
+++ b/pkgs/applications/misc/qpdfview/default.nix
@@ -10,13 +10,14 @@ let
url="https://launchpad.net/qpdfview/trunk/${version}/+download/qpdfview-${version}.tar.gz";
sha256 = "0zysjhr58nnmx7ba01q3zvgidkgcqxjdj4ld3gx5fc7wzvl1dm7s";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- qt4 poppler_qt4 pkgconfig djvulibre libspectre cups file ghostscript
+ qt4 poppler_qt4 djvulibre libspectre cups file ghostscript
];
in
stdenv.mkDerivation {
inherit (s) name version;
- inherit buildInputs;
+ inherit nativeBuildInputs buildInputs;
src = fetchurl {
inherit (s) url sha256;
};
diff --git a/pkgs/applications/misc/quicksynergy/default.nix b/pkgs/applications/misc/quicksynergy/default.nix
index bed1d1fc97c4..b2616bf7b778 100644
--- a/pkgs/applications/misc/quicksynergy/default.nix
+++ b/pkgs/applications/misc/quicksynergy/default.nix
@@ -7,8 +7,9 @@ stdenv.mkDerivation rec {
url = "mirror://sourceforge/project/quicksynergy/Linux/${version}/quicksynergy-${version}.tar.gz";
sha256 = "1pi8503bg8q1psw50y6d780i33nnvfjqiy9vnr3v52pdcfip8pix";
};
+
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig
gtk2
synergy
];
@@ -28,7 +29,7 @@ stdenv.mkDerivation rec {
Remember to open port 24800 (used by synergys program) if you want to
host mouse and keyboard.";
- homepage = https://code.google.com/p/quicksynergy/;
+ homepage = https://sourceforge.net/projects/quicksynergy/;
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.spinus ];
platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/misc/redis-desktop-manager/default.nix b/pkgs/applications/misc/redis-desktop-manager/default.nix
index 8bbfbaf7cf0e..59d22b967b57 100644
--- a/pkgs/applications/misc/redis-desktop-manager/default.nix
+++ b/pkgs/applications/misc/redis-desktop-manager/default.nix
@@ -24,10 +24,9 @@ stdenv.mkDerivation rec {
sha256 = "0a7xa39qp1q32zkypw32mm3wi8wbhxhvrm6l3xsa3k1jzih7hzxr";
};
- nativeBuildInputs = [ qmake ];
-
+ nativeBuildInputs = [ pkgconfig qmake ];
buildInputs = [
- pkgconfig libssh2 qtbase qtdeclarative qtgraphicaleffects qtimageformats
+ libssh2 qtbase qtdeclarative qtgraphicaleffects qtimageformats
qtquick1 qtquickcontrols qtsvg qttools
];
diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix
index 03d058783b23..8b93dd51406b 100644
--- a/pkgs/applications/misc/rescuetime/default.nix
+++ b/pkgs/applications/misc/rescuetime/default.nix
@@ -9,14 +9,14 @@ let
} else fetchurl {
name = "rescuetime-installer.deb";
url = "https://www.rescuetime.com/installers/rescuetime_current_amd64.deb";
- sha256 = "161f71kvcrilv9qxldwn8xsqs2g9c2f2g9wb5brbfc0lqbbc8n89";
+ sha256 = "1xjwaqz0gs12ndgw7c2f1nkvj0nqcl0bxhd54pwk0dwrx9pn9avz";
};
in
stdenv.mkDerivation {
# https://www.rescuetime.com/updates/linux_release_notes.html
- name = "rescuetime-2.9.11.1285";
+ name = "rescuetime-2.9.11.1300";
inherit src;
buildInputs = [ dpkg makeWrapper ];
unpackPhase = ''
diff --git a/pkgs/applications/misc/robo3t/default.nix b/pkgs/applications/misc/robo3t/default.nix
new file mode 100644
index 000000000000..fc7ff4842394
--- /dev/null
+++ b/pkgs/applications/misc/robo3t/default.nix
@@ -0,0 +1,77 @@
+{ stdenv, fetchurl, zlib, glib, xorg, dbus, fontconfig,
+ freetype, xkeyboard_config, makeDesktopItem, makeWrapper }:
+
+stdenv.mkDerivation rec {
+ name = "robo3t-${version}";
+ version = "1.1.1";
+
+ src = fetchurl {
+ url = "https://download.robomongo.org/1.1.1/linux/robo3t-${version}-linux-x86_64-c93c6b0.tar.gz";
+ sha256 = "140cn80vg7c8vpdjasqi4b3kyqj4n033lcm3ikz5674x3jr7r5zs";
+ };
+
+ icon = fetchurl {
+ url = "https://github.com/Studio3T/robomongo/raw/${version}/trash/install/linux/robomongo.png";
+ sha256 = "15li8536x600kkfkb3h6mw7y0f2ljkv951pc45dpiw036vldibv2";
+ };
+
+ desktopItem = makeDesktopItem {
+ name = "robo3t";
+ exec = "robo3t";
+ icon = icon;
+ comment = "Query GUI for mongodb";
+ desktopName = "Robo3T";
+ genericName = "MongoDB management tool";
+ categories = "Development;IDE;mongodb;";
+ };
+
+ nativeBuildInputs = [makeWrapper];
+
+ ldLibraryPath = stdenv.lib.makeLibraryPath [
+ stdenv.cc.cc
+ zlib
+ glib
+ xorg.libXi
+ xorg.libxcb
+ xorg.libXrender
+ xorg.libX11
+ xorg.libSM
+ xorg.libICE
+ xorg.libXext
+ dbus
+ fontconfig
+ freetype
+ ];
+
+ installPhase = ''
+ BASEDIR=$out/lib/robo3t
+
+ mkdir -p $BASEDIR/bin
+ cp bin/* $BASEDIR/bin
+
+ mkdir -p $BASEDIR/lib
+ cp -r lib/* $BASEDIR/lib
+
+ mkdir -p $out/share/applications
+ cp $desktopItem/share/applications/* $out/share/applications
+
+ mkdir -p $out/share/icons
+ cp ${icon} $out/share/icons/robomongo.png
+
+ patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $BASEDIR/bin/robo3t
+
+ mkdir $out/bin
+
+ makeWrapper $BASEDIR/bin/robo3t $out/bin/robo3t \
+ --suffix LD_LIBRARY_PATH : ${ldLibraryPath} \
+ --suffix QT_XKB_CONFIG_ROOT : ${xkeyboard_config}/share/X11/xkb
+ '';
+
+ meta = {
+ homepage = https://robomongo.org/;
+ description = "Query GUI for mongodb";
+ platforms = stdenv.lib.intersectLists stdenv.lib.platforms.linux stdenv.lib.platforms.x86_64;
+ license = stdenv.lib.licenses.gpl3;
+ maintainers = [ stdenv.lib.maintainers.eperuffo ];
+ };
+}
diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix
index 3c4cf27308bb..bdf14c03bcc2 100644
--- a/pkgs/applications/misc/rofi/default.nix
+++ b/pkgs/applications/misc/rofi/default.nix
@@ -1,14 +1,15 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, libxkbcommon, pango, which, git
, cairo, glib, libxcb, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification
+, bison, flex, librsvg, check
}:
stdenv.mkDerivation rec {
- version = "1.3.1";
+ version = "1.4.2";
name = "rofi-${version}";
src = fetchurl {
url = "https://github.com/DaveDavenport/rofi/releases/download/${version}/${name}.tar.gz";
- sha256 = "09i3vd8k6zqphrm382fglsmxc4q6dg00xddzl96kakszgvdd4qfs";
+ sha256 = "0ys7grazqz5hw3nx2393df54ykcd5gw0zn66kik5fvzijpg3qfcx";
};
preConfigure = ''
@@ -17,7 +18,8 @@ stdenv.mkDerivation rec {
sed -i 's/~root/~nobody/g' test/helper-expand.c
'';
- buildInputs = [ autoreconfHook pkgconfig libxkbcommon pango cairo git
+ nativeBuildInputs = [ autoreconfHook pkgconfig ];
+ buildInputs = [ libxkbcommon pango cairo git bison flex librsvg check
libstartup_notification libxcb xcbutil xcbutilwm xcbutilxrm which
];
doCheck = true;
diff --git a/pkgs/applications/misc/rtl-sdr/default.nix b/pkgs/applications/misc/rtl-sdr/default.nix
index fb6e9e86e599..652dd9d5e650 100644
--- a/pkgs/applications/misc/rtl-sdr/default.nix
+++ b/pkgs/applications/misc/rtl-sdr/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "1dh52xcvxkjb3mj80wlm20grz8cqf5wipx2ksi91ascz12b5pym6";
};
- buildInputs = [ cmake pkgconfig libusb1 ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ cmake libusb1 ];
# TODO: get these fixes upstream:
# * Building with -DINSTALL_UDEV_RULES=ON tries to install udev rules to
diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix
index 7e16da68f471..02af4c28d593 100644
--- a/pkgs/applications/misc/rtv/default.nix
+++ b/pkgs/applications/misc/rtv/default.nix
@@ -2,14 +2,14 @@
with pythonPackages;
buildPythonApplication rec {
- version = "1.18.0";
+ version = "1.19.0";
name = "rtv-${version}";
src = fetchFromGitHub {
owner = "michael-lazar";
repo = "rtv";
rev = "v${version}";
- sha256 = "00d2s29sp68hw8ljjmzn5dc5ly2s3c7qf0azwizgd3b40zlfgzcg";
+ sha256 = "19rnw9cac06ns10vqn2cj0v61ycrj9g1ysa3hncamwxxibmkycp7";
};
# Tests try to access network
diff --git a/pkgs/applications/misc/rxvt/default.nix b/pkgs/applications/misc/rxvt/default.nix
index e8914b75b8a5..8e63cdb6d16c 100644
--- a/pkgs/applications/misc/rxvt/default.nix
+++ b/pkgs/applications/misc/rxvt/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "0jfl71gz3k7zh3kxdb8lxi06kajjnx7bq1rxjgk680l209jxask1";
};
- buildInputs = [ pkgconfig libtool libX11 libXt libXpm ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libtool libX11 libXt libXpm ];
configurePhase = ''
LIBTOOL=${libtool}/bin/libtool ./configure --prefix=$out --enable-everything --enable-smart-resize --enable-256-color
diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix
index 1ed6e4d70c93..c093a7516031 100644
--- a/pkgs/applications/misc/sc-im/default.nix
+++ b/pkgs/applications/misc/sc-im/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "02ak3b0vv72mv38cwvy7qp0y6hgrzcgahkv1apgks3drpnz5w1sj";
};
- buildInputs = [ yacc ncurses libxml2 libzip libxls pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ yacc ncurses libxml2 libzip libxls ];
buildPhase = ''
cd src
diff --git a/pkgs/applications/misc/sdcv/default.nix b/pkgs/applications/misc/sdcv/default.nix
index f808ec611a33..bf2de3a5f1b9 100644
--- a/pkgs/applications/misc/sdcv/default.nix
+++ b/pkgs/applications/misc/sdcv/default.nix
@@ -1,34 +1,32 @@
-{ stdenv, fetchurl, pkgconfig, glib, gettext }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, glib, gettext, readline }:
stdenv.mkDerivation rec {
- name= "sdcv-0.4.2";
+ name = "sdcv-${version}";
+ version = "0.5.2";
- meta = {
- homepage = http://sdcv.sourceforge.net/;
- description = "Console version of StarDict program";
- maintainers = with stdenv.lib.maintainers; [ lovek323 ];
- license = stdenv.lib.licenses.gpl2;
- platforms = stdenv.lib.platforms.linux;
- };
-
- src = fetchurl {
- url = "mirror://sourceforge/sdcv/${name}.tar.bz2";
- sha256 = "1cnyv7gd1qvz8ma8545d3aq726wxrx4km7ykl97831irx5wz0r51";
+ src = fetchFromGitHub {
+ owner = "Dushistov";
+ repo = "sdcv";
+ rev = "v${version}";
+ sha256 = "1b67s4nj0s5fh3cjk7858qvhiisc557xx72xwzrb8hq6ijpwx5k0";
};
hardeningDisable = [ "format" ];
+ nativeBuildInputs = [ cmake pkgconfig ];
+ buildInputs = [ glib gettext readline ];
- patches = ( if stdenv.isDarwin
- then [ ./sdcv.cpp.patch-darwin ./utils.hpp.patch ]
- else [ ./sdcv.cpp.patch ] );
-
- buildInputs = [ pkgconfig glib gettext ];
-
- preBuild = ''
- sed -i 's/guint32 page_size/size_t page_size/' src/lib/lib.cpp
+ preInstall = ''
+ touch locale
'';
NIX_CFLAGS_COMPILE = "-D__GNU_LIBRARY__"
+ stdenv.lib.optionalString stdenv.isDarwin " -lintl";
-}
+ meta = with stdenv.lib; {
+ homepage = https://dushistov.github.io/sdcv/;
+ description = "Console version of StarDict";
+ maintainers = with maintainers; [ lovek323 ];
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/misc/sdcv/sdcv.cpp.patch b/pkgs/applications/misc/sdcv/sdcv.cpp.patch
deleted file mode 100644
index 6f835f16e458..000000000000
--- a/pkgs/applications/misc/sdcv/sdcv.cpp.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/utils.hpp
-+++ b/src/utils.hpp
-@@ -2,6 +2,9 @@
- #define _UTILS_HPP_
-
- #include
-+#include
-+#include
-+
- using std::string;
-
- extern bool stdio_getline(FILE *in, string &str);
diff --git a/pkgs/applications/misc/sdcv/sdcv.cpp.patch-darwin b/pkgs/applications/misc/sdcv/sdcv.cpp.patch-darwin
deleted file mode 100644
index 2ee9a24e0347..000000000000
--- a/pkgs/applications/misc/sdcv/sdcv.cpp.patch-darwin
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/src/sdcv.cpp
-+++ b/src/sdcv.cpp
-@@ -27,13 +27,13 @@
- #include
- #include
- #include
-+#include
-+#include
-+#include
- #include
- #include
- #include
- #include
--#include
--#include
--#include
-
- #include "libwrapper.hpp"
- #include "readline.hpp"
diff --git a/pkgs/applications/misc/sdcv/utils.hpp.patch b/pkgs/applications/misc/sdcv/utils.hpp.patch
deleted file mode 100644
index c08641abd6b9..000000000000
--- a/pkgs/applications/misc/sdcv/utils.hpp.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/utils.hpp
-+++ b/src/utils.hpp
-@@ -2,6 +2,7 @@
- #define _UTILS_HPP_
-
- #include
-+#include
- using std::string;
-
- extern bool stdio_getline(FILE *in, string &str);
diff --git a/pkgs/applications/misc/sent/default.nix b/pkgs/applications/misc/sent/default.nix
index c6430af55608..24e76500a6a5 100644
--- a/pkgs/applications/misc/sent/default.nix
+++ b/pkgs/applications/misc/sent/default.nix
@@ -1,15 +1,18 @@
-{ stdenv, fetchurl, libpng, libX11, libXft
+{ stdenv, fetchurl, farbfeld, libX11, libXft
, patches ? [] }:
stdenv.mkDerivation rec {
- name = "sent-0.2";
+ name = "sent-1";
src = fetchurl {
- url = "http://dl.suckless.org/tools/${name}.tar.gz";
- sha256 = "0xhh752hwaa26k4q6wvrb9jnpbnylss2aw6z11j7l9rav7wn3fak";
+ url = "https://dl.suckless.org/tools/${name}.tar.gz";
+ sha256 = "0cxysz5lp25mgww73jl0mgip68x7iyvialyzdbriyaff269xxwvv";
};
- buildInputs = [ libpng libX11 libXft ];
+ buildInputs = [ farbfeld libX11 libXft ];
+
+ # unpacking doesn't create a directory
+ sourceRoot = ".";
inherit patches;
@@ -17,8 +20,8 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A simple plaintext presentation tool";
- homepage = http://tools.suckless.org/sent/;
- license = licenses.mit;
+ homepage = https://tools.suckless.org/sent/;
+ license = licenses.isc;
platforms = platforms.linux;
maintainers = with maintainers; [ pSub ];
};
diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix
index f4e1eef28363..5fffa6681cb2 100644
--- a/pkgs/applications/misc/spacefm/default.nix
+++ b/pkgs/applications/misc/spacefm/default.nix
@@ -26,8 +26,9 @@ stdenv.mkDerivation rec {
ln -s /etc/spacefm/spacefm.conf $out/etc/spacefm/spacefm.conf
'';
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- gtk3 udev desktop_file_utils shared_mime_info intltool pkgconfig
+ gtk3 udev desktop_file_utils shared_mime_info intltool
wrapGAppsHook ffmpegthumbnailer jmtpfs lsof udisks
] ++ (if ifuseSupport then [ ifuse ] else []);
# Introduced because ifuse doesn't build due to CVEs in libplist
diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix
index 16d6ca2e26fa..59e67fc65e2e 100644
--- a/pkgs/applications/misc/st/default.nix
+++ b/pkgs/applications/misc/st/default.nix
@@ -17,14 +17,16 @@ in stdenv.mkDerivation rec {
configFile = optionalString (conf!=null) (writeText "config.def.h" conf);
preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
- buildInputs = [ pkgconfig libX11 ncurses libXext libXft fontconfig ] ++ extraLibs;
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libX11 ncurses libXext libXft fontconfig ] ++ extraLibs;
installPhase = ''
TERMINFO=$out/share/terminfo make install PREFIX=$out
'';
meta = {
- homepage = http://st.suckless.org/;
+ homepage = https://st.suckless.org/;
+ description = "Simple Terminal for X from Suckless.org Community";
license = licenses.mit;
maintainers = with maintainers; [viric andsild];
platforms = platforms.linux;
diff --git a/pkgs/applications/misc/st/wayland.nix b/pkgs/applications/misc/st/wayland.nix
index ab890c8db718..69794b1cffbd 100644
--- a/pkgs/applications/misc/st/wayland.nix
+++ b/pkgs/applications/misc/st/wayland.nix
@@ -19,7 +19,8 @@ stdenv.mkDerivation rec {
configFile = optionalString (conf!=null) (writeText "config.def.h" conf);
preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
- buildInputs = [ pkgconfig ncurses wayland wld libxkbcommon fontconfig pixman ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ ncurses wayland wld libxkbcommon fontconfig pixman ];
NIX_LDFLAGS = "-lfontconfig";
diff --git a/pkgs/applications/misc/st/xst.nix b/pkgs/applications/misc/st/xst.nix
index 05e34cc5c305..877990861fd7 100644
--- a/pkgs/applications/misc/st/xst.nix
+++ b/pkgs/applications/misc/st/xst.nix
@@ -15,7 +15,8 @@ in stdenv.mkDerivation {
sha256 = "1fh4y2w0icaij99kihl3w8j5d5b38d72afp17c81pi57f43ss6pc";
};
- buildInputs = [ pkgconfig libX11 ncurses libXext libXft fontconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libX11 ncurses libXext libXft fontconfig ];
installPhase = ''
TERMINFO=$out/share/terminfo make install PREFIX=$out
diff --git a/pkgs/applications/misc/stupidterm/default.nix b/pkgs/applications/misc/stupidterm/default.nix
new file mode 100644
index 000000000000..5701997fd299
--- /dev/null
+++ b/pkgs/applications/misc/stupidterm/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, pkgconfig, vte, gtk }:
+
+stdenv.mkDerivation rec {
+ name = "stupidterm-2017-03-15";
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ buildInputs = [ vte gtk ];
+
+ src = fetchFromGitHub {
+ owner = "esmil";
+ repo = "stupidterm";
+ rev = "752316a783f52317ffd9f05d32e208dbcafc5ba6";
+ sha256 = "1d8fyhr9sgpxgkwzkyiws0kvhmqfwwyycvcr1qf2wjldiax222lv";
+ };
+
+ makeFlags = "PKGCONFIG=${pkgconfig}/bin/pkg-config binary=stupidterm";
+
+ installPhase = ''
+ mkdir -p $out/bin $out/share/applications $out/share/stupidterm
+ cp stupidterm $out/bin
+ substituteAll ${./stupidterm.desktop} $out/share/applications/stupidterm.desktop
+ substituteAll stupidterm.ini $out/share/stupidterm/stupidterm.ini
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Simple wrapper around the VTE terminal emulator widget for GTK+";
+ longDescription = ''
+ Simple wrapper around the VTE terminal emulator widget for GTK+
+ '';
+ homepage = https://github.com/esmil/stupidterm;
+ license = licenses.lgpl3Plus;
+ maintainers = [ maintainers.etu ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/misc/stupidterm/stupidterm.desktop b/pkgs/applications/misc/stupidterm/stupidterm.desktop
new file mode 100644
index 000000000000..c26d46060183
--- /dev/null
+++ b/pkgs/applications/misc/stupidterm/stupidterm.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=20170315
+Name=stupidterm
+Comment=VTE based terminal emulator
+Exec=stupidterm
+Icon=utilities-terminal
+Terminal=false
+Type=Application
+Categories=System;TerminalEmulator;
diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix
index 950f8da78605..051b67bc972c 100644
--- a/pkgs/applications/misc/subsurface/default.nix
+++ b/pkgs/applications/misc/subsurface/default.nix
@@ -1,64 +1,23 @@
-{
- stdenv,
- cmake, doxygen, pkgconfig, autoreconfHook,
- curl,
- fetchgit,
- grantlee,
- libgit2,
- libusb,
- libssh2,
- libxml2,
- libxslt,
- libzip,
- qtbase, qtconnectivity, qtquickcontrols, qtscript, qtsvg, qttools, qtwebkit,
- sqlite
+{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, cmake, makeWrapper, pkgconfig, qmake
+, curl, grantlee, libgit2, libusb, libssh2, libxml2, libxslt, libzip, zlib
+, qtbase, qtconnectivity, qtlocation, qtsvg, qttools, qtwebkit
}:
let
- version = "4.6.0";
-
- libmarble = stdenv.mkDerivation rec {
- name = "libmarble-ssrf-${version}";
-
- src = fetchgit {
- url = "git://git.subsurface-divelog.org/marble";
- rev = "refs/tags/v${version}";
- sha256 = "1dm2hdk6y36ls7pxbzkqmyc46hdy2cd5f6pkxa6nfrbhvk5f31zd";
- };
-
- buildInputs = [ qtbase qtquickcontrols qtscript qtwebkit ];
- nativeBuildInputs = [ doxygen pkgconfig cmake ];
-
- enableParallelBuilding = true;
-
- cmakeFlags = [
- "-DQTONLY=TRUE"
- "-DQT5BUILD=ON"
- "-DBUILD_MARBLE_TESTS=NO"
- "-DWITH_DESIGNER_PLUGIN=NO"
- "-DBUILD_MARBLE_APPS=NO"
- ];
-
- meta = with stdenv.lib; {
- description = "Qt library for a slippy map with patches from the Subsurface project";
- homepage = http://subsurface-divelog.org;
- license = licenses.lgpl21;
- maintainers = with maintainers; [ mguentner ];
- platforms = platforms.all;
- };
- };
+ version = "4.7.2";
libdc = stdenv.mkDerivation rec {
name = "libdivecomputer-ssrf-${version}";
- src = fetchgit {
- url = "git://subsurface-divelog.org/libdc";
- rev = "refs/tags/v${version}";
- sha256 = "0s82c8bvqph9c9chwzd76iwrw968w7lgjm3pj4hmad1jim67bs6n";
+ src = fetchurl {
+ url = "https://subsurface-divelog.org/downloads/libdivecomputer-subsurface-branch-${version}.tgz";
+ sha256 = "04wadhhva1bfnwk0kl359kcv0f83mgym2fzs441spw5llcl7k52r";
};
nativeBuildInputs = [ autoreconfHook ];
+ buildInputs = [ zlib ];
+
enableParallelBuilding = true;
meta = with stdenv.lib; {
@@ -70,31 +29,73 @@ let
};
};
+ googlemaps = stdenv.mkDerivation rec {
+ name = "googlemaps-${version}";
+
+ version = "2017-09-17";
+
+ src = fetchFromGitHub {
+ owner = "vladest";
+ repo = "googlemaps";
+ rev = "1b857c02504dd52b1aa442418b8dcea78ced3f35";
+ sha256 = "14icmc925g4abwwdrldjc387aiyvcp3ia5z7mfh9qa09bv829a84";
+ };
+
+ nativeBuildInputs = [ qmake ];
+
+ buildInputs = [ qtbase qtlocation ];
+
+ pluginsSubdir = "lib/qt-${qtbase.qtCompatVersion}/plugins";
+
+ installPhase = ''
+ mkdir $out $(dirname ${pluginsSubdir})
+ mv plugins ${pluginsSubdir}
+ mv lib $out/
+ '';
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ inherit (src.meta) homepage;
+ description = "QtLocation plugin for Google maps tile API";
+ maintainers = with maintainers; [ orivej ];
+ license = licenses.mit;
+ platforms = platforms.all;
+ };
+ };
+
in stdenv.mkDerivation rec {
name = "subsurface-${version}";
- src = fetchgit {
- url = "git://git.subsurface-divelog.org/subsurface";
- rev = "refs/tags/v${version}";
- sha256 = "1rk5n52p6cnyjrgi7ybhmvh7y31zxrjny0mqpnc1wql69f90h94c";
+ src = fetchurl {
+ url = "https://subsurface-divelog.org/downloads/Subsurface-${version}.tgz";
+ sha256 = "06f215xx1nc2q2qff2ihcl86fkrlnkvacl1swi3fw9iik6nq3bjp";
};
buildInputs = [
- libdc libmarble
+ libdc googlemaps
curl grantlee libgit2 libssh2 libusb libxml2 libxslt libzip
qtbase qtconnectivity qtsvg qttools qtwebkit
];
- nativeBuildInputs = [ cmake pkgconfig ];
- enableParallelBuilding = false; # subsurfacewebservices.h dependency on ui_webservices.h
+ nativeBuildInputs = [ cmake makeWrapper pkgconfig ];
cmakeFlags = [
- "-DMARBLE_LIBRARIES=${libmarble}/lib/libssrfmarblewidget.so"
+ "-DLIBDC_FROM_PKGCONFIG=ON"
"-DNO_PRINTING=OFF"
];
+ postInstall = ''
+ wrapProgram $out/bin/subsurface \
+ --prefix QT_PLUGIN_PATH : "${googlemaps}/${googlemaps.pluginsSubdir}"
+ '';
+
+ enableParallelBuilding = true;
+
+ passthru = { inherit version libdc googlemaps; };
+
meta = with stdenv.lib; {
- description = "Subsurface is an open source divelog program that runs on Windows, Mac and Linux";
+ description = "A divelog program";
longDescription = ''
Subsurface can track single- and multi-tank dives using air, Nitrox or TriMix.
It allows tracking of dive locations including GPS coordinates (which can also
diff --git a/pkgs/applications/misc/synapse/default.nix b/pkgs/applications/misc/synapse/default.nix
index e7d2a595684b..2533014c5607 100644
--- a/pkgs/applications/misc/synapse/default.nix
+++ b/pkgs/applications/misc/synapse/default.nix
@@ -12,8 +12,9 @@ stdenv.mkDerivation rec {
sha256 = "846d8a5130580bb47c754bb7f20dc76311e589c00a18b02370a5d78b52409220";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- intltool pkgconfig glib libnotify gtk3 libgee keybinder3 json_glib zeitgeist
+ intltool glib libnotify gtk3 libgee keybinder3 json_glib zeitgeist
vala_0_23 hicolor_icon_theme
];
diff --git a/pkgs/applications/misc/syncthing-tray/default.nix b/pkgs/applications/misc/syncthing-tray/default.nix
index f9d1039a292e..f16a0d29c40d 100644
--- a/pkgs/applications/misc/syncthing-tray/default.nix
+++ b/pkgs/applications/misc/syncthing-tray/default.nix
@@ -15,7 +15,8 @@ buildGoPackage rec {
goDeps = ./deps.nix;
- buildInputs = [ pkgconfig libappindicator-gtk3 ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libappindicator-gtk3 ];
meta = with stdenv.lib; {
description = "Simple application tray for syncthing";
diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index 3ecc772feaa3..ee3cb9cd8ed4 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/applications/misc/synergy/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "symless";
- repo = "synergy";
+ repo = "synergy-core";
rev = "v${version}-stable";
sha256 = "0ksgr9hkf09h54572p7k7b9zkfhcdb2g2d5x7ixxn028y8i3jyp3";
};
diff --git a/pkgs/applications/misc/tangogps/default.nix b/pkgs/applications/misc/tangogps/default.nix
index 584b8f6a2966..bde30d9041ae 100644
--- a/pkgs/applications/misc/tangogps/default.nix
+++ b/pkgs/applications/misc/tangogps/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "15q2kkrv4mfsivfdzjgpxr7s2amw7d501q2ayjl3ff4vmvfn5516";
};
- buildInputs = [ pkgconfig gettext gtk2 gconf curl libexif sqlite libxml2 ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gettext gtk2 gconf curl libexif sqlite libxml2 ];
# bogus includes fail with newer library version
postPatch = ''
diff --git a/pkgs/applications/misc/terminal-notifier/default.nix b/pkgs/applications/misc/terminal-notifier/default.nix
index 47cea34d4a54..c838eca50659 100644
--- a/pkgs/applications/misc/terminal-notifier/default.nix
+++ b/pkgs/applications/misc/terminal-notifier/default.nix
@@ -3,11 +3,12 @@
stdenv.mkDerivation rec {
name = "terminal-notifier-${version}";
- version = "1.5.0";
+ version = "2.0.0";
src = fetchzip {
url = "https://github.com/alloy/terminal-notifier/releases/download/${version}/terminal-notifier-${version}.zip";
- sha256 = "09x7vl0kddivqq3pyrk6sg1f0sv5l7nj0bmblq222zk3b09bgg8p";
+ sha256 = "0gi54v92hi1fkryxlz3k5s5d8h0s66cc57ds0vbm1m1qk3z4xhb0";
+ stripRoot = false;
};
dontBuild = true;
diff --git a/pkgs/applications/misc/tilda/default.nix b/pkgs/applications/misc/tilda/default.nix
index a64ab0ea2ca3..7378950b189b 100644
--- a/pkgs/applications/misc/tilda/default.nix
+++ b/pkgs/applications/misc/tilda/default.nix
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
sha256 = "1cc4qbg1m3i04lj5p6i6xbd0zvy1320pxdgmjhz5p3j95ibsbfki";
};
- buildInputs = [ pkgconfig autoreconfHook gettext confuse vte gtk makeWrapper ];
+ nativeBuildInputs = [ autoreconfHook pkgconfig ];
+ buildInputs = [ gettext confuse vte gtk makeWrapper ];
LD_LIBRARY_PATH = "${expat.out}/lib"; # ugly hack for xgettext to work during build
diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix
index 2128c260b805..c7ee4fb1c4cd 100644
--- a/pkgs/applications/misc/tilix/default.nix
+++ b/pkgs/applications/misc/tilix/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "tilix-${version}";
- version = "1.6.4";
+ version = "1.7.1";
src = fetchFromGitHub {
owner = "gnunn1";
repo = "tilix";
rev = "${version}";
- sha256 = "1vqi68jlbbaky1569kd4lr6p02zsiv7v2rfb8j1pzwj7gydblaac";
+ sha256 = "0x0bnb26hjvxmvvd7c9k8fw97gcm3z5ssr6r8x90xbyyw6h58hhh";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix
index 6a613b6d5b5b..2c23ab9261f6 100644
--- a/pkgs/applications/misc/tint2/default.nix
+++ b/pkgs/applications/misc/tint2/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
name = "tint2-${version}";
- version = "15.1";
+ version = "15.3";
src = fetchFromGitLab {
owner = "o9000";
repo = "tint2";
rev = version;
- sha256 = "16mpvknibbqy0vjgkwig7g8i6rivm14ipd7ixvqydgcj7wibn0b7";
+ sha256 = "1d83ppwckc2yix1grw8w31rlkyz6naa40pd3dg7n6nidx00zwn91";
};
enableParallelBuilding = true;
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
homepage = https://gitlab.com/o9000/tint2;
description = "Simple panel/taskbar unintrusive and light (memory, cpu, aestetic)";
license = stdenv.lib.licenses.gpl2;
- platforms = stdenv.lib.platforms.unix;
+ platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.romildo ];
};
}
diff --git a/pkgs/applications/misc/tnef/default.nix b/pkgs/applications/misc/tnef/default.nix
index 63d68bbbea4a..eebab6643a68 100644
--- a/pkgs/applications/misc/tnef/default.nix
+++ b/pkgs/applications/misc/tnef/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, autoreconfHook }:
stdenv.mkDerivation rec {
- version = "1.4.14";
+ version = "1.4.15";
name = "tnef-${version}";
src = fetchFromGitHub {
owner = "verdammelt";
repo = "tnef";
rev = version;
- sha256 = "0p7yji5hqq7k4pcba1cnv4jkl0fkg7jd77c1q164wk0vwinpmsc2";
+ sha256 = "0wm5ylppkjg518ldb9kzlx58a9l8z66gpz9ljalmyq6a77khd7pj";
};
doCheck = true;
diff --git a/pkgs/applications/misc/tomboy/default.nix b/pkgs/applications/misc/tomboy/default.nix
index 357713df3845..ba6e97d61fb3 100644
--- a/pkgs/applications/misc/tomboy/default.nix
+++ b/pkgs/applications/misc/tomboy/default.nix
@@ -15,7 +15,8 @@ stdenv.mkDerivation {
sha256 = "0j5jmd079bm2fydqaic5ymbfdxna3qlx6fkp2mqhgcdr7prsbl3q";
};
- buildInputs = [ itstool intltool pkgconfig
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ itstool intltool
libxml2 gnome2.GConf atk gtk2
mono mono-addins dbus-sharp-2_0 dbus-sharp-glib-2_0 gnome-sharp gtk-sharp-2_0
makeWrapper ];
diff --git a/pkgs/applications/misc/tqsl/cmake_lib_path.patch b/pkgs/applications/misc/tqsl/cmake_lib_path.patch
new file mode 100644
index 000000000000..5eed93834632
--- /dev/null
+++ b/pkgs/applications/misc/tqsl/cmake_lib_path.patch
@@ -0,0 +1,12 @@
+diff -dur tqsl-2.3.1/src/CMakeLists.txt tqsl-2.3.1b/src/CMakeLists.txt
+--- tqsl-2.3.1/src/CMakeLists.txt 2017-04-17 20:53:22.000000000 -0400
++++ tqsl-2.3.1b/src/CMakeLists.txt 2017-10-05 21:14:39.048329343 -0400
+@@ -54,7 +54,7 @@
+ if(NOT APPLE AND NOT WIN32)
+ set_source_files_properties(location.cpp PROPERTIES COMPILE_DEFINITIONS CONFDIR="${CMAKE_INSTALL_PREFIX}/share/TrustedQSL/")
+ set(HEADERS_TO_INSTALL tqsllib.h tqslerrno.h cabrillo.h adif.h tqslconvert.h)
+-install(TARGETS tqsllib DESTINATION lib$(LIB_SUFFIX))
++install(TARGETS tqsllib DESTINATION lib${LIB_SUFFIX})
+ install(FILES config.xml DESTINATION share/TrustedQSL)
+ install(FILES ${HEADERS_TO_INSTALL} DESTINATION include)
+ endif()
diff --git a/pkgs/applications/misc/tqsl/default.nix b/pkgs/applications/misc/tqsl/default.nix
new file mode 100644
index 000000000000..829ed2585627
--- /dev/null
+++ b/pkgs/applications/misc/tqsl/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl, makeWrapper, cmake, expat, openssl, zlib, db, curl, wxGTK }:
+
+let
+ lib_suffix =
+ if stdenv.system == "x86_64-linux" then
+ "64"
+ else
+ "";
+in
+stdenv.mkDerivation rec {
+ name = "tqsl-${version}";
+ version = "2.3.1";
+
+ src = fetchurl {
+ url = "http://www.arrl.org/files/file/LoTW%20Instructions/${name}.tar.gz";
+ sha256 = "10cjlilampwl10hwb7m28m5z9gyrscvvc1rryfjnhj9q2x4ppgxv";
+ };
+
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [
+ cmake
+ expat
+ openssl
+ zlib
+ db
+ curl
+ wxGTK
+ ];
+
+ patches = [ ./cmake_lib_path.patch ];
+
+ meta = with stdenv.lib; {
+ description = "Software for using the ARRL Logbook of the World";
+ homepage = https://lotw.arrl.org/;
+ license = licenses.bsd3;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.dpflug ];
+ };
+}
diff --git a/pkgs/applications/misc/truecrypt/default.nix b/pkgs/applications/misc/truecrypt/default.nix
index 4787516cedd0..9df2a2dde765 100644
--- a/pkgs/applications/misc/truecrypt/default.nix
+++ b/pkgs/applications/misc/truecrypt/default.nix
@@ -85,7 +85,8 @@ stdenv.mkDerivation {
sha256 = "5ae6a4f32ca737e02def3bf314c9842fb89be82bf00b6f4022a97d8d565522b8";
};
- buildInputs = [ pkgconfig fuse devicemapper wxGTK nasm ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ fuse devicemapper wxGTK nasm ];
meta = {
description = "Free Open-Source filesystem on-the-fly encryption";
diff --git a/pkgs/applications/misc/tzupdate/default.nix b/pkgs/applications/misc/tzupdate/default.nix
new file mode 100644
index 000000000000..7eb0f2d41b55
--- /dev/null
+++ b/pkgs/applications/misc/tzupdate/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, python }:
+
+let
+ inherit (python.pkgs) buildPythonApplication fetchPypi requests;
+in
+buildPythonApplication rec {
+ name = "${pname}-${version}";
+ pname = "tzupdate";
+ version = "1.2.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1wj2r1wirnn5kllaasdldimvp3cc3w7w890iqrjksz5wwjbnj8pk";
+ };
+
+ propagatedBuildInputs = [ requests ];
+
+ meta = with stdenv.lib; {
+ description = "Update timezone information based on geoip.";
+ homepage = https://github.com/cdown/tzupdate;
+ maintainers = [ maintainers.michaelpj ];
+ license = licenses.unlicense;
+ };
+}
diff --git a/pkgs/applications/misc/udevil/default.nix b/pkgs/applications/misc/udevil/default.nix
index 9a4b795061b5..3cc4fcc1517b 100644
--- a/pkgs/applications/misc/udevil/default.nix
+++ b/pkgs/applications/misc/udevil/default.nix
@@ -5,7 +5,8 @@ stdenv.mkDerivation {
url = https://github.com/IgnorantGuru/udevil/archive/0.4.4.tar.gz;
sha256 = "0z1bhaayambrcn7bgnrqk445k50ifabmw8q4i9qj49nnbcvxhbxd";
};
- buildInputs = [ intltool glib pkgconfig udev ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ intltool glib udev ];
configurePhase = ''
substituteInPlace src/Makefile.in --replace "-o root -g root" ""
# do not set setuid bit in nix store
diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix
index 84ecf18c5ae5..bcf43514f45e 100644
--- a/pkgs/applications/misc/udiskie/default.nix
+++ b/pkgs/applications/misc/udiskie/default.nix
@@ -4,13 +4,13 @@
pythonPackages.buildPythonApplication rec {
name = "udiskie-${version}";
- version = "1.7.0";
+ version = "1.7.2";
src = fetchFromGitHub {
owner = "coldfix";
repo = "udiskie";
rev = version;
- sha256 = "1dvfhf0d79al0vnrwdknfiy2297m3f7fgn7syr85p29hd6260jnv";
+ sha256 = "1p732gi6lhwcqxvsa0pknb6jmhy3kgv3yzz7xzmdzhy47m312965";
};
buildInputs = [
diff --git a/pkgs/applications/misc/urlview/default.nix b/pkgs/applications/misc/urlview/default.nix
index f745bf3ad601..0a651906cd8f 100644
--- a/pkgs/applications/misc/urlview/default.nix
+++ b/pkgs/applications/misc/urlview/default.nix
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
sha256 = "746ff540ccf601645f500ee7743f443caf987d6380e61e5249fc15f7a455ed42";
};
- buildInputs = [ ncurses autoreconfHook ];
+ nativeBuildInputs = [ autoreconfHook ];
+ buildInputs = [ ncurses ];
preAutoreconf = ''
touch NEWS
diff --git a/pkgs/applications/misc/valauncher/default.nix b/pkgs/applications/misc/valauncher/default.nix
index 00a60ae50a48..f780e5469d02 100644
--- a/pkgs/applications/misc/valauncher/default.nix
+++ b/pkgs/applications/misc/valauncher/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "18969v870737jg1q0l3d05pb9mxsrcpdi0mnyz94rwkspszvxxqi";
};
- buildInputs = [ cmake gtk3 vala pkgconfig gnome3.libgee ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ cmake gtk3 vala gnome3.libgee ];
meta = with stdenv.lib; {
description = "A fast dmenu-like gtk3 application launcher";
diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix
index 1e7c7f654b5f..7f4adeb2be87 100644
--- a/pkgs/applications/misc/viking/default.nix
+++ b/pkgs/applications/misc/viking/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "09kq0sxs2czps0d6xzgkkp41746v44ip63m72qvfs7rsrnqj7qnz";
};
- buildInputs = [ makeWrapper pkgconfig intltool gettext gtk2 expat curl gpsd bc file gnome_doc_utils
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ makeWrapper intltool gettext gtk2 expat curl gpsd bc file gnome_doc_utils
libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2 sqlite
];
diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/applications/misc/vym/default.nix
index 8e1514583a25..e06242f7a024 100644
--- a/pkgs/applications/misc/vym/default.nix
+++ b/pkgs/applications/misc/vym/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
- buildInputs = [ pkgconfig qt4 qmake4Hook ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ qt4 qmake4Hook ];
meta = with stdenv.lib; {
description = "A mind-mapping software";
diff --git a/pkgs/applications/misc/xautoclick/default.nix b/pkgs/applications/misc/xautoclick/default.nix
index 32daf108c1ca..bb18da4d4ada 100644
--- a/pkgs/applications/misc/xautoclick/default.nix
+++ b/pkgs/applications/misc/xautoclick/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
url = "mirror://sourceforge/project/xautoclick/xautoclick/xautoclick-0.31/xautoclick-0.31.tar.gz";
sha256 = "0h522f12a7v2b89411xm51iwixmjp2mp90rnizjgiakx9ajnmqnm";
};
- buildInputs = [ xorg.libX11 xorg.libXtst xorg.xinput xorg.libXi xorg.libXext pkgconfig ]
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ xorg.libX11 xorg.libXtst xorg.xinput xorg.libXi xorg.libXext ]
++ stdenv.lib.optionals gtkSupport [ gtk2 ]
++ stdenv.lib.optionals qtSupport [ qt4 ];
patchPhase = ''
diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix
index 80ecbdeba77f..2d2c2e2bff25 100644
--- a/pkgs/applications/misc/xca/default.nix
+++ b/pkgs/applications/misc/xca/default.nix
@@ -20,12 +20,6 @@ mkDerivation rec {
configureFlags = [ "CXXFLAGS=-std=c++11" ];
- preBuild = ''
- substituteInPlace Local.mak \
- --replace ${qtbase}/bin/moc ${qtbase.dev}/bin/moc \
- --replace ${qtbase}/bin/uic ${qtbase.dev}/bin/uic
- '';
-
meta = with lib; {
description = "Interface for managing asymetric keys like RSA or DSA";
homepage = http://xca.sourceforge.net/;
diff --git a/pkgs/applications/misc/xfe/default.nix b/pkgs/applications/misc/xfe/default.nix
index ad642ecec5ee..78e1d15481ba 100644
--- a/pkgs/applications/misc/xfe/default.nix
+++ b/pkgs/applications/misc/xfe/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "1g9a0bpny2m7ixgxpqjh0wvh2x6d0lpj6682zn5dfqwan4j2xfsd";
};
- buildInputs = [ fox pkgconfig gettext xlibsWrapper gcc intltool file libpng ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ fox gettext xlibsWrapper gcc intltool file libpng ];
preConfigure = ''
sed -i s,/usr/share/xfe,$out/share/xfe, src/xfedefs.h
@@ -23,7 +24,7 @@ stdenv.mkDerivation rec {
It is based on the popular, but discontinued, X Win Commander, which was developed by Maxim Baranov.
Xfe aims to be the filemanager of choice for all the Unix addicts!
'';
- homepage = http://sourceforge.net/projects/xfe/;
+ homepage = https://sourceforge.net/projects/xfe/;
license = stdenv.lib.licenses.gpl2;
maintainers = [];
platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/misc/xfontsel/default.nix b/pkgs/applications/misc/xfontsel/default.nix
index 15d054c2be2a..7d22a1605740 100644
--- a/pkgs/applications/misc/xfontsel/default.nix
+++ b/pkgs/applications/misc/xfontsel/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "1grir464hy52a71r3mpm9mzvkf7nwr3vk0b1vc27pd3gp588a38p";
};
- buildInputs = [libX11 makeWrapper pkgconfig libXaw];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [libX11 makeWrapper libXaw];
# Without this, it gets Xmu as a dependency, but without rpath entry
NIX_LDFLAGS = "-lXmu";
diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix
index ecd6ab8c2add..54d61a047a78 100644
--- a/pkgs/applications/misc/xiphos/default.nix
+++ b/pkgs/applications/misc/xiphos/default.nix
@@ -21,7 +21,8 @@ stdenv.mkDerivation rec {
sha256 = "02xyy6rxxxaqbjbhdp813f0vp1jpfzqscjdbdc0qcd4yvi3baj5f";
};
- buildInputs = [ pkgconfig python intltool docbook2x docbook_xml_dtd_412 libxslt
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ python intltool docbook2x docbook_xml_dtd_412 libxslt
sword clucene_core biblesync gnome_doc_utils libgsf gconf gtkhtml
libglade scrollkeeper webkitgtk dbus_glib enchant isocodes libuuid icu ];
diff --git a/pkgs/applications/misc/xsw/default.nix b/pkgs/applications/misc/xsw/default.nix
index b3a57e1cef21..3e8acff00f89 100644
--- a/pkgs/applications/misc/xsw/default.nix
+++ b/pkgs/applications/misc/xsw/default.nix
@@ -14,9 +14,9 @@ in stdenv.mkDerivation rec {
sha256 = "092vp61ngd2vscsvyisi7dv6qrk5m1i81gg19hyfl5qvjq5p0p8g";
};
- nativeBuildInputs = [ SDL SDL_image SDL_ttf SDL_gfx flex bison ];
+ nativeBuildInputs = [ pkgconfig flex bison ];
- buildInputs = [ pkgconfig ];
+ buildInputs = [ SDL SDL_image SDL_ttf SDL_gfx ];
NIX_CFLAGS_COMPILE = makeSDLFlags [ SDL SDL_image SDL_ttf SDL_gfx ];
diff --git a/pkgs/applications/misc/yakuake/default.nix b/pkgs/applications/misc/yakuake/default.nix
index 8db48a7b3e61..0eb33c845c39 100644
--- a/pkgs/applications/misc/yakuake/default.nix
+++ b/pkgs/applications/misc/yakuake/default.nix
@@ -18,15 +18,14 @@
, qtx11extras
}:
-let
+mkDerivation rec {
pname = "yakuake";
- version = "3.0.3";
-in mkDerivation rec {
+ version = "3.0.4";
name = "${pname}-${version}";
src = fetchurl {
url = "http://download.kde.org/stable/${pname}/${version}/src/${name}.tar.xz";
- sha256 = "ef51aa3325916d352fde17870cf706397e41105103e4c9289cc4032a1b8609a7";
+ sha256 = "1q31p1cqhz8b2bikqjrr7fww86kaq723ib4ys2zwablfa1ybbqhh";
};
buildInputs = [
diff --git a/pkgs/applications/misc/yate/default.nix b/pkgs/applications/misc/yate/default.nix
index dd3903cde271..bd891ff8493f 100644
--- a/pkgs/applications/misc/yate/default.nix
+++ b/pkgs/applications/misc/yate/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
};
# TODO zaptel ? postgres ?
- buildInputs = [ qt4 openssl autoconf automake pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ qt4 openssl autoconf automake ];
# /dev/null is used when linking which is a impure path for the wrapper
preConfigure =
diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix
index a646cd10b6df..8a460f890167 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@@ -19,8 +19,9 @@ stdenv.mkDerivation rec {
icon = ./icon.xpm;
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig file gtk girara
+ file gtk girara
gettext makeWrapper sqlite glib
] ++ optional synctexSupport texlive.bin.core;
diff --git a/pkgs/applications/misc/zathura/djvu/default.nix b/pkgs/applications/misc/zathura/djvu/default.nix
index 2e644453dcb9..34508da0e371 100644
--- a/pkgs/applications/misc/zathura/djvu/default.nix
+++ b/pkgs/applications/misc/zathura/djvu/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "03cw54d2fipvbrnbqy0xccqkx6s77dyhyymx479aj5ryy4513dq8";
};
- buildInputs = [ pkgconfig djvulibre gettext zathura_core gtk girara ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ djvulibre gettext zathura_core gtk girara ];
patches = [ ./gtkflags.patch ];
diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
index 23a654b4d510..c9472f356672 100644
--- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
+++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "06zqn8z6a0hfsx3s1kzqvqzb73afgcl6z5r062sxv7kv570fvffr";
};
- buildInputs = [ pkgconfig zathura_core gtk girara openssl mupdf libjpeg jbig2dec openjpeg ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ zathura_core gtk girara openssl mupdf libjpeg jbig2dec openjpeg ];
makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ];
diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix
index 4912489d6b35..2dda88f409b5 100644
--- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix
+++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1maqiv7yv8d8hymlffa688c5z71v85kbzmx2j88i8z349xx0rsyi";
};
- buildInputs = [ pkgconfig poppler zathura_core girara ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ poppler zathura_core girara ];
makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ];
diff --git a/pkgs/applications/misc/zathura/ps/default.nix b/pkgs/applications/misc/zathura/ps/default.nix
index 89d8d5badb0a..a415cde3c7ee 100644
--- a/pkgs/applications/misc/zathura/ps/default.nix
+++ b/pkgs/applications/misc/zathura/ps/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "18wsfy8pqficdgj8wy2aws7j4fy8z78157rhqk17mj5f295zgvm9";
};
- buildInputs = [ pkgconfig libspectre gettext zathura_core gtk girara ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libspectre gettext zathura_core gtk girara ];
patches = [ ./gtkflags.patch ];
diff --git a/pkgs/applications/networking/browsers/arora/default.nix b/pkgs/applications/networking/browsers/arora/default.nix
index 8bcefe4fe7b0..f9d5f01be201 100644
--- a/pkgs/applications/networking/browsers/arora/default.nix
+++ b/pkgs/applications/networking/browsers/arora/default.nix
@@ -1,21 +1,25 @@
-{ stdenv, fetchurl, qt4, qmake4Hook }:
+{ stdenv, fetchFromGitHub, qt4, qmake4Hook }:
stdenv.mkDerivation rec {
name = "arora-${version}";
version = "0.11.0";
- src = fetchurl {
- url = "http://arora.googlecode.com/files/${name}.tar.gz";
- sha256 = "1ffkranxi93lrg5r7a90pix9j8xqmf0z1mb1m8579v9m34cyypvg";
+ src = fetchFromGitHub {
+ owner = "Arora";
+ repo = "arora";
+ rev = version;
+ sha256 = "0wmivgx3mw51rghi6q8fgivpkqc98z2mqmllf7c98ln0wd8rkf3c";
};
buildInputs = [ qt4 ];
nativeBuildInputs = [ qmake4Hook ];
+ enableParallelBuilding = true;
+
meta = with stdenv.lib; {
platforms = qt4.meta.platforms;
maintainers = [ maintainers.phreedom ];
description = "A cross-platform Qt4 Webkit browser";
- homepage = http://arora.googlecode.com;
+ homepage = https://github.com/Arora/arora;
};
}
diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index 75f2dcda6a62..54fee5847e18 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -47,7 +47,7 @@ mkChromiumDerivation (base: rec {
meta = {
description = "An open source web browser from Google";
homepage = http://www.chromium.org/;
- maintainers = with maintainers; [ chaoflow ];
+ maintainers = with maintainers; [ chaoflow bendlas ];
license = licenses.bsd3;
platforms = platforms.linux;
hydraPlatforms = if channel == "stable" then ["x86_64-linux"] else [];
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index c4fd85ab93e9..82c2c6aa53fc 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -60,10 +60,13 @@ let
in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs));
gnSystemLibraries = [
- "flac" "harfbuzz-ng" "libwebp" "libxslt" "yasm" "opus" "snappy" "libpng" "zlib"
+ "flac" "libwebp" "libxslt" "yasm" "opus" "snappy" "libpng" "zlib"
# "libjpeg" # fails with multiple undefined references to chromium_jpeg_*
# "re2" # fails with linker errors
# "ffmpeg" # https://crbug.com/731766
+ ] ++ optionals (versionRange "62" "63") [
+ "harfbuzz-ng" # in versions over 63 harfbuzz and freetype are being built together
+ # so we can't build with one from system and other from source
];
opusWithCustomModes = libopus.override {
@@ -76,7 +79,10 @@ let
libpng libcap
xdg_utils yasm minizip libwebp
libusb1 re2 zlib
- ffmpeg harfbuzz-icu libxslt libxml2
+ ffmpeg libxslt libxml2
+ ] ++ optionals (versionRange "62" "63") [
+ harfbuzz-icu # in versions over 63 harfbuzz and freetype are being built together
+ # so we can't build with one from system and other from source
];
# build paths and release info
@@ -90,6 +96,15 @@ let
sha256 = "1vhslc4xg0d6wzlsi99zpah2xzjziglccrxn55k7qna634wyxg77";
};
+ versionRange = min-version: upto-version:
+ let inherit (upstream-info) version;
+ result = versionAtLeast version min-version && versionOlder version upto-version;
+ stable-version = (import ./upstream-info.nix).stable.version;
+ in if versionAtLeast stable-version upto-version
+ then warn "chromium: stable version ${stable-version} is newer than a patchset bounded at ${upto-version}. You can safely delete it."
+ result
+ else result;
+
base = rec {
name = "${packageName}-${version}";
inherit (upstream-info) version;
@@ -117,15 +132,26 @@ let
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
-
- ] ++ optional enableWideVine ./patches/widevine.patch;
+ ] # As major versions are added, you can trawl the gentoo and arch repos at
+ # https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/
+ # https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/chromium
+ # for updated patches and hints about build flags
+ ++ optionals (versionRange "62" "63") [
+ ./patches/chromium-gn-bootstrap-r17.patch
+ ./patches/chromium-gcc5-r3.patch
+ ./patches/chromium-glibc2.26-r1.patch
+ ]
+ ++ optionals (versionRange "63" "64") [
+ ./patches/chromium-gcc5-r4.patch
+ ./patches/include-math-for-round.patch
+ ]
+ ++ optionals (versionAtLeast version "64") [
+ ./patches/gn_bootstrap_observer.patch
+ ]
+ ++ optional enableWideVine ./patches/widevine.patch;
postPatch = ''
# We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX
@@ -134,6 +160,9 @@ let
'return sandbox_binary;' \
'return base::FilePath(GetDevelSandboxPath());'
+ sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg_utils}/bin/xdg-@' \
+ chrome/browser/shell_integration_linux.cc
+
sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \
device/udev_linux/udev?_loader.cc
@@ -242,6 +271,13 @@ let
"${target}"
'' + optionalString (target == "mksnapshot" || target == "chrome") ''
paxmark m "${buildPath}/${target}"
+ '' + optionalString (versionAtLeast version "63") ''
+ (
+ source chrome/installer/linux/common/installer.include
+ PACKAGE=$packageName
+ MENUNAME="Chromium"
+ process_template chrome/app/resources/manpage.1.in "${buildPath}/chrome.1"
+ )
'';
targets = extraAttrs.buildTargets or [];
commands = map buildCommand targets;
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 7aa02e2c5745..911b55b115f9 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -35,7 +35,7 @@ let
};
desktopItem = makeDesktopItem {
- name = "chromium";
+ name = "chromium-browser";
exec = "chromium %U";
icon = "chromium";
comment = "An open source web browser from Google";
diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-atk-r1.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-atk-r1.patch
deleted file mode 100644
index 602be1e3ba74..000000000000
--- a/pkgs/applications/networking/browsers/chromium/patches/chromium-atk-r1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-gcc5-r3.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r3.patch
new file mode 100644
index 000000000000..7605df6b145a
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r3.patch
@@ -0,0 +1,98 @@
+--- a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h
++++ b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h
+@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents {
+ allocation_length_(0),
+ data_(data),
+ data_length_(0),
+- kind_(AllocationKind::kNormal),
++ kind_(WTF::ArrayBufferContents::AllocationKind::kNormal),
+ deleter_(deleter) {}
+ DataHandle(void* allocation_base,
+ size_t allocation_length,
+@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents {
+ reinterpret_cast(allocation_base_) +
+ allocation_length_);
+ switch (kind_) {
+- case AllocationKind::kNormal:
++ case WTF::ArrayBufferContents::AllocationKind::kNormal:
+ DCHECK(deleter_);
+ deleter_(data_);
+ return;
+- case AllocationKind::kReservation:
++ case WTF::ArrayBufferContents::AllocationKind::kReservation:
+ ReleaseReservedMemory(allocation_base_, allocation_length_);
+ return;
+ }
+--- a/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.orig 2017-08-15 12:45:59.433532111 +0000
++++ b/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2017-08-15 17:52:59.691328825 +0000
+@@ -10,7 +10,7 @@
+
+ #include "webrtc/modules/audio_processing/aec3/aec_state.h"
+
+-#include
++#include
+ #include
+ #include
+
+--- a/gpu/ipc/common/mailbox_struct_traits.h
++++ b/gpu/ipc/common/mailbox_struct_traits.h
+@@ -15,7 +15,7 @@ namespace mojo {
+ template <>
+ struct StructTraits {
+ static base::span name(const gpu::Mailbox& mailbox) {
+- return mailbox.name;
++ return base::make_span(mailbox.name);
+ }
+ static bool Read(gpu::mojom::MailboxDataView data, gpu::Mailbox* out);
+ };
+--- a/services/viz/public/cpp/compositing/filter_operation_struct_traits.h
++++ b/services/viz/public/cpp/compositing/filter_operation_struct_traits.h
+@@ -134,7 +134,7 @@ struct StructTraits {
+ static base::span matrix(const cc::FilterOperation& operation) {
+ if (operation.type() != cc::FilterOperation::COLOR_MATRIX)
+ return base::span();
+- return operation.matrix();
++ return base::make_span(operation.matrix());
+ }
+
+ static base::span shape(
+--- a/services/viz/public/cpp/compositing/quads_struct_traits.h
++++ b/services/viz/public/cpp/compositing/quads_struct_traits.h
+@@ -284,7 +284,7 @@
+
+ static base::span vertex_opacity(const cc::DrawQuad& input) {
+ const cc::TextureDrawQuad* quad = cc::TextureDrawQuad::MaterialCast(&input);
+- return quad->vertex_opacity;
++ return base::make_span(quad->vertex_opacity);
+ }
+
+ static bool y_flipped(const cc::DrawQuad& input) {
+--- a/third_party/WebKit/Source/platform/exported/WebCORS.cpp
++++ b/third_party/WebKit/Source/platform/exported/WebCORS.cpp
+@@ -480,7 +480,7 @@ WebString AccessControlErrorString(
+ }
+ default:
+ NOTREACHED();
+- return "";
++ return WebString();
+ }
+ }
+
+@@ -512,7 +512,7 @@ WebString PreflightErrorString(const PreflightStatus status,
+ }
+ default:
+ NOTREACHED();
+- return "";
++ return WebString();
+ }
+ }
+
+@@ -533,7 +533,7 @@ WebString RedirectErrorString(const RedirectStatus status,
+ }
+ default:
+ NOTREACHED();
+- return "";
++ return WebString();
+ }
+ }
+
diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r4.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r4.patch
new file mode 100644
index 000000000000..cb978d58a060
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r4.patch
@@ -0,0 +1,98 @@
+--- a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h
++++ b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h
+@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents {
+ allocation_length_(0),
+ data_(data),
+ data_length_(0),
+- kind_(AllocationKind::kNormal),
++ kind_(WTF::ArrayBufferContents::AllocationKind::kNormal),
+ deleter_(deleter) {}
+ DataHandle(void* allocation_base,
+ size_t allocation_length,
+@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents {
+ reinterpret_cast(allocation_base_) +
+ allocation_length_);
+ switch (kind_) {
+- case AllocationKind::kNormal:
++ case WTF::ArrayBufferContents::AllocationKind::kNormal:
+ DCHECK(deleter_);
+ deleter_(data_);
+ return;
+- case AllocationKind::kReservation:
++ case WTF::ArrayBufferContents::AllocationKind::kReservation:
+ ReleaseReservedMemory(allocation_base_, allocation_length_);
+ return;
+ }
+--- a/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.orig 2017-08-15 12:45:59.433532111 +0000
++++ b/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2017-08-15 17:52:59.691328825 +0000
+@@ -10,7 +10,7 @@
+
+ #include "webrtc/modules/audio_processing/aec3/aec_state.h"
+
+-#include
++#include
+ #include
+ #include
+
+--- a/gpu/ipc/common/mailbox_struct_traits.h
++++ b/gpu/ipc/common/mailbox_struct_traits.h
+@@ -15,7 +15,7 @@ namespace mojo {
+ template <>
+ struct StructTraits {
+ static base::span name(const gpu::Mailbox& mailbox) {
+- return mailbox.name;
++ return base::make_span(mailbox.name);
+ }
+ static bool Read(gpu::mojom::MailboxDataView data, gpu::Mailbox* out);
+ };
+--- a/services/viz/public/cpp/compositing/filter_operation_struct_traits.h
++++ b/services/viz/public/cpp/compositing/filter_operation_struct_traits.h
+@@ -134,7 +134,7 @@ struct StructTraits {
+ static base::span matrix(const cc::FilterOperation& operation) {
+ if (operation.type() != cc::FilterOperation::COLOR_MATRIX)
+ return base::span();
+- return operation.matrix();
++ return base::make_span(operation.matrix());
+ }
+
+ static base::span shape(
+--- a/services/viz/public/cpp/compositing/quads_struct_traits.h
++++ b/services/viz/public/cpp/compositing/quads_struct_traits.h
+@@ -303,7 +303,7 @@ struct StructTraits {
+ static base::span vertex_opacity(const viz::DrawQuad& input) {
+ const viz::TextureDrawQuad* quad =
+ viz::TextureDrawQuad::MaterialCast(&input);
+- return quad->vertex_opacity;
++ return base::make_span(quad->vertex_opacity);
+ }
+
+ static bool y_flipped(const viz::DrawQuad& input) {
+--- a/third_party/WebKit/Source/platform/exported/WebCORS.cpp
++++ b/third_party/WebKit/Source/platform/exported/WebCORS.cpp
+@@ -480,7 +480,7 @@ WebString AccessControlErrorString(
+ }
+ default:
+ NOTREACHED();
+- return "";
++ return WebString();
+ }
+ }
+
+@@ -512,7 +512,7 @@ WebString PreflightErrorString(const PreflightStatus status,
+ }
+ default:
+ NOTREACHED();
+- return "";
++ return WebString();
+ }
+ }
+
+@@ -533,7 +533,7 @@ WebString RedirectErrorString(const RedirectStatus status,
+ }
+ default:
+ NOTREACHED();
+- return "";
++ return WebString();
+ }
+ }
+
diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-glibc2.26-r1.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-glibc2.26-r1.patch
new file mode 100644
index 000000000000..ec37a2816d51
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-glibc2.26-r1.patch
@@ -0,0 +1,220 @@
+diff --git a/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc b/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
+index c80724d..052ce37 100644
+--- a/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
++++ b/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
+@@ -36,19 +36,19 @@ namespace google_breakpad {
+
+ // Minidump defines register structures which are different from the raw
+ // structures which we get from the kernel. These are platform specific
+-// functions to juggle the ucontext and user structures into minidump format.
++// functions to juggle the ucontext_t and user structures into minidump format.
+
+ #if defined(__i386__)
+
+-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
+ return uc->uc_mcontext.gregs[REG_ESP];
+ }
+
+-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
+ return uc->uc_mcontext.gregs[REG_EIP];
+ }
+
+-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
+ const struct _libc_fpstate* fp) {
+ const greg_t* regs = uc->uc_mcontext.gregs;
+
+@@ -88,15 +88,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
+
+ #elif defined(__x86_64)
+
+-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
+ return uc->uc_mcontext.gregs[REG_RSP];
+ }
+
+-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
+ return uc->uc_mcontext.gregs[REG_RIP];
+ }
+
+-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
+ const struct _libc_fpstate* fpregs) {
+ const greg_t* regs = uc->uc_mcontext.gregs;
+
+@@ -145,15 +145,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
+
+ #elif defined(__ARM_EABI__)
+
+-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
+ return uc->uc_mcontext.arm_sp;
+ }
+
+-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
+ return uc->uc_mcontext.arm_pc;
+ }
+
+-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) {
++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) {
+ out->context_flags = MD_CONTEXT_ARM_FULL;
+
+ out->iregs[0] = uc->uc_mcontext.arm_r0;
+@@ -184,15 +184,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) {
+
+ #elif defined(__aarch64__)
+
+-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
+ return uc->uc_mcontext.sp;
+ }
+
+-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
+ return uc->uc_mcontext.pc;
+ }
+
+-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
+ const struct fpsimd_context* fpregs) {
+ out->context_flags = MD_CONTEXT_ARM64_FULL;
+
+@@ -210,15 +210,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
+
+ #elif defined(__mips__)
+
+-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
+ return uc->uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP];
+ }
+
+-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
+ return uc->uc_mcontext.pc;
+ }
+
+-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) {
++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) {
+ #if _MIPS_SIM == _ABI64
+ out->context_flags = MD_CONTEXT_MIPS64_FULL;
+ #elif _MIPS_SIM == _ABIO32
+diff --git a/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h b/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+index b6e77b4..2de80b7 100644
+--- a/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
++++ b/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+@@ -39,23 +39,23 @@
+
+ namespace google_breakpad {
+
+-// Wraps platform-dependent implementations of accessors to ucontext structs.
++// Wraps platform-dependent implementations of accessors to ucontext_t structs.
+ struct UContextReader {
+- static uintptr_t GetStackPointer(const struct ucontext* uc);
++ static uintptr_t GetStackPointer(const ucontext_t* uc);
+
+- static uintptr_t GetInstructionPointer(const struct ucontext* uc);
++ static uintptr_t GetInstructionPointer(const ucontext_t* uc);
+
+- // Juggle a arch-specific ucontext into a minidump format
++ // Juggle a arch-specific ucontext_t into a minidump format
+ // out: the minidump structure
+ // info: the collection of register structures.
+ #if defined(__i386__) || defined(__x86_64)
+- static void FillCPUContext(RawContextCPU *out, const ucontext *uc,
++ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
+ const struct _libc_fpstate* fp);
+ #elif defined(__aarch64__)
+- static void FillCPUContext(RawContextCPU *out, const ucontext *uc,
++ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
+ const struct fpsimd_context* fpregs);
+ #else
+- static void FillCPUContext(RawContextCPU *out, const ucontext *uc);
++ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc);
+ #endif
+ };
+
+diff --git a/breakpad/src/client/linux/handler/exception_handler.cc b/breakpad/src/client/linux/handler/exception_handler.cc
+index 586d84e..05936d2 100644
+--- a/breakpad/src/client/linux/handler/exception_handler.cc
++++ b/breakpad/src/client/linux/handler/exception_handler.cc
+@@ -457,9 +457,9 @@ bool ExceptionHandler::HandleSignal(int /*sig*/, siginfo_t* info, void* uc) {
+ // Fill in all the holes in the struct to make Valgrind happy.
+ memset(&g_crash_context_, 0, sizeof(g_crash_context_));
+ memcpy(&g_crash_context_.siginfo, info, sizeof(siginfo_t));
+- memcpy(&g_crash_context_.context, uc, sizeof(struct ucontext));
++ memcpy(&g_crash_context_.context, uc, sizeof(ucontext_t));
+ #if defined(__aarch64__)
+- struct ucontext* uc_ptr = (struct ucontext*)uc;
++ ucontext_t* uc_ptr = (ucontext_t*)uc;
+ struct fpsimd_context* fp_ptr =
+ (struct fpsimd_context*)&uc_ptr->uc_mcontext.__reserved;
+ if (fp_ptr->head.magic == FPSIMD_MAGIC) {
+@@ -468,9 +468,9 @@ bool ExceptionHandler::HandleSignal(int /*sig*/, siginfo_t* info, void* uc) {
+ }
+ #elif !defined(__ARM_EABI__) && !defined(__mips__)
+ // FP state is not part of user ABI on ARM Linux.
+- // In case of MIPS Linux FP state is already part of struct ucontext
++ // In case of MIPS Linux FP state is already part of ucontext_t
+ // and 'float_state' is not a member of CrashContext.
+- struct ucontext* uc_ptr = (struct ucontext*)uc;
++ ucontext_t* uc_ptr = (ucontext_t*)uc;
+ if (uc_ptr->uc_mcontext.fpregs) {
+ memcpy(&g_crash_context_.float_state, uc_ptr->uc_mcontext.fpregs,
+ sizeof(g_crash_context_.float_state));
+@@ -494,7 +494,7 @@ bool ExceptionHandler::SimulateSignalDelivery(int sig) {
+ // ExceptionHandler::HandleSignal().
+ siginfo.si_code = SI_USER;
+ siginfo.si_pid = getpid();
+- struct ucontext context;
++ ucontext_t context;
+ getcontext(&context);
+ return HandleSignal(sig, &siginfo, &context);
+ }
+diff --git a/breakpad/src/client/linux/handler/exception_handler.h b/breakpad/src/client/linux/handler/exception_handler.h
+index daba57e..25598a2 100644
+--- a/breakpad/src/client/linux/handler/exception_handler.h
++++ b/breakpad/src/client/linux/handler/exception_handler.h
+@@ -191,11 +191,11 @@ class ExceptionHandler {
+ struct CrashContext {
+ siginfo_t siginfo;
+ pid_t tid; // the crashing thread.
+- struct ucontext context;
++ ucontext_t context;
+ #if !defined(__ARM_EABI__) && !defined(__mips__)
+ // #ifdef this out because FP state is not part of user ABI for Linux ARM.
+ // In case of MIPS Linux FP state is already part of struct
+- // ucontext so 'float_state' is not required.
++ // ucontext_t so 'float_state' is not required.
+ fpstate_t float_state;
+ #endif
+ };
+diff --git a/breakpad/src/client/linux/microdump_writer/microdump_writer.cc b/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
+index 3764eec..80ad5c4 100644
+--- a/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
++++ b/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
+@@ -593,7 +593,7 @@ class MicrodumpWriter {
+
+ void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); }
+
+- const struct ucontext* const ucontext_;
++ const ucontext_t* const ucontext_;
+ #if !defined(__ARM_EABI__) && !defined(__mips__)
+ const google_breakpad::fpstate_t* const float_state_;
+ #endif
+diff --git a/breakpad/src/client/linux/minidump_writer/minidump_writer.cc b/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
+index d11ba6e..c716143 100644
+--- a/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
++++ b/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
+@@ -1323,7 +1323,7 @@ class MinidumpWriter {
+ const int fd_; // File descriptor where the minidum should be written.
+ const char* path_; // Path to the file where the minidum should be written.
+
+- const struct ucontext* const ucontext_; // also from the signal handler
++ const ucontext_t* const ucontext_; // also from the signal handler
+ #if !defined(__ARM_EABI__) && !defined(__mips__)
+ const google_breakpad::fpstate_t* const float_state_; // ditto
+ #endif
diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r17.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r17.patch
new file mode 100644
index 000000000000..6cfd08d58c23
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r17.patch
@@ -0,0 +1,68 @@
+--- a/tools/gn/bootstrap/bootstrap.py
++++ b/tools/gn/bootstrap/bootstrap.py
+@@ -179,6 +179,7 @@ def build_gn_with_ninja_manually(tempdir, options):
+
+ write_buildflag_header_manually(root_gen_dir, 'base/debug/debugging_flags.h',
+ {
++ 'ENABLE_LOCATION_SOURCE': 'false',
+ 'ENABLE_PROFILING': 'false',
+ 'CAN_UNWIND_WITH_FRAME_POINTERS': 'false'
+ })
+@@ -204,7 +205,7 @@ def build_gn_with_ninja_manually(tempdir, options):
+
+ write_gn_ninja(os.path.join(tempdir, 'build.ninja'),
+ root_gen_dir, options)
+- cmd = ['ninja', '-C', tempdir]
++ cmd = ['ninja', '-C', tempdir, '-w', 'dupbuild=err']
+ if options.verbose:
+ cmd.append('-v')
+
+@@ -458,6 +459,7 @@ def write_gn_ninja(path, root_gen_dir, options):
+ 'base/metrics/bucket_ranges.cc',
+ 'base/metrics/field_trial.cc',
+ 'base/metrics/field_trial_param_associator.cc',
++ 'base/metrics/field_trial_params.cc',
+ 'base/metrics/histogram.cc',
+ 'base/metrics/histogram_base.cc',
+ 'base/metrics/histogram_functions.cc',
+@@ -507,6 +509,7 @@ def write_gn_ninja(path, root_gen_dir, options):
+ 'base/task_scheduler/scheduler_lock_impl.cc',
+ 'base/task_scheduler/scheduler_single_thread_task_runner_manager.cc',
+ 'base/task_scheduler/scheduler_worker.cc',
++ 'base/task_scheduler/scheduler_worker_pool.cc',
+ 'base/task_scheduler/scheduler_worker_pool_impl.cc',
+ 'base/task_scheduler/scheduler_worker_pool_params.cc',
+ 'base/task_scheduler/scheduler_worker_stack.cc',
+@@ -523,6 +526,7 @@ def write_gn_ninja(path, root_gen_dir, options):
+ 'base/third_party/icu/icu_utf.cc',
+ 'base/third_party/nspr/prtime.cc',
+ 'base/threading/post_task_and_reply_impl.cc',
++ 'base/threading/scoped_blocking_call.cc',
+ 'base/threading/sequence_local_storage_map.cc',
+ 'base/threading/sequenced_task_runner_handle.cc',
+ 'base/threading/sequenced_worker_pool.cc',
+@@ -579,7 +583,6 @@ def write_gn_ninja(path, root_gen_dir, options):
+ 'base/unguessable_token.cc',
+ 'base/value_iterators.cc',
+ 'base/values.cc',
+- 'base/value_iterators.cc',
+ 'base/vlog.cc',
+ ])
+
+@@ -652,7 +655,6 @@ def write_gn_ninja(path, root_gen_dir, options):
+ static_libraries['base']['sources'].extend([
+ 'base/memory/shared_memory_handle_posix.cc',
+ 'base/memory/shared_memory_posix.cc',
+- 'base/memory/shared_memory_tracker.cc',
+ 'base/nix/xdg_util.cc',
+ 'base/process/internal_linux.cc',
+ 'base/process/memory_linux.cc',
+@@ -827,7 +829,7 @@ def build_gn_with_gn(temp_gn, build_dir, options):
+ cmd = [temp_gn, 'gen', build_dir, '--args=%s' % gn_gen_args]
+ check_call(cmd)
+
+- cmd = ['ninja', '-C', build_dir]
++ cmd = ['ninja', '-C', build_dir, '-w', 'dupbuild=err']
+ if options.verbose:
+ cmd.append('-v')
+ cmd.append('gn')
diff --git a/pkgs/applications/networking/browsers/chromium/patches/constexpr-fix.patch b/pkgs/applications/networking/browsers/chromium/patches/constexpr-fix.patch
new file mode 100644
index 000000000000..9f187752ea67
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/patches/constexpr-fix.patch
@@ -0,0 +1,98 @@
+From aab2cc3a20af9ebe9ddb8dfd15089f131f95817f Mon Sep 17 00:00:00 2001
+From: Tomas Popela
+Date: Fri, 20 Oct 2017 14:06:42 +0200
+Subject: [PATCH] Fix the build of base/numerics with GCC
+
+Initialize the uninitialized variables where the build is failing.
+
+BUG=776705
+
+Change-Id: I5782e18086a752b3676f8738930bf0553f3f97ad
+---
+ base/numerics/checked_math_impl.h | 6 +++---
+ base/numerics/clamped_math_impl.h | 10 +++++-----
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/base/numerics/checked_math_impl.h b/base/numerics/checked_math_impl.h
+index 2926b37b5e..e083389ebf 100644
+--- a/base/numerics/checked_math_impl.h
++++ b/base/numerics/checked_math_impl.h
+@@ -67,7 +67,7 @@ struct CheckedAddOp::value) {
+ presult = static_cast(x) + static_cast(y);
+@@ -127,7 +127,7 @@ struct CheckedSubOp::value) {
+ presult = static_cast(x) - static_cast(y);
+@@ -183,7 +183,7 @@ struct CheckedMulOp::is_supported) {
+ // The fast op may be available with the promoted type.
+diff --git a/base/numerics/clamped_math_impl.h b/base/numerics/clamped_math_impl.h
+index 7b5e4346f2..303a7e945a 100644
+--- a/base/numerics/clamped_math_impl.h
++++ b/base/numerics/clamped_math_impl.h
+@@ -87,7 +87,7 @@ struct ClampedAddOp(IsValueNegative(y));
+- V result;
++ V result = {};
+ return BASE_NUMERICS_LIKELY((CheckedAddOp::Do(x, y, &result)))
+ ? result
+ : saturated;
+@@ -114,7 +114,7 @@ struct ClampedSubOp(!IsValueNegative(y));
+- V result;
++ V result = {};
+ return BASE_NUMERICS_LIKELY((CheckedSubOp::Do(x, y, &result)))
+ ? result
+ : saturated;
+@@ -136,7 +136,7 @@ struct ClampedMulOp::is_supported)
+ return ClampedMulFastOp::template Do(x, y);
+
+- V result;
++ V result = {};
+ const V saturated =
+ CommonMaxOrMin(IsValueNegative(x) ^ IsValueNegative(y));
+ return BASE_NUMERICS_LIKELY((CheckedMulOp::Do(x, y, &result)))
+@@ -156,7 +156,7 @@ struct ClampedDivOp::type;
+ template
+ static constexpr V Do(T x, U y) {
+- V result;
++ V result = {};
+ if (BASE_NUMERICS_LIKELY((CheckedDivOp::Do(x, y, &result))))
+ return result;
+ // Saturation goes to max, min, or NaN (if x is zero).
+@@ -176,7 +176,7 @@ struct ClampedModOp::type;
+ template
+ static constexpr V Do(T x, U y) {
+- V result;
++ V result = {};
+ return BASE_NUMERICS_LIKELY((CheckedModOp::Do(x, y, &result)))
+ ? result
+ : x;
+--
+2.14.2
+
diff --git a/pkgs/applications/networking/browsers/chromium/patches/gn_bootstrap_observer.patch b/pkgs/applications/networking/browsers/chromium/patches/gn_bootstrap_observer.patch
new file mode 100644
index 000000000000..f1207439bb4d
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/patches/gn_bootstrap_observer.patch
@@ -0,0 +1,11 @@
+--- a/tools/gn/bootstrap/bootstrap.py 2017-11-07 23:06:09.000000000 +0000
++++ b/tools/gn/bootstrap/bootstrap.py 2017-11-08 12:17:16.569216182 +0000
+@@ -481,6 +481,7 @@
+ 'base/metrics/sample_vector.cc',
+ 'base/metrics/sparse_histogram.cc',
+ 'base/metrics/statistics_recorder.cc',
++ 'base/observer_list_threadsafe.cc',
+ 'base/path_service.cc',
+ 'base/pending_task.cc',
+ 'base/pickle.cc',
+
diff --git a/pkgs/applications/networking/browsers/chromium/patches/include-math-for-round.patch b/pkgs/applications/networking/browsers/chromium/patches/include-math-for-round.patch
new file mode 100644
index 000000000000..530493dcd0f6
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/patches/include-math-for-round.patch
@@ -0,0 +1,34 @@
+From 7f90e2cceda0458cf56026eb6ccffb961a47804b Mon Sep 17 00:00:00 2001
+From: Raphael Kubo da Costa
+Date: Fri, 13 Oct 2017 15:49:32 +0200
+Subject: [PATCH] IWYU: Include math.h for round(3).
+
+math.h was being implicitly included, which can break the build with
+alternative libc implementations.
+
+Bug: None
+Change-Id: I969b320b65d0f44abb33d3e1036cfbcb859a4952
+Reviewed-on: https://webrtc-review.googlesource.com/9384
+Reviewed-by: Tommi
+Commit-Queue: Raphael Kubo da Costa (rakuco)
+Cr-Commit-Position: refs/heads/master@{#20292}
+---
+ p2p/base/port.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/third_party/webrtc/p2p/base/port.cc b/third_party/webrtc/p2p/base/port.cc
+index a1b478d11..81aa0aadb 100644
+--- a/third_party/webrtc/p2p/base/port.cc
++++ b/third_party/webrtc/p2p/base/port.cc
+@@ -10,6 +10,8 @@
+
+ #include "p2p/base/port.h"
+
++#include
++
+ #include
+ #include
+
+--
+2.15.0
+
diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index 2bc818695306..639425477c9e 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 = "27.0.0.130";
+ version = "27.0.0.183";
src = fetchzip {
url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/"
+ "${version}/flash_player_ppapi_linux.x86_64.tar.gz";
- sha256 = "005sxx3ll18c6idy1db2gb47chd9c5mf83qac0vyvljsrlc7430c";
+ sha256 = "012fhsjfp71vaarjhi3dd4qpb41n4510zmid38hl2hsjz7qrj5aj";
stripRoot = false;
};
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index ff349c8a5762..8f87fe7ddddd 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 = "09q7s5x22vnmvqyz0f1l6qnaryglmsp0rc63qcg5sfvgv2g17g5x";
- sha256bin64 = "12z6z8gjxl4mx8j6db8nnlzrj03rh4qwyrvcf4hqcsv7b1armg6j";
- version = "61.0.3163.79";
+ sha256 = "068jaws7lqwlw3g62d2cv7i44p6zvdnizdqd56hfs4wj08k068db";
+ sha256bin64 = "009ckf3gh039dwdf8rj494ra4qp0kijgzkrxianda1r7cqz1c3ys";
+ version = "63.0.3239.30";
};
dev = {
- sha256 = "168i6dcdl13an3vlr2m83q8fcprgckmclkmzwj70jdkp84qx80fq";
- sha256bin64 = "116vddp01m2ls337zj6r4h1nvybphvldlk9bs8czypx5skn29vbz";
- version = "62.0.3202.9";
+ sha256 = "0kpn5w1qvjlkxqhsc7lz269mxp7i0z9k92ay178kgsph3ygncm0x";
+ sha256bin64 = "1pvnkhvks3yvpdh2qg9iqg6xmi5bxrl1n6mp9akywv1d5wsba7kg";
+ version = "64.0.3260.2";
};
stable = {
- sha256 = "09q7s5x22vnmvqyz0f1l6qnaryglmsp0rc63qcg5sfvgv2g17g5x";
- sha256bin64 = "0a0wd06c0v061lnmb8x20gqgsg9zqafp2kq1fl3cjm0ldg9rwayw";
- version = "61.0.3163.79";
+ sha256 = "0sclvs11kn60ibc66wfan0xdcsr2s8vkvbq759h86w9gq86pcycz";
+ sha256bin64 = "05lbrzd37q57mx9rii995l9z42a4aa0jh55ia615sqmzr56a7fdr";
+ version = "62.0.3202.89";
};
}
diff --git a/pkgs/applications/networking/browsers/dwb/default.nix b/pkgs/applications/networking/browsers/dwb/default.nix
index 0aacbd2565b9..137b463a1e1d 100644
--- a/pkgs/applications/networking/browsers/dwb/default.nix
+++ b/pkgs/applications/networking/browsers/dwb/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation {
sha256 = "1wg7pslcx7z4fw595a3nbnygxy2bwfj0h377i48mxhddvl3wzzbq";
};
- buildInputs = [ pkgconfig makeWrapper gsettings_desktop_schemas libsoup
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ makeWrapper gsettings_desktop_schemas libsoup
webkitgtk24x-gtk2 gtk2 gnutls json_c m4 ];
# There are Xlib and gtk warnings therefore I have set Wno-error
diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/networking/browsers/falkon/default.nix
new file mode 100644
index 000000000000..9356794bb5d6
--- /dev/null
+++ b/pkgs/applications/networking/browsers/falkon/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, lib, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig, qmake
+, libpthreadstubs, libxcb, libXdmcp, qtsvg, qttools, qtwebengine, qtx11extras, kwallet, openssl }:
+
+stdenv.mkDerivation rec {
+ # Last qupvilla release is 2.1.2 so we add the .1 although it isn't actually a
+ # release but it is basically 2.1.2 with the falkon name
+ name = "falkon-${version}.1";
+ version = "2.1.2";
+
+ src = fetchFromGitHub {
+ owner = "KDE";
+ repo = "falkon";
+ rev = "eecaf2e9d6b572a7f7d2e6dc324e3d79b61c31db";
+ sha256 = "01r5aw10jd0qz7xvad0cqzjbnsj7vwblh54wbq4x1m6xbkp6xcgy";
+ };
+
+ preConfigure = ''
+ export NONBLOCK_JS_DIALOGS=true
+ export KDE_INTEGRATION=true
+ export GNOME_INTEGRATION=false
+ export FALKON_PREFIX=$out
+ '';
+
+ dontUseCmakeConfigure = true;
+
+ buildInputs = [
+ libpthreadstubs libxcb libXdmcp
+ kwallet
+ qtsvg qtwebengine qtx11extras
+ ];
+
+ nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qmake qttools ];
+
+ # on 2.1.2: RCC: Error in 'autoscroll.qrc': Cannot find file 'locale/ar_SA.qm'
+ enableParallelBuilding = false;
+
+ meta = with stdenv.lib; {
+ description = "QtWebEngine based cross-platform web browser";
+ homepage = https://community.kde.org/Incubator/Projects/Falkon;
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ peterhoeg ];
+ platforms = platforms.unix;
+ broken = true;
+ };
+}
diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index 79f56413f4cf..16b59debdd42 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 = "56.0b5";
+ version = "57.0b14";
sources = [
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ach/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ach/firefox-57.0b14.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha512 = "01376c4365dc8c5cba1e37708f9a2b2e9408c6a2a06790a433e058dae5d245b35ed1f7e8f573e496442d8657f96db662c540a70c4d6cf8f154ff8cf04b5f06eb";
+ sha512 = "07c3398805092ba5d252adcdb690a144f8143a8827e70e3be3cb71175735c9c37c9d0edb93936f8cd1af16ad7a6f988b8e8fe9eaed7e36bbb85abab0137893b6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/af/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/af/firefox-57.0b14.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha512 = "f502bb10230ee5dba28e7dd84a0d76a9e868c2da99588c00f35492e9c355902cb39d383bf7a8b6440d7e7811e70a7a1945978de0e59a85514eb8c16d939e799c";
+ sha512 = "fd954a1ddae090d6bd2c76922d4ec53ef249749c27996fbeb1276d2d82284540a000ad4fe6efbd690bb5e73b6923016d5c9c98d34ac5748c29791187417dd8c6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/an/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/an/firefox-57.0b14.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha512 = "488e58bde0417b70c7da08ae22c40089f759a5f2919f2a3dad595f880607880e3a4a202944c8d03f71f1d420147fa0e3e896ef88753723d8c4ee92e0c32cdb0d";
+ sha512 = "c57c10028a99df1694897966f54aa6f8b85a6b2d0ed23699542a7a2bbe458e26d622e2de398bf7559bc33e7e4172d23d5aff8402048174a39804247dd8516e0d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ar/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ar/firefox-57.0b14.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha512 = "96d1f3dba912702eb6d467ff1be67fae112b82a77620a53125aaa861c241bcaeb441c73339e20fbc5c41eb8883a370c2371b4a3d7b0af04555dc07bff5f1cd78";
+ sha512 = "a4417b95c1bec25f148c57c42895e84024153065536a303f8eef7a0d9a7d39d4de8bf287f3af815e8ccb7ec7ec797f098416f78775acc8d778c91975d6268014";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/as/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/as/firefox-57.0b14.tar.bz2";
locale = "as";
arch = "linux-x86_64";
- sha512 = "75873538776101e59c5544aa644bf563bd7bc0b3882f43e9d3ada94cdcb39d3ca2d34cd796445fb680f81bdfa1604cf6bc7b79175625b5e56ea12a6790171c2c";
+ sha512 = "5b624b9d0a4ee345d5c7b79913a8cdb48acebae32f088479c0745acee925d58c826b5125186ffa7c017ff3524983bfa06fe5061ee9423c37fb6f0e7323cac85c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ast/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ast/firefox-57.0b14.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha512 = "84b975021ff95e4d0490d82ce7666539f7806b8563ab42cf9a8139db06f3558a4680d33840405a497e92ed5f2366af979ae0bc8d188be3c3015131f4459c1a1f";
+ sha512 = "efb5ac3daa79a88425401f2bf5df6c0fba90fefd21840723cedc8ebae149816198b727dae67c3f74406c47e01dd2365d1eeb92c39a549f1acba4ba65dab704b4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/az/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/az/firefox-57.0b14.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha512 = "3989e10d2884c827a82f8202cd440b9f5867e6af38cfa952848789cb855963e2ed75a13b029d47ca04a93a0bf94d53e7e1dc253e913edef6e45922a0b05bbce7";
+ sha512 = "703332727a0db4a51a39859209ce76120cbdde5a00d32a931e118e478dbb5f4a4e8f3d06abfa9bc97bf66a411f533c23b7375599fc0a7f0c13c9d7f518cb8990";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/be/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/be/firefox-57.0b14.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha512 = "3fa693d5d909a32bf206e81f69a1bae19560a6e4d281d1c023d956e890089e3bd4f006b3b44b9186f7f50bcb6566dd375386aff634171cc9cc27955a4ac64043";
+ sha512 = "d8ad4ba538e2e3f86ad8564e2418cbd34f33d4e89233fa6638acf10a3e10eafc0b81d6c20b585b872c5c00bb6fa2af1ea4097c19de01446a6811e4843c99fbf2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/bg/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/bg/firefox-57.0b14.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha512 = "e595c12a4c0e542be9954b3ae633f55d94bd9b402e854dae04c16d9c2c4e28814e31dc48e669ddca2bb76a55191b223f225e01cd6c23010725da0e8c29ce111e";
+ sha512 = "cb6af38306ab8bcd9229cf1dbcfaaf310108c31e28dbae6b9fc21a4cbdd82baf9fa785a9a94bdacb779c8679721903bc721a0e7ca2a1a09995fa97f1486a8232";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/bn-BD/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/bn-BD/firefox-57.0b14.tar.bz2";
locale = "bn-BD";
arch = "linux-x86_64";
- sha512 = "af7f0023f5abb0ea9446380165c9c955a0bfe824377a3ebdfefcfc5dee079aabf317c832de459da41d330697c69ba3f4519136ea5922fe26827745f2b8567bb7";
+ sha512 = "1739ab1c4c1a7387dab56fb89762b26d8cf279c14a7bbfb1f7f888e9c2c714eaec84aba12f1384defc7974e207b506e206f980a8a68be7f274cccf7232f30e32";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/bn-IN/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/bn-IN/firefox-57.0b14.tar.bz2";
locale = "bn-IN";
arch = "linux-x86_64";
- sha512 = "5911b03099379731bde2c904ed11e5eef69e6d53a1492cb07c4d1ee6f3747fd891ef34a168adea716d867b9ab02ce0faaeff2f60a47ab0863abe0578e5829ea6";
+ sha512 = "358f8e3c1e9774fabd6bd8faff4cd2903c0e0cae6e5e6ee6f2ceb228ce7d489ed9112eb729a4f7d0ea25c377a2a54772279ea1343cec449b949688dfe19a69a0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/br/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/br/firefox-57.0b14.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha512 = "2e8c4776671c29b4d885c8ebd87ae107656117d826081230890c6deabd0106b75d53334a718b36a2cec4ef9060bfc9c1a4f1d3543d13fc17218ad594f4d0f0cd";
+ sha512 = "df0c34c951d81d500a0720c2a9cfda76831564dc45d2e34d37b677702414b2f53710fe4eb7f63257658fd058ffa648a904aaad4d864a325a1b1e1ddfee2faf32";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/bs/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/bs/firefox-57.0b14.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha512 = "e1bc29dfad9794ba95f81f611cd9075550024976651812053b1e976fa7c9e6aafb5d375c30d6164afd93255830a5d336a5c2522199701bd26bedcc6cdab7177f";
+ sha512 = "091cffc15f609bfab74061f13c526d4c13946e7b79d3a190ced0ffe2fb9aed457e1e1780d9c152699f4b42aa920d9bc77701eb944d9f9671b70da3278fabde8d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ca/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ca/firefox-57.0b14.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha512 = "4122426fc6b58472f4c57c03618f7b1039958a5e5e66309472279a59df077ef08eabee1237c59fa5ede0ea18b927b60a9ed8319cbb396c5b204d6b55842b4d51";
+ sha512 = "cd485d1202daeee2e24ca812350ce348ba93a0bf389741b13ad6aa6a81ae4c57007ea0b312e401fed8c268c8a86b5ccbf62ee25d2c1d8d787f16e92467f3c136";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/cak/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/cak/firefox-57.0b14.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha512 = "d1c0dc77a7a06d5fcbe231c5ee3802aae200f578febb77c41c675a5a525675442772e585fc399ff79777ab66516df4ec05c0a22348fbbc29594ca0cfa35b3b7c";
+ sha512 = "c5573576cc70d776f3d40a2451295ad8a6230b0de280b0a2a3dae7ecc2c1fcc2eee5fd5e4df91a2b1c9a63411263a4a55f0bfa605a0688cbfb10c341dfe4eaa0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/cs/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/cs/firefox-57.0b14.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha512 = "8934f3b7d2644dab828090e8aa6a2edfe1b21efc95d63b1a7821dd9c4cb9367d1a387d97e2a8c54f4815877533e9e20a4a0bf49446d9429f4519f28fd382e128";
+ sha512 = "771141fa3d846651448b158d8ad583a45dd2fc05ca5e3ff2ca19687431a140744707260b3ad9e304bb2062757ef333815f69e10a48e72308a802f9088e24b22b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/cy/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/cy/firefox-57.0b14.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha512 = "d072efc296e744273c081b1fa78348c9b48137d0d42ef8aaa26f1607768af3dd62179c693bca567c4fde993f913da856ea36af350fc90df18d8e726f227b44ba";
+ sha512 = "7fd6f5eb9473b3ee68a7a2a98128c205df6654bab21e4c19f6ecc1e427dcdca3b93e9ff22239ebb652a545a3cb8892782e34cb876ada78d604bc48816960f897";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/da/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/da/firefox-57.0b14.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha512 = "358d83de5408d2cfeef5b8e77054b528ed736a0b2552e93d7cae405d346dcf3a4ebe3470612cdf37170ef9e4ec00c87b23ececbf07bc07f67fbfe013576278dd";
+ sha512 = "30df907a7e99f41f9291d2e677e124363a8c2f702e90db870e2ccc1bbabec2266f0c64fa3daac66c5da1543056d1e3e1e8458dd4627cecfc0a9090ab0aee13ae";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/de/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/de/firefox-57.0b14.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha512 = "02045240e122fb3f8339c8c09f90ced093d8c92d80f65ed03d922ebd10e454bf9b8d25df36eb8548f1249f43cb8f5d91f50993ec3623e5107115dee9de405b89";
+ sha512 = "bce375636ad043e2a9e331ecf84154f5e329217b6c1697ddcf17301115f39c6f35b88083cbec132f92fc30d93b414a8a913ddf02ff0c406295047d5d11a7a3e1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/dsb/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/dsb/firefox-57.0b14.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha512 = "eaa5f2e6f2fd7447f79c9bebf8046ab05ab67f5717c15f01af676c3b384750b7929fea818bf064b2949dfc0cf36cd4e12f17c4c11c5f7a563474666b217b4ed9";
+ sha512 = "0b75a555b9b02759b4315d3f77d78e71f2106db1b2901457b54e7a487b9f35a0aed3b6f47e7363257b2bbcd42104783fe14bc4171d658515b72fb61bdf9b0fd4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/el/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/el/firefox-57.0b14.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha512 = "93573cdb8088effd34206a9525bec895aed4920c878ec77fe847871c4e01d70ed35cd00aee4311e3409beb04e2f3aa4504c6bdb9b16f05b4540093db2d0924e5";
+ sha512 = "f4592a580dd7fa207943d071c92816c1f6583f579e8a8fb6564da6e95c0edff1c7dac24c581e25f874b354b55aabdb8fba17a2f4d9677b653e957a66360fabc0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/en-GB/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/en-GB/firefox-57.0b14.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha512 = "765e34242d93d6f53fb59d9400444e8d236b11b5ef9335324e6b0fb57c04036121935e88068fc13dc669e0fcae50d0e84cd4b393b47689d2204aec86d4daf48c";
+ sha512 = "56731ee2e83a591201471bd6236a247a3a5713607344ae8a5c03efcad4f69eeec010dd89c1fdd6329325768a4b9a83ecbc278fc503a8d61244523748d0a8fd06";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/en-US/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/en-US/firefox-57.0b14.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha512 = "bbcdf507dec439732a4c3c030c876c135d99126c9b35df52b6ad377575b971931eda12b9ec446be768058edc71d7331fbd1635b39baf837fc428887edbc8d5bb";
+ sha512 = "cbe3a6ae2dc8d89ebd935d2c58d3f735ce08f45418c31f1faa9f75d75255a07fa87d9b7d53f571bfd876701b566e27cb8bd761cd167749e2019b1f3bc1fb569f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/en-ZA/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/en-ZA/firefox-57.0b14.tar.bz2";
locale = "en-ZA";
arch = "linux-x86_64";
- sha512 = "06d2e4cbf018dbff55d8f91e3ad9754b6a191cf9cf22ba38eb316421f732141e44c3d3b4b475e97e548ac8701652f2e9887be3789d78c9f06bcb9d1fdd4e5156";
+ sha512 = "f5c32cbea6753f4325c7cfdc99bacc4565b58b0ffb7cdc8db6d559922b8402493b502e7a05fda4e08746d48dfa50ca7b70ac27e152ceed3fadb9d2af2ac0f639";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/eo/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/eo/firefox-57.0b14.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha512 = "9612deca064158eb9981a24946ab612b472c48a897aeeb22729677cd86a8209b85e75a3f89a408de4823947ad28fb2b0c66541e27433236aaf337ceef02166cf";
+ sha512 = "89d278965fb4c7899abdf17f2fd1dbde201c959b623c46ba4db51628a3a09c5e054a614b8657f7f190ca5e9cdecced24f126978425bb38d14c84770958466bb0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/es-AR/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/es-AR/firefox-57.0b14.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha512 = "a507fc11e9a528afd89c32fdc1bfc1255edace78cb11db1b238cde52ee113f6ffc2506908ad4d1331c3b80655de193b4c5b3890c979953cc01711fb2a7d9cad1";
+ sha512 = "d21ed37e2d6461f31519d08040b271e9a6d476e7132f5db406fa3eb3fdce67384af376a89d740426fba12a5602c20a4d315c0e337f0707ed7b91d739b648ad63";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/es-CL/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/es-CL/firefox-57.0b14.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha512 = "028aa444658a288ce5fe84825aad85a340ab36383d04012a8dd93fc057cd3d2ad2084c84db87bbcde4778915eb7eed080d4fdf8baac009c0ad6a00d1ecee2f96";
+ sha512 = "bd0dd077e732c996de27e5fabd22933aa1c1ff448425bc757be909ccfdf7a8a2f32944721a248e4998bf9d455fcce13c22a89dbb780c3a61d8fb06745075b122";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/es-ES/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/es-ES/firefox-57.0b14.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha512 = "9ed4b5a1631110ccec6b31ea3d666fec54e9dbe9746552fc02b0eadd09053020abfb6053c763ce9f3877eaa2e1f318003177e9c3cc12e16120a7ba2881795525";
+ sha512 = "7abe774d7c2baa9e055c382fbe4612244e9ce5c778185e86c1b4e8422ab8af4f99a949bc8560109e6995d8101f8563e6251643a5c6e4ff1ca9675b064e1da580";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/es-MX/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/es-MX/firefox-57.0b14.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha512 = "bb13cb8455d87244a8f5216b765293ba13816ee08a0f73e70d706279d5e322e69b5627ee22aa9ad44ed20ce54730bc2f072d326ec669d509674855f835702a9c";
+ sha512 = "4f4c6a5cb3fb25a030a44f3b7c60d6a1af77b083ca4cd04711ed4663e276f03ac92f4b8be697554af7a4721641fc7588b005e27f2ed2c5c1efb947a64cfae8a1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/et/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/et/firefox-57.0b14.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha512 = "e7e099b80ce94392f53dc1ed3a696cad77ea1a1910ef79dd7160366f6f880857c5d3b867ca3635dde72d22d40000b2acd9495fd3804aa479c5e5adf0a3bb44db";
+ sha512 = "f23d6cdaac6a412c28c633fcd304833bb341c159090575b8f8cd7bed6068a3ca3497cae072d831b1ac40ebc98853fec978a09009d3eaa5c1f6aa6bd4f8c3b956";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/eu/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/eu/firefox-57.0b14.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha512 = "2b6ae7dbec4facca5a00a0c9827ad634b7862ead7c8694bccda7f90cd5183687bf122e29e38515b6457839913b8dd5c6e24a156edd74d3ac4ae9ff6fe8b5688b";
+ sha512 = "1f7f209e1faafd254e607c7bfceb5b1913c59361d55bfde394d2af4f745e0be54b7d119cf71a88c577dc76f0ca9a96fa52cdb38b27ed5dd6d270eef5efca2501";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/fa/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/fa/firefox-57.0b14.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha512 = "07a376c694df8a306fc169c8e0abb311361dcd3ee252654e8821673a69e6de9b3f25a47094091bfae620db152c471c39f7fd895d81acab877ffc471aaefc2439";
+ sha512 = "e175dfa91bda0daac8854d999cf3770332d61dc11ba338ba8a9c42718e7d470e07dab656a3a13ff25f4295df648196549b4a3f4b273061c278f03e0a76815213";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ff/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ff/firefox-57.0b14.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha512 = "745c62ac6f055bc01dfbf8814c54cf823718d472533a3650f3ebb59f4c907109cd15d881ea19d80566cb66121c6ff2ffdd9c551c4eca62ec1cad3976d1b513f0";
+ sha512 = "243c09586248988625ae347ad10b691cb5f93ad78562c3223a244403a5ad41b138289a992edfce91a8744f45ff8a2feb008ef3dfeca608fa2cf44e39746bf794";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/fi/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/fi/firefox-57.0b14.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha512 = "f679b7e843a0626ac2e7f6fb9f85cb6628d162692263eba6506e94f8b22b543268b1de64e4cc9ae5977c7fca0725dee337a120647a5dd73edb56ee678b8088cd";
+ sha512 = "66ac96ceef9d36ab4c16a288da714c9bb9dd72b12cd814dcdb3740135ce6d19f18ee564c31050b619a1af207d086674ea4f60ee01de3a18eb854f35af5d3fb8c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/fr/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/fr/firefox-57.0b14.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha512 = "a95c3dd2946bcffaf8a34fea1e11df826e1dddd642cf79677465379e43343711a18fa88d1c74247624b7e7f690ecfd62edc38d9971dd5df81d05be490fa3672e";
+ sha512 = "7a9398f8753c0b3d6777a5dab4c28fbacc493883e5326fcac0cb0a0f62509169768355a5c5db377afa6a1ec79676b8de53ccabc49666ac9830d588ad2c8bd8eb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/fy-NL/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/fy-NL/firefox-57.0b14.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha512 = "bc6a82e5de1fd2f9c4b9fc4915604443d9102ffd8caa348a42054a1a251e820ccc69db4dcea5b4aa43e04e5c07e904b10db8b25c60986eecf91cbed89fff4f6b";
+ sha512 = "b309d91af97a94246c9450eea61f81cd8f6e8564bd089caab7e1238df4855aea54568ae8d40c3c59e09729779623f1f488e2b18f05094ad79d7d773a82196eee";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ga-IE/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ga-IE/firefox-57.0b14.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha512 = "271dca766101881c0869a3201f5312790d11befc96c3106f92740b798052434191389f86522b40cecd882d6f85a920556d53ce409ad5f12d1ca68434fc836a0b";
+ sha512 = "f3b699c8cddca58a8610aade833b470e006a804606ecf13f166239f32ec7fdf0ae57e6f91d3a104efd08fa9cb34c7d78026753d0cc235cabad8aed8ae85ccb22";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/gd/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/gd/firefox-57.0b14.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha512 = "afc35f1f071fe307df82582a19b817f1cb395c975f047c04a9b64790d87efe4fcb2486d4523b9144cf63f1b2949f3b67d74a7c8005c658b22eb6d363a407533d";
+ sha512 = "261b14e52513485a14d4c92f580a9deb228dd730f77911dde25785b8eb7974a1fc6d39b6d377a3dabf3f488f9d29892aed86c38a115aa4c9660b27a229a512f7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/gl/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/gl/firefox-57.0b14.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha512 = "36a054c5d56752ddb8e5af417d53e4811b23ee5ac00b57d12bdad2152ef4a237579001f44ae41c9959a68fb144862e0185b0607df3c9801ddeba7f9a27edabb8";
+ sha512 = "6028afc50364a4bc0e21fcf82181b3d6ab44a985d7ed55fc090544d25c0bd65ba8737e1b653e9cf860f201c6c3aded33693c2ee7cb7229b899007e9a607a39fd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/gn/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/gn/firefox-57.0b14.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha512 = "f29d9f9d793730324399d6edf5d724f1ebd7f25037865af74616ab660bf6f469616fec7a7e2f1c5d8b7427a5b3b610c876100e5f737facc366d7ecc92606baae";
+ sha512 = "a189db0e527b1a69d1f42b23b5898224313f73b269ece12bcafdaa9204cecc2424660ff3543098cd6036ca17c724436fc6cce9fa7f38376dbd35c943f56cb559";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/gu-IN/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/gu-IN/firefox-57.0b14.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha512 = "b2e0626abe14e87420528b8e1875c22c5a97717f9d6fd781956fd7858a1a08c5014dbdac5dae6378fc2fee92bfd50ac4bacb29aff738ea8288cbbee68cf58ce0";
+ sha512 = "59c9e99ce0da07aefa433b76a961cf8b9294b30c4c3198ac7c8cee5d430c89a10058f614f0955ef768d1e0c12e583fb98612caad4cd48389454b9878bbb08667";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/he/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/he/firefox-57.0b14.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha512 = "3a29a3f008b226c760d488e5673b6ca8d545a309aa8c19bb56df4208143663e92d29b4dfb0ae6606ac5f83826d1c6ec2118adfdf5ffb55e954193407b2249d7d";
+ sha512 = "101f7135364f544517674f8c0bae2d16aa600798ec7755f4e02d0827df6920a60c19fb0d2ab3dc20febe1e9dfecd192a64fddfb2697b825ac940de530383ad7c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/hi-IN/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/hi-IN/firefox-57.0b14.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha512 = "cf0894c7b4e954ab39b847ff21a88b68152e3eb1577d6ce6b513c73ad8c26fe184227da022b827b35442a069fcdf3182a843bd4266d29ec525436f7bb9761cb9";
+ sha512 = "dfabec31fc6170e3390a313a6f201ee51930c1e1c884a5e1b0b2107a2a3c1d19753c91404146dbbad9dc572f9828e3196e6fc1002a9b318b3648b1dffe2a9cf8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/hr/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/hr/firefox-57.0b14.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha512 = "7f512df549b19e82d054298b1b5284956ea9568793aa0a7c676fd5f52792ff943a1f8bbcaff05996236e4ab19cf4e914d6e1178a493e7077ea97877d14ee8d70";
+ sha512 = "2dec6c07adeda8008e3d85b6552f29f882b1bb9b89a5e03422126067ebf9eda03e0272f31464c42f8b9deaea174c26b1571c1c416f1fab63a7e67cc0bfc2c136";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/hsb/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/hsb/firefox-57.0b14.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha512 = "d7626253732cf868d1f414e297cf4598b1a3bcef10c43641030c599b6d04599139f268a993d4d151bdf08ecc0129dbb638f581de58c1e76f28bea30be0eca68d";
+ sha512 = "b5dce6117e1c964a612708263adc5533d8a063ad6586030fda1a214c6df887995f7ae7782039f063786bb332732857781392c16c646c29d9ffc53fc3c8cac8fe";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/hu/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/hu/firefox-57.0b14.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha512 = "f74dd31a8987d35ee1e3c96546d6b180830b174bc03bce12ce83bd52e01f7f1ca9242830f785953ab0ec73cf2dcd19be61cd55981bec6c8926bfadc9045bfbe1";
+ sha512 = "fe5654e089d50c099aa3cc9279c0a4a3e975a3e10d15b9b832249d082f95d461cbaa51f5851c3f4a680419e293fc9137b1ddf275ad376e073090db37ed92d888";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/hy-AM/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/hy-AM/firefox-57.0b14.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha512 = "2b1902d366b7de359b8ea0a5fa75897b76293630710d30e17413a1990bc96a8cbc0032e68d73e1ff298cd366ced5f4c51f0a693c665bd3761db3646cdb536666";
+ sha512 = "9678679c8bdd32131fb7397a88098028a955624a68d59746d073671298a3ecbd8d2933675ba564fed0650f44add7fc1135f441a3edf2ea932cfe6fe5b2ef5d13";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/id/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/id/firefox-57.0b14.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha512 = "424d9aa341405c5a6ea5441e0c471debd7d49c4a4df632d796142db9d4c944b49317758e2211b806bbc93904d4341094fe29aa44d6ef936346cc17263c357e89";
+ sha512 = "c863c503ecbd71f17c311f99d94a86af12a57bc1ce0beed6fd0d0ccc5c814c25e5636de9127610b768fb947a0ee48ea585e1a205e1646ab20d2f6c2044b67618";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/is/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/is/firefox-57.0b14.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha512 = "3ad0b286a36467973c4910eb20b09d20ec46d47fb6796078fda35335266f791f7e82d01ae8b7a0fa49361cc79cdf2864240286b6a8a447e6dfa6f49b23f2b1f6";
+ sha512 = "7fe2398dfc0da2bd215867414d765729e2b30620930ee1f50b98a348f6e6fc098c952d0c5ee200dbb51a84ec82f4ee2fe8b01c4a6fc879d2ebebd95f39f825ba";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/it/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/it/firefox-57.0b14.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha512 = "3c47bec4d903795f522d227d085e0d7ffccadb0e219f7a67159e5bcdcf7f7f2e1543b95ee8acd495982a464095521ec9dc22d9f90599d267eee8d2f6b4a543ea";
+ sha512 = "043b409173d097ce49eda0e16144b3f50ba7f7a83ed679f8fd09c26d18914681e15b68308ec6c65aa09f26afd195b6f8e5afb4e2276a5717b716280450dc403b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ja/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ja/firefox-57.0b14.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha512 = "2a1e435e0f74205577c28a6265ac0acaf165b4b891129994f4d42cf78ea66216a04c9f4b7652053281e3717a51135c12324640c5ce285981a1165d9e749a64d6";
+ sha512 = "9c4391e27831ae034624f22e8643922324b7940f2b6c739d1c6b5c47449b83f2c8756b11efca47a42820a867248efc023876e1218327f1c8e80cda0c960734a5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ka/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ka/firefox-57.0b14.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha512 = "177acdc588044116cd4efb5ff10f178a6af2ebf7b90b80c06b07587e11d89a45a5f0ed4b0a9c7b2b2cd4896f3f4c5003b9dbed33bd7ed01ae6d331e637f2237f";
+ sha512 = "490c43518d3cf1320d9a3e8f28c70908b31a5f9ed01b211f4e53aef67baa279eaf129f06ec6c21efe2fd4a89364f55ccda95847f058cb2f83fd1f92c466263dd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/kab/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/kab/firefox-57.0b14.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha512 = "6e13833052dd32ea168d0e939ea7703c6c5a092848cd45ed8e6b1b0c18bcbe92e1a4c37ff7b1cfdc1c1e618f4efb83dffaf58501ce4f851d845b273fde5ac513";
+ sha512 = "bffa144bd5c6c0d3fcf9c8d44c679f22af1127734ac8934a5cad4d5e6726978133cc99c61dde870143fcfa0b07c146c4d7a84117178e01083a0c37d9b4810184";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/kk/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/kk/firefox-57.0b14.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha512 = "1deb2df839e0708f2b8bedebd47a4643e1a3ef2abcf892b14fc4842688918cfac99b8345944a00fcb36495bbce92fe2f76b3bd6f7616220a4a4758396d031d75";
+ sha512 = "5b49760338013954ffcc3ae2c9c79b0d9ebd92f1a148188249559723bf23338a7b606b26f5326b48e2acb15e7ce023f4dd2a536c0cbf5b7af8eacfc33f3be670";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/km/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/km/firefox-57.0b14.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha512 = "aed5a7b6e3fb2d4f4260703f83b1092953fb4ee7891ec8dc50250f9b00c4f1ad51d6f9e15ccb8500faf87f723ab891e474b43d4caf4a22620f5660ee8736c9eb";
+ sha512 = "7ea92ede74eda15d9a77b6b22a02a634364b60bff135da5356991644f474a47c16283670d24f2cc28d112c97f3b49fcfacb1c618f9caa16fb013c3c650b50feb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/kn/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/kn/firefox-57.0b14.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha512 = "d83b0af01fe7f335b3fd3bf89e9162a2c54ce95332de8687e265666b417a3103a508c57f770a4d075d3062cc48f652324fb1c73b1edfb8158b6f5cae597dbb59";
+ sha512 = "e3d3ad10a374421603068c420e2c5c28ee8a9f9b822df556a1237eccc54a778ca572e09795aa9022cfa373652cf2913c621c2fab82484f7eba77f56305ed6aab";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ko/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ko/firefox-57.0b14.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha512 = "74bfe8e9a084348b7f1911c2cbbea89757b72ea8b584fd7bf26c79cc64f3b38ac642558ec3fe059464f252667d2e04dd70cbb34b92ffaa0467f5067636b05311";
+ sha512 = "a681d5e49952f1e671e0c86854102979e052b84140002b968f791f4a325858985751a3872446ae2495802ea0c1df884291c8559a573cdb236cadb7cd706ce718";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/lij/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/lij/firefox-57.0b14.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha512 = "31fbd3b75c1c7d64a9b13c52680c6c3b36e604893a768a572d41481b388e9beb7942f435510b7dcc90e7f9ef42d81e05c7c77f28e5cbca63b51beaa54b09de40";
+ sha512 = "b33522bc78b07958a3b5b80bc0833673b1516652de2a165f5bc7ef54575a21af20a922e207be02c4531f64503e97279dca4ad4833d2eb86a6c04f3fd1fdae7f7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/lt/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/lt/firefox-57.0b14.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha512 = "ce6ebfb5a34f90ea5a8f742a3ac9a6216909c8843fe255f9906c297693a64e2ebd0318ca697cb02a896a122e29d2a8bd055957022a7cb770bad6687e83e9fa24";
+ sha512 = "ec27a8aabc0736b410509a9fb9706627e06316b34a241639ae27108ba3c4945b4ae675fd85da390ae053603a0a13a124c0638c11c0750c665c8226446435bfec";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/lv/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/lv/firefox-57.0b14.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha512 = "b965eb09bcb9d5e0cbabc1c8ea7fc674aca2b185b2ef83f3c3560fc68fdd2fd428ee6a9d1e72980123816c01b2ab6877add15e706eb2a90b2f9220db3e411a8c";
+ sha512 = "bc4b125320ba7033946a290e0d974cd4a4f517ae9c9e2a24d86d28307476fbcb4372ec0cfc567d984e90d105cf692a08100bcec81e4ab615fff19ec0ced0096f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/mai/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/mai/firefox-57.0b14.tar.bz2";
locale = "mai";
arch = "linux-x86_64";
- sha512 = "3d6daf9e6e2459a246f9bd4d8e66c01f7acb0a4a63f7413c38c7158134c31b5986ee86233482d80cb33a3d8f0d9946c6cb79ec357f80c3ef22dd0ecd173dfacf";
+ sha512 = "2aca4d6ce673fcb71a8c6228e243157e597573d152d05bebdf8b9df3bdb479dcce1708cdaf2462902c5ed0b7eac83a9dca523bc55a6bf6b2a9fd1d4582a3d68b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/mk/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/mk/firefox-57.0b14.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha512 = "f8e0208c360cc9b87ce917f51d2302df31f1cc137a16fbd8678aa664d0ae8626dc08f534dcb4f34e1a56cca1d0a3bcdad01eb506b04b0e2054c1db5acaaa8300";
+ sha512 = "22fd8e59aad75508702ea3fd37af4261f864a76e943cf6d07789d4f1d094d7e0d5e76e5d4c92b6dc642e0f30047d4515d8520bab667c05c16aa4ffb60f0fa168";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ml/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ml/firefox-57.0b14.tar.bz2";
locale = "ml";
arch = "linux-x86_64";
- sha512 = "7c184b7bb8bcd115b4a3d10543a4805291ccc13a3b807d71a862b8d166e324d9f4ff28dbb71f2b36c26731d6d7085dbd45f708f20d6bb20a918c361fc0dec218";
+ sha512 = "f96568186cf49bde7ceaf36805277c0cf4d75da2d5930227e625e2abddd5b740df4207ce53abac24c77dc755f52132204b945fcd7706de4e3075505635eae9fe";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/mr/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/mr/firefox-57.0b14.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha512 = "cf55c41a5ffef1fb41d6c82f5b9492f5cb4cf5aac4e14cd4ae751e81c15acdf30264653b8adee86fc343552c21484c8a1390d3872d30afe113fad94ff68a574a";
+ sha512 = "82fbe7593e52299dbebe38fb97126b91f57e48968c7235d8adba93776ea6c6883dd8eb5df3345cae55d156a7bde2004f1f446339e46de90c85f1525eb1334147";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ms/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ms/firefox-57.0b14.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha512 = "a54c9904e67547d2c2c7bcd2c1a5df3b54ceaaed65bf6cdc35466d530797136b38e1f79cab4fa544d122ccb8787039cc3fd2cf3a1f166fcab8c27ddfa820a291";
+ sha512 = "3ece240f01f8322a86d1b8861be25e895fdbfc9a024406727400e0d6cee8efe88a11cbd6799e4b7d0d8396cad80a6a7438d4f0e3b641f94396a7d2e80be06e02";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/my/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/my/firefox-57.0b14.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha512 = "a267f9ce6aced112b488e90b859ebb2d6e02fc73dd208bad34ab5c1dd7a122e4b97b68813769b85f036ccfe8af7e56ea0782914c210b684f863cf2f268f27050";
+ sha512 = "9e670ecd9628c8822f634031dc7b6ea2610687df8967591ff44a3fc2922fc11bf84575811e9e0f51997764d67c357de5020619e3f637e31c3421e64b533930dc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/nb-NO/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/nb-NO/firefox-57.0b14.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha512 = "99b1b97f5c78cbeb67f7ba66c05d04d37bf808e52f98c25dcf2d0c51a400a26499101e4706a20162a805da2493db2919bfc1714940234e94247c2a17e18f7358";
+ sha512 = "298d7d24c92a5f56f00d7d615ffcaa1b483882f5845f3de4bc8be2811ec6b5808a2bb813ee9d9b8aaac84a6c6f7bc600b45b7c22480e6c4c111fbe815d46e70f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/nl/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/nl/firefox-57.0b14.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha512 = "b19d2699ffd4bd0e5de12a87f8a5461fe28869cbbfe573098e628ed3936baff9ca582c47104133bbab6199472182c9f71af18756ea750e9f2b256b01314884bd";
+ sha512 = "c59787d50bb14ecee498e9c454e3ab79571656160761e95a53b41ae8196093f6dec3f435d9a69f064b9c4aff0bef332e2d5334153d98c8984041e26c82ef04a6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/nn-NO/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/nn-NO/firefox-57.0b14.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha512 = "87e3dc181130019499cceb8b3a2f86e0b4ed32defe44eeaeb3df8dc4bae1827eeb90742394c3112cbbddd8960f3aa1a2157dd8903c2eae1cf4c17fa9e3179dc3";
+ sha512 = "c7c9965a5810bcaac0f1b0d08ab6a9d660a00e40368369998101c2cf043837459e6e65078906c0278564412655a76987f30b671bd90edb25820362c3a846b1eb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/or/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/or/firefox-57.0b14.tar.bz2";
locale = "or";
arch = "linux-x86_64";
- sha512 = "cd6220bdd6f2ef82b0af214c62ca77b48cfd0f790b9f62316b2a2267aebeee3954935999bd6f1cb2fa4cb64650755ffe208f14b322990704daae742ed126140f";
+ sha512 = "bbdad4aa7743a1af3c31eb81003612d0729ceeea5a0303f129f24e352219007b55f40a931a0140fe1b1b4cff694572d1141779238881376e77f30a3f3675512f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/pa-IN/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/pa-IN/firefox-57.0b14.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha512 = "cc7c72ec73a7618664f759ae9f96d06174d835ff6779f6bb3b199e4a38651de695db0149041f619ca4fc4c9d2284757cf33683c6c107dfc08e25bc39e3a5f6b0";
+ sha512 = "99f5ba6937e08c2cb0f05be9b8f2e87e1f27d5ad610540b3011cc2fcd11c2a7a84a1cdaea9b6133d1c9a38311eaa13221ba57bdb444c9aa343c446abc41c986b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/pl/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/pl/firefox-57.0b14.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha512 = "718ec975c1511130799ae59188034dfca681659596755aff6809336be2dd41e0ae744fa2fc245e51f8de86409d5677796efad33c7bdf29873b90dba075c941d0";
+ sha512 = "956648b1f331356f8ee31158758fa0ca7cc7685aa7b20c1833d87828f5f4d695fb3fdbebc55f4862c0f76afe72ea6035261c9ebaaec2561d728d61a4bf53ca9c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/pt-BR/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/pt-BR/firefox-57.0b14.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha512 = "f6063c710d24d74714b2661e7918566904d3ad4e189ceeec662253f7039f5bc8fe9612ebf618c858c15d64e90e2eafbfaafbec78e441a956c7cb9ad21467a547";
+ sha512 = "528a30c7ec5c7485d0a64b6787e0c14c66f832b2289884ff234799631f4e9c6d620c3312ca3d1872e28c80c7a192b8e0e4d0b9d88dbad610268e9d3fb37b3a05";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/pt-PT/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/pt-PT/firefox-57.0b14.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha512 = "450f191ffd823d3a079f486dccd7cc2480f3aef840c1168b38e187a9073f1c8f3ad093ef5c56951440716d6dc6bcf98b5352d4b863308a14bd5b6b7e6a0f8480";
+ sha512 = "c70eb4dd653d035fbcb7de8bcc78cc1855f7d6dde8296a825d733a26e9c44e38c8e77ad54c63f806f12b90c601508bd6376aa620a1e0948c0b265dde3c2443ce";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/rm/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/rm/firefox-57.0b14.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha512 = "552cdfa2dcd7db775fe9591246c5c96997f0a86a031a2f6cb2a31a00fe05c78667e46cf288e30a3453d26d8e7fd2480d2f94857720488b6a291bc359553cb668";
+ sha512 = "c9b9f0e3ea90fe7e2d5c2907d82e7ea5abd5f30212f1fc5e726dfe72adbe3835107cc836e310ee4bcbbcb6ed6a08bc8bea06d3bda08d1fe7a08ae20b6a22bbdf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ro/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ro/firefox-57.0b14.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha512 = "be2b95672070d82fc92849832a37ba41caff186c1c9203a2cd113f6b949c4d86ad162a607688d3e3f546cc29553e8acd9b3d94c14593cee10365a580af0b7d1c";
+ sha512 = "6246be75562143b57f27de69e39f9c82c7aea3e60d515cbab0ed5e32228f5b33abd61cb2fa7f3c4e73c65a6dab5ed446a0eaaa94767e0196d5b337e6b5a410a6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ru/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ru/firefox-57.0b14.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha512 = "2825967493d4a3a39aac644484556a09bc9a63e601539115d8c28bf5f2724b22b3a374a5ea30cf8f312e6c075203014df850cce3436da0c5a0dffefe9452f371";
+ sha512 = "467a4adb72e27ea95d324f52007e18c3ea307b7ff158a4e58bba69859f5369fca8e7243329e2bacf590f35315402af10d8071c34886a7fdc3cfd6e0548653aba";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/si/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/si/firefox-57.0b14.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha512 = "7407388751b8df127156f5ac4519d459df4b929d79f4d82c0d150b8f327698da435460b911a077e25fe5affd05f692d4a18bbb8f71cf3921179c60d107460103";
+ sha512 = "47b11ccc3bdc373f3591ee73b84edcb9afe915f1bdf5b7abe65eb2ea675da44316a4ee5087c0c4e69a90dc337d43e201ac15b98d04a0ad970f8017d737e4f738";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/sk/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/sk/firefox-57.0b14.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha512 = "2b6ca2922e28b061024c1738fc70fb0b31737b938a8fdee3676504a87c73c29751d22f33241a450941200e7fc1920cf66847dc8188d987d47f4990af00622b31";
+ sha512 = "c7696394b76668733814f1b2cc1c41cbfd962d4d58e424c041fd419b3da2559b1f4057a8aee328e0698ec8b350e7909ce5da3770f287ba485dfbcbeb3d1de9ea";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/sl/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/sl/firefox-57.0b14.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha512 = "ec9d090376d17c8ca283870d62b50961c520e1d841e11137d19f6083ded9ef683cc0d14cca37446be0eb2b5a6c9a9fc79e12c5753316bb7ce0f3cd07b1a0fd00";
+ sha512 = "aea6c90fe73f9aa1340de0ba8207089deebdfea21d5fbd5d5c0ada6df26a4acb4349eee4a7ce09f9088439cf059fb7fcd6169cb1c34c83a33c909bdb3ed7af43";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/son/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/son/firefox-57.0b14.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha512 = "0f175c5dfeb93d07cd4008967b4f3e492cdf0fe44e3280b1f761a5d9f552a7bc2df12b3e4e5bc8ec388e93ff4d9f8ceff46b46edbb331e7e92e2648804e80e67";
+ sha512 = "6d3a9b05ea14ad1281c51d99757475b6642a5411b7b409f2acba695c3c0a5719f4feaecd0c56713899475501fad3413fe46f4a3efd482111aae2395df22b1e25";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/sq/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/sq/firefox-57.0b14.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha512 = "6ec09ee64afc4cf4e6f710d49f8010dc62394e1a912fa6139994a741c6abbb99a570478ecf94801a1ef8316704614fca5e807b0830f77ac5714a7fa3a53d5007";
+ sha512 = "9e7639f9fce27b4c3b3fa265e0662b31360313569f1fad798c89ad1eca1944827c3aae23c283f4e153d3f81a73d235b5fac56598cc02dfe2dcb38aca806203a7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/sr/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/sr/firefox-57.0b14.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha512 = "0515e265c0ee0a223af68c6406a04c0264e3e806e5a575afe6c6adaed5bc8030b37c70352f84742a85eb70884cf43484cdbabd8de1980034246bdbd2d46d93a4";
+ sha512 = "d84980d2b454f33a33fdd9b44ea7e2c41a73a351492fa7bd951a8e4ec288a7aa4d12ae362443a664abfb554693e8a8f5428843b28ed48429de3d32575f94ea74";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/sv-SE/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/sv-SE/firefox-57.0b14.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha512 = "c2982e666bd96ff6bc4af4af2faecd84235a1e314766414f521e0fac9aaf184635a3b40e118fadd3cfbb0bb50fb91834f26a608128125eee5d023dd2fbd6d87f";
+ sha512 = "b26deb242735a3fa662687efbb8a293e76561821540ad701091a8b7033c9c1047459fac955815790ed026e4f69a51d2b0396a21102a79623b72f5ef8cbbd06e4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ta/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ta/firefox-57.0b14.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha512 = "603799faab54ec78905c8b5413357a50723090c5c362f3bfd5eb6ae7f62264c5111c4062766848f6f487c0f107a0a17bae87362bfe05e86c448ec455c4c9bf2a";
+ sha512 = "1e98d86b9df418542dd15a204ed70732dc8111d8fdf34edbfee8217460e04467a822b66804e9876e28f15e9167ec5a6dc1551c4159c136006392feb7ca218009";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/te/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/te/firefox-57.0b14.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha512 = "be6afcbd8a3ea34ceb53237eeff1b271a92fc46b2138f3c5df9bd33c8be83c7d22a7d3198b91f540cae542aa3eab28a9184fc6b544de906f89fd4732c1a59ba6";
+ sha512 = "d22b7c8b45d37631434007b196c63044a860912826cb301a218b0aebab5ae8283370924a703cebb16a98a589336e024b31ad580b6fb57ccf3ed53f238e361704";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/th/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/th/firefox-57.0b14.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha512 = "3de3994a01bb3238888754ef27a41d37568d7e9e55b42e24071fb8187129008d06b5b41015d612f9caa5777a2e6ea5cecf772fc76e1b0629191126565751d014";
+ sha512 = "8a806b68e3e5d4ba884bb9f72bf07c2bcdcf33a8111236fe837a41738e997116d092ffe73e4028dd7429c4bb0f097270fec7a20ff3b5bb316fde0a90af92d22e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/tr/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/tr/firefox-57.0b14.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha512 = "34bb2d9358202072ce71b052b4876a2124a4263904a74582fc9973d4c8ee92c00bfdc92a88d663b045bd94945abd8e9d843cd626c16504c2543b0c1bb6a6303e";
+ sha512 = "9b1e73d28f5f1fc352f830aa59612170b72dffd7ae060a8f2422ce14ec46f9e646fe625ce36dc4d380fb58ba0300c68a83f2d8aa8282100f6ff33a43ca79d807";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/uk/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/uk/firefox-57.0b14.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha512 = "228f227258a73e9b945c8b6101598fe5a1f963eac7db546bc730dbde6c114630152767e54367939281aa9d97780d1643250140cf94e0f6032efe2a170c88eb40";
+ sha512 = "96d471b413e980ced87be210faccd8cb6b796c17b871cf785c34f10ebc04c4c76ce4756bec0dbe121b689bab2f777e54eef6ea43750e31c1c83524d0825d0fc7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ur/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ur/firefox-57.0b14.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha512 = "34b3371285df53ed817032cfca1caf0eee92e8b15de741c7c1babeb9bf3671c3bd7ae43d80113d44f6ef5deedbd586ad36721dc6d92b73c6b1a889700e07e99c";
+ sha512 = "0724b881cd4aa040b249882d41cf55260d6aca1f4876c89a42f717f00cecf40b32fa60451685b7a182d2ebb11dd08af7e0327bb5c9fe94b2a6f03ba8c9b4d02c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/uz/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/uz/firefox-57.0b14.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha512 = "8c82d7db9a48bf70658a1d086c94d0071e2b42677ab4b2eb552f6f42bd57e20a7c8580f065448346d810c0d76704bdd8d318bf0489302f8807f695529df8d4f2";
+ sha512 = "bedf1751786c828779fb719edfaec466a299ec706e40dda5f886bffe911d425b82e9f9a3cbf5a0deadff7ee77fd63c73f38ce3462aa7203316fc0569a4423927";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/vi/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/vi/firefox-57.0b14.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha512 = "64d3173fe6514b17025a85119da84178cd72409763ac4b415d3527afb77eddd2c6b344be9ac74f9c9e066b468bb6c7094c579df6a9379f230b44c21c3bc2c215";
+ sha512 = "3ed1b4f71d75d0e863da048edf60ee3cbcc5239d4a8ebaf69fa6d3a8e8be20e556dc838155d7b99ab2776ffed60e578ce253c8e6f57491dc84ef3b68049cf929";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/xh/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/xh/firefox-57.0b14.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha512 = "9a2aaa10778b8da82077b40e3fe5e295c34e7b75dd1d28329f786729059c7dcdd9a74f8e4a3dd123f3e3246c227173df23a3c5e8235fc8e3e05c64c79d03cdc9";
+ sha512 = "23db4e5df5432094b7f31a688b84d23304c7890d0ef99cd9c992d7a108a08199b6f6f94bf3574668b9b0a915ac49d2c0e8c6b0c37ecb145da3f5e2a5660d6d9f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/zh-CN/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/zh-CN/firefox-57.0b14.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha512 = "8fff898917a7d05c2d808eb272ea5c0e9a8eacea5d62dc3a40f652a12ec9c48594190c4d5c97ea9720a0da86e3322dfdf3760fc275f1bf23f4c6f328a4d6462d";
+ sha512 = "bf08e65cf257f789dee34891818f94368fe89bb500138ffc72855da7acc62cc08a4eec3f4d32a637f59fd0eaf072994ba4d5691da300d75738e3274e4db3ff45";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/zh-TW/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/zh-TW/firefox-57.0b14.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha512 = "c396e60a474d6869ac1023edc957b1b3d06e6b6a79bebe4512450e237c5f5707ce6d0ecdd5c904b0366c95a3edea331a1a6cace5171a3480fa47c08ee41c1ac7";
+ sha512 = "6b924c8ad6b86cf07b6b2f01a6138636391acc519c469b7c1dd96ee5c707e1b81c656fe87df31519413ad60e56e06da46c0f762b26249426428dafa0420a5b97";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ach/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ach/firefox-57.0b14.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha512 = "90fca234d227c88264494120a5da0433c4efebdf273074acbe073250a5d71a736314859dd9d29e693c8cf5c2056a17b215757fb2e2625c7832673179c2dda632";
+ sha512 = "56d847a9417a134af10f53ac5630f7b4a7108b177444327df97511494e2a28a279990ad37d48fe1fc482f34b45db66f1c8d458162f253faef3ea2e66e42e7166";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/af/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/af/firefox-57.0b14.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha512 = "a45a503a524c7207c120c9981425278f04454da2762ae024ab0c4df37fe355bafa4344a38c2bec49e232bcef100478f3a722c44056516a06fdcc939bb7f76939";
+ sha512 = "98d55bc29423eaa62b1c5f179887ac95e8aa228ded6e077cc645660a048ee3e42da7966adb9dad5f168477262638456bd9509aeaabfb2a754f0435b60e9b3a46";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/an/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/an/firefox-57.0b14.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha512 = "f0195a1aa23b895c08b2afe1569e968534e203442d5a5831cabdef49b9e5f335f46a33f26fb58e585f46907fd059ec28a80b8c5d724a998109b635905a504109";
+ sha512 = "0478d738826d3d9b0898ab93e25527b4dae789652a65a7b16ec5796b8e48e575387fa3b7474d7092ad851e107c03f9c58d8dbe738277371f2e881c56c9f727f3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ar/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ar/firefox-57.0b14.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha512 = "2649fb1096d06dcfce03b4a53acf3bda1bdc89cecd1267df8a67551cd1a8b3ca8d56c6e2a8be9f26d477e68d5e91a8538af2d3e76a7a1a8bff969972bec8ed46";
+ sha512 = "4c884b86e8ef6b554d85151f1eb780edbee0bee6b60f2ae3b30ff9be74591c4f4df07e5834d0ca5cad456c574abac712a8e856e07892df652f7db510618d231a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/as/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/as/firefox-57.0b14.tar.bz2";
locale = "as";
arch = "linux-i686";
- sha512 = "204a40f2fb1a55bbb0ca9e6f03764ac3a4e9c24f17a61029f3b6809e54d81ce7d1bf5b87799106956723efb5d9f3cca6db7a32197b7912b079ed786b6325b4c3";
+ sha512 = "a58c8f47fea197a5b9a397f8e58f73e381ffae3426c83872407481f079b62a585230d2f389245d5eca6308e8832fc95d8dbb7da97d25551faa44c20f6e032bfc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ast/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ast/firefox-57.0b14.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha512 = "68a1c622459ddc75d667ee3dd969788c76524c1d81e45cfa99f846063f264fec6c9fb2bbd12134af9a2e139e0c272b8031cb432df29838d3c08f93bdc8b4a522";
+ sha512 = "fa4f10093602f03b759502d76ed1d7636ca2fb0f83174869e3cdaec3503fae625e6d49a07c011dfdf6964aca7e8ba81861677cb387ab8c638a5a671864451dd9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/az/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/az/firefox-57.0b14.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha512 = "7fe10e5952b1798241f3269d1b98baaff0608d9aa4dd46977c49383732386256aa0c696b59602c65ad386b0132c70cd5188a791474b20a2fc211eb7364437782";
+ sha512 = "8560bb32c0c3aec695d86d1c0ab6491ba0c2dfd0a936e7cddfb8d3cd35890db31ea233afc74d19974fa693614bfe7728e69b8d1ee47a34331b07674b0b57f118";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/be/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/be/firefox-57.0b14.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha512 = "4fed1eab9d2c1c1290ab6b0117324ce5cf2913a9d7d39082b11aafea6bd69a8a9178ae1474bc971e64fe63a26aedb6f7af5944ce9f5ec311d6e395997a766ab0";
+ sha512 = "026e1ecbddc4972cbf1a2a930fa1488b4e649ca7c811ad243a3c068f8cd6b57e5a73d193a3feb4cb49f012dfe3b5af9002f30609cd1551abc1ccc5e89476440f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/bg/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/bg/firefox-57.0b14.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha512 = "0e9b1e31ff2c0684275a9839f67b3b04ff28f4dbee09e07b5ad8b0b29eb63c5c8c37ed693a65c932268681276504eb84ec9abf97627a4d3c6e9b431bada37e2f";
+ sha512 = "9d145f71f46e12f071e8e181f6511d20a6ca5f1f1950cb076ca25b929893da7546b950450f7fcb41021c4591238738f9b8797395a86c599a907f0df687cf0282";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/bn-BD/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/bn-BD/firefox-57.0b14.tar.bz2";
locale = "bn-BD";
arch = "linux-i686";
- sha512 = "21281a5729c17002152af5ab2e0dc0344ff66b89ba0f1b566fd2a17e71d7515767d3ab1098c746fa8f87be6603dddda2b7d060720b753a07389db82e7f98df22";
+ sha512 = "846001c844e9ee3d9305eb5be18438af65d5920363f19935a60b503d4a31c0fecf1d7e6fd286cb7ee4b7e26455496b1d27fbf6ccdf2d2a432ec2e2472ebc9c75";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/bn-IN/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/bn-IN/firefox-57.0b14.tar.bz2";
locale = "bn-IN";
arch = "linux-i686";
- sha512 = "5dae77a2ef94e01155a547b2d853bc8c78166a37cecffd367e648e4f04fb87333d716c8f65d521710207f3a46a69a405592a2476b95dbf9bbd799b1ef8837145";
+ sha512 = "712ae023c09681b1ee9f41240d12a1641df5c4fd7eeff15d157c379e5b5779c65b93719b238fb121fdb9e5ce10809b21125a6eae23a77e1806daa0b2b13e4372";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/br/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/br/firefox-57.0b14.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha512 = "73726276e5920205bc9e5d281dac7995133cf2073b69ba4a5996919a68e19c9fd2b6c57f305a4e3f88feeb890f4f006fd2ccd0ae3c5e89e0cc6ff4f3ba657e70";
+ sha512 = "b99c48b8971dfdd0e642cf76cf890706402079122311b1b6af77d658b03acf87feb67918cb83e5435cbf0746e2c2a7c49bf7283969685d0b4bd616d4ec3066b4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/bs/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/bs/firefox-57.0b14.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha512 = "4ce3ce74a8f61de0a2334292ab35ce8189cccf240ae9e3f249f6d736f01803460d2c09504de94f23347886369b1af4d29a3a338ddb2879ef6f2d95b253c40eff";
+ sha512 = "2203e66bcf453f22848df010cade83d6982178c8ccc023e05ff8fa60aa3f7e583f9d8e33a313fb70a696e149773d567be8228084708ca8d01b3cabc431a7576d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ca/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ca/firefox-57.0b14.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha512 = "0b57c6754d47109089aa33edcc12f483bbc81d3027d9f09f3e69c47aa17092477d60447e19c0d1ef991927127307d448772fc5e050e73d4b1c75fc91043c18fc";
+ sha512 = "75ce6cb2bd7c1d79b4260dfc19237a1344fbefdff9775a7e557f9a31dd9fc6235f58ca8bb8430b80bf0f25c14be5dc2509e86b41b7ff7814e2fc1baa63f187a9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/cak/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/cak/firefox-57.0b14.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha512 = "5315a9c31ef931c69875415245628cb9b11bfdf6a0900be21ae58a67301e4380b479e4426400081ba9e2735418f0eb2c6d071e830c1ff37b3e5ac2a354b0c46d";
+ sha512 = "b4f0a11030bad0cd177db357bc49b6f745cd429d3a8dd9bb09e99db1dffd32ce8c21a94c0b98b6db703fdbe16750b4574b3378dfd40a358bc0c7957fd2cbbe2a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/cs/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/cs/firefox-57.0b14.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha512 = "82e827a0a23b80783bc0bedd7cd2522a5fabb9cbcd63e6d644b4859a34a7ec8f1b6a80df02a389e6ac92c6116f74d642599726cece33c77612dd37de4a106ed9";
+ sha512 = "5ee1dbd826801dc5b029c8eadcfe8d040f000527a6ff7f2a40713a137c59a144456adbb35cb202d7883d831486a0ad56079d07f681ce294a5e97825b7effd69c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/cy/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/cy/firefox-57.0b14.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha512 = "cd5b9e70099f7529561553a12c307f4541de147b7bb7cb45a62c65f8f2eef98b4488458eb3316c6d5102a3f29dc9f9604f7aa9619a179bcc40e28050eb51d0cc";
+ sha512 = "7116bf1dbec5603d22546b1927a6038812c2abe1e9e7e1ae556919e62f04af422950efd808e28eb7f8b349a9d79bf01b9280d6a6aab94bda8c0f6e2a8968b841";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/da/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/da/firefox-57.0b14.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha512 = "af9a2f686bc68f54b4fab2030933c49ae8218e1de6e538d6e46f9144e338a3b4684b195ba743cd900bb5a8890e72824491d36a94c0e07ce4cd465b40d931e05c";
+ sha512 = "538ddf539a6d9dd22bc2dbf9f712773c1d7896ce2a49632d4acc2e5716dda95dc9d10393bacdf2fb7d24342c8a93c39eee139f32edfb429b0bbf7053b7bb3240";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/de/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/de/firefox-57.0b14.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha512 = "5c2c13831b8ee7591cae89ad7fa8bae9f34d20d4b473e4ad755a2396a382115f1665ef5bcc0c58faaf01a112dde04a3df391dc77901d0858d90533ac557cd957";
+ sha512 = "ff33af1ffb0549951baa32e423eac3828b15bbce18ee03cfcdffb57504fb0e592db2721f7008e84562e5c1ad297311a1b3d4fd5ab41e3d8346a2d1ca50e54c35";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/dsb/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/dsb/firefox-57.0b14.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha512 = "75d765e2869ff7ee0487471a5b1c15af22afa9bc8027f13f67de4265277ebc079ff769cae3a051300fc5c682a3d799fe64870e87161dd8e063c9b89cbf6477d2";
+ sha512 = "6dce022b035bf9c5d76c45492e29617668e0000f5f3981e3f132ca1595bb54b504cffa92d220e118fbefe8088f3749f4d077c591a12657ce9266b88aab8019c1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/el/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/el/firefox-57.0b14.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha512 = "c430ce65539e96de0646307b9618a64f3d0441637798ecc4d0a59f77efee9cc6d269647d22f77e0f50ed01f3bf6f3786d78a4ef95cdb5e92d7765fb142d13d16";
+ sha512 = "b917927c48189bd26289fabe3a51f59965c8a421aa941732a50aa9aa3769ce085ee69bb04202c21699f5ebd6ec2cff75ea2446246d89916127be9418bb00f47b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/en-GB/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/en-GB/firefox-57.0b14.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha512 = "f371086cc83b0274133244566720d66120fe086410e768f91bf737870316a9398dc5ebae67b4d5da5dd5df72940d77e93655e94f051cc8b813cc2a40aa7de547";
+ sha512 = "17257657f8366c5efab1a0c47aeb6129e624c883222a6bc3bbb097bb49b531894cdbfd39898d0d83981a1609fd3ea5dd101419819a1f156668fd3cdb3758b8d9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/en-US/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/en-US/firefox-57.0b14.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha512 = "59884b1998bcf9a2a9ec0722852b8b29f20d67a32516f00dc28f46ad2c00047e799d8a0a8de3ea5ce28e6e536feaf49ac28c38b5b68e7f304481315ccba71a7a";
+ sha512 = "c86cce7893fbaaf4d3b00b961b07a2f2d680ec07451b735449a501b2d9fcfb2fcbc0cb29150866805ad38f6a4aa1b6c4cd87f5872b8c735791953f3646600703";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/en-ZA/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/en-ZA/firefox-57.0b14.tar.bz2";
locale = "en-ZA";
arch = "linux-i686";
- sha512 = "5119056668a3e539309192dc61ad2bc30d5677c297da4a18d423576bda292218e53b149da825225a016f990fbe5e2538257343dd1fb87a216ea1fa7a37586544";
+ sha512 = "0b278c62b2185a4a6cafb7015062693a0dad610ada1123d07e162456e4d942f02a0566ce525e68b639fd152c420b925ee3e934fd3c42ba25524b18cdeeb9af5b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/eo/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/eo/firefox-57.0b14.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha512 = "2eaf2e224cf43d5a5920c690c83e4cdddd8f1c2d2813aff1057d99db77a7a68ac818ae311400efd6cea91ac89151c3b532563a9238b26d022be7c260d6fde28f";
+ sha512 = "a681db144a631e6584340febc3de05803921b757f7c1d39ad5b8ff3d119ed8b71a4d70a43ac1e3a121e04102770d2796103aa127886753b2bbea723e22df7000";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/es-AR/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/es-AR/firefox-57.0b14.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha512 = "d74ef9bd620f4d62b79c0cb4c1033b3cc2278375c61f699c3251bbcc0390c657860adfb2c438f5b3eb9ab69413e2767269bdc96000a052b0ed73c0f572ad82a2";
+ sha512 = "40f5a7d9ba055f7eef155601f8a57e566c0829f32c92df48ea2ecebf6e10dd80885881a98d18a693643e2c00f8734218a7ef8908652eba1c4d4288f95a34cde3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/es-CL/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/es-CL/firefox-57.0b14.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha512 = "dab3dfceb1ad8073cbcc02fad1eedd530db1b9092374929c6e5eca55923f30d36f848862fc60aef3b71deebdf5bdf3f7a222951a3b3daffd32a9a60dd6ce5176";
+ sha512 = "be1e5b8c6e184519d0b10fe67736d7635b6fe8ad71ab78014e53ce9a1f1342a83aa1b18f535ecde2406e8be7a8633ea58af9adb355ad2b19ce0879c62f70bd40";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/es-ES/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/es-ES/firefox-57.0b14.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha512 = "c099fd1756b0e11e05656e08e50c78263f3d75c640322144bee5ced382987461c33327ced61d57cef7119c4b133246b075f443edc0b17ed0fa1e94ac37cfbc70";
+ sha512 = "be0d2b2cb5f82fbaf10be63aa76a5ff9b9111b4caf0ef5222b3ad7d67d39f25dafc125352c00bd91bb1eef50a6f57e996f6a10618d50c5d1340604883bffecd0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/es-MX/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/es-MX/firefox-57.0b14.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha512 = "2c1f85ddfe21f9fd9cff763fa1760fe74e501cbc01fab33d2f06b089550be8f6c9fbd3d3ced7f57efd33073adc9632c1a0bfebbe45acc8edebc69bf3b36a3a80";
+ sha512 = "439f679ddd8169d51e1c1f9ad32185fc9b33df0a1301af7bdf8982dbfc5410cf82edb4dfce3dedc214ab258d714da91661882e45b8220895aafcca171fa9bb02";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/et/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/et/firefox-57.0b14.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha512 = "fb1e3c9beb39c79c073181f96e84fe7c840146c8e28480618b8d44d1ca7a4930f34e44b415ae02273661a8f4f3918a39760ebb00962a938c9c3f9a7c1179bb5c";
+ sha512 = "2b80629eba503ca034fc4e9d873707aaa7668b2d4563792e3500acf89b35153fbd7f6406d12497b1ff1423e7ddc3bb4e0f3f63cc759758e544145f31aaea5a03";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/eu/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/eu/firefox-57.0b14.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha512 = "f896c5066102e5d5ac16d580e3b70b703c015aea4ced26019824b181cecbd75c8c01d777d36eab6a9cdfd926f722e9351d02b3da8e42e9abe031529b439b1f84";
+ sha512 = "03047624365bb4fc5bae68a5bec91a396da7d404731cbe09d89baf3079be0c4a9a2c7ff73d231f39e98689d5c4dc7290d2401fe14cb564ea53d063f79d7c151c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/fa/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/fa/firefox-57.0b14.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha512 = "a2d88f92dfbe449504b0d68450f56acb6dcb1051d51f54851eb30968bc762e3208ee7a3005f5ed4371c8a81bb3b21fe41bf88a9d9b1736e3d5d34caeda8422fb";
+ sha512 = "8758735d6bce447b8492f9a395da6f58c63537fcc946b17b8173554b6eaf32a41137011bbd44842b16e8053d55642feb880e9cd52dbe75fbd55dc592724a98a0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ff/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ff/firefox-57.0b14.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha512 = "ad7fbe231d45c96ec00d5a3c2ae5d6e47d0ba13745f0415539bd2eef40442364cb8417ff1b86e6400179ef571ee90e10348dded1197d0fdef64bb5f83f143d04";
+ sha512 = "5d6a1b45f69135dce282fc411237db713538830b00f6361f86a95da199d56f2bb351de9e59fb1d61a4b617c79e8a80adce3c3e57ba837187d4c368b79e414dad";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/fi/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/fi/firefox-57.0b14.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha512 = "613c7e26c71e758bde31c294c8a063ab72bc1a9795b4a0206c0629c1d70a0153b03e0a0337f21c91df1f11f9c9228c997300a26978c4af6473c52c45d4eb1740";
+ sha512 = "f35de96ff1b8542206fb8e9942333397050a6e88bd0e6bca3c1e56fc4dc754dfac0b554b74188d316e6c820881ded2812efd9221b2c3d6497826ff29b89382ec";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/fr/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/fr/firefox-57.0b14.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha512 = "fd065d962171f8438738385cc160396f7ca48e3ac89494bb772d9a778826803ac8d08893b9b1327018121020c190a7cd42e01a540a896019b5f9522a4727515a";
+ sha512 = "118d6ae69eb686ed1d791463bb2ba025749068017de94a9d002d22b195ccb9e0cf0d042e613ca88c310e685070612a070308971e12eeb318b26b2335b13a6a33";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/fy-NL/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/fy-NL/firefox-57.0b14.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha512 = "0742a8ad845fd5269fca4f75716355de149a78768cd20fc2cc44ab3ecb8704a7e9fe75a376ce5b2419946f03b31d1fa702b7d4792f95a728bbec5a9ebb481205";
+ sha512 = "79a22424fddf0add63c3a3528a63ea4c0c9d39f3bf9e35e18fc9ad4a57be7e7f675087f1a491698868d5ce57cdd149aabddc224b7b3078ad3a81e6ee6dc35b2b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ga-IE/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ga-IE/firefox-57.0b14.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha512 = "9c6ad31ac03fcccab8fb7499c3d9243bebb8307ef3881c45eeccdede5180d3ed7b3ce49d12b403286836aa523020e2c400f10f8b6cc392906a41829e15aac4c0";
+ sha512 = "04b87f564be35d19135973a0e17c2db1670aa804ad8c76b40c8f3ccd670e0c64456d84cfec276dfc55dfa29db5fc0bc70826752bba756cdb597c7fc12da1d30e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/gd/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/gd/firefox-57.0b14.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha512 = "524e7f7ad6b055f1deb9e6d38632bdb7de2f77fbc67ddf1eb83ca419fcaf056d5a9c697146a252e999f2d4f1595ece70e293dfcb18e9bd6fd6a1d0b1f886deb3";
+ sha512 = "f2a66ee64ef80dfaf2c16af952be22ba9c11b3a2859b6a861e04ccc2e7863ed5bb1421338c1ce30ad9ca4506d6223190ab5feb194ee445e9fb09a11aa99a465f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/gl/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/gl/firefox-57.0b14.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha512 = "d8d25e18080b72497ea69962afa364f0cfbd8671ed5ef1e52b2fa2cd8f6dd23d71182544651e9a1508b1d50da8f6beac361b9426ea5be1a819bfc858b3d7cb73";
+ sha512 = "f59b462819ee53e8727863b3e4cc240b83ec5828860e3a0428b012eb4047ac837760157a7db60bd85486cfb9945185a2b8f637581e489d90bf140bef873dd9f4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/gn/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/gn/firefox-57.0b14.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha512 = "4664536b70c34c35b43ab278874d13c0011890b071d1e3582959315b6edb54b3018135b1fa94ac482860cf6cb15ead63420c1896574348b78265c48f2a016ca6";
+ sha512 = "17499a923e6f7d0e63e4ff0ebee17f02c99f614da02d0ff8a737a37ecdcf69ba1798139c1b824d187b67b443e54701b1046b59fc6bac3757f86fd6303a778c57";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/gu-IN/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/gu-IN/firefox-57.0b14.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha512 = "c6b5374c4bb866314acfd01f1e95713ca50d51fb77a9251e6b228695fb45ae5492d11798369f27bbe1b254b77ce46b67528f1eec72b4b91a68819030f6500c01";
+ sha512 = "605ef03bab50ab1438be938bd8aadd917c742a5ac0bebd14dc8388a6e5cd844b52e0ef23670537dc50c2f3b4ca20814a9e559e667f3baaf292ce3fa16ded26a4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/he/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/he/firefox-57.0b14.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha512 = "b3a652dbf92a1e2b252d40b6c419c508842c779c3d5fa8458402a129eb773762048abe64cd04f41658b566b3a0add948c998ec6ec1ee32fc96f8152785a7b21d";
+ sha512 = "51bb0b64426ed0d46bb2265b18138dd0d5fdc58c2782d3bff4dd8ae13bbfb354648b346e07bfe2795a4fc31cff2df54d94ceb42ba0342a59218eb5444e9fc12f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/hi-IN/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/hi-IN/firefox-57.0b14.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha512 = "7e857cbeaf419a3e1685b778c38f5d8f2b437eda2ac0c67576ed50cabf3abc13d8c95045649a3a68cadf053a7af9b64b8bdf84e614f2e52f35fd50b69b234eff";
+ sha512 = "74c921e0bcefd0c81616b8685ac3a0fc85129a950a917ec37c724fbd92df8099e79726639cf18235379ebd345f78de754e4b4e87d859e696aec6e780c607839d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/hr/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/hr/firefox-57.0b14.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha512 = "f71b627e820eb44f7b6a61f6d2a0637712a2a516eecde38c2bd13c37f92b34add41b4b274a616697e96340e44144adb0d9812dabd19aea563f90409d605d6ca6";
+ sha512 = "8c4b634cbacfe34a2031c1edf196201fbbf13f7bf22be2910f27788e56b0647598d805953b888869644f4ec3547a0813377d517676e732770684b057e5f76028";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/hsb/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/hsb/firefox-57.0b14.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha512 = "e5f9eaa358e3f87d78daa8eceea39dcff1ba6854252f3327791ce51ed6a51030cc3fd493a11647142edfb94bdfdaef82893d89f7796c0e3bebb674876fcde554";
+ sha512 = "59ed77d9722413d8d75c8474de28660fe59d8990deb3c1743fca4fb1c18529173e0e7bb171cdd98df961792ca6368b91db26d6ebeb461543473ee5ce8eb7da82";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/hu/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/hu/firefox-57.0b14.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha512 = "9d74b920a7ebab561d2a812c33b3abfe73d4e2343f4f6fc903b65b8d2f6dbc7b63fdca3a567966e9ad4dd2bbf9ab50e88d71b95eb5a667aea5bf913ddf635ad6";
+ sha512 = "de8d917b533941220763d011fc9b38f0c0f8f32f09d999fdbe985017a002c3375b592865420e58fdc4a3d56f73206ddbbac568fb506ccd2e3cf4d2507e8ed315";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/hy-AM/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/hy-AM/firefox-57.0b14.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha512 = "0315f4276f80aa0cb4a3e90dd452d1b65a270e830da91f9464f336f9fb9cad35eb446855ee63bfdc08219065580609a29870d1bfca873a88db0f0dc1ea39e362";
+ sha512 = "ea76bd2eff30277dd06d606b0568dedb0f01c6330118da99fd6952f9bd5c8060a621687c66853b46554560b56f1ad2401e87e66bd44d1a85831805caf7ccebe2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/id/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/id/firefox-57.0b14.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha512 = "a447dafebf5892dcc5e316fa1fb325a926bd6d5b3f8d808dfb1136f5fe83eed57bb065844288d7634d8a61f260f87974b67ecc2efb42f5ac8c6cccec5a198908";
+ sha512 = "024ba211754ca36470ff316d626f46cfc2763b94dbfe027fec9dd628a0c617fbc9050ce7af336d22c962bcbb9190f1980b1381c5d3509485b4f7bb5780c6d15b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/is/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/is/firefox-57.0b14.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha512 = "84e35402b9f5e7cab69276f2780f89c20361fa463afccf985866861d41775bf5e4efd81c8b7d5233d3851910f0c36420ad78e735995d49acbe48201e3162f99f";
+ sha512 = "d53d4d7545bca63ce99dc691481b890846c33f5efb802734514ba493e1b31e3b4ee9632a4389dc388c77692ceefa9eab4e9f85de1298d0337a6756ceb27d55a7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/it/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/it/firefox-57.0b14.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha512 = "53e5969577b9fe93e64f7c4e45825290ccfd4ee7f7a18b53229f8040cb15c45ad558f274a072e92ddbec03af8e405216386e07414886193241e1efbc07b9dc72";
+ sha512 = "960bdeabd29fd9bfe72f9e2b5dcefc1c9577490636e9cacee964b8646ee29ce2cc4c9cb87a93f057e2a6371cb734920928bbab90e6c6738a19098e9e5a4dab75";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ja/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ja/firefox-57.0b14.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha512 = "e0b26b41bc58dcb4f2bfa29fc806fedc3547d4e8b6e97c79750d77c3c822ed8f410bd0f1e99c3d261cd7f187468828c0d1eb86b67d7c67a4ed164647c323dd39";
+ sha512 = "f9d889ff8a25259bcc28b1178ca511ad7cb0ad9d0882c8b3f6a04e98d5f4b63ad9b190cc66c184f93fc96e0f869bdb10cdabaeb7b9807d49c3f72b7c62efe3c0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ka/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ka/firefox-57.0b14.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha512 = "d14fef9f3efa294df9919d25a43233d979ccede7107d502354b2ab62949d6df3325b8b920684d0994a3894f88730f3edc5450d90bca9056fefc58739b60afe48";
+ sha512 = "1ece76f8237065e712b9835d0ea15f2b7318f420f8e4d6f73496bd1dd9cc5fbbb4125a04b4b4cc5c36bedaac39fb844a101653efbb5d0555bd13c3a4ea3e9d28";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/kab/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/kab/firefox-57.0b14.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha512 = "24212c3f06b204a348a6f864c9354d93317098093e84f57d6c8017618f2ceb15098136bc0afb70d315254cdce37ed73f7ede1db18ae1d909ce85deead4fae61a";
+ sha512 = "67d22ff37a79716869d7b59e95806c4a9b89bb2e256e0f1549fe5d3bc9fb3909f7d1c23111e8bb84a9cdfb4e029414908a79a8512c49847fb1d4b20263ccb43c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/kk/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/kk/firefox-57.0b14.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha512 = "2cb4bfeb2f2d3f0462e776ea82882f3431fc1877f89500aa70933f9a352b2a2fc77a9f2453954459fc6c9a22103476262bf5239e8bd4252ca7bd29a33536390c";
+ sha512 = "b9cc2b1c31ea4bfbf17c2c7b0452bebb830cd3b8cedfcf2739360dba562119e0eede3b660a403420f367287e94e0bb34f072ea13b1cd1b58681302267f299464";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/km/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/km/firefox-57.0b14.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha512 = "745a5cf7ed4435ebfc1f2bb2dbee3ea76820c1758835c032579ec7e4afdfc9e43e28836a65bb667ffaa9bf1168244ebdc1ea14c14265e2ffb8d1fb7d4321aaa0";
+ sha512 = "afb6985ad592ad2d634c3f84b1d573bb87c59bad892f066ddc1bafb5cce7109c59403f3c1394b2f65da0fcd29ec897a3144ce1ed410f623354410c27e386ce06";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/kn/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/kn/firefox-57.0b14.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha512 = "95be01ed5085dc900679c23eda769fe0d83f09fa1269dd006cf2f2a4585b3d4e4175472db9e54d9dde45bdabe517149346a15c3eb42a47a935b2ceea7dd31f82";
+ sha512 = "cc85e9d276e4833fc962554e44a54ba8f5d56c387c37ea78f2f8deb1b845eae8ecaba1761726e209275d24c4192bd61e409c9d87320c1315665c095fb5231a9f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ko/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ko/firefox-57.0b14.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha512 = "339f3d3353a7d2f739f3796b53f42f8b1aec930a0bc63a2593f3019b5ff246de2ac99753638924138cb9febd5e0359b77108261337166e3018d974a3f88f2714";
+ sha512 = "3934a012853c70b77fb02689141efcba7679e87d115d80d1c7f5945027f082986e679f146a6acbc97ff5b5be6b0d057e3b3f8dc292c4e66a37d5c3972fe865c9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/lij/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/lij/firefox-57.0b14.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha512 = "80de8bbe41e6d5a7076f3300cd90820d75068c0bf08cd8e7d79a63f2118fc3c5f5ddc4316afb884d767dcf95ba4b710e40e78d5b35880779ecb286350c9e834a";
+ sha512 = "571334620261a36127ae1e7a03c6142ed22fe49a95e28534030882c47a7325ba8200b8350904fa0e501cbe0801c2bb1968b456e9982bef165d3db0e82ad34b89";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/lt/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/lt/firefox-57.0b14.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha512 = "8bdd86ddd12f39820a639dbeb248c419efb0a7aa11223ee25b98edaa0c1aa514edb29c498932a9d2b5a368811b902e1a875c74704661f4785a38c4ec867bcfc8";
+ sha512 = "3a7a0f09b52991a4d8cc6009c2fb91f3f908989d8178b4b9909bfd90f29db6ba11f29ffb35f3f1e578f96d6be10eb0fb337d28188dc792e6d024e42a5a16af8a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/lv/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/lv/firefox-57.0b14.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha512 = "51692ee445ab31d6443a823017405305af68594242c6a24be59db1ada2f9dfeb479fe595fc0590178b23daef59ce6dd84be3dd1779b4dd9f516a8f59be9d7c7b";
+ sha512 = "7e5153caca960317e039f8ad44f6eee4ac8f582ff2b957f70c9eb3d6967d62fb94e4b13611006d746bcb4611ec1b0a003bbf610d412f9e41f86a8ea19096b70c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/mai/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/mai/firefox-57.0b14.tar.bz2";
locale = "mai";
arch = "linux-i686";
- sha512 = "8459e52c6961e5f42f4547e6ea33707584a10a85fcf5b3b83eea4b4f06b2169c7dc39659ea41f3a4f1e554da5af2f9063503d9333d0d5553a521499b1efa24fe";
+ sha512 = "07cbb84ad4537482ae8b1ddb00a86197552d3a80f6432779952bc9b1577c920de07e60f78272b1ee3889b031fff1c5a34e1c1a69d3fa0621fc53413242f80242";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/mk/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/mk/firefox-57.0b14.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha512 = "666e675faf3747877eeb8e188a68a1c9979a5823a7bcc63c56e53697084d4673363e057c3c73c51dc281c107161867d20adf615bcdda14f2c1dc6f3876630d6a";
+ sha512 = "230ba5c56d60d1ec08092e9f6ae396fa836df56dff1aaed933a706014318fb13328db5d6b0bc3dcc030daab5f906d7760bb3a6af3c03422f724d627ab8b9d48d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ml/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ml/firefox-57.0b14.tar.bz2";
locale = "ml";
arch = "linux-i686";
- sha512 = "db10acd345e98dae88e059df5ab0db7cddbf4243d0fa1fe43d4c1581286d1a625fe0d8808d6b23d6740116cbd99c487562b667e32c42c6749750090b3b0a287c";
+ sha512 = "e4aff215ab6b3bbdbe08f7cc698f11b12bfdab232ddcf995681ef62dd9808789541e8ac7b9b71c003775b78451c06f79ebc45d5a85562385a2e449679db346f4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/mr/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/mr/firefox-57.0b14.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha512 = "1715b23b260872a8aeabda5476fe6ba6499485566525542968f2cd144e10983b38b7713614a846d06dbfea18f49f08ee7b5eeeb90baf908b5886a09f7d874f46";
+ sha512 = "b2b44d4a205e39d82b453a35569da1a3f428610551d322a1c57e64da42d96ca2f199e8e01769a24628506cbf3b621cd734923f9760305de8e480d51f360f79e0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ms/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ms/firefox-57.0b14.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha512 = "548616f8d58c140ce0d0d8c181219c8a62702c1d4a11addc54edceec81cb3e98e6743a5999c03f5076466e9bb0fd00345306ab7e91686c4b1815ac6c99755228";
+ sha512 = "3646303c3858e4c2a7dbb555495f5f06b1867a04a37cb8ce95bdfd998e7bc96d8afb8c83b1df7d945bdc8327cc8d7be3f3bd7199efbe23e58cc3e38608ff8313";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/my/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/my/firefox-57.0b14.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha512 = "e13dc5258eb2f751ae79b3aef7892aa9ed3c56eb44fc7e32aea240b2d73dfe5cc6b2ab07ab49548023a099f378c98b8245800edbe73d320b45d1607350145990";
+ sha512 = "afbcd9f8dce81267614855d4d59da02f87d369c2c0af78e28ebf25de18ea4eaa1412999fcf3d414ebd030f9448d71e48500a4e90aae03b3905ba69f2670b17d6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/nb-NO/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/nb-NO/firefox-57.0b14.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha512 = "75e02e3aac37c840bd6725207ba53beb7cae3bb7a34bcc4c4114b412774114315d17a98457970b3f8ded7911610811bd12b9614826755f99bf6cb3e9018f2909";
+ sha512 = "747dbaa1919c1cec14d4e085f8c8f284fc49508ce82cdf9a97538a85aeb9b901eb9e160e03346a769ef760bdb2108b33a25a967a527dfd3758f25cf11bad2e31";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/nl/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/nl/firefox-57.0b14.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha512 = "480de8826af835dda939f63fc007b01e88ea1cc2145e80e27ac9abb36bf85d5f0f7441a28623fc6b648b28c81ae02133df654a874942a497682c14a03280c4d2";
+ sha512 = "d882e7c1a49ba670535f17fc9ea99e7be4505d6dbd5d90855e4614cef319c38718da445afc411f1951ec3fc5d9a3b8799c64459a7adb588a29a126d1cd16d8fa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/nn-NO/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/nn-NO/firefox-57.0b14.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha512 = "be5c63efa39bc574cd5f41bde6b35d3ccffa43069c61b11c75e0f9039c90e47b56bf41f20b041463cc1638639c581c1682605b24fc1621ef6380396e64d57f71";
+ sha512 = "8bc137f953b13a447dfd419b9ee0e4005134437892f214e49e18f98e080d5413d1dc655bf0bf417cd7c8a09811d3e7850967662b9d0be0d3b72cbc92db7e2307";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/or/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/or/firefox-57.0b14.tar.bz2";
locale = "or";
arch = "linux-i686";
- sha512 = "a448cf44d66e795cf2549b21728ceedca364091224720c1e72524ad55660721fe48b6ab5a3b3824a4de962bcf093a467f2dca34921bf7107495b9592bd87886e";
+ sha512 = "34bbba4bf288f62654f88afc461155a27cc0316a920d7b8e42198054d5800360401c933624140cd569bb9864f9eeaa5616fe2530888e4717c964506ce66cce0d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/pa-IN/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/pa-IN/firefox-57.0b14.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha512 = "f3b3f12a19ad1ab45709f1294f21bca08b9d39bc3b1a4bb3d7bca304443de3c5718c4b714a95c3d858dc87b1bbddbe34d7479bbb2890cb5f5dfe5adcc639479d";
+ sha512 = "1403e23fb95cf8449a149ecd698e768897a3733718dc1f6eb4590685263e2a1b54aaa3e557a968cfe71c5172bbdf7d24f3eb9fcdbeb431e31a1a26c0b9738e9e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/pl/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/pl/firefox-57.0b14.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha512 = "03be7e535ce2e13d87c19e95711bea4d76e26517b8e877c4dd5885c7917c0079e8642126ad19365325c224e10a419586f109de5b71767777c0488c0213447c09";
+ sha512 = "a2d99c00bdb839e4ce89d1bd6a0334bee4b6c6d426c3054257824c46abb1eb3c1f283aa0a4a030f1865fea350a7032cfcba86e231d11ce06ec3066f5ac4d47fa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/pt-BR/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/pt-BR/firefox-57.0b14.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha512 = "64be7571a7ec3a89098f309edced9f492cf0c3cd7a1fe0154d7e9cb645548a21f55c1631ae5ef36cb4ef0cc1f9f977ef5beeb8fcaeccae42279c2028339b3825";
+ sha512 = "5768a805aa0b7780b55fecbd9bd349c6cd78efcbb3595acc7cab18d3356835e53e63e58e352c30c79b349e0b0c80be59509fa684be21f541cc67aa320e654f44";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/pt-PT/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/pt-PT/firefox-57.0b14.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha512 = "0a72d994790d9ff05e799fdac7f74e7033bbab686b0c8ea5a997e01ef1e9c93e59ba760eca254bb177358fc09b7663416972428939189a709599685db543661a";
+ sha512 = "ca4dc2c76af2db4d9a44f8ce9f29adf7188a799d00d2e8cb1bac807dc90930b06cc5329097ef771e4f070969cf42c3cfd65b32dfd3112f59efdb0071bc6292e2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/rm/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/rm/firefox-57.0b14.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha512 = "d5e1872e7d05b854c04b67eb920950bd66f62d37c747b656f87cf37506a111df222557d8cb8b7968a4123f6e8e490256f91d13d64a0744991c8f9e1e41329aa3";
+ sha512 = "86af2317c04244c63f8182f46eb95abb1a113223c6d503c6b85c2fa9b596f44959e86323da0ad3a708f6c94aea4180246bb562f26c64a8c9b27d9a490d65a291";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ro/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ro/firefox-57.0b14.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha512 = "80f9394ab1d00cc4b933f9460e7ad1ea6092b5caf4dcd72db53536dc46d3f2fbacd83770a1fb5a29713ae11b7f3c0c0fc2b96734169ce45a5addbf03cdf6b2f1";
+ sha512 = "2120d05bdf2dd8a702726e232fb3f94838befaedeedcb7c651d8d07047759b885904220173bfaaaa6d55b71e52085ce23156ad030992e8ae3981d47b41de046e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ru/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ru/firefox-57.0b14.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha512 = "f116481b96b8bf426f034b6374c8559b7695946fabe898683035be02d20b7ffee6a2feeb3b16a575e107996b017ef8f4e3f23c887ccbd04ad7b8f687e2af760e";
+ sha512 = "221b4170254ed9acd7edb256ae560060f640c7e6c02236e1925e38489e387f839c14b5cdfa2a0e4a0173e8b98a2ab57b7733a6fa361172166097fc84b260bba3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/si/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/si/firefox-57.0b14.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha512 = "af93d52c290d07a60120cc0422e44099fdaf0e3c1fd7babc1f4779f77cd8c8848985fd1c7bb558d8eb1252cb4f96d1b65f5ba9e739e91e6008b5f8f2b581f324";
+ sha512 = "ea216290852677ae93bdbfee42b65473f9e00797175b7e36f4766a251fb302fd69009888f36efca7d04ef29fb0d66e75bbfddbf25f7f59dbe1d6767ffeb0c543";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/sk/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/sk/firefox-57.0b14.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha512 = "88680ad43f541a8ad9780188b92883aaeb805f47b11346f40d236b8a4ff3ca7e719270c01ae9765e336788d93c54ca8f2a80df3e0316022169702db75fbf5ecf";
+ sha512 = "92071604add2392aa144caf61ad747d98be52c3fbb82c86f903772d470928f71748d8def2f367a8b6bfe04ac6769fc57f8de29210ae50bc45b75b94f5005b564";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/sl/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/sl/firefox-57.0b14.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha512 = "45692963e9c6c9122832ca105a19e4a9d6a4ae0c0fa66c5573e0b02ca74e2b72bfc229619a3ea3899ff591f70775949e53fc36a5a6ffad699f3824d8b5723b75";
+ sha512 = "94341abe0210c9632ebabc47325c55577e9e6a5f54b4cfb0ba9d19298dea1b3d6f70a68c3f82f6a4c371f8ddd6e088b18ea56282faeda0c824040e6c4cee0db1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/son/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/son/firefox-57.0b14.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha512 = "e1a43d8d56105fc7ae69b23f3cc596363d7e0e22b18614cb512a32ecf3f9369be240cbd2d5775537363e40e3de0f0494054331554f093c40dc85d0f1aacde366";
+ sha512 = "537a57fb00d61b0566d9fd344919b65486f7c767c93d0aec9595467cf9a081d63c8ee7d3c7c3a3409ddb08d57f36ae078e3defc79826779954641c895079c1da";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/sq/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/sq/firefox-57.0b14.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha512 = "a80d2f2dda50f2977346c51d25eec1f52363282e83eb83dd8d6ac36ce41ae5d8d5f3925db70e2942e38e9cc61b30341c47d1fae7e60c68f8bb1ef28f1978d695";
+ sha512 = "a4ad413f8bf4ea8333b3c182a5c02283886e395e58b6ac5a53a298afba0938ec38648b67af3009a44468ab6fa89b6684d86b4d83525f0dcbb470f078584b6dea";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/sr/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/sr/firefox-57.0b14.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha512 = "e379874f97402001a48954674d84243c8da577533e309fa7f61c832c413519f784fa418d35f00b7af760e55a75f192fd97532ef2b2796130b396782b1c6b9d2c";
+ sha512 = "15990e14d69bc0f043f7bcba54c5c27b7562c8fa68c5c14e7df695382303ee6ad40eb6b22319e8f9110b59f51209e0c8a6357e257862a50d8d515ea7f414ae74";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/sv-SE/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/sv-SE/firefox-57.0b14.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha512 = "272861b15c0476f10482f4ffba5178a7e4cc5a62e52337eb217ab06386d75998bdca7f31f478541cbcf330823b3c187fb5d247cc311c973b41f7cc56f458814d";
+ sha512 = "690e94fc46c94710e488b1a8cd096927756026d0d6ea49f983883092e32f9dc0d2fdbaf6efe4c236cf750873b7907807fcec6826d2ce8b2473d0c4ef5461a1e3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ta/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ta/firefox-57.0b14.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha512 = "bf2d304c978fbbf65aafa5ae01fb7da0cda9d2b133e0a78c21923d9f35c9fdf41d5aba17c863aca79ad021875cdfea934d6ed9db8010f66f6552860ea9cb6bf3";
+ sha512 = "839ac81dd6cde69b05e934a4bfb943fa5c65f86d4c7d64c58eb86e7911f81d93a85abc3ad732ae0baa9c7df76a906826a109ea15cb4ee85e802248b99b9ef1fb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/te/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/te/firefox-57.0b14.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha512 = "a407d5fcaf5b1cb01d7bdbe3175327d9f985af0ff8b5b27ac93345c1a4266f4cb1753f357603220757202539c5dd7c2c7bc197d18e68585a4118384b729317d3";
+ sha512 = "58b1225e50a0d3aef4b1d2da5d494b41e5ee41f53e2878a4945daf308d452348deed4cf87641aa51e9c061393c239109d02523596efb8ef7c675c885d80298aa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/th/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/th/firefox-57.0b14.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha512 = "a3ae0aea5eb5b4df9e12c039cb2876fa1bc39c0c6a1d62971a7cef532ddcf6d76dd3c2314efde74b3226cc75213b2e1cb0f80718408f707ef4c986320dbe3c66";
+ sha512 = "6d0cd2b6cd315ca50445f3f87d1d2d2977bc34246481a58239f06a90253bbb810c0de488d064e80d3d2bcc475d34481c1f59ef0499ff59057b77c0cd67e71c7f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/tr/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/tr/firefox-57.0b14.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha512 = "4dc598410320ef44ad558da2f678791796dbe86c3d4c4891f7c50496984b2afc9f9879488f4f7fc4446ddc237ada5bb9d443b9822ad5dfa9f0c6e46d6afc1ac5";
+ sha512 = "291f0c8f1241120a4fe4c2754ac82f443ef6f0d354f8b71b25b2020948a4de5b7ddbc87bbe2fc08b09ab1ec491a34fbbc69e6d472dc0114e369a99f967bf27c7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/uk/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/uk/firefox-57.0b14.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha512 = "989dceca0a7c5a0b091b1ab80d15c140a3b59f950b520a0e2e87436fe4e32a28e9508ba82335e269e5fd562e31a56d7040097e1fe2365330aa257c5ee227aa4a";
+ sha512 = "a6db7a4daa79d614b2d7c94372aacc50b4068ad437b38aab72cce99aba668fb230d5b81691678e09efb645282118dedf25e0c94e9d9cd9ef6a692c43a288e119";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ur/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ur/firefox-57.0b14.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha512 = "cda7780cf5a9bc6a06c1ae9cd6f9f52911f2ac55aa700f87b3a3021d46dcb31f1ada5550009ed801f7754b7a5a19c3ef25f537e6280014c80672543701658b90";
+ sha512 = "cb69cf2aab416490b866e9b15b3706dfb81b003887456ad83907047424285f46d1a4b727766b78a633b33c6418c3f24dd9b53a90b151a1752709191328c0e227";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/uz/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/uz/firefox-57.0b14.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha512 = "755d03ebdeede91ac2380d53f4cb130a48331f6e8685eca21f717fc3b8768239a96328086733f768349ed231ad9b2716b58c4912fd8044f644d775489c4030d4";
+ sha512 = "bb29f30171804b14aed28e5953bdda7bc94e2e1d23eb9af54c36937f90ff7bfd068abe4c065690aeab2ea61df08a59a5ed808e1f41e7d055b81235f8662d35ac";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/vi/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/vi/firefox-57.0b14.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha512 = "56946ebb5e9746d9cfd9ec14cf72708fa17237915c5fd9d953d7ebf5ded0f3e2778b8777a1ed9da191741baafa47e27cc12eaa2a1de46013104aafce251110cc";
+ sha512 = "b91dade05c291572c257be0a33d685fb48079c4c1dceb95d6b51601430717c5bdd4f962b9047c2f2a22dad38578a041025ad59b424efd1260ddf6f9d9e4d92b8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/xh/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/xh/firefox-57.0b14.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha512 = "081be12a468f7c8dc79336cbf9e08082d0f79c39baa491a10b9a68cde05de78cea67cb247008d99c241e3c66deb5b92bc3518150138103eb1c75f141f6ed03ed";
+ sha512 = "771335861bfdb99f17ae6c8607e784e3901f637d8e4a06385bd2bab4797589377e8c1b875600e9d8434d6ce5a7003ba4ca154dced98228b85c6f70272c0b8616";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/zh-CN/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/zh-CN/firefox-57.0b14.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha512 = "015d744fa850e529d61e4dcd0fc5459fca47e7a4048dd5b3ddab29c2474cef6e76bf5fdb1e91ff1df843e3dd1834373099372bc36270358a77d42d4e39eff8c9";
+ sha512 = "d48c546975b92cc5c130e50b9fb3c84116235aaaed6ae8e04e975d8ed3605540b9ad640bc995fed23e42d271b9b2b598613b14822358c7487852030c5802dca6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/zh-TW/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/zh-TW/firefox-57.0b14.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha512 = "2fe5c828da675b1b1e5b53fe9d292db27ef449eec8f53160fd60893d0bc523a0131209253d9b7c1846e8fcec2145fc760fba29c4e3850f97b2c3cd3a1b13a085";
+ sha512 = "9e731700c738f0db2390478ba293f78a98496c374cd871a0ae483c3911685f0cca1b89531c06177f739fda77ee94fba03f2d93ad4669ce219d215cac8429819a";
}
];
}
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index f59cb402720d..347ceba9ab4a 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -16,6 +16,7 @@
, gstreamer
, gtk2
, gtk3
+, kerberos
, libX11
, libXScrnSaver
, libxcb
@@ -53,9 +54,12 @@ let
inherit (generated) version sources;
- arch = if stdenv.system == "i686-linux"
- then "linux-i686"
- else "linux-x86_64";
+ mozillaPlatforms = {
+ "i686-linux" = "linux-i686";
+ "x86_64-linux" = "linux-x86_64";
+ };
+
+ arch = mozillaPlatforms.${stdenv.system};
isPrefixOf = prefix: string:
builtins.substring 0 (builtins.stringLength prefix) string == prefix;
@@ -100,6 +104,7 @@ stdenv.mkDerivation {
gstreamer
gtk2
gtk3
+ kerberos
libX11
libXScrnSaver
libXcomposite
@@ -168,6 +173,7 @@ stdenv.mkDerivation {
'';
passthru.ffmpegSupport = true;
+ passthru.gssSupport = true;
passthru.updateScript = import ./update.nix {
inherit name channel writeScript xidel coreutils gnused gnugrep gnupg curl;
baseUrl =
@@ -182,7 +188,7 @@ stdenv.mkDerivation {
free = false;
url = http://www.mozilla.org/en-US/foundation/trademarks/policy/;
};
- platforms = platforms.linux;
+ platforms = builtins.attrNames mozillaPlatforms;
maintainers = with maintainers; [ garbas ];
};
}
diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index 2da11eac98d1..2f3e8c40a3e5 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,955 +1,965 @@
{
- version = "56.0b5";
+ version = "58.0b2";
sources = [
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ach/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ach/firefox-58.0b2.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha512 = "42b7889e0358946f0852079433eb84ac49b88eacd5baa1213082fff71a8bb2b060b50b6356c20cb2b59ebeaffc245f04ed086a4fe466886f5865c857f99b9ce4";
+ sha512 = "6ffa1c861a68b6bd7e65b0883c734baa1161c3ff827cff2fabd2e38b5de64bf973034f40958471c12fbaec806978a74b3e2a5a4c2e23caf87dbe747cf75d0a1a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/af/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/af/firefox-58.0b2.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha512 = "c784881efa9b4ebb8e5a892a4d9fed02f85f541461e6fc8065d9a6a8db629636e00eaea7d1cb009005de829387a4c5614465e696ecba66af2516cfbff35f6d82";
+ sha512 = "4bf2e416ff864e6062a76c14d70d60da9c3c3261b2d401e4e0cb1abdec77f0c21878b36b863f3d11316e6114e358af200b762c4f1c7cb7cc84cb12c8c95d240e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/an/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/an/firefox-58.0b2.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha512 = "8440277fcbf3b927ee5bddeb572d55ef2f23997016f8cd5b21e88d969cd863a3ed7076d9cacdec4939e58ec2bc706099a322336c2fd4b796435165d55f206112";
+ sha512 = "d1136b831820dd7f9bcd2d5d20d68ba66bdccc610bc9d26b59937b2ba017fff7fa1be1d616ff5586e136a16d1a2023255eb430d78ab7c97f35bad2b6172056b9";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ar/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ar/firefox-58.0b2.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha512 = "4cc24cf7ae84bdb9520ebd6816a46c6311ea92dc50c2fd8fdbb4eb2384bb45357b9dbef641ffd5be1ff4fcbbd23b2fbe53d68136717fdd3031564309cffbc2ff";
+ sha512 = "ab9dc901df22fe84d01cfbc7b251ffb50eea784c2cff1a38c404b75ac58349f312ca7b602c107ea8b08bab7dee292b99ca33d3651fe43479357b57ef2d36a07f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/as/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/as/firefox-58.0b2.tar.bz2";
locale = "as";
arch = "linux-x86_64";
- sha512 = "2d0d1f5fbff86c7e0f53ed4c721e6b2e1bc8169aa5a2c75f4752347614da669b3d097e68e62b0b53373c408818ea01fc9716a7a0b1932f6ba7273d6f31fb99aa";
+ sha512 = "f7af5fc1e80cbca6227266c5f7945c665499f5be36436e7135721d67efcfb3d2b101e1749c03101ef491c231f96cc746a6bbae25fc5818f1790d61f59e4fdf2c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ast/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ast/firefox-58.0b2.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha512 = "fc7f099bb283540974eff2dfbec5fb212b3a27aa09be8d04ff847d99fa37183435f296cae389fe4161c436d3005935acbdbe00373c54cc5d18b140f26c3d829b";
+ sha512 = "ac9fe13f073358dd71f81583e6d831617be46b65781da099fac48db37a942c31bfad3b72422ef8a14e65c5de28939cdfbb1c580f3db5cdd54819a0da0257e151";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/az/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/az/firefox-58.0b2.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha512 = "557ddac93830536ace4fba1ab634e1eee14fa3c09c3dd95a16c169437f8c255d5eee4ee54791d8fa1f97123b9ebbf91a57cb70cb4fdb61b8805c2252f1640329";
+ sha512 = "05e30463e29723157815f91c02f7d6e323fad0443d59ef9b6abe2110998170894aa95467d5f05f78daa43fdf05f3e72af5c9656134529aadc9cf165b201acbe1";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/be/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/be/firefox-58.0b2.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha512 = "420b8d556a0b6364e48eb04eab3e29a63c63f52942384c0d9ae19532754b51c98bb0b8d19c871c92d8d9127cd289dd0a74c30e7167d86e32d378a7820bcee184";
+ sha512 = "5aeac6d316409651180bb00de74ceb48bf8bffeb027491c1d42830390aa11d64d13e6748a6bd5519c5132d902e0bdb06dab35ae76d6ecf2a8e769503587c7660";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/bg/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/bg/firefox-58.0b2.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha512 = "b63385545d6d006e0febe92a835ad4b809a24bcc9c44d356bdfb2338819e6430d0c73922a45fcbd6fc076362794daf7a68a9662aecab6e610a518ac604757910";
+ sha512 = "6cce86d49c53498611c85505b5996c6db92b5a5aca9319b18ea0e5ab19dee2842cc4ca036ccd9b1bb7131aa539e38037c0363281e170182ad81e59141150f20f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/bn-BD/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/bn-BD/firefox-58.0b2.tar.bz2";
locale = "bn-BD";
arch = "linux-x86_64";
- sha512 = "3d4754940f51a21bc3e881bc454349ed9bd6cec84395566d76d1dccd8c8464cb8e485f35d1e920c7ec0ec93304c16d3d323a94a00f3ffffaf5fdbce46da24da4";
+ sha512 = "b177f5531f887bea5a8b47da45a4ec1477a9adfe48de02ede1aa49761fedaff4ab06603ea004ccfc0991e9598982077dc2f30945e1042ad8098d8cd6eed7fa41";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/bn-IN/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/bn-IN/firefox-58.0b2.tar.bz2";
locale = "bn-IN";
arch = "linux-x86_64";
- sha512 = "fe16eb336eaadca6c73ef1655011ec8acfa3d4166f21909ffba109fd90190810b66ef3519d172b0f963f41776616ab41b25dceb8f9a6b775c8df5f305f6f1555";
+ sha512 = "5475cc9261e666aa11915f70599a281dc5bbba7a88527646fc932b6272b70a936186077254d147c68bec28fee4f79859567256c327043ffa5504feedc76e3eb9";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/br/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/br/firefox-58.0b2.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha512 = "17b0a958074d4db010410fc2278a8a2a4777fa68c8796b28f70d0b65ffc341de283ea6b89410c5228482cb920ca21031784d4e7a3afc01c8ed0b0412bbca8cfa";
+ sha512 = "ace1027ea7d5115ce7654a8b12609c4c78da5a6dbf8a08544d467d4a8766f39df557659c9c54fd2ee613c403ac523cf4fa8fe241544112e7c7999c572f45d656";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/bs/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/bs/firefox-58.0b2.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha512 = "536f92ea3b7b390414bbc9178d855fb3783d5659ff165d6846b5233dc9e46fd46323783342f939b8daa2489be4df7f3f33859f629437693dcfd3fdd982192905";
+ sha512 = "d8256bcaca634f53c60fa8fc4189c68fc14dc1aa7941beeb28692f76e4ed62465290fb0234236a684ac489634f71577dfd5d5e613d710f1e191cb3021b2971a0";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ca/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ca/firefox-58.0b2.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha512 = "f7b36fcba699aef0438192bbcc13cb6426b69036f1256c07422e78df45220960dd122f9eaf62984041c142f2fc16f858561d9efaa509852696d0c869f097df8c";
+ sha512 = "0fee3a02c437015679460682325c7fadb211bd5d4a3f5f1ee04c978eefb0694ccae7b840801a9453f8ca0d383079fc0481cc157741281ba09be32a1012ceb2d0";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/cak/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/cak/firefox-58.0b2.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha512 = "6c4abfb4873d08ff30ed48612e536106522dd39921da4e3303d752f468e64552a77a65631474e2e2342d1f6dc4ed94ba74b2c6c0bd15dc559468195c2ff3e95d";
+ sha512 = "ece5f44da4de5370701ca57f6d3bfa68df19568ef07ad515a2937a49b77e63ab9752ac9d31b1da837e914ccf9805528e7727e04765cb77909e33c576358c6912";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/cs/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/cs/firefox-58.0b2.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha512 = "be8c3a83f0d74f7860603ba0665cac831d787eacc427f8bd42ea118409ae9f1866a75ce06a4bf88c732847e9df5cdaef33ccd25d9dcfb5b6795af2bb5f83c971";
+ sha512 = "48fea82e0062a91b89e868c0f3baef3869987b9465314d40f9df109b573c24d826bd87a474e81d43b5aa9dd02cc1968f438c4c93924c06ddc133dcca592ab095";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/cy/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/cy/firefox-58.0b2.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha512 = "a5473c8f20f36d755ec01feaaf62281f199041b1bc938c7477bc4205c488265457fba6d204f7dddcc67f37e1c92ae2bd312a8406a3aea0a34e50ed3dda364a20";
+ sha512 = "15cf8a4ee6016f4dc81cc1a4287ec1b7d26fe8eab613087bb3b95c7feac4adf89fc25777961682e5f85a158a5c1afe3d41d8c5bdc455a0ce0739c59885d0a2ee";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/da/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/da/firefox-58.0b2.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha512 = "0408c697dc971b6eb5225a3038a79c18fad96a75ed87e3f061665d00baf27c05e060835b3b77393bd50247c1a13ffc2314805460bf5d5f881ad0a48ceeb090fc";
+ sha512 = "7e66d426d4837999faef4f8259c30720a39448b81ccaced2698be4051311cd7b7fec08eb0ebd738af7bef3474ad4059e2e90e9c8d12d829c8cbe7d758296343d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/de/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/de/firefox-58.0b2.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha512 = "1c93a760f4847163841dded76414669bc94aafddcd4b1b366f72db92e10575dbd52612ff5c906449dff510ae108f13cf39e6e836071c1d4b173dd211a98bc874";
+ sha512 = "cda87407ecd86d825dcc15dfea4c1dd2f56d3bcaa6af2cbdbb8b209ea280c60dbb72b68db71f84e94783f7c263ad4dec503603b650411c72b38c1a5a470deefa";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/dsb/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/dsb/firefox-58.0b2.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha512 = "622bd1d9399e6be83c1d03a8a99b31ae1561c45a2bd1a62677c0298408125cb54df7e76df7b26ab741590ac7dfde9e0df0c3b8e202e0267ef775705b73fd4299";
+ sha512 = "db9da2c7397d64d1d5944f6dab29b29325b6773f85af1a4d5e87d06dcc580cc1157b4f7092e7fd9bde250f332d26983b7ac2c7662b240f4e97f2ee1404ad4b1d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/el/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/el/firefox-58.0b2.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha512 = "c716d48bf2ba9eb8e2ba6d15d96a0378478937594376da77699e4239ca7b410d8088b97eb7a2076f05611348b6376c5fd1219166ab81d84022f958b1febae751";
+ sha512 = "51c02952a6a1f94f25dae1de9138a9a39203eec9b02c3f90084e319f8e3e17c436937dc5525709229db22a27de5f79abc1cdd8502631b6ba280770d91151d5d5";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/en-GB/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/en-GB/firefox-58.0b2.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha512 = "b19aa13d69cbbc5d63e4e6f819d6ad888a686a07a6b62b8ee2c745fc8fb4d7340dfbd3fc31b2a7e4f23be1e187a15455e0a5a3a9065b759e574f7c9c756917dc";
+ sha512 = "b5925d08497647afb8f6cb6bfe5ea5fd899e55ed77f3709ae007e2359d1b7c38fd5e7cedc56f12d68e660b5d9f10c56bd65cccb92a645d25cc617f188da88a65";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/en-US/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/en-US/firefox-58.0b2.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha512 = "613dc9d25997f80927b6b7b850fdf9b4287497bff2446a490274faf99a4fabd2b2b6140bce560f8edb5dc1f3da09a9a855547afcbace3ffcf2172befca74a0e6";
+ sha512 = "b40a42713892b760d659c4fe5ca002b8ccb5309319b57d89b5f9af37c84a021ad67601f5c7f5b02a445dec7a00d671a28df6ab701775f59b1a7be7dda93d673e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/en-ZA/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/en-ZA/firefox-58.0b2.tar.bz2";
locale = "en-ZA";
arch = "linux-x86_64";
- sha512 = "c0f5506e770d57bd5f5bbe84c89126e835833c059dd064b2b4af3aa31514d0223cd3b3bbc23fd99828c9dd07bbe63eab89415667ba1b269a2db2c90d165f492c";
+ sha512 = "1765b79663475ff97dacaf441cf127256be5097205f52f3ecd5648b5d15087a9e43fc97e165cec714d452a3c802d798b89650eb3e9b33c00e739a1ca2684dfd2";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/eo/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/eo/firefox-58.0b2.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha512 = "ff63cea657e4e78caf74a0382624accc1f4f4870af36a8b425df305e71a84d605bc2fe2c91636130053092518763fb2ad0eb2e2c73ff443b1c05fe0c31f892c5";
+ sha512 = "e1d30c41b6ba56604539a5b527effd16c7a40f85691fafc04d8e006f2d09c9531f70f5e3305aea8eff8840487acd87657a0aae66a3275d5b64ce84ee151ba3e8";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/es-AR/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/es-AR/firefox-58.0b2.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha512 = "00c89d9dce0deffb2fa536172e040f4f75f170c8427aa3bffd5c1bc526af45b439c28e1973db1a3ce459e5fdee40a0c817b5580b9cfc68f85259cc27feea6b09";
+ sha512 = "6830e829c86a4860a3ae461e16d4d63feeb141cdf65fdeb29c4cdd4e4fbd1887a5425b81eae9a34a28d750fbe27e70f065acd70d0cffa6c9d1cfede023e43f07";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/es-CL/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/es-CL/firefox-58.0b2.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha512 = "6aa8d504e2aaf86dbae7f637921e8e354f63e98f59be261f80256544cc5568c6f8c616fc72948bdc1d30cff62dd36513c838fae9207a8b7eadd7b20e5fa017aa";
+ sha512 = "ea55c8fda45368ab7adc12891c3cc19d27124e8740ccbcda6b2b7edecd3310dfe068344f856d97b5c8cff066427dd21baf2d242397ef249a7590d01989be274b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/es-ES/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/es-ES/firefox-58.0b2.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha512 = "ac3494d7704c2962cd4c00d5fce1fa9581f0565dd5f6dd90eec1638237956f8204dc68b590ce75e5ce6961d786a7e722d5ad0dccf036bfd51ffac530a8f56519";
+ sha512 = "ba2776ad1a474183d828fc73c4a3e3f8036159c8ba08ea8b6bcfe562aac0808adc015c94f4375dab850fa61df6ce94d6bb684e028db07385486ecc2964f9834e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/es-MX/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/es-MX/firefox-58.0b2.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha512 = "6fdbb08c25feec44b38e6b4beafde422fc04bfc1c54e049a1b863c8fa4954a2b1ebfa5a4d26c507e83b446d2b836d922f4c6cbb71f77cf616c7088470e73bcc8";
+ sha512 = "14b755e01ce982a3aacab5cc70c086c877f16df8b46e46aca46faf0950eeab61e2cbc90de0f9dc452c6f27f8e4367e4fd70209491721c04a88af9fe8edf92b10";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/et/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/et/firefox-58.0b2.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha512 = "317b05efdf3e14b907d7240d8102a2a826d2906a52bf83ecbef8f184d813af7b764521b2c884e70e29f50c23074b41d4887dfbab9b6fcbdb54c022cf2d16ccff";
+ sha512 = "d211c2958e9927c2852801331ced3986a5a9f75b9fe3d734a5b380e807a6f91e3c328c48817e21b43ca2b6fc48986f80f5d5f3cf4c0bd03257c046b5a930c985";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/eu/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/eu/firefox-58.0b2.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha512 = "7a81f3320c8adb613f80074a95cc877589eeb8b5ea47408fe526641059ac3c70c8b6a381db2f8b1c575acd2aaa857499277ee6a0b0e294038c4d29800bbd469b";
+ sha512 = "d9f53b988a86a48df41a691742975096343a3b4905e5ae78ec9bfe5580ff71cc56457fbfad2fa8512d3a3124989532f21caddfb920d886c6891b2a1d82e26b6f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/fa/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/fa/firefox-58.0b2.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha512 = "86a5c82dab2766fa00991409fe28f81ec0d2ed0ac67b9854c5a78e55677e58b223edc13a4e122397eecc34b46bd5dac80d3e61d3f35eaf1a49ca544193de3a52";
+ sha512 = "43ad5afa9cca9944203c33ef053bc86cc36e50497992ecbb7959edce25d54d588b736f56684af04fba8f10750b450a613ca4008715ec5edc2cc70d31a5288296";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ff/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ff/firefox-58.0b2.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha512 = "349863d7a8a3b2637296422fa750f72fc14df88c944c06f8ad1e8dbb3215a7d5106a331691712127a5229a48eebb090c750b9fece25da5c34261e9ee64c2eec0";
+ sha512 = "64a11c61a3104e5fa06c802e25ebb293e9fbe58b3d4af50a36a9919d213d75ecb1e1aff8d164f111398b0e4efb46a2574d05f23f39ffe845729e0fe18ec27720";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/fi/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/fi/firefox-58.0b2.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha512 = "83687fd94ef6ce5def8dc427b08e50b1c0a41f97b81c6d7ffb83863aecd3f97f3c3f6301a4d5f5c1ea8833d72e41d67955bd4664502e6cf75b4b327e98fe0552";
+ sha512 = "0c739ae31197dc3c9c10a40ee97eb4bd623ac3551f67bd2dd0527a4e6efabb47bab6c31c15925925d5670611b82de921e0d068491819b9a580c8062cd0a794cb";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/fr/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/fr/firefox-58.0b2.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha512 = "2527eb06212a1e1063f91fc59af54ec427ef1d23ca9d1f1f4232be964679ad33bcfbf7acda4e3c3ced32f584761f7f506c2744552877fe3db35a36387d995263";
+ sha512 = "7fa98e4e5fd8174043d6d85ee63aa22130a9191dabd40ad8935f233559eeb2dc46bdf27047975251f4d843770f900eb1756161e2d5dfd91e95c4b03b0841af82";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/fy-NL/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/fy-NL/firefox-58.0b2.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha512 = "7a64a19cd37c1059fd338790d8aed3b9d0f9319ff8075567b98f721a2c3f2cac9dd09f5a678bd8f4792580bef2558a858bfc6ce33afb8bbd8c40afc3f85cceb8";
+ sha512 = "412827dd52dc04d0a342bc0ae0871108264048b13f3476af0295b9304efea3eb24719b5ed034407dd25f7d7faef635ed08056b12de78d6fb1ec0a30acc1a1392";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ga-IE/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ga-IE/firefox-58.0b2.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha512 = "8b29fe1838e333ac3704994865bf61b11b99b8f91b46fffea30047232b8bee3589f4f27ca392a64abcdb902042ddb4cd0860dba97577a062f21f4cd994d63366";
+ sha512 = "02272dfcf04b9ee4bf6ea5f1b03f59892526e0df14cab0dfa1b090678e9ea45a76962bbbb35ab5ee13a6bc919bb5849d5e401f8157f0e5119c265a53759177d4";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/gd/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/gd/firefox-58.0b2.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha512 = "979009a44710a0206a035bd752b2c61f2178a354a692b327028cd5896a18ae4357955303dbea9326393bd993e9b088fd587d82917fc89c93a45275bdce3f3079";
+ sha512 = "64a89548064d36cbca0a0572319e979a565470b4cc63aef5005f520e58f37e7a54e7ab5380ee5e0947d1a1b051825a5fe223a8ad5cfc833636ae9f9653b33779";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/gl/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/gl/firefox-58.0b2.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha512 = "8a6826171d549fc69cd63e6916e9c4abe10c76d0f1c149e6282c48e6f6895726d41714e8c83b4a5128bd9790bb45f186bc4dfee03f06e22d18be859cf31cad66";
+ sha512 = "b69ab34709258444c957dc55f55bfcfe5965b31e984fb911d2fb8b8499a62044c5d24e68e93880454b09888f68e3e80c68c0e37a424de53786fcbe1ea8142ab0";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/gn/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/gn/firefox-58.0b2.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha512 = "8009c5297c726346ab7c24bb88ad4a7a4466dd19f01a526e1786887115600b06b37a2b80449ac1ae207f2f4c07b6a2343f349a7c314c7b7d1e934769bde47a9a";
+ sha512 = "25f3c7753bfe47a5198e770def91596f904f5b4de0658ee49c2209afbcf53fda35c8058465ae21876aa733daf35bf58c14f464f2e125996e27952759671cf351";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/gu-IN/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/gu-IN/firefox-58.0b2.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha512 = "329ed99e9553ccf99f5cc0d1f69c1c1aa931ad12720c2d3f340e2e139d35f142d97fe8ca43f1ea80b2d366379d46f8ca0ccc2e774ba9f9f1ee1b67599e794627";
+ sha512 = "f20a7cf31dca9f635b96b5a95b24fef039f3a856e64a34b681d75e19e1f997bf41f7a8a49163ec1a63ea2d2a500eba174a3e8f5c931e4b7b9ec0857c908c5aca";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/he/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/he/firefox-58.0b2.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha512 = "f2623131ed9451d74ade849c33bb04b38ba3d555e06ee45a5b82ca4f6eefe55a4797e5d53231916bbe3589ac277387a103aa9675a32ca372af53b4778cb44133";
+ sha512 = "c2de1b8b8cd2af04efb78b432b865df564fdb70e41b3ae7ee17bd66f438bd8ae60b49774265ae9efc3e5e17d8ff947f50de4872e6004e497b3ad073c096d5110";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/hi-IN/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/hi-IN/firefox-58.0b2.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha512 = "33f35fbf42679b48911ab20189d470daae6c31f767fb0359ce674ddd72150013dbeadc9a3a73a116a4d39b725cc54622b3fd19e84e5b388edbe2efb9231e53af";
+ sha512 = "9f513d17bc01dd34b1a07939d8d4858b5c525d99a0bab1eb7ed5f205de3442e3f9dea90e5bf2a7743f6b624757dd3b182ad976d5b32771e99b8c62b016aab594";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/hr/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/hr/firefox-58.0b2.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha512 = "4ef717da1b5ada94ab5d41d529605de22270f5d9f037b7bf3f19703cde55b6757fe396c087692faa0fbc500a60a4a6562f8fbb9c36e3deb859601c967c68f112";
+ sha512 = "0f43806af6aca2980e358fb7bb39b2970d9d7c32175ff9dd4a3af5765866fb68a1e4a5ea7071aaaeef4a70b502c5df86dd88e9a4fb5e6db00f5e11f9d99b324e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/hsb/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/hsb/firefox-58.0b2.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha512 = "2bdb5e05436c24c0c4b856f2d2feffc32165240b2b7943ea5a7c93f46b1068eb21bdeac2605ab35d40ce596c9aaabd8809523a3cf768615eb6c03d9661ab815d";
+ sha512 = "4397b1ff3a113f7591ea8c2211fb7b15edc3af9d2d8883a720eb68d5f19024488262818795d9f14b67c91649337e8884ea12d6dff6fcd0650c31d2f917cef493";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/hu/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/hu/firefox-58.0b2.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha512 = "81cdebd0af73a7b8983e2de296f12244a6b0a92be865d0fbe089d74af127663cc3003e822bf525316bb14664ccfa3412b7424069d1b7abd17ce1e54cd5f66c7a";
+ sha512 = "d7dd0be61fe7ac795817b7e2eca9f9ce1c312e49e851e068b410fb9076fb83bfb82928eaf7e1bb11f7647890a0b74dd16b93ede8e8672f7a70e9d0482a859646";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/hy-AM/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/hy-AM/firefox-58.0b2.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha512 = "f4f0e9009478904018eed8fcb6da30fa5607b5b00ee7521aa290dd13ae52e616e5903ea22e6e40f87340e3740b3d415b53bfd415ad288d601ced9318585667f9";
+ sha512 = "a924053e4df4b5e036dd25e3f663239bce6e6879e0cd0060fe62a5f06c573bfbd25ded2be37940c14a13c493ff421127245dea88ef183ca9f496bc8a89d1eeb9";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/id/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/id/firefox-58.0b2.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha512 = "75da4e9be3ecce3227a3a914d9e5da90de8d4abcf49a4eb1c119d842a97a6cb789b703d3199ede4ca03502fc9e0a940c1829c85eea6adb7fbb4456d71838c39f";
+ sha512 = "cd83da2536a067120783df1a5a04ef3e16aa87a47fbfc4c50d0009983652506e10688f05e2da66034051fbe8518754e025489b29e013cb07b9829dfb2c70cff6";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/is/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/is/firefox-58.0b2.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha512 = "6a3d0d38f257571c865295a6b3542c1bdb8de2344c5402b8f46a85adfeb367444fd1c693611f7b0fe7160a7552086d0d2b0247fa7757d19df1eb8375f2655b06";
+ sha512 = "87e6c6111b9a30de82235201e9d341cf2ceed3d4599d94815d807edb252dea937d7870cfd229d7fb47af8c822201567f3ab990b15731f9fef243edbbb5ff918c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/it/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/it/firefox-58.0b2.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha512 = "650239200182d14069faf4557ccd02f155af0c954e1aee11909c648067421fc27f8334fb038a60eb9c0fc661edc0bd43e7a87ce345a4580bbfde798c5ed301cd";
+ sha512 = "bfded5c6a7aabd2120cc56c756d900b2b71766d4ea6cc6c5cc9905ec14068cc98f10a8ee54862f8223b6d7ae43b09346dae87e5b146df8bae1a63dc84686ec69";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ja/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ja/firefox-58.0b2.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha512 = "da783d020fec47024e27049a163c415ad050e65d0194324bcbd1faf9005b03fe02c2e1349855c8e00301a13a5507ce3bfce58506f375a4276fb912dece622229";
+ sha512 = "e74df1de9adccd46ac36675084a16c7d07bfa48025802ef3c932b291bba76955de14f52282bf2cce2d69a355393e97aea946cbd3314c5cc97e699afa610c2afe";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ka/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ka/firefox-58.0b2.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha512 = "4934648edf61441922dae1703ea70b5c670e798955891961432709ec04feb46280ee8cd924f37ebe4244f069d3d3f9d6dea71d09100fe7e11652e30a9c16508f";
+ sha512 = "fd729433c08e2c569e0c72859d38f70fd62293b5f1a97bb41ee01950845c4480c6f48e80cec6ffd9fd81d34e357d2fbfd67515a44c9db02acd5f79acb55886f7";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/kab/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/kab/firefox-58.0b2.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha512 = "82f28e1309b49921e735f0bc3818664c912877ff6608161f7ce86ee821857e321cbea7db52b8e640fe989d5b52c2b5069506b0af68e6fb89660b79e7c5cda95e";
+ sha512 = "edb999b2b27885422defea989e41c845b0f7a50d47e4f6e7ff2690fae9b911b9c0dd93e40a7420b1920790b5443800990836999e3044457acddb55781fb8a7a7";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/kk/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/kk/firefox-58.0b2.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha512 = "befd1cda746b5c795584e066883835d16cdbfbac14e5e919140fb0ff2d695f0f793f7f27fcb60f2d98ba9c9df0f2c3323b72decc6aab8b40e64d7fc2a9b01314";
+ sha512 = "21eba1ee7a9fa51cb9967ecb4250fa305e3e516d0d69285a90b1ccecda6add2793fa035ef434626f4d9620374e91f1db4d8489a1454e4d611a529e693e46d09b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/km/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/km/firefox-58.0b2.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha512 = "c302d0da1baeb0c96e134c40b97c1fc095223c45916496074857a39a16f8505c929a6eb2d73cfd679b99298b305c061734426177d5c7f72e616c3cc792179e67";
+ sha512 = "565028e6aa408c734684518d7f3d033639ebf6ab3dbc74b682f291933f1141fbb7b758b0c1e8fed555067db0981e8a4f5d5c4e2e9c53d2ad066b8df269ff489f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/kn/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/kn/firefox-58.0b2.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha512 = "0318de8cfa51d459cf852a073d064fd3a129c081897a35bc2e1e456bf5149b305a80f2a01389f271c844db786c4ce00feea6b011ab3c7fe0f5102b73a65bfb8f";
+ sha512 = "1f6dd3187c140ece200c16a4e80ff848131165603fcb38385842e8feeec5fd13db3d1ae415a8f428f2d22f20289a856bb3afc96d853cb9e31c5d1445a1a63dda";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ko/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ko/firefox-58.0b2.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha512 = "747fcd8849372aec24c6a0c25a9e8df28d1afd6255f60be64d050204fd72bfed385f11dc3ca6d721bfe05b13d13b0b0b45343c75a7bba5950042d5984ffbb831";
+ sha512 = "103a51778565afbd6423a043340e9bad47156fad51776106aa0342fca022ca6481f7b13b8f2a51d2e9e8b1982f50f377ade1d73bf6b152dd61c329fd3456a1ba";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/lij/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/lij/firefox-58.0b2.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha512 = "102a20ffef4e3720f0cec2ec9d5803a8f5abbd66c99195729929225acbe292f92f4e505119f1207a5d0d1b0a148b3b484bb22174acfd6d6d79b464ad3c61be70";
+ sha512 = "4c92f4803f094bb5d64c58c6d8315e51e764fc80c1886e9c18a58f93a93f8794a00a4319ed90ba60ecc9ec4dbcc37f3e8960a8b67261673806a19c8bfac8d989";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/lt/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/lt/firefox-58.0b2.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha512 = "23e3efe3f8fd80907e685090f82305cac2be37c7f8a38c840b392d3f5eb7ba3a607bbb35c4a6c6191c401c6247d1f8c4ba2b32cc857c848aa8d4d380e41c6808";
+ sha512 = "83dcc50c0f7eb41ca6fb41a1b036b80a8ab4993334a632e60b9523eb8a4306db427beaf2527bc4bdd1143ebe6c0f4b406b1b9768ef8f3c03ce375e33cae6cc11";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/lv/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/lv/firefox-58.0b2.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha512 = "9b784af41d5be080cefeeaeb4519bf0f25a9c201853fe078cd91e6074c678cad8ba69c1bf2c1dd018f41dc6c645dd3b7bafebd402a04f2fda93a05a0019b1d94";
+ sha512 = "27daf42869ae64f31d8d83f52e9d3f951e1277352276eb8436c2885e1a1de023b3985a0057687dca48ba69aed0ef03cf27770099e45a0fed5461de8cbaa0205c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/mai/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/mai/firefox-58.0b2.tar.bz2";
locale = "mai";
arch = "linux-x86_64";
- sha512 = "d61f3668ba4c7187b00fdef5a3bc46601c90a148be468ce021a42b3218f9a30bd8f4780e80fedd98d7e1133ea0e899ef02dcf2d715688a6e384aa7db542337bc";
+ sha512 = "9b7c38d7d23f6604963f280132b16c0a949530d7df88f47a5328d1ced1bfe4cf8f12fd6540b54a4608aa0efe09f35f870f18c49d4a8cf1a95e800b541f534b79";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/mk/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/mk/firefox-58.0b2.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha512 = "79d34cc870eb41c5d709d52b16b448b7e2d6f35877957e2173cdaa6f66dc889fa489258cf7b0bed1e7e87b187199eba799396e65bdcfcbf1d0ec0b258b2665f5";
+ sha512 = "1cb4b8304888fb9a4adadcf23b0c624c1ece8fb96a972f6d788f1b8936f05f8ab331df7bb949a4883673d193238a80919f728b985e0a9601f7c59c519fcf9501";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ml/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ml/firefox-58.0b2.tar.bz2";
locale = "ml";
arch = "linux-x86_64";
- sha512 = "9fcf038b2f891d62ed7b26fec3bcdbecbcf530756f38887c4f1a71c58cb2fc82af9320b03cfbdb5762c80eae7620fa0116f32d22fca5186e7a1b2738ad0d71d8";
+ sha512 = "e801dbb5f71922d09563149bb12461d4661eb877bb862f04fea418b9fd488dfb871deb97c131aa680d551de5d46e2801545d01f17fde06179290e12288e5f74f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/mr/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/mr/firefox-58.0b2.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha512 = "cfa9eef24205cec3d1b4a6ce58f4814d33d9806ae885702d3c0ea96994126ad9d79caa7551780f3581db0de7802f7e4cc666fd9d5bd55dc7da64fe4d5dbadc2a";
+ sha512 = "41eff5af28b452069fed8c8408dfe47b46ce192b6d0a996c6c5b0600e862424580c50251fbfbaaeed64d387367413f69ee2ed9819bebebf9fa67b2ff50e4417d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ms/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ms/firefox-58.0b2.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha512 = "0be1321aa5aba417b5ef27c1b6ddbbf10d915cfb3ebc6f70a7473f31284a4f6ecd7ad61ef27156fa8b6008598b0aae3b3b272ae4f0db2ff477083e037616efd3";
+ sha512 = "544e03a7a03b26a5b2f9da0284325234149faa5bafda74895f6ea29743471e302cc33b5398bb5d3e0f2d14dc82b6e8a8d02927e2a2e2c2364b3e2d1f20bc3354";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/my/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/my/firefox-58.0b2.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha512 = "ea25f3df7053cb85b3cef5b3428c1e023e6631c7fb836421e5afb9794913057feac1083e08385ec595c7fe9ab578aa5c8728dff9f338f4d1aff09697c0985c60";
+ sha512 = "28dc75be5d3eccdff87eb738a909195b5832cd4deeab9f4f29915e372462e24c9160e0dad4ec9fc80cd14179bd1eb08e79ed96afed74ce053a43731b0a95ffbf";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/nb-NO/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/nb-NO/firefox-58.0b2.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha512 = "6eb487bff2f942fc7c319551eb2558973235cf05cb47e5a8b7273c0cd2d9162ae96345aa3dcd38710d4169f84fbb5ff28aa16277d98a4aa0864c9608f98b8f89";
+ sha512 = "6c9dbe11b53af3ef09b9520df28c2ae606fc8ef552518b8bbe3816a871333a061f504b113e05086ecf590041182e3baa134bf6d84a45b6a5eb3c2fa43cbeaf8f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/nl/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ne-NP/firefox-58.0b2.tar.bz2";
+ locale = "ne-NP";
+ arch = "linux-x86_64";
+ sha512 = "80b819ade71f4ba3034d04d3f5178b1f4221ef5930d5f5429c5cf255ade70ccfeda42d87da3f4e227446576405362dcade34db285addf1bc2474404d98f96a94";
+ }
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/nl/firefox-58.0b2.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha512 = "20587b5fa98ac42adc9b83c704c5c9eda0bd2b0c40475b71d11f289c14c5df3e7811c4b4661d82baa99436ef143dd8185d2fc30bfdb8eb4c64ff72c5986c3df5";
+ sha512 = "a617fcf15d972552b2cb659fadf695ab5ef6953c7c81273ca7cfb5ef02d681c80d245ffa62c25a0ef6a894c9f1413245c50bff375c97e34b8a16ae30fcdf217d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/nn-NO/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/nn-NO/firefox-58.0b2.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha512 = "c231055deea74c29c30a79be5e592cc5ce21aacbc3bb53d8d7a35ff5f6ddf7624e6d4f3257c7fc2c99bcd2f22359c38ce10508f31b786bed90c9f68c3e916c6b";
+ sha512 = "e124e1b983dae9ce9b595423949767980289169b9b3609033c34176bd8d6fec9e7cb13504a8d03c0d42359aaf045fbe0ba66aadf0566acbc80840861676ae9ec";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/or/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/or/firefox-58.0b2.tar.bz2";
locale = "or";
arch = "linux-x86_64";
- sha512 = "092bcdfcb26c272dfdcea1a8b05745fec1d6d41c6b8ed930f44d7bbd83cb190857ec58e084ab602ee2499ef73743a4a6582e1f53b59151285978a9a1e64f2d35";
+ sha512 = "f7b8643f83ef6ccc0d6d3de8629808372625d7cd75d0bed8d8993d4fcfbf37764bb29ab1b2a2d3519cb6e5fe2d43af33e407a6295b1f770cef4672f20f1aa9ec";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/pa-IN/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/pa-IN/firefox-58.0b2.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha512 = "31d2ba332a534e7d8763a7413bdd24643313712635d050183aee8524612a9f122a5acbf89c674d69dc609897942f3613c9cf8fac7b92e1c22863cb54fbc0aa70";
+ sha512 = "f3cfeb091d875fa35f2b76d5fd33c4766fc3d37dd4041b23e400e223d6be4e791a797cf95f534b935e6f40c28ba58b4394fed28c3beca7a097eb5616feb02924";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/pl/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/pl/firefox-58.0b2.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha512 = "4180fc65b77aed5c93d6622da562e9fe7a6bc7af70747795bb37427e822c1e007b1be6fb3d50a12fc3f90e459d2e687403cb3f2df7320d6381795149977f6a1f";
+ sha512 = "a0f5e040ce4614d82f5ff7fb5b6e16920299290840a961b8e71c5fcf9c9aad88092d519739b21bbd330d03aefeb25cb0c8ddb9d75792297b970ec741043c6ff5";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/pt-BR/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/pt-BR/firefox-58.0b2.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha512 = "2d2defaee8947f5177603f60e21499aa4f192ac8a6ae53060d51bcc418654cb95cb20fdfebc052fdcfb397109b868a35c6ba8419886a499736e5655784607693";
+ sha512 = "d9de5bd80a4658a4b7fbda8b22dcea6104a77034e62ac66ee4906c2f71f9048c9f8f3b85bce38a0a4c6f9d0243e23ad4ccd6db8ccadcd3a1d79a034554b5035c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/pt-PT/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/pt-PT/firefox-58.0b2.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha512 = "05da355fd644ced4c3aaf54e2f6f1a11f07d2952edf9511c60fb699e4bf5ba195044387d2687b4fa3a5b5413dda3d91acd6ffb28ba6e2b7210ed00ae5bcd2eac";
+ sha512 = "ee24357ea59c9936f8bd4f2ccab32d73012b9bdc0f6416350a30a0c3a726a817eff5a275f689dce78c0256816f644b56e68ce8642632ff2394bb89719873962d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/rm/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/rm/firefox-58.0b2.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha512 = "dd2bd357d4652008b5f07d318b32383d8d30c6324482aa7fb52c3e821d4b3ac162ec26e5f521f661416356b87d013ed50da9612eb43b5fc3b95e37cdc25fdfa8";
+ sha512 = "3fc05929e41b1da505831fd29ddc590b11c8cc68d656e6a29ceb36a8d4f1718d3e2c651bbe57dc6587d6cce08a71b2131e6310e3ea688f2950a5edf4dda5f14f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ro/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ro/firefox-58.0b2.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha512 = "ef8cf533b848e7e6bd0859506b964632ab9497bb70755f957c5ab61d64c87ecba173cb871e35b35e090682d34b424ee90514062a429deac68bfaafe561195b51";
+ sha512 = "8d204165cb4a8b4861f2bdfdee197a621db698c767443ecfe25751345fb651be01d3d2d18de8cba10e684f203a6276ee71ed5b1b99a43d1df943a9b5147e2fd6";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ru/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ru/firefox-58.0b2.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha512 = "ee6a95e2a69980170adaf7c60dd23764deeb86f171142985733e967f8ad7e842a58ebddad5e828ab308872f40955a3e53bba1f818b38b075f531289fdbea795c";
+ sha512 = "7b12852be30cba66d33b345fb8976d1edca871eac490d3c49f0ed89c48a772d48a4094dc1e52a32e103a3196f6bb12264b3fe46bf53a14ca0e5ed3eb49164d0c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/si/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/si/firefox-58.0b2.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha512 = "fa4287dc50567a52441f583eb0e12c4de4064a51b12e80c195f1a583dcbcae51f4b8b45804080c2437999123581f24a490df25cb27aa563e47ae05a135a21748";
+ sha512 = "7079174fdf891f983d0415cb802470899af11e792e3abdc00f8503116a007cec1177fc71f96f8b0b8d15576d2046690824d152cf7b5577f5cfbe0aece16c36d3";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/sk/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/sk/firefox-58.0b2.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha512 = "d4110c9bc7eed9f037145afb5399a88565e0d94430ac56cc8ba8aa3640ceaecef0fb31cae7add7e893b6f223dffee62578f5243cba944cb157328a6d69768b9c";
+ sha512 = "820e8465d6b9bae28a572cf7ee3d2b8594fdb6fe54879151ab327f93a1313cb2019687ac335ecdb64c5047421832db50c05b01b0b52303a0cf71d4a320900557";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/sl/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/sl/firefox-58.0b2.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha512 = "bb06ac7d7a6f38e67061a83d6eb76b86a45a37f3c77e805dced9db8c6329c404acefc4e688d8a05c962f911996617a1430b66d2dca0334bd861ba841775b2225";
+ sha512 = "d1e55e5cb55c1894a39ec3eb11657c1ffb491f165af8e645f28d2af6e3ae481a04177345a76e91b769a68fcb2a84dc425363c153820be564ad015eaf27ba77d8";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/son/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/son/firefox-58.0b2.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha512 = "8fc6940edb2a41e9bc2a0474a3302434a754a185a5c71be3b702112a5683e348dc9045ad95f7c0babdaabbd5737ac8954238b6db81b870fb0987626fc4e4ce6c";
+ sha512 = "1b46e24fab45edf3aa81535f282b73c8b7e5975b6f329f751a3f3300c7bb01fc77e08660eb01158473bc1c8ce2c1cb831da316d39ef4e89370b26d6fddd68fd3";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/sq/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/sq/firefox-58.0b2.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha512 = "2c0da802929f7961b517ce6028fbdbb4191e0387ff175cee08663581539d7dfba71617304f2b7fcc3045f8e30a3427a7a5d749bb641c18a90ec515cbc8dd1437";
+ sha512 = "3e6ac70fb3f1c7dd7617caf254abd3f4c725019d56d6ccb15a8dffb6d5e5046ade6e6b50be8cf8239208a4c4458063c435de63ba7e9c6de4b93ebf3d3b7a8ca5";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/sr/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/sr/firefox-58.0b2.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha512 = "92f51e7aef94bab43fd58b16f17cc3a9086ff754d039783e2829adb3dc5df2d9e39256221ba1576299da79c17b735f0f51046edefb4886a022cc23314a831b43";
+ sha512 = "fe2164cd54ec4ae280432e26310be2ff167a990a578ec1b6ddbdbdc14563c0e49f87dcd6358b745aaf6acb258b385dae97afb2a1fd6106e5dc269a0845740114";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/sv-SE/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/sv-SE/firefox-58.0b2.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha512 = "2e9806909a770d44da18b381d428ce2ca27d0808fe1d39e698c0ce5cf48505ef248f236f8f38ff66fe5d98dadaf516d0c62f3071dc1ddb0955356a9bae3a8af6";
+ sha512 = "c79e3ff3c3a2cecde79e2e5b24bb9806df816a4a1fc3d0f0aae67471e4b107bbdcf6686414fad8e3626799f12f8d818023f0b71bb393b1770eff38d6169d70c9";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ta/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ta/firefox-58.0b2.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha512 = "bea6475ad949b4dd35dcbee67e4d1a8d462cd04eaa8ed637b8dc7b7dd386c7eb51d7e7469282bd3d5ad368cb50adc16a888421a1bb6ebed2d6b8892c96f30c8a";
+ sha512 = "8266408b1f4e0fc2b96c0cde463619675f7038824c3ebb2c97186e79736431b77b35e0ae62fe09064fe631f07b77eb19becf6e435d4fbc096f41020bec291384";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/te/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/te/firefox-58.0b2.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha512 = "37db9e889edeecc36bdc313941f96abaa96c8a584a58f2b43abcaa8843cd5fd25d4abbb345c567f129f34d67eafb1d5c2cebbf3c4ca9139a8f9377f847a7ebc2";
+ sha512 = "110dcbd4c13f9d917f78094914a25c8f7d80d44aee9553421130dc526c0d6c29bbead1e5fb2f778d955bf65436d983fea429de6f73b9328066541841f7475e02";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/th/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/th/firefox-58.0b2.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha512 = "15f011ea725e90c2750ed7949a33109f08f44816d722762c6e3692d2570d2bb4671c861dc20a8b0b091bb0b00c11baee6bf449dba818dd5fffeaacda9fee08b7";
+ sha512 = "1533d96c6f0e23f38c113515e7fff3caf99915035050cddab0ca021b176d7184b80e9bd5ac79d809a0d31b3be987f9e31367874b4c35adbcf62a2ce685d41338";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/tr/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/tr/firefox-58.0b2.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha512 = "5313c9dbedee7483215285d3909568e988fdf13ce6039d2eefcbf75754a644136a155f442112e7e19df9983d83ce349dfe5eececa4b45971db72fb2fbed80f5d";
+ sha512 = "da6ce35769007f140b9732d7d429def5267f733d8674a7a80b11aa89aaa7514743a61d1f22210bb7368416f570d7f0748609b31ac72ab80ffe0ef7fea3397bb3";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/uk/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/uk/firefox-58.0b2.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha512 = "4a127bdd6284fe3b8eea6ce8f5b22cb46f5e1ac066186cbd90afbd8419ed7d0d31b786f210c0a3c0fe2a2b327e2cf6b2f73b45a829b9c5d092eb2e048178da82";
+ sha512 = "df03b9d2bc39c4d620d1886dc1d22eb70289fe8d6fd7ef429beb8170a95b5fb1fa15526b9b68bf774a3f09170d0573f642173a6302f8dc9acc41bd9f2604773b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ur/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ur/firefox-58.0b2.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha512 = "755842ae826e377e33c767971c43a62ac6953f58ff2d23f0109e13bfaf608757603902d2576665f605192e1094504eb02df0636b5f666ea84eacf956ddee2841";
+ sha512 = "a0914042713f9fb91e52e35eafe4b6a666b670e951b4e6c3ed3945804a5640d06c5634eda943927a84ba274871242a4495b754280e4c601fd69c9e054f1b8175";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/uz/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/uz/firefox-58.0b2.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha512 = "34d5f4446ae341433b0aefd7a76d3e9d6125c60d28480eb70ecfba5d7a7060e1dcc085b088eaa7ecd7d0e6814be8ed9fead537c46b404426976ba21d2d9436d0";
+ sha512 = "22eb91f33b22b43a81cb0039aa2f11bccf6d83433897d0607d5a52c127366a3b75c18d1df2ab985090a724b278bc703e80370b8ac765bd891981620b0ae36a4c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/vi/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/vi/firefox-58.0b2.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha512 = "272544bd42a3d22f3598884c906d1ba31df7e4b4debd55aa02110a05af74a0544e5c7fcff8937c9671b25c1637f8de399fe82eb0798ddbe40618b4a020c9c53e";
+ sha512 = "e6801f622d134be7811212ee8ed47bec259eea1463baeac098ec59e5687cd2ebe42d77d42fa0b18f4a054c7a392efcb6121ddba000323998901f46ace3a7fe4a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/xh/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/xh/firefox-58.0b2.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha512 = "ad0aa5402a6ffd28516d428e6f11a8aa84c68291f6722bd35776b27a8359b70466833f504db181ac5d13f8f3ba9fb87df118b5a82b473ad9a5c752b76cf1ccc7";
+ sha512 = "0c0ec3f3112ba5cb7a8df9c9c69714dfc585539b4a13632bba94c8e58b7e5a44a25ec4206c7d656fb31c883454a337e5c3cf24ba67d758fbe9841207c4b84249";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/zh-CN/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/zh-CN/firefox-58.0b2.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha512 = "348779865bf610de937e073b364e2e384792bda2d5d6932187717f9ab1af547efe6483fc6b09e9bd72bd3bad908507d3bd67c13d196dc7e1857f6f658dfd6361";
+ sha512 = "789602749a56379b7edba5bf5ea9acd1d950782408f07f0ecf505575ef5cc94f580a601d26c4225c40d49eced4d844fe4213be2df52c83db7788b4a42fc10952";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/zh-TW/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/zh-TW/firefox-58.0b2.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha512 = "3c444d575c000b34f8c536a48688f35166bda3b9702841c9f023430089919cb9c368ab0507e4949e3258a50fd3915fe21963e3c39a29644d4313698e9ec8ceb0";
+ sha512 = "44b7d87e066ffd2cb83c33dda0ea3edb18cb0439c3ffb45d78fc07109e370b6b8cb7e95379423162928e9f81d5be773377716af774f8b3378d9214049bc73917";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ach/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ach/firefox-58.0b2.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha512 = "f42a579de711981143832279c2dada8aa915ede2f9e601fc4d5c15b2c6497dda9c6d651fc6b9865e7827dc4f4b2da944f245dc97a73db27ec8b7aab74ee17f9a";
+ sha512 = "586c8cb8baaea42e694dd5f9886df52c4a34ec8224863127bd3b87bbe2594420b90a644c7b414b85db98714eaaecae88d8b91fe78351cf0e113dcef89d3e0087";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/af/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/af/firefox-58.0b2.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha512 = "8075a2593835c69f9e2b97b0fd311355cfab0257351684e0c4dd2c3fa8105aa63a946dcf196f4dc3256883fb360c4474560be1846cc06b23058da5d87935e658";
+ sha512 = "5d66112bd0b361b7a064efc184bf51d498a61a58ac97ff4a6d542b7c6be6f1802ec7da9cf89fc554f8d3e8ecea28d3d1c694cf47b628a15ddce6bb24589be525";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/an/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/an/firefox-58.0b2.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha512 = "18247733d65e0cf282b38ac1b52370b9e0053951d726c283adf4b52738dad9633f9a670a65dd1fbf6d84802ed4cfee26adf19c05abcfe1787c3cab3d11ba7794";
+ sha512 = "3726fa3ebc4d21b02a7165d12b0ef8fe2c3ab5b204fdcf6e8b71994ff48897631dfd220708da0365cb875de8b6e20ea0db416654d0de471989f8cc57f427e64a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ar/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ar/firefox-58.0b2.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha512 = "a15777a29eddc3dcd3d9e7de970faaa10321ad991eb82956887533c9a414b6dc0e6eec6797996b5b1c286c387c5a8b01df28fbb4a5efa485712ed8c9477ccffc";
+ sha512 = "ba99e30e7cd10dad54df7331087a2667d8ee1397c1b184f7deee3ed15f7c6d6b111592e74be320808bf67846d1cb7278270a47cdaf9db1d0fd671387371a203c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/as/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/as/firefox-58.0b2.tar.bz2";
locale = "as";
arch = "linux-i686";
- sha512 = "5a2d3cdb707ccd9c663613e177832318517e66de05e825da66935a3756a07cd2aaeae6adb196cd6a305202a3b4990e6dde1b7e4b30144023fcf9e4b77c55f0ff";
+ sha512 = "db6035cc1b2a6c04ae79e4179dc5f1a64a910a0c8646e8cb93af63460b5d8bb5a07369b93dd4c703d09a39693a07c3bfb913e4ba6d45aaf3e125c407b38f6d6b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ast/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ast/firefox-58.0b2.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha512 = "08d9e6cc8a58895569667f42b6684cf342d2bc015a49f7a5ccf09f26384e7194833a3c0380385d8d0d4b1ad104c74f549ff94d03dcaf7f97cd9722e454a3a14f";
+ sha512 = "42496b6755ef735527419453fab12497a8d6762d176faa8b0af7338c2e62cba2f2560ba0f7a22d6eaf10badeb2caeb6367773b19d2717c1bdad64149d74d0f98";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/az/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/az/firefox-58.0b2.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha512 = "327e8ed170e1d571eae445b1206c83a7c25b4c09437d7d96f88fca5d95946ed0fe1c9c44a3776490e339050f9ac050378e9fd79819409e4432feb2d1e130ec89";
+ sha512 = "c16fe3c909a0793cd91f320f94fe309e1f0b559cc84fb01ece5bfe455a1854701b259821f79fa6db8cdb6dd630a477e55e51793947661e0b3fb8aa26f3c4e22b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/be/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/be/firefox-58.0b2.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha512 = "ca96078fe9eb12c9acdbb315addca23aca87a923d51edeace03263ced2eab68a985030360a36af8f4843aa4f2af02609ad39517689a9ef219d29080f12605f34";
+ sha512 = "5bc3b984ad38f105a922d1c614e1783d32a84956848f51797d4f1b3b5b9daafeff0730d103bb27313840b07ee97be73c30d6674a527f57ea7d95542742a06a00";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/bg/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/bg/firefox-58.0b2.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha512 = "92fd642c41c4b5874e02829c155f6ee7a1f11779b35f43c446bacc36febdfdb415e7d30e6039c4f70df3fd7635a9f187863b249e2a352b60796d1c0bec300d9d";
+ sha512 = "50f64269f264fe1c31970b43d6a0a8860a563154b8913b9a6d186398a6e6d80baf37bc0f091a6ff49115d44d01fca550cf1d65c16dc77d6498a236595be2779e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/bn-BD/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/bn-BD/firefox-58.0b2.tar.bz2";
locale = "bn-BD";
arch = "linux-i686";
- sha512 = "c3ecd61ffe1177d786491eda2c776bdc136a36e756d083aebbd3add157d27f4c736fe953e2065956a13203acfe95ebfa4eb0a65c8518423b34a74ceac8248d80";
+ sha512 = "be9cf4bfba0a65d491a586a1ea2ed6a2dd1946bfa715401763b3067c3388b02a86a1d53a7295ea6ed6b47cabdfa342d0f0ac6598e62f396baff74db5858f0c8f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/bn-IN/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/bn-IN/firefox-58.0b2.tar.bz2";
locale = "bn-IN";
arch = "linux-i686";
- sha512 = "bb21a47a80862251a8d5120133bbdad67490572d794f1a7d76ffba77f8cdc9029066c176f2b423b8ec49342b390c35d95c29039044165b874cde42a852eca727";
+ sha512 = "f448f52a639102c82396633f62741861cb2a3a0434a0e7185c8ed6e70b24153e606a5ed22ff003ea7ac2aaf6996135e7094e5d0226bbb8f143f0f3871daf5ad1";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/br/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/br/firefox-58.0b2.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha512 = "fc9342c239310ccc8231b25707e5a7598cd4d77aad3990feed5c48750c677c3fe4354279cc39cf367a872f25c9ba95c805cff9193d13aff801d95b9c5d5f70a2";
+ sha512 = "f52471ee4b82c820813accebfd6563494d41ce7949449ecfbb86da45c0a4f36c0894b830ac33f96894b02e6785cb8389a965d638f75cdd04018730cbae41c7d2";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/bs/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/bs/firefox-58.0b2.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha512 = "3f8da7b739effdf144d2b2d104d27501575452fa20a07419910dc8fa8f2b8a92ef421c3d774e8032a2f234ca95c55efd28e8d99347f7afcdc59f5eaa5dc6ff29";
+ sha512 = "9df7d37a1cd531c43cdba491ac5fb844c20f335058858cda88bd9934bea097d9d170e18b3b29ef0fbe5ca2808469b75a4eab767b37ed2e29ac7cf2141ade8f38";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ca/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ca/firefox-58.0b2.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha512 = "1c1f8a7886de815c14da3586e9dfee316f05ad9943e9c952ca44b098786a0f721a89e9ee566f2bc08c664636558006cfefe5823053dc4f23065e636056b3b5c9";
+ sha512 = "43fb2e6b9945a4586070d433fe080cd2b9b8c0923c12ca084d6d21dc3e22164f470a3c791b5af181aedbe1d76e78cee3981c7fd1872f45815a8db267a9ccd74c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/cak/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/cak/firefox-58.0b2.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha512 = "9992fb1ccf287e3858ac6686a43b7515370f8043fa2c2fcc814bb1ba49106f1b83fe8d8abc72df43f3008b8cea56f97254e0360a0cc4808e923515bca53dc3ed";
+ sha512 = "7a76be4291a5d3f6bf150f09701df4390d7f74c0046694a220f4511468a815404713062ad560f75d35643548065a2340bc70c439e23ae14272fbc20375f5901d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/cs/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/cs/firefox-58.0b2.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha512 = "e6c99e5533e988c10615286bf3bbb588ac9854ddff12690537cbe64cf209ad5512649690463f61b7d08bcb57ef246191c8c4d697f6de80248fd8eb72e0518c0f";
+ sha512 = "d0a8c61960d2289b5402f718db28a6ff355fcdbcda77124949c420c3023b57595559305dc763165550f0453ae0e4a01cbbd3fc37e6af9540c80f857c8b4da00a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/cy/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/cy/firefox-58.0b2.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha512 = "92cee85be1caee2c9221dae96a5989aeec61451ba3ea6923c7ef713a56b168d871f78bf993685f1e6e56cf13b47aae067070eb9f08d58304722ecc57663b89b6";
+ sha512 = "85d9dd9fbaa72ff350d464015f2ca2e810a66d2917f19a7830ef50548ea3b5de1a4e818fcdacaaf9e5c7009cef391bfd3818e196d89483abc43a1badadcfd41b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/da/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/da/firefox-58.0b2.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha512 = "7491a8d2523dcee7c7b9e2ae7ff43edf179cea94dd078d447cb8346ccc1a2053ba01edb5083a8b616e67fb5c53b88ce8c63ea9efa0ddd309a104750360c27ad9";
+ sha512 = "f7a87024c27c0b7fcdaf5cee4c31235043c1c506003e04c71e60792dbc9a4cb3fdb972b335c3b6eb10fc9774b36dbb2f6b415ca90f4547c6979bf4568876075b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/de/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/de/firefox-58.0b2.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha512 = "32bc1d2d6e0702360296accc324836a61cc68611cdaf01abee71d151f02044d467b985e4ea998bed6a8bfd30fe9fff30f55b271a15c9cd3ff94f493b3157a2b6";
+ sha512 = "b4f1fabe3de50583afcdc27a3599dfe9d2a08f2e8b1942aa0045df6059e9686d2f2f1fb3462c2e21d9e6fa1ef5a7849bffe2cbfe1d18bc70879a98ce8fad8718";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/dsb/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/dsb/firefox-58.0b2.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha512 = "fa09fd3afcefc4df3854f599d5077652561b7763dd54c0a95db2107b19146c74152f9059fc9e54844c9b31ec26e1392534dadf1ae592aaa170ba3bb8ef8ed0e3";
+ sha512 = "0d85cd11ad6c28c87d6df4dd9f5f16dfc37f885b1686ff85ea051bddd6f5b2db43db0a6b2f71998eed707533416b6af5e4dba209b43586a76e74c03ba26cecdf";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/el/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/el/firefox-58.0b2.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha512 = "1d95c37d13df3b04f21780fe9cf95b70115adb4f647a720083ed00e6bfcbdaf26f62e9a265cc524b852a7c44b68fa4d37ac08db070eeec1fc3cfaba1fe83184b";
+ sha512 = "014ff2a89bd240bd32399732647b4c0cbb47ddb9e5a7705be56eee3df8c8b2c95339be61ed35893c4a4fe03afbff3e48c9e03d44f0cedd5c3694ead76d4ddd19";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/en-GB/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/en-GB/firefox-58.0b2.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha512 = "09b6f11cba4862647d37278ebd7f9f2e8105e0392130b6d30f722f3d06c75f108abc509354a7bcf1da4d4709af76dacbb66a56d5a7d0733a4f2287202a40351b";
+ sha512 = "e8746eac5d253cb2e5968b0d2da6b596a3b14baa967622528d03db684f9b507cbcde59fc0ed6ceb64d4eaf5e1767abf1fd8e8b651bfbec1beb9b7a5019c8ae4a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/en-US/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/en-US/firefox-58.0b2.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha512 = "0461eb469f6e1ddd9f32f3a970b6afae3e551d72f14397d1f6955defff87d8ecf2bf2cff47a84f7989f23c4943466b09ab47bae1bc2849691fad87ce8f62c318";
+ sha512 = "ad0b071d92c3a882f81b7ac3e295e4234b9912bdca1ab70cae0d79f17b3f5fe04d30c70e91f5639b8c8e0f6759988f0f7bca3a0d4771ba3b60c63b08bbc71c8b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/en-ZA/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/en-ZA/firefox-58.0b2.tar.bz2";
locale = "en-ZA";
arch = "linux-i686";
- sha512 = "d5864881455d7ca5cc9dcf032e5ab786f6e7e9cf900aae7ba40061dc0df526c29767e792515e35c7bdfcbf71b9163d85a7b80e03b0865d36e5d5dc524c4ebd05";
+ sha512 = "4434b81ad8cba0b9c380a73feef18eeb1f1c043842b24a13dbe1059285dd0d4c6168f358a38a31a143e2b0f7c2d19bea08734d02a5f7deecd2a185226ae6d694";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/eo/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/eo/firefox-58.0b2.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha512 = "4a16209388b1ff42c355a8b0af3c9340035854deea138ebc206cfbc610ac07e18b7099f18c67d59f45104a754919ad3ce65975f94fb2fd8c1b22389c7af676a1";
+ sha512 = "1f3ab8f6e3969cb9aafb4fc8ec1e8af9d2f883e4013851d822bce47153a1d06fd689e0e2230ebb0fb3eea81f140f4cf984a4b5286325a576bbf5668d5c247346";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/es-AR/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/es-AR/firefox-58.0b2.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha512 = "df195bf219be42563df30fd59504b1721d77db945adee200e8c8b9af7aceeb3ab2a4f2a3cb5a1707a862441f580a3d6cb02beb0bae5ef8cf677c0b20da2b3e8d";
+ sha512 = "b609c22e7cab67feb44be92f8ea3cdc86a512ee96c56c82273013a02c795bcd8da4ef40f586c94133118ef5ccc7968f21a27cbfef499bcd61be069e55c6f9567";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/es-CL/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/es-CL/firefox-58.0b2.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha512 = "9d5d54c44c019de98838ee5dceec8632d5944ea00d88de42c983e7b01e14b1a3e7fc390a16a60bb4fc00333bf862a58efe8079c9b57b2957c4020e49bcba0bb1";
+ sha512 = "b6bdd2abeff665239e8f246940ee65bfcb54f1831d34aee5264b3e7714ad6819a5dbe9e3107d169cbf8f2532bef1d68bc40d185c281977efd8a3f8d918b06388";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/es-ES/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/es-ES/firefox-58.0b2.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha512 = "3e02e852544d0f78d2e842ec38cce1d9e43440d04fd4b8e43932ae184b43a8e3ffa21a85c76d0d506235f871b695cbbe277d07d4ee3eef2c997843e5a170af89";
+ sha512 = "672afad688d5a03a1aba52d9ca29073dd2e7636ad049f98552978cc98285b5794b5ab854c78d169a14825455933413e5dea5d4779f5ef24447c1a414361fba37";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/es-MX/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/es-MX/firefox-58.0b2.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha512 = "b9d1450d16ca587ba9fbf4000bdfd528ba3932785b63e948211f6f1fbbdcfce7898739ec6aa2d76a3464a1802393f45841167598f5a933b3800940d432a6b12b";
+ sha512 = "d10de0d07161e4cca3a7ca42fa7ec3941062db191f2d80325770f55ebc080be2c8ff9b3b8b52c47cd8422f6811696fd6dcad51cf1c2c4fd6c976bd197dd39251";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/et/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/et/firefox-58.0b2.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha512 = "68de6b9772aa4caa43f48025e145c70bd685a0f14bfc87de0668d6617f8f38be7871528e30a79ae42d86c998f8a36ee3455b4434bfaf76fd86760a3150eb6ac1";
+ sha512 = "c3ea53b3422a9cf101eb737d2cb511270fa4b0370453dee86c74f6cf9f36f6d7a2c4f36b85b760ddd089bf655f540f8d12a1d59c259e8beb26b69ab345569785";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/eu/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/eu/firefox-58.0b2.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha512 = "a1b1476ceb14e9a8732a5d52e114f3413d012538b4d41e601a6824b2c71346c5e1bef236c3b02a2104859b431fbe1bcf9d2c9ed9d5a616a6b17db8dbf58185d7";
+ sha512 = "1221a19d5fb265cc86fbe3a1f03d99d0d5a5088432d89624ce7c00f26dcaca5571f8b136be8fa65f4c829e6b5a371d22d49dc7bfd0c31f3c168a4abd7d49e8ba";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/fa/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/fa/firefox-58.0b2.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha512 = "b063e2b73a0a8bebd7476b60b0a15fa3a80d6aa5fa51b68aa7bc964d21278ecbdac306ba2be1df06bdb205c396e5cc1253adef47ad395720e1938cbe30208f8c";
+ sha512 = "575757d295a420921db0528a8833cc69a7aafb13e4a51c63804b8c76517497f63e84aeb4972bdae0e7139233be50613c26179b6d7cd066beaec2d8ecdf429d95";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ff/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ff/firefox-58.0b2.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha512 = "8a60c7640e7adda279b33d3c5e8c3981bd197118d38adcee7d9c053902680e329533c256c7361f2c7626f55d3550de193997e7212055338da8959b821c95289f";
+ sha512 = "a729c190bb3579ef4fca48c837c886f152bfcb550c29fe01a65f6f1186b7e80b71dde3a4f45ab80f282b04868cbc1291e1949a908b7075752fe0af7409c3fdfd";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/fi/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/fi/firefox-58.0b2.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha512 = "9845de20dab7f981f3762c983244f1c812768a40ef7fbea61f12df2fba80fd6664166d1376559a73edf6783b558d443b95f2840207ef4b6653012f2bfcb50fd5";
+ sha512 = "ac7a6844df3a0183d9516e3f526d6e8729b831f241926add256eb790be4d05ab58c62726940eece24b0be6dde8530c62280c744b00117312e937bc024b16d197";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/fr/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/fr/firefox-58.0b2.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha512 = "21ed69aa109aa0931b6a3fade415df4347e3a387ddd8efa2dd0789c7bba5f74d1242b59df2641d8b968cb2edad19b24a370fcbf322d382ff60c7f7bfb3565b70";
+ sha512 = "f46400d33f72dc888ce686e270c981b0fb11b68207d89297288010df325a71b29f48200c34322a5d9ff493d9540aadcf5f30282fc1da0dff75cc63548534378e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/fy-NL/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/fy-NL/firefox-58.0b2.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha512 = "2e04e3f247cd3941748c71c63f35a7a328b7920f9ebec417a7b48457ca6b4c900e14139fc921a1e6a9dd5e9d766a35a5241849f20a5e1abd3ee96fdbb28ed48e";
+ sha512 = "17e6da89a57a34e4609acbffdda18679fb446c3d931bf5277e10099f3ceaade22bd9db41e9d38da6db09d9150888544c6619a818a50737b429a6f03def94479b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ga-IE/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ga-IE/firefox-58.0b2.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha512 = "4d129d34f70069fb82f50dfe9987192b2f32186f6b9ec7497abafde3c02c65724ffefdef360cc27c39bcc77117bc373a516703dde68af5b1907713060cceeecf";
+ sha512 = "5671564000d63a401e40db275a9ac2f131c9a0811b0165cf1f1d3769324eb481b2de95a29f4b3cb8935ba9808ece9bae4e7760c14764c8521cba1517bfa69626";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/gd/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/gd/firefox-58.0b2.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha512 = "41f29605f42672f0c178b5efcd3f20f647647c84a0b6a0cf814712758b41aed844517452c421592d6d44a7f2b1924eeae71092bce70c1862517cf776fc563739";
+ sha512 = "f7c280869b2468c173f0c45a92301c16252365e5cd1fac0b3ec7a3e779325f0cb6a31bb89761e37b697dc5f1a5dcd8160d935769a683dc656f89ffc29995e782";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/gl/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/gl/firefox-58.0b2.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha512 = "4004eb49e097e9e5e135b2d6d13a637a7c8eabcc8b181c068d8fc2b6991129820ceab18a13e4e3054b8486b9a0a3a6fa4a3246d4af21e51052438dc77bdf230b";
+ sha512 = "75e161834e33a4d9e761f85b2cf1de2da88113503c1235d26a2db0a0ebd815ec12e6d5673aeffb368dc6f75877c52d67e59f27ee44e9eddea8f7efa17b4b040a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/gn/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/gn/firefox-58.0b2.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha512 = "b66153345fb4e611a476275fcb43d4742468fc83e1a109b30aebdbf86b8e661d06f29c950a265d4e929f949415f902f80ad5d418f3fd9a0c310d2ba7d7b8dd86";
+ sha512 = "5aeffab6468ba08c15d74cbbda355a8c51132d8f09f5d603e61c6caa04f1c57a3cd659463454d967a8fd68a17bda9185a0d281368381bed772d1b7e8c5722fad";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/gu-IN/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/gu-IN/firefox-58.0b2.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha512 = "446760799bc1b453e1f1d1be21076cd7164f96a2d2628e8e6d48304d2c03df939e43ef66b97405196a9879eeb07deb728985d7c4fd0c021558121627d5f94145";
+ sha512 = "89d204f7b931897a9a782eaf99b5cda7a049d35f7e4f3336b3f941d6234ae3984130c59a352052878a72602d6fd21e9725ec51fc2bf990ab395bfccc1ce202cb";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/he/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/he/firefox-58.0b2.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha512 = "73fa828925f54f3bf1447e81230543909bbe5af400ffad5c1af54ea20aa8f24a7c7c98d75e92e391a9b5f2bba41fec85a54f161528a0aac418e2bba8b63954a7";
+ sha512 = "7e3bfa2d8fc1ab1640bd2310c596451afc25ebdbf5b0827e218afcc7144b126220bd4cc94c8c769c20b6f00c6ab338adf4602dc271a3480caa1db69b28e41409";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/hi-IN/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/hi-IN/firefox-58.0b2.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha512 = "bf5f891911d699de47349b6dc8ef1fea3d4e6ff1ea243e50b615035ddee991d94f57bc2eb191bac15e899c63037c976adb051f8c03a10fa0b170041b36f79a57";
+ sha512 = "803312f7e912059d05c88a1a6f448fdeede2aee53532fd67d685ad64c4961dd125c81ca9792a2ee781269221da738fdd7c76119a3b9d4ce6b9a5cf579af90388";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/hr/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/hr/firefox-58.0b2.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha512 = "e840ce4d1fdc373b22f3b8b6b33ed86ed19721d5f8fb52dd550f75d71ee6204d0baaf4856f090a710c622c5279944421f0efbba0bede9350055a4cba95e5bef1";
+ sha512 = "bd4c68ee7fd5d7ae80907111f184825b94b1f12d02019cdf1511ec76ea98098b1935953b5c5759f28538f110a71cc7804b2161d29b8b3835a481f6f025b70448";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/hsb/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/hsb/firefox-58.0b2.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha512 = "139d7d9d831cd89b3f9db005b1e93908c5a0d3e7bc77923cd2ea78ae3443c26fb8458c3ddb5055f381f99e9851002c0929f058869aaedea2accb2f616917b1df";
+ sha512 = "6d9d67e98cb39884b54e068b471d5e16e38897105ed890f14d322568a910fa29c5a3a927a31215133a8635e47800f8863afcfb7d88243b8cf9414b450c70f44e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/hu/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/hu/firefox-58.0b2.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha512 = "7e121659835fb0b175f5b19fa3a6049285ff8ad87309572eed8616e3f418591311dce94f724ff6bdac34bc5480f656fbe54b1202d900d7bd73f034fd06f766f0";
+ sha512 = "2f07c74f085e7490ba851448db019d7e0d5deef9a74e53c7e0e3bc13d4be5ba341032b9c63d5f2a7f631883858046d84eae5612166e966c330bd14777015a6ff";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/hy-AM/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/hy-AM/firefox-58.0b2.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha512 = "db9f64ae24566a158bb27525ea5f6623a433f4c59b78601d289d42d8b8d128ad8957cef953ed27f6af93b91cb01752cc010af398869693940030a3ef8534a903";
+ sha512 = "91440eb5832be50208473b6474c0f13d794cc24a37b2f9a160b2f173fadba946b934fe0c0867b7e3bab605da6011f32fe834825f2ef229e0a20813f58097ef7f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/id/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/id/firefox-58.0b2.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha512 = "413933af7bcd519529140a6609d0ce179140477bada96bbd5863f4f5159dd322ca0951b5e5401afdd1865e5f1aeb01ce6c535b121a002d8cf00db55c2a2fbdb2";
+ sha512 = "b0a2504f562b902bf0ff11363c44bc6fece5c327d0acf9eb8f0b17d5750846df1ad1414c17387a39bae5f1ac33de9198b05c55b0f2a97590a29e6b9c243ff20b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/is/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/is/firefox-58.0b2.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha512 = "6ba6a3f75ecff44391690b5f720159e86095eb7c5cae34bec0e9986071a8a4bc31cd03941c46ba40852fa6689f0b241d117f76ffefbef9c85c519bbcfb4246c2";
+ sha512 = "e3518d927758c3e6c0bf73026b3896ec44cd5bb0abc3e0a8e280e458c66b70a32b15d53a27b97671335fa3a00cc7a88032f11458962e48cb1e984aec6c22dea5";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/it/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/it/firefox-58.0b2.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha512 = "489893f4dedad8a3ac628454bdd2452aede7f37748d4af32b2ad5a1d1da4703c19c9718811d3ab6eb47becf4be60bb18c3c97476983a70cb135136839504616e";
+ sha512 = "617dacd7122d8920c9b51974136b7834c079adf0486e9476f4e203805621864c47138a6bb79f05496f075071d37e45baf6279815e17a3640a805e80b7489b61a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ja/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ja/firefox-58.0b2.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha512 = "d2e45cdccd321f8056e7b092f07cfc5da8150b96ec4d9eacb42c391c2b38ec4ab38f9467c4f5fab7608da606d2d87b94c20b5306cd4aaf881aec353348fc7574";
+ sha512 = "a0e21fe3a2eb933ebbf379294eebcf3c9f59f5331d4ad7959f5a1241aa4c0a90aa018c901d715274b12b2bde9533571ff164bdf71f081024dc0810e838f73fc0";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ka/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ka/firefox-58.0b2.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha512 = "06cdbd6010fe2e0017dbaa9c0bd8b84a6133d607837afc3eb35488bbd0459c0ebee50e4352afa218bde546315cf0aeee3a34b9dfc00b03fbf6f6e3c205735030";
+ sha512 = "1f33af1629bd806aea449d429d7348362dcce82a5a02ed4930375e9701c700eebfe5773ef492fd303f68d86dd3ce47cd7c3f73e1a5bbf3d82bda1095e696cb55";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/kab/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/kab/firefox-58.0b2.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha512 = "d2944780c51ae3641ae51d34e082222692352c75b1c85bfad15cf97b3083fea3b8f3f39938d35bd6d452d102321d1b598c30e85fa576eac32bc623e37e36c432";
+ sha512 = "84f8b464d56f70ece330d6cb5dcc9d7c65b201b4365bc030c02c4b9892ba8641e8686e0f0419da40d620397842c4dcf0de58e9cc6776108e99e9659fe0997a75";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/kk/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/kk/firefox-58.0b2.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha512 = "eae250b6981a4b932dfab0cce9f31fea9ae32ffdee5021346362ad3151421948db9781cf8b98b2c77becb4541047d7d0cdbbda731aa24b7827374078a575ba55";
+ sha512 = "83774a6b52db454e9a8b18b1ca7199f52ff215e5e35fe7cf0d86de6ae61af3846eb25510fdc7dbe670fc227688ee97b1ac6f25fb6860575431500a0b02eeb4ae";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/km/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/km/firefox-58.0b2.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha512 = "fd5f9e8f999b173decebffa5f449ff0681b5ce7258b56dffd909d86364567b3e53238159648ca12a6c76ab5abf5903a6fd82207e8e5c8ae657aa6a0c650b1f6d";
+ sha512 = "6d64e1ad6f6ae88c4d32b6ce96c7f72c03cdb1d13fd25c819e8aabfed07b16bc1ea308f991c8671b6812ae2f91114ca14ef8049bf0a95dfa4b79d11a38bc8afa";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/kn/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/kn/firefox-58.0b2.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha512 = "22f0e3b45877de32edde2f351d9434a9d6676c51bc70233c289386fa752ad5768d2fab202f74f2c62ffcb1fec2e2d318041689352d93f8dd13608e9243191b68";
+ sha512 = "46bc7f686d971754d1ca3040fafa5573c1b4c6df63d91511beed6848b15717e4820b1a1ef842ef5704dac42e51cd6102102f0566807a2b1ed86f8fc5d8e1cf2e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ko/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ko/firefox-58.0b2.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha512 = "631bb19fc65075b18e4c88d60b5a76e39d8a7516a44c2df5375668ca86775e577cd60e5b9e445073a47c9d117d7e96d9e8a5b2422749e0dd3622530abe21aa42";
+ sha512 = "1eecec7d2ba6c2052f26177082384a48505ea2b88fbc5a3880166b11ca061ce77f9e08055776b9904d1d677ce072a87bd9f703dda51667f3fb50b62b42d6bc03";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/lij/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/lij/firefox-58.0b2.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha512 = "ae267046c3a6ca584c85f5a8d4da3516957313cc68e554fef796fdab92a2d450effa15efcbca5686f46a4dfd6ad1f61bba529d9cbacff0e65a857052b95ecba1";
+ sha512 = "20a4f1a52da9e853a40049d7fbed2435ddd48f748a453ae94c9ea14bfae3082aebf032c8f573104eb07317db4ebb970992db667010d0d8e0af6eef995c6481ad";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/lt/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/lt/firefox-58.0b2.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha512 = "db979def47bdc8b13060aeb2f0741c4e28d5e1bf0480703f26c0d7e5cef48c10e3d75260fdc6699668cfa3374de5ee25b150f3d5e0857ce801aeb187a8e7c4d6";
+ sha512 = "b427ef0a9af8c10b52d4ad55da69d314a55da4de8c68572c57a0983f3e8d566f1604f28c06267736e1d3921cf81912a8829bceddd0cf72b60c08cbb49a190c6f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/lv/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/lv/firefox-58.0b2.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha512 = "a703df8a6c1a381a281ebb9bf4008637009da5f66194a4f85afbf2ae980de5a118e0ffdd35aea7e8521026140f2c003afce8ea1c906ab90c1db7aa4025d03be0";
+ sha512 = "ff70e130c43b3a5e6b378aa4c048e5b92488a75b8c22a4df4a08ff1a100d63f02dd1bcfa5d4713dec79f65bbac31d3078f786143497c6b0a3d49b545ff43613a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/mai/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/mai/firefox-58.0b2.tar.bz2";
locale = "mai";
arch = "linux-i686";
- sha512 = "ba9015d716e0d15b36cf7e83a28d99310a87cb2242b9e920ba8fa9112567cd0de1dab1cb8fad6ec26f381ea1cddc0b40b4c41d91450c1c76124b3c53869bc27d";
+ sha512 = "cfb436e43c1eaa7c5d7b0e4102b79a4e68833591a3c3b09df084533c0ac445bc6ad9a7f4e6f3e3fd0c4ef10c5c177ed7149c992742aa3512c0761a15a64e808c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/mk/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/mk/firefox-58.0b2.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha512 = "12c4a7dada07fb6a643675d5f504cb76e00489879fe3f2ac2e9647e053fd508b18c56f2aca172aa12988cab6672c75179e7366cb43791a443ef70dc88d0897f7";
+ sha512 = "59c02906c3ae7f810d53b04d8eb1ff6255d62dc3062d5938453a37d50bd35565215e6df9cd13eedd552d9121c415ea94f6a7b507c50b510433c41b6451f1f61d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ml/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ml/firefox-58.0b2.tar.bz2";
locale = "ml";
arch = "linux-i686";
- sha512 = "f6c93dfdc19487c1d61fba8a001680b9556ffed9599d4875e3e13e8df07dd49ce266c545aae9718e2657425815c643b803c170b620fb28c7e2727e92fcae0b91";
+ sha512 = "84c005fa8b3310ee98ec57e882205a465349481bf4cdd3d2daaecc7104ed82882d93df133f6945a2bab2e0b03ef444435438670674d426f7902ef55ead3ad4d8";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/mr/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/mr/firefox-58.0b2.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha512 = "eab3ac3f2afbc091a0fc02a6fd6e0bdc2dc232e06019d2b7ad3004aaa069f7afb1d4a89b7b0932e80589eeb262ee3e0b54f75ec09e2d09f58481d08c85bc7b09";
+ sha512 = "0bd928955589fe29d3801cd4995d9b20c816262549f96e894d06aea026dfcb621aea12abd161af991ee533491408660e38dd8c95af2cb91f24ae1cd6de949c07";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ms/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ms/firefox-58.0b2.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha512 = "99c3905d7b081407c6b044aca8c238e00ff2b6a4ef1cd24813746efc862a50fe7f2f3ebc79cf2f436e95cb3214894d991f8c1b003e52b70b2865970daf55c148";
+ sha512 = "b9486a558d50b1afd2f7b2dce4a932f233635c2c15c08ca39ca80e83b1319ee1db59aeba679cedee109e4bebe8082017aa7c61ab79bb39238e3c231435a24399";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/my/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/my/firefox-58.0b2.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha512 = "e391c752eee676f298ff37d086edaece84578e0bafb099f4ed8e0790d64de9ba64f4cf15c4218b70d519507f767572af7fd269b93d1766d2fc76a7fbd8a09848";
+ sha512 = "d3caac45f5923c01c5c2f7515f2d813351fc8941b8ab11e856b69353f7147bc8c8b06c535642b8c04945c50f923533ac06f87fe3b3a5a818024cd42c08b71a03";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/nb-NO/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/nb-NO/firefox-58.0b2.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha512 = "99be4ca9b8178d6ed7d7f1c7ed466bc7113087faf7256064ccc0638366c554a7443b5ec83bb85b00689d2d4787f04268dd736eb62261cad69927d68ca6b83061";
+ sha512 = "56dd91a54b47451bebbd2fdddd5550ee2f8d4339bf46a38d16598e68d54bb853bcc03bd5db946fb800d501c1aa4630f8ed35cd0d8789ce260c78dac0823d7308";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/nl/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ne-NP/firefox-58.0b2.tar.bz2";
+ locale = "ne-NP";
+ arch = "linux-i686";
+ sha512 = "93667ea20de391de78cb8d2a0e06c9015998d00fd4a9fd112912ba93855cae49ce0456fb562bba8b2a32875d4e891ed5e5253517d05ef2b8e6a48bb884f55dc2";
+ }
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/nl/firefox-58.0b2.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha512 = "de3eb748339672383aa8ac01cb2494bbfcf08e1f694a5505ea2407374e44cb339f857c2a45f72da3831e0f800ac2b78ad159cf3c795244c0b7ac13c2cad50240";
+ sha512 = "9255942bc49f5fd871b4d1c701175a4b74cf555ebba1b89bc8d5d78b9d1db9fc5409c162c2434b78f3094062eb204765a55f235695e6a8c2dfefd70c14cf9fc9";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/nn-NO/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/nn-NO/firefox-58.0b2.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha512 = "bc45d70e14ec14122e45dc62a1b3acadc5a3de2a9ad6bb70d848c2952ced6ef3032a336579504fcf474bc3f12f7b8eeb6c92e529053ff3592a167b999bbe67cf";
+ sha512 = "1a72ee04194b5fd4c0799363eb55bba6f993ec51fd920f5a7fe68c06622aa8d92ab7e014275b66fe4406c1f44276d01b34c843c84d16e523632fe2697661a228";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/or/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/or/firefox-58.0b2.tar.bz2";
locale = "or";
arch = "linux-i686";
- sha512 = "91d846d406acc1e453a09b5de1fea0760564478a680511afc54e40c5dacaed602f8ab942dd77f25c1d89a507b867126969c36c0098763eaac10f047912cf83f1";
+ sha512 = "8b0230279f6d2563e43a0fce11b86c302d852c8acf72a1d27e77d6480d63252518ff5b83ee94b7e5188f687f75bf8929118d01e42e4a7335c0fb5c721bc991af";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/pa-IN/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/pa-IN/firefox-58.0b2.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha512 = "5c20abd276309d82e772989dbc8c8daa6997bddb67d794cb39c0af364407d57ba9d28054116af38d5b42ec339c16eefdf3266355560460b64957504833c7936a";
+ sha512 = "d7feaf16ea00a77ab91a9b1017f3589e6ddca518cfdf09634fd74142d0a4ce0a87c06ce373a7dd356236aaed6673b3d274bb59fad6113a10cb285abc663ef6a2";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/pl/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/pl/firefox-58.0b2.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha512 = "470f2e471aedff4520ecbfda764710181cb6cf044204968f14f68bfc34f07a07a8b6e80d4dfe6f0abb1b4a79a5ec5169e552a3588eef7265df9d3bb91da731a8";
+ sha512 = "4da447f1beb6eefab3af199090382a1305332802a9e466532a3237271540dc8d1d7b32795196c17a7b41e9884276beef294159db35ca52e3a289e171844838d5";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/pt-BR/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/pt-BR/firefox-58.0b2.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha512 = "3487002948274414166cbf1527be353e9bc2267c672c2d14d731c162684e323543c5b54a43bf1f66353337e3df30fd45dbc90f0dfa8e07d8c4d77883ba1ea909";
+ sha512 = "77bd9d6d893f9c89bbfd6feed241155ce1b6b2d6c3e31985e64fbecac7b254dcae3c4ec7418752d2dc0a9dd820b4358e77011087a61414f320bbf18e93d0ec74";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/pt-PT/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/pt-PT/firefox-58.0b2.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha512 = "7f1b57fae5a4a8981a2b5fe1ade023e1845af866ebf60f56d88c3cf8c9fdeb42aa1c48f5a3f8f535aa310d7f53ea2afb3787cacb8a211649be9ecfec0d7a1451";
+ sha512 = "29c6bb56aa2652aec25bc46f46aef5743ea6023106a109e50878528755e31ddcb6e641841729415453161c6c3ffea1a2888fddc046077a76aa723b393ae1c90f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/rm/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/rm/firefox-58.0b2.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha512 = "a73cfe38beacfc621cd10373a774b4ec517ea336e0249b7abd5500a9838fb3ff7b903f64c82fe3a8cc91f89f2bddcdb2d16fb41617a0be69eed67c47f8f5cca9";
+ sha512 = "0d28de9c90068bcf336959588e2f202fedc2e5ff47d08fc15b4baf127ea79162d89080ad933cc7e57c03270a5d86100073a403229ccefe590369df4b085eeda2";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ro/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ro/firefox-58.0b2.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha512 = "f18d20b7ccf069b843dd9acd3bb46c2d41408b319ac32114aaada886d43cb679b4624512637b1202fac9977d1a657deeb7dc662623e69c2e04b558ae0ca0ec39";
+ sha512 = "a31114b63d5570327302cad0c1e77d7e6ade42a65f53dda70434e3043d1d5188d96791572433d9fb2acbaa1ff5110c9c24cd022c1696867ff6c2999571568076";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ru/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ru/firefox-58.0b2.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha512 = "4ac1c79dce2a208c461a6a8bbd447aa4aa40b8dfd3bd1b8bf3dec3fe5610f8bb51d65052ea23f81d0792f6a4d6b49ae0cec1e82199e8b7c94788290073bb7681";
+ sha512 = "ee8aaa73834322c22b239297738eb2ced76a1c2eb7431288ebfcf100966599eacac11ba7e00fa9211fad6c8e624a0f0988552ff1674ac0395ce96c755228cc1a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/si/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/si/firefox-58.0b2.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha512 = "d5c0c9fa140ec72b805f5aae8374cd0f56d21973fea5ab14f68040f38d15ed32d0c7542456eaf40f100006d79acd006cbcde1cecae81efca5097ad25d6d3171a";
+ sha512 = "22bdfb93f5f153d5ec5556fb8c0e04183c892bffd616eac296d2f2b0bd8ff32bc04bd204e1e62a56a52c1fa00c9d8a309bccbc353179cf3ef1b8d74a4e0c7168";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/sk/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/sk/firefox-58.0b2.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha512 = "c5cd6793ac43b865c025f64c1cc10e2771be1e0ff6578258aac3cc433545228949c6bf33fc2764cf7272f76026549857124b535ffc64018879a7b7afd534f05e";
+ sha512 = "3a3cf394d15b11dd95fc0e597fd327d391f06d7a0731b3b57f7a9bea1a05c39b6b65b8a1092f44edd16f08ad2ca8cbd63730650531d1697fdd3fc55a1dcb6c01";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/sl/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/sl/firefox-58.0b2.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha512 = "5fc23876fa9cea6ea3209bacea4ea3975e7979c0ed0ee023857288ab286a4d6366c7267fea5ca7a4a5d4ee11287af490fb6bfb7e287d0f3ab70bae715e2ae049";
+ sha512 = "cc27b4356c292b41756eba6debad5b4b18e24435d90c4d2b8afa622328ab96fcc0c854cca03d6ff6fd648d3322bf01a57f9a83fdf5966a7467575dfb1c227db9";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/son/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/son/firefox-58.0b2.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha512 = "db1c80a5dcfa6aff3b9e8abf2a89946cf13a7ba045124bc37dacd761011ad3757319dac52a084a7b79acc0a1a813ae0d4507045c7cea01c3d06d0c6fb89579bc";
+ sha512 = "7dd44cfdd59e0e1bb71aa3b2ae8243751bafad89e6639d13d0efe4a3ab99ef34d87ac27f249d768c457e6ddd01d574beaa8ba689a7b85e9c1ce841f2506c55f2";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/sq/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/sq/firefox-58.0b2.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha512 = "3b73fd94fbd37d486a4bc2b0c874101dca703cd0561e6b8bc19c4c3297c6fe6aabcec3d4274c361d6eb40f3851f262ac6b87d4efc6d025a236b90bf9c3c41e16";
+ sha512 = "60d7b94a02b6eed876aa7d8cdad849bf384d0f62efaa0590d19907d18d9f42cab2b77b0ac93ba2eaa721d44237e1256fe092429f7c95de4c38c97e8e3d7cd2e3";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/sr/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/sr/firefox-58.0b2.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha512 = "b827604905e7a0883d6e6d12295707c23077f2e7605b10084fcd9bf927a61401169e4b786d88e119f65b173d832cdeffe9163ad1b5522e2cc1b49693f4065f6d";
+ sha512 = "268fe1e88100cd55fe5ca1b3c2a028e436de0360e0c9e95ae2f77176e67f975f1609e97447eb98eefe82d188a804ffb04c05eae69ef9f6e405296f99794e5f33";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/sv-SE/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/sv-SE/firefox-58.0b2.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha512 = "7dd79aa34c6645459de8c8a6d54f050d381a048a960da3d44238ec6d5579fe9856052a167e861bb72c4b73946836ef66f4b5cc9a2aa6894f7d59a8545583cd46";
+ sha512 = "39c049e89a7e48f9f1d965d8fe43499856c3cd1ff5d86005d90d486b1cd04adddc5ef5246c71908ea38aae995456aae22124386b5a45d53e86e3e74380193bd8";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ta/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ta/firefox-58.0b2.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha512 = "8bb836b634363a5ab120cb7fe94de9d8e7a0a66fe0b78443bd3b65fc6c9225b3bceb42539e9cd0bc424115a24938c809a36149a70796a854f4f76f009946f628";
+ sha512 = "bc4fc2ea66fb0701d77ebc31c92d0a72775af52ed8ea7273a470783f972576349db571c861835d78fd201cb28d80fe4ccc5fc566af61502e74cc8e72cc1ac3a5";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/te/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/te/firefox-58.0b2.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha512 = "5f9c4eccc27acff2e6bd388c4e8bda7813550de17747f7bac13c3d72d58babbc1f63051053cbffd9a670af0a317a2e81ec3ad77f1a04a969f8333fd87d6f2f29";
+ sha512 = "73090fb7df13733d6dee28cb6b9bf40aedf19ffa85149a5d0afb24732b9420f13b8d9860494f83a908c54db9d6e864eb73ca80cac549333f6e3a24b87c8f7337";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/th/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/th/firefox-58.0b2.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha512 = "b05172f35cd062bc21125ee6230135c30afc3865612088c2bcc7e6e013817452a4dd9e5d269a8b2ebeb144d0c0864a155e40bf59312fa7cff7ee3da7d80ba55a";
+ sha512 = "d6f9e42773736a179ed85ab2767f74270d868adb749286c1221484296f269c5087074e40678bf3abd5b420de3487d934982e53f7d094b98b1faf84ae9b19b7ed";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/tr/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/tr/firefox-58.0b2.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha512 = "06e2ae2b1d3c1c06225fb24cf9a7148e80b56a2359c218ac55a04c4a21d0ebcb13c357bb455157ecdeff7b1fe9a0841a73b4facbc4a53e7529793d5f1a3ff70e";
+ sha512 = "f9714e0d2340ed9c76a67c733936485810cdf2e3b38c32e1958fabdefcca989102c175c77a34eab30fce1270076a81127ae14b68b8371aa86bc2be2051db4a0c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/uk/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/uk/firefox-58.0b2.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha512 = "bc8cca21ae9a19a0a345e08a304d4a9964e448b3787ff9d61985082d9e04ada1709924020842f8fa68ef7238ac551f575a5540e1a2254ca7f54f9fc403c25e10";
+ sha512 = "784692df6d887e23480cc66730a2e487440d22812398415e412e2d8bdd1f1f9f0235a85be0f1dc55037d3c964996f57a1739f1ae54fc8857d211715a20a40c5d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ur/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ur/firefox-58.0b2.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha512 = "d4b02d24bd952c67d298ed8fd27e7565d6ab9533d8acd69aa9a1dfe2573471378480523092c01f929f25e81cb43817bc4c0c1dbff88031439b0a358c5bec9eb1";
+ sha512 = "103d50b878d74827f11c79005f008fb8291cfb8c062e136e2d965bc61200fb6c82998ef3bd9c186a7ce5ae1371e5f21ee6cc6d664fbd60f737b7d05a85abad2f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/uz/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/uz/firefox-58.0b2.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha512 = "6db32dfb929b7939a2f54e198fc6bde10cb0aa2d9b1e39156ea1dba35ec7957fa87e5c7ffe1adbcf9ce0fb2d16eb324a8a6e49a6ff304bc369c52e91d050c714";
+ sha512 = "869230cc3f649a9ab78a2de7dd68cd6c0d416de0f27640c1b2bdd80c88acf71b653bb9ad51a8cc7a8c2be9bcd7cbf5ebe5574577ad00cdec542a85e19902ecfa";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/vi/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/vi/firefox-58.0b2.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha512 = "7cb643e9a6d920b813e7c2e12e17b5b1ee135178e208bf152eba388c9e68389d3e90425a86d45597253c729562bbd2c4b582d86d2ed2aadaf0780a08ed787421";
+ sha512 = "f80a57dc3d505701ba4a79819988133a74913918ba96692ed6e6d4479672e28b5c4acb06b978be3e7494ff868737992b8a34223964b737a7346fecf2a93eec5d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/xh/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/xh/firefox-58.0b2.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha512 = "254e006f0ce5dad4d1b7681fcf8569b7e7735e9b534f626d517c58f33da483c9de00990d77530fbc3147b2a26c5bf8c0834e7c029ee632890ca98e14328207f9";
+ sha512 = "662b14f48738d32b88c14bab1730e73ab208e85317a4abe8215419642299020a491d22299196091b40af41e88fa4fdd6794385152d9eea49f2aa9d6cf800c8bf";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/zh-CN/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/zh-CN/firefox-58.0b2.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha512 = "30dd152aab923fbc4398fec06d5558aa1abd0d9c690ad4ded7d1695fa4355e5046c4279c450e856c87e32699354d657279958ce1b7c01d646e89faed1acc142f";
+ sha512 = "42562df31b9f69b0370c01f281f289bb7bde34f5c82e43d46cf22084dfd12ecfea7a340116ac16744d5f6af04bbb9eb48d31b610dde34def50860327b9caa9fa";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/zh-TW/firefox-56.0b5.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/zh-TW/firefox-58.0b2.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha512 = "f2d7bbb0cff7e0d0c77dfa42bdd268c06dfe1b5d3135baf4e095dd9f36e25f8bbfb3f06851eef314816d53e5118da6a719c45071542e54d9e4798b2d13b06580";
+ sha512 = "71965696cd645d00cc0c2f212e89bc63e023f6c36c3182ed0169839550752559d8c1a04ad47c832e5113c321a54209e00ff598dae7cf5a46edb169176f3cd86d";
}
];
}
diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 8a8298ef8180..1dd7f67c0907 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,955 +1,955 @@
{
- version = "55.0.3";
+ version = "56.0.2";
sources = [
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ach/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/ach/firefox-56.0.2.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha512 = "fdbe702f129c2e8c749fed009609c475282638b5e920defeb65b94cce807f96f8f07d02d916c91b3d50cb9f909b419d2c635b3914f8f059251f33f93b887c797";
+ sha512 = "1488a8d46bcd28b1f70d3338361adc2a7c1c38fb418884d6e0741a269e40be49c1e0d9424fd910c37cd18df2354e02e6f95d26beada0216f71d02f6b1ed08cd6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/af/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/af/firefox-56.0.2.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha512 = "b5ace58a9cffa219e3a56eb5e427a482dcce4f2e4ac2a6955c3bea6c40b48940763129499803e86742ca3407d4a80973094d9bfce869bc2a321b443258fa5806";
+ sha512 = "f04bae02532785fae3cb95a0c8f9708b3ce86a30dd9b560c14c5a58a9f5af1be014a36127933b9b7dcd450f116597ffac1d8dcd1bb1b0d8318197201d1577900";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/an/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/an/firefox-56.0.2.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha512 = "d737a3425592ecc474399feb2d1f82fd7cdab362ed406f26671ddb3ce88c8736b17627ac279c12551c2b27432f9ba8bb3dc93b6ca30124cd155848a63bccff06";
+ sha512 = "11920a51c909a6ed72cff80dfcbd90f5133e264a2725fbf48df8c27264271c6f24e1f0ab2233e37d458e8fd7f1415b4bd999a270575508c0205fe46d96e8c394";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ar/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/ar/firefox-56.0.2.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha512 = "31e834d78399549ef670e78d2ff9befad6d300dc327853d1435d02533379e23ae38cf3dfff1222e314165c8f80e2e4fb9f364a9a3b33fb3d0aaed3259414d321";
+ sha512 = "e9200a8808be69271e10158ad77e87672478e31d4941448f612beb5ab7fc83a23f809eb928e64c4ee4399c6f59f994ac23ee67181c0ba1fc22991281a377c5a2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/as/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/as/firefox-56.0.2.tar.bz2";
locale = "as";
arch = "linux-x86_64";
- sha512 = "8393861ad7e2ab0a070ba32f38afb59bfabba4510f0f9a85273b4300fd7b2f45461d8e2c0a485e1d5776533d4b0bb8d06c78efc2a2a0c87af55fe5eede33e6f2";
+ sha512 = "a3c8711dbdfbc0633df658dc1b5b740f216ed3127b37f255a3aa13b6240c42bfc23fb08dbc9006bc6a3832d58c0aa30a0351d4fdbf6cfdb18875abacbd5b2c76";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ast/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/ast/firefox-56.0.2.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha512 = "e091884962a239f65f7bee05e1bdc516091b89ae7be1dd6517c4ae3b8ad34af0c49c04d365114cceca40a6a8af229256f100e4a1aec09e7e284fd6cbee497e54";
+ sha512 = "4202d5cd25cd33b169560d3a7fae3a999a692ab5caf3ff9695f20337931c940c4583d20549c60e345cc0b2e23e16094379241c766ed7d089f103c7e0065b0153";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/az/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/az/firefox-56.0.2.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha512 = "3324d8041257adf120d08537ffb94e90ff1d701bd60b9bc3016570887c0a2ff2d10a406de599be8bf5146b62647f4b95b87e9fb48736c4d0e747be03a35b6d09";
+ sha512 = "3414600e12fb48b1055149799c3e5659ffe97e7bf53962db89de3f35c9b82072a307e42a11e4e0d14f12e471d8ca965974ffd3401035bb3619f6036cb77184f7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/be/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/be/firefox-56.0.2.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha512 = "65861965c8f3c5e37d9b6e919f0ec506340b38a2cfe71905b43802ff3cceaa062ffb49516541253a8c944ea2a6b0c09d6523da6f5b8419857921c08a53b70062";
+ sha512 = "eca58b4e948394d04a55bf0efa4a200d4cb3111aa3e45ee915389faeae78b9a70357f43baaafb81b57df0170a82c972cd991c05dd5825a41aec12adeb0c7d57d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/bg/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/bg/firefox-56.0.2.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha512 = "948b2469ade253a0c174d996053e4855e477f93f6a35351c3c6db10aba6e9894fa850289aa90bc7d830edc8ddad6ddce78f6bf5047f91701152c4b7dea10accc";
+ sha512 = "4632a66be47c512451f3c36be34240ae3d9ff86d42dd03a65a9a360c71457085984560c53671af531e22877939f8aab298b623f822b696659413b9b27d12a00b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/bn-BD/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/bn-BD/firefox-56.0.2.tar.bz2";
locale = "bn-BD";
arch = "linux-x86_64";
- sha512 = "3cba3214ff62b5fbed875e7af40c04382564caa3ab613f44d25aba56eefca893dace583afbae172153fcbf1adc13cd0545e3c80ee72631862f46e4211589e103";
+ sha512 = "08a0c899b12159d0e253d0937e1efbf1d2197e724d243f7feae09d0ec97891c6d2d2e8c26ac0a473fb62d274f612b4231d8ce31fc3b411ca24e35b302aa3a2ef";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/bn-IN/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/bn-IN/firefox-56.0.2.tar.bz2";
locale = "bn-IN";
arch = "linux-x86_64";
- sha512 = "8a9335fce85a4787c091053842a45e2234ba13ac75568209d965f28a8d40ec42f8eef8da62878c0f8f17b6db052f72a00798bf2bbc37c7de9c861efcebd9e41a";
+ sha512 = "37947b6d1a55847c9fc94e7d20b90b5367453450c6e572179e4be7459e6c6b926f2f6528c10cad168ee1b8ec9f7643f5b46a4602aefdad77911d2fa0b661b7f9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/br/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/br/firefox-56.0.2.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha512 = "1b08b96c1030302ac47baafbaec63ce87a5744a284c20a6432208d0e3c7750f15941f89c69fe3f8a7875a7eaf7a9872855c72c4157447799edc2ba6bcf3768e0";
+ sha512 = "8464ccfc3f56786e0614449b82a79b4ac4cbffa6860050e09e9c179b2ac95109d8f016cab4c847c70d2d897c15979b9d53691431d3cf505948437aa439301e8b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/bs/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/bs/firefox-56.0.2.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha512 = "35e3a1c0b098c5ccf68e2b4547cedc513d31ca62897e0a6ceb6283e0af565ee7a1da847459217dca94c3e192e5b643dd0fb1e302ca54d866f7023841722f8aef";
+ sha512 = "090697aa8355450f2f8329cc7d1c33ae9490cee06597c14c8a14b699b448b989565d96cf6c6a06e1ebed9485adc283f6a3480c190de17d6a4400377f4938bc8b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ca/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/ca/firefox-56.0.2.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha512 = "372881da1ab01c36e06c9bbc7a67c12adf2af454afb8baee79b506d65e99754340e0650a7c16f01ee6735d2c2bad6ba82ea437f3d6265f17efe2ba26d4b55471";
+ sha512 = "c898dcad4eedd480968a2404206e94a46937092bcb35377a75b291aee92a5e8250c84698ab43cd509f4f87899be0aa16e060c13ae0a2a561355faa400678f19c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/cak/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/cak/firefox-56.0.2.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha512 = "447414a13729e3eef3311802c4714a00c707f3567d4d90687420972f57f4ab7079afcc741f7ea0e992f916786919c27a6670424036b50fac3be52bfe8eefbc8a";
+ sha512 = "e05d885e2e1ec9396a6d6d204bd5e94af6e5a02e534b57c5cadcf39e30c7753fb57e05507b2fce5600ca9d815d0be332eac0b3e5d53aa8f0fac1813aef375575";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/cs/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/cs/firefox-56.0.2.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha512 = "2eb5388d2dfccc213c730cf605b134e51c68496c93dec255c9ede8820de2d40968371e989f125c4ee938622312e782d6d68b28c836e7c8cfbfbfb100ddf59441";
+ sha512 = "a1d7615ce0369274e6109e1b7915c926863554863b8703838b145c662213fc0e2229117de511cd2a35b08cfd3870f480660e45a2cd72f8c65acd800698d951c6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/cy/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/cy/firefox-56.0.2.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha512 = "f27a12d1e9c9c5712f2da5236a2d81b8958eb8a208cabb8b6e1e75e40579bcefd9ea17a64d5f530248ae8f288ac1628ee350b1b280aedf3dfb8948d5cb800983";
+ sha512 = "c4d3b5825a7e27f0ef77001e793de91abce40fc39e2a8743fce3273ba616915b1be6b50223220fca91e3ece47bb3b125965ea50b4d728316865699a7d1c30c15";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/da/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/da/firefox-56.0.2.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha512 = "f8957fea57b1f48ea18eb65bcf5caf3d5f71aa3ad44c697861d9b7c7655cfa99c66a49b034eacb8530d42a66b2a458ce4a4c97890bf8f28cb06d24d000517c57";
+ sha512 = "13f28b2d0b7043d50156f452abf0786a86f98d63b844a481d3425d6f8ea3f926d5911ef0407f7585929478adc0cc6a538df92f0f8715686cf5b5596b91d55796";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/de/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/de/firefox-56.0.2.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha512 = "11a2076a5502d2edcf91a0b1e8776f71be3e5970885843096ab2e576dc5910da6b758b9372caba83fb5a6c20fafbc1dfa8d0a238020b32f93a7ffe50ba1ec430";
+ sha512 = "fde8ace2a67dc8966eb25c0b7eaa6417114999d9f5969d8a846c76c203e6452e91d86639c3419d7dbaf628c4aa79efc3b9bb62b3582e141aba6f674e89f395f9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/dsb/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/dsb/firefox-56.0.2.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha512 = "e788a73b2b77d2cf6aac1557814df1d88ad9e036b1d58218781dc284433f3b8b9e1a34be4c0bceabb99b6238dca2f9dee8f5e97a994e09f5fae175eec7e34b9a";
+ sha512 = "5ddc2d792d4fb555b5623ca8a7b214cd3f1e3279fb1b7f261641ebc2268a659ac9b6620a306cad19f7443c87279dd1908fa15d13eea2efcb0e8bfb036680f367";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/el/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/el/firefox-56.0.2.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha512 = "03099311390384c652e7dbbcb41d60eae522a1ecaa69b6e17e214fc0e06f81739456a2543adf9808b2b08d6b0c0b84dbea6168c70be4cc1ef71a04e81164792b";
+ sha512 = "d0d22198853cb65fb48eb15d7fd709a8f377de92f39491d53859df7372740eb34b731de6f83bd9511e51ab80ab2d1c98f9e7ef52249265728038c9bbfc9d15b9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/en-GB/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/en-GB/firefox-56.0.2.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha512 = "e971fdbb2cbe2e080f75900df9a32506e26eb07859f635c9f9b4738ad20cf7bc939bfe6b8a91455178d124a29d869f5f960ad9bac64ac863d31dae3a2f4ab2b8";
+ sha512 = "a628f43bc48ea39e921363c820e59d8000890a550032a7fdf0e536ea912ce53055946591af6fb5028af58845297861e76fff9d6d75a888fab44052f4a392dbe5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/en-US/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/en-US/firefox-56.0.2.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha512 = "99f270542b0d77a0bf2ce7926dcff04a356785af9269854eb12bd50c179e1d5b6db66885900a0f1dbfd1ae50a40298a2be7610b55380886719fbb3890f9e66fa";
+ sha512 = "0aa78818b8eeb8033554b970c31835efb6eb5c9c12d313b0bdfeef8d54136830a66b78acc96cbdd99e8505a078fee84f4ed1dbb315b45471987c8fc6c52dd08c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/en-ZA/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/en-ZA/firefox-56.0.2.tar.bz2";
locale = "en-ZA";
arch = "linux-x86_64";
- sha512 = "837b11040ac50920f41400bb7764864a42fa84da9da6c606c9475f862cec3bcae8ea1bba3b72424c668d9bc036a00c7c360ad248285ca8d6f6d94aa46c80b868";
+ sha512 = "2bf77e13acda72da29302b1107b744a9977019bb58e2795e42feb60a363f2156738a9992172f263c12a70258e5c336534255a44daa52b1ffcc81923dc2d12c12";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/eo/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/eo/firefox-56.0.2.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha512 = "0d7c650fa35e75a6af940bdb4662e03fe4a76f5fc3750ec4f813bc6570fce252256f6fd1e6b26a15c6f19c819a0e0bb2a26325015feb37b4f5318a018a8c09ef";
+ sha512 = "67f3d380000c6901d6a3f35de6c49392deb209702619ba54ff4a6f1299685d7bad556e659116153a9b2bd84af0c683a558431e9b20b66cbac7b32172efaa123c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/es-AR/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/es-AR/firefox-56.0.2.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha512 = "442370c45f57cf0a63da9d7b33e377b766d71c80606144d4cdfa956c6d4d5c91314cd3f9b7db007cefc762dd2cf79bbe1999842f1ff74bcd85affb7ed1305158";
+ sha512 = "1dbe15c98158091d8b58e16e35a8edc7e4f9c2519d36d20e973ac1e89e10de7f5d8797f4c282f8bffc386d58aeeb7ed51432dae853c439a54ee5729b918c6e96";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/es-CL/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/es-CL/firefox-56.0.2.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha512 = "ce5cc274961638c396ea3350857c79fcf39bfd116a9f3ceda74bef9d5eee2dfab54b12d77cd9e0a01bf98856f0b7eb8ca155fab50f444a4eab785086e8045734";
+ sha512 = "e6cbbdb9e2cbcac69d678932836bed72c9268ebffbb7d85003de6e71578aa980248173bef5468e28473422060ef57f8a18bd973d92685a13cd77976f6b75ca7c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/es-ES/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/es-ES/firefox-56.0.2.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha512 = "45aa1e6e9df4bde4fe67296ce735eac1356e20bdfde638944f809338869ce243c16a23bd6c066cc3df54cd1a8b7ed1937eeb56f556803dceb3b1fcdc2ecc273d";
+ sha512 = "610cf7f14595edc7b7c99740ae284382be2d5e3f9a0cc505705392eb9cd9cfad732ee7dc7cbc6be74f9056b12762d51e6ccd74db17545dd2e92b8276a37a0ae9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/es-MX/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/es-MX/firefox-56.0.2.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha512 = "17c4ccef75bbe794d398121beaccdc3110d58991d5a0bfca857914c8fca5c866b45d1e4cd07e2be8f4f029a058179d61c774b74f1e9c6fb513e547a79ea901cb";
+ sha512 = "a4c4e98c2af1bc272cabc444184bb8fadd6645e3fc99a3423581d3ea7ebe59429d2e7be5235e0c62ee9ce46380a997a32269f1b851aaf128c133846a22b1f7cf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/et/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/et/firefox-56.0.2.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha512 = "072b65588b1829309af5b84fe46e15974f8689e07be1bd24fd09cf5ae403d66ff196b1deac32de70d97fd5984d5579aa991a9fcde4df8fdd1884050507dab13f";
+ sha512 = "ccc077554338fb011d5e64ee198d61abd16f750c834aa59abf90146b66801d2c7069ac294abdea824d5511976a5ab5d4c0f00af9cfa01f28ffba9d58b50958cd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/eu/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/eu/firefox-56.0.2.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha512 = "dfde116081eb810215d29a142f6f3c16c0664c01415c6d2f3cd6385097b55a49b112090934700e9c217a286e345be13236df1768f602232db2da0a47edeecf03";
+ sha512 = "7a15e0a070cfbfa03592702afc28e75fac4de34b4568fa78b516d9330bac6fe9f909cfbe3b77dc7aefe24543e7e5cc719c4af69431487b27ca6672aaf26c693a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/fa/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/fa/firefox-56.0.2.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha512 = "7b934fcef4d9eda9895f4ea1a0e52e8ff40186bfec73e8c1171d0d96ee6a2b19d7a077e4208c0d6c768f6078a90525772086ca08a179036a2723443761e69259";
+ sha512 = "652641ab4d7df5fc2f519bea1daf6503d17f36f6772bbaf511e99ac8d5907d9797f2d01291a31c8517076a34fb7b4c60eec817ea4e3c86903dcd84b559bb0ed3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ff/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/ff/firefox-56.0.2.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha512 = "1e6667da86ad91d5bdbd27bdd615f8152a84e01d6304de4da90d48baefd758fc6e124c4253a00a89431b6c860ea574687237fb20b8ff95f52ee55b661447e723";
+ sha512 = "b988505e4ade02ebf594692ec66d9946da91261a386ae484d5171dc42e992ac18bed1e7982cbcb9508364f3f9a656c267c7bb05912eb51f14f0ab68507393175";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/fi/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/fi/firefox-56.0.2.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha512 = "24d8f011fff7425163a3a1ebc497eef9fbecdba8deec7ced18d1af0dfbc2e0dc31dffe29a7d6179972026aa04f5111ecfb5d1bdb29f466d041e5ba8058ae7f31";
+ sha512 = "7d19b048d6c09f87b4b3419a53c5b25e5e2c17db13c830c13b79d536a2425833cb4b55271e878466b4558ed95f43a68db05f86812411b0926df38addcf2f0c93";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/fr/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/fr/firefox-56.0.2.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha512 = "651bbba82549e5309373cc8ba3bf00c0cb87f0a8e1f943ef4c55b1d9157879a6c0132a8a296a9df3d10a501a1a13dbbfc18ce97febeab9b2e19fd87c00ce860a";
+ sha512 = "42cecceb791e7275e140fb9087702a0e6b55dc4b693d206112199545c9aa1411ea222a58de12a1d0d705a6332496090fb6fb208a91ed02f88b5c2111cbbdfc96";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/fy-NL/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/fy-NL/firefox-56.0.2.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha512 = "0adfc657c5e29e0af9c33972a93973ade9a4441e32998a1e8ac45ef814791637e26fad074ea2d3669f5d3261bd48afcf1abb30170844db12ad49a1a1b0a28bc6";
+ sha512 = "53f9d33b8f7eb6ba590a5096e23176b373bd8359ad209c9052add4ddf112d9b4374f3a0be0d83b0cdb679f07cea3d553b2649a6b03f0f09150b63719d7d54092";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ga-IE/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/ga-IE/firefox-56.0.2.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha512 = "dca148b6cad926c1b57a2fa1d8e2175cca84f9ad7041a517fcd7436ae557219a19efffd6986ba7e7d1b0ff51f895d6894bc6c4316ec92b2ad79cdf747243bfc7";
+ sha512 = "f405c2609cb06538647776e7294121995f9b5a1e49ac4bca52c52fc772d6cb3f54d67f983becfed2284f8d283074f1a5e6b1ca91b5c188a53131f653c6f44560";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/gd/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/gd/firefox-56.0.2.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha512 = "f4f01d4253b0e2ce56aa15839ca619df93fff7b60a771440a7102df1d84d45e37a7981044ad40d03e8dc70317836968bd84cf3ab3985736593880f26d95d7e60";
+ sha512 = "9307cd40b64fc2a3daab44fb01b61aaf55989ed86cbfae47d47d4fd2556de9de0176aa976f3e85f5904e7e19d0c0ea06df3682144c3c418381c38e5196316ded";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/gl/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/gl/firefox-56.0.2.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha512 = "2fb7a2ced35eb942cca10b4ca4b89fe4c0eb1a8f5aeeb9d62989717b704a922bf2678251e4c5fdb4a3507255f1548c183081d88e1586a727c17ec821240443e9";
+ sha512 = "077d3329036e67877aafe852719c6efa9a9b35580de0f66ab2f01757d4a8a114067f2ea78e78fac6cba8a96cb0e2865c3faed830b68624a23d3c63339c31f40d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/gn/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/gn/firefox-56.0.2.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha512 = "28a720b0e8c3b452ca6824db44f274728d61471a815f858d95498ec8a8662973b0800e34cd8cceb5a0abdad405ee5eebb87f5f8efb5e07ebb8021bee41e73827";
+ sha512 = "aa35ce7696847882ffba9db3ffc63c8ca827bc70902ad86716bbbed1d1e9bf8cbaa89a7795cbc430e7adab0987ced12ae950bfd395267bd440b8b5d94d9e9349";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/gu-IN/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/gu-IN/firefox-56.0.2.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha512 = "5b1fbbba89814b15c6d8db09a1f335bdf37a300035ecd637909aba756a6986b3ed2107e5f015df2122e594e3a4a84775110f2e1faa9412302758f20915da5b03";
+ sha512 = "15d0e2275e4d411ab1bc82f04e6d0d70e49e61a46f1360fa3594669b526f1ea546d1e95268484bc36361dc7c2af8202fd41b40601fdc9cfed42a5920a7040f75";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/he/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/he/firefox-56.0.2.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha512 = "96dc38740133f31d385f5a2bfdac4af4eb9ec13c9a5fb29b989de34349eea3a682dc50a57b52037228dcea56b19535a31c37b47873b34a6383dc687eb3d61680";
+ sha512 = "d193df19e352f9ee34af4069e1296f4ec36cb92528ba2ec090aff1bd5d781d071fc7887ae7abbdb302bb1f98b736a3bc06fdf96ee70c36abb2a005fbfd108165";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/hi-IN/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/hi-IN/firefox-56.0.2.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha512 = "62ebb2492546d9d6923a93b506c573e1bbb1cdd563700db4980b0d9afcfe19ec3b31b34b5f0d141e1a5827bf922978860ab13e36338a611a6c1143b225d6c546";
+ sha512 = "749bab51a40077f180f37876fd2418ef228275976d15b533c45c1c3054e112754f58a7f16244b9b9036f3a9d6b0dafe66d4cade45960450f98fc17866e8c0949";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/hr/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/hr/firefox-56.0.2.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha512 = "1de18ef034b46d2d610268bcc5735e10671a6e7e70c2239d869606cebc0421c0c99032c2deaba2b0ced97c937441731a8097598185a81ebfb609662471081533";
+ sha512 = "6e2c09245f5d317d60ca51601f3a75f6f873407f64b778fc9a27bb446830a7c4b067860c5dfba5bc7d33e03ef57fc2ab9a6ce58e05fec55b13728e9561a915e4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/hsb/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/hsb/firefox-56.0.2.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha512 = "2a500029892890bbcc44937e02c2f8dfee42fcc0cf0397e635b2e564aff66806424f0c0105440e3fef973289ec655a109b480c9c52f9cf820ffdedc7a5314377";
+ sha512 = "a485e38f7de4cb83b28a518028853d2166ef61a3dcbfbb519f308bed16b849ab6b1d2f7658c43d7f103ffb773beeb28eec2d599f11607ff7e1d465a39e519804";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/hu/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/hu/firefox-56.0.2.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha512 = "3227cf91840b19e45e4d1eb1454d0d1ebfaae1f91a632c93e994cd576f3d6dbe1acee273e266b12a8d8d18409e8c7da8abb2284a2d85e0f48a3e2619d6ffbeaf";
+ sha512 = "7092c3791312583d7984f36c132700a9e7233948d6769ed5e179ab334297904ab8125ddcb675193d8fc201506a46e35e36860c339d1824513b266412d3393e68";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/hy-AM/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/hy-AM/firefox-56.0.2.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha512 = "47d744ae1aa81e5caf0ec14bbb19289bac77c969c773a3a98ef6b22577a1b345127333281d9d041c9a835aa2a6313fee26dd5e8d20e452a9ebad049eff96c560";
+ sha512 = "50b0858fcf05524bbf54af6f2d1f0f283e20b73c79037aace88af7168d2854f65aa74db95d01b8c97937fdd76070ce113cf44af9b749c47ac07253192ea21745";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/id/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/id/firefox-56.0.2.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha512 = "3745ceb9ac5cb1a11d4fde46787a435a44c6197d7cc557fcffd6c68a332105eee9e0aa4042dc010b11e0a4846caa066f96c786a744b45a2b13b832b29deacce7";
+ sha512 = "dfbf714329453c41833b3ccada9184e6c016038e9a07b351ad6ef191c760f74b7ac45981f7ecee6a1e2de1a37ac64cb116fc7cfd6973a4d111fd5c58f8eaecae";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/is/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/is/firefox-56.0.2.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha512 = "cdcc14717bf8460b2ae2a21dc5ae4d9e3f9486ca29d744149f90e26f09f6fed54b40739f75ad644c57b8a1e4b16dac49f43167ab74e8e29b850d6dd8b22a68fd";
+ sha512 = "694b5c1a45f98550cf9ab4253ff536b8d6fd00232255e18f7920cdddca1dfc2ea4a5348baaedb4dea671d09ea4afd57ea6c116963776875a2aa92401d8f92bd1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/it/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/it/firefox-56.0.2.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha512 = "d93cfd5b5bdf0dcef5a82a39e592cfb3aa6e4b128ad22c38fc5ba3dff8177947c877b55da6d45fdb0e8fedf73aed024630eebc45910dea6760e4cbc0cb47f971";
+ sha512 = "cb313f84266093ca3c959ab40391df4ce8f5d0975ce190090d97b4db4ab7402b9ebbf0b34b7281ce44d7e8d8fe989c86515f757aed66a7f356045ad953876b5a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ja/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/ja/firefox-56.0.2.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha512 = "d9508e377e104c869c38d62edd255b2837092571c0748112554efa8fd9eb2f17319e3e7d36fad2538b49eb06a82151e364614416b3bd17c181923f5506cfb445";
+ sha512 = "e09e2cf8686aef0d96eb4bccff75694dc799247b35ff4cfefdf8b0ddf650224138994ee9a6904ba4634837883b64317ea90dcf791481b7eb9ada9d978479de2a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ka/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/ka/firefox-56.0.2.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha512 = "6dd2fffd82ccf111b133431edde1c8bdd34769803cce8626987b7665203d64925aef1c2bcbdb2be70897e3f66fd40bdfedf4b6ffc9dfcb2e8f0ee585a1b75cea";
+ sha512 = "21d1920ab8a21ef93d74e47ad4d6dae81a721867dcdbf2205b0e2c09c13d0850525cda123cd2f38a418f9127204e8f31baaf49f0a0bf76e43d9b5e916e2f0d52";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/kab/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/kab/firefox-56.0.2.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha512 = "389d33267f621a82d08e179005dafe88284a2580cd2803a3c223e9d132b471a69ea97647883ca05fed98d96048b0f448f376dcb3994c64c3f25598b601f2226f";
+ sha512 = "4e7cfa3a7786158df33605e2c516c29019adb90f1fbf783ddc539acc43784920859936a29d55583c2a2ba4c464ffe062c9780bc6da2f4a2bfea3848b1f27ea2c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/kk/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/kk/firefox-56.0.2.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha512 = "48b5cc20a559aceff6f58fbc5bc18ef72e60ed5ae4ed86e7d30ba75169a1bb62bee19deed7dcf071ed470719c8f97117fbd2dd0f973edd3cd641500747fc1dae";
+ sha512 = "8cf851ad7a4d13655f63f83c136b87aab6b002ca4865601098694cde08a85a2fea8d6b2a9f68560f52fb8f70f964ba3ba5d68491de92cae7396027d3efedad17";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/km/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/km/firefox-56.0.2.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha512 = "783a67160300aa95ff851e913b5af9208db4d1c96696db9aeb153a6ca0d061b68d2d83fd231b1ff73d11fb6c9689ede2c1632d43e23fb2c923e761cbffd73b64";
+ sha512 = "d1d73336758269c7de6741ad88e8d4428030fe8f48cea98f931ab35d8df96f3b2924eec09a32ce16759de3156d8434c7818bb70a0534be297da86a4d46d5f712";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/kn/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/kn/firefox-56.0.2.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha512 = "a4ae433d78844021f0fbe9a36b2baedda3c80cc10fea1bdf865d110c52c23936c51f5670917947aca9c313d7de936012661a96b498f3a88dd73ef6862a1035b3";
+ sha512 = "bb05c04ab39115420a912efd25de8fa3c68eed6402313ec8a52115631d62560752f8d0aed51413d8e4aab7ea0020065c5d17e93f9f5408911b95c3ae84e3fa4d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ko/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/ko/firefox-56.0.2.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha512 = "a1075cb1d622af46b47110da0e0c846a3a245fd94a89427d1598cec1e30f2b43a5697075358bddece7b44fa4bb5dacb63751a6cb16f00a447b9c3f815a96838f";
+ sha512 = "9714993754262e9a39d8c29e515b019bdaf94b77e7965ac374df415a524d5ba1ef1fe74be56c4629ba3065c256e108ee7f03fb0f1ee847eb9746b6887f530da3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/lij/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/lij/firefox-56.0.2.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha512 = "ef16c60f7a479876655338a822d0a366340581f90ba6a5927336aa24c7241ae1de7295dac0aa9d94758fcf2f9de696ec5996066db51ab961e108b73717f93019";
+ sha512 = "eb9ec79213968585b9578da6aa939a62aad98c58575c69ed7f81baa2a1b2c5f0ad5b0854d24ab1b5ddeaedbf2d71cae5c8f68b6c1f509a4bfb89fb158c7985ee";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/lt/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/lt/firefox-56.0.2.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha512 = "4eb707f286d699948bcc7df14096f32581a0ba2edbde59b89f1568f6d5a96e412d2aac210d765707b4bd797845cfb70569e57b6587a8fa67b81ce56d23648666";
+ sha512 = "b1ed129e96fe0e27363bb1f26163fa3c4acd973dbd43f52f92ee7b1682a3761e9858c70c39216e3ad847759b4d5584399dcbf4756034029c9ceaa4168f8f52ac";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/lv/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/lv/firefox-56.0.2.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha512 = "45fed96d0e82dceb48853aaa08ac9f6b26ef16ee8fad04ef15cb76cc2f1969a3733fd74468088803a735feca5e5416b853f41956d240d4150254a61ac86f83cf";
+ sha512 = "83055b9a4fd2218696988ad248b041f352884bd3522bcbcf8933bcc44f31c7fdea6a6c7e4c8160b6ced6ac6ac2fd34a120708667e543cf5f6c2dfdafeba882b8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/mai/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/mai/firefox-56.0.2.tar.bz2";
locale = "mai";
arch = "linux-x86_64";
- sha512 = "14739a5b2249386786c14816115a9b1a21bded28083bba11aba28012a9c7f5240d7b4dc3342192689d4d3a096d6a6f516d22f4370e49d465ee07721e937c1380";
+ sha512 = "349fb2d38a82a7cbf561cfb92fd439a9dc6114656d9f6e63e810bdda434840db43fece5d14488ecf50fa07bd4beb2adbb1b13092d6eeaddfc691961f901f793f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/mk/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/mk/firefox-56.0.2.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha512 = "fa44baf0e211a6efc3498c077911879593bb3dd715dfe3127f3177801f86fc7561f1ceefd5743cf4367bb01082a19df1f003ec879d314d252877bb69e2a12213";
+ sha512 = "48b67c7e258169c58ff476b6af1b4a07cc3b8f52e3f74cf3f039453679aba943305c3e7ebab589abf6db7520f1ea096c55397f748f896947e9057719dcedd5f9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ml/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/ml/firefox-56.0.2.tar.bz2";
locale = "ml";
arch = "linux-x86_64";
- sha512 = "91b233c59500256bda1e9236df9e282af2a161b4085e4d3af4807e4d9bbb568bf1c83b1d7314c01e10dd5757fbb9d291ac3df334e40e3f155f996db506996bd0";
+ sha512 = "30520236e653bef324badb0e4acb63ec9f027ff5c8fed22e256d609791c8c0d923e7b55b1ed69d66a1c6a554f271c9ebf1086ebd8b818c683d2499f6b41e6800";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/mr/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/mr/firefox-56.0.2.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha512 = "eaf62cb8a34af24dffd29daa1a5e2b9bab7f58a4016a6624335f621cb75f187d09c3fba71abe780b58c3e4861b640a1e8273a682d02c2179909249725a44da30";
+ sha512 = "04bfb26407b529d15880c5b4fc1c20fbd87ec5818d1713fd93241f055eb6206de2ba80e6ed2589e292ec1aa325ceaf891424477c435bd8a353aebb9606e6e05b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ms/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/ms/firefox-56.0.2.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha512 = "f089fa240f58ebc248fed6922eb1c429043504df079027f0f8122288ca7277bfb24644852c73ba1cb8032e5951f6066b4175b59bcd894485e7adcaf7823776bc";
+ sha512 = "18c4ff0297dfbf69aa376d21afb3a870c8d121749ad88fd361aec35b426386e3659a7bda48caa030a2ef8f5c4d591c54ec205d22fde27b2eb3343eca9e48e289";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/my/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/my/firefox-56.0.2.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha512 = "747ae8c0826f463a9b5f6e68283069ac35501245a3ec4e3df356e4244bf649bc83f3564bf7f7dfd572f7c09fc2b4cd533b7d60a1c2839de9ff9e049945d3238a";
+ sha512 = "09a61232686acb110da288d5e473b6c28ba0f01ff1a17338ddfc10efa7b60a6400a5c29f81da113655285f63be7fc673b68fb390888046b29752f73461d1dd42";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/nb-NO/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/nb-NO/firefox-56.0.2.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha512 = "063eb5efc2a47e6ac39d71900844df00bd1508873ffda1a1a7910bceb83fcb33f33b6de00470e1ef23ffdcd46dbb7ee2e60d9272e43f74275ac1c3b34c330f68";
+ sha512 = "ec583cd909bbdfc85b6cb59573e34d5299283328fad02f0ff69392e969ed2c5064a7349dbbeaebb0b87fbacdfb28b2919502b2a5e2a2ea288c6097e82d25c47d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/nl/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/nl/firefox-56.0.2.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha512 = "77441aa1589345be58882ecf3890e2f029b80ba62946109d48a105d421db7259532ac153fc1b5dfb4ff54c788def590dfa98ebb6f5c95383374843e9f8dba1e7";
+ sha512 = "7254a36511c7f1e1fe1f6fce9eed847482238ac178f6c8730edde61c86395fb0bd4938ab0e2ddec77ec2d22d9a1c0e69c2e00a5040acce25cf5aa5cf79cc087f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/nn-NO/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/nn-NO/firefox-56.0.2.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha512 = "0369a0732cd13ed14059041187de9bf10ad018b68449513da224ade76827a21df8b87743137028c788dcbc76c216345a50bc82f097aaa991d068cb37473ab5ee";
+ sha512 = "545f40ffd96bbd6c285994888d9a8f4622a7075e5f306effe5b4430a7aad69f670b91167e7b5cc0196250fb330d133fb1787df041f77ada58c14f16fa7340741";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/or/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/or/firefox-56.0.2.tar.bz2";
locale = "or";
arch = "linux-x86_64";
- sha512 = "dd3a1a56f506cd20163d28c8aab98958dedc811f921f4a0c277be59d93379856b04fa7362d3528c5840cb024280919eabf7acec031bcd1a198012457a4061a88";
+ sha512 = "c76e512c201c27fc39347950ab4fdbc14bfbe6e3ed8fb7d7893119222edb02c56ff313a3263e14418c319a75236c74f74ad5aabf51e4867d9ba0123476b0e7d2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/pa-IN/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/pa-IN/firefox-56.0.2.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha512 = "04ac45c34a0373e40574662f841879172d6d49fb79c0b39d0394397f26e3291a5ef053b78dac8d1bcac9d55fdb9e3e60dbe315f2416d4b93ecf6a258bbad31d8";
+ sha512 = "336598460b71d9e019ffd190b7839887a6cc1db01625c182c1d483ef5bd2593534ba5c34b1cf424ec689b36295263cfaa2aff7275f7900fedd544b8f2f5f0d0a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/pl/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/pl/firefox-56.0.2.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha512 = "1037efb25bc120e8aa8829362991461f22c0a7422afd45a3bcd29e81c81d009efdb9b8011e09fdf95e2d59a37199a75fa5ac46f042552140bd9ab571c63ac702";
+ sha512 = "d2a955085b4f3f7d7c44553932aad0d7f943656d173fd10024993e59fe97be38c60e8dbf9350f43ff91fb4a27f6fc849a3951f1f790238b642b418267eca0e50";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/pt-BR/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/pt-BR/firefox-56.0.2.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha512 = "66372b345b017a46b0bc6a5eb2cd54854e15fb6229b72b418dabc605003542b97170c72ef4d22d05a41e8622c8f43767e32971e09d1d0c3c4f58c008a0028532";
+ sha512 = "06eaafd16dd5d9cfd960c1f485de6d41409a50a25ba79e792a9d377f69665be62a36754e7d4e570840a63c6e877e6459d35bc503751b6cbf29481444ad098738";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/pt-PT/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/pt-PT/firefox-56.0.2.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha512 = "99b5a21180578bcc24e2813e2304a3b70f6d19c199925b0771938366e40710329ac408b59635f741e3082048972a740e84166fad9d567d155bb714aeac35037d";
+ sha512 = "8f3641797eb0053525278af741254d380b51679d1f7caf262bd519fff72ec0cf0242d03c65e94e758076dd7c5420a8eb8c5563cdecab1313b57556411c12c59a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/rm/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/rm/firefox-56.0.2.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha512 = "d67cde6cce18638e061256a562774a332192242a506b817b033ba41fe2f0f854bc0c80ce9b956f5ed7f25e51fd257cdb17673b05cb139a7e619cf5f01d90fd96";
+ sha512 = "00b426505507935c4664437e6ad159acd272d99d6a674611add7466a8e0f1689d2f557d09cbab1604ef1b45fab4dbb814049cd6a806e0515b7a9633a434c4003";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ro/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/ro/firefox-56.0.2.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha512 = "dc33064cebff3ba13f169fc1f52f4134c672214431db0d6309b111df8c53d59db5ac32ec54e5001d14b837cb8bcea02ed3b48763bde75c29fa8e4ba3a406fe08";
+ sha512 = "17f8ede2c98f5496e8ec3027fd6b35c2a3d8b4c3b3644bb6f2120ee75ad3aded59497df34a91f355fd00ed0f0f08cbf0ee7d22905c9eafdaca73a4dc4f67ee71";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ru/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/ru/firefox-56.0.2.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha512 = "24b5259c9a146176075e26b37744759ce3f9b24c7e7973b9394fe2a70ad10410e2c4453ee55a1bb2bef9b766fe829b3a7dc99cddc4686081f413f4cd2537be35";
+ sha512 = "706da80de603e54843631225b4a4a5a8e1c3ad3277230cbfc0aae932cc87858935b6ad4472f6aef366be5dd06eb7e87abcdfd6958740d0f3c61ef89d46863ad7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/si/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/si/firefox-56.0.2.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha512 = "0d8590d03413e817baba1d5f32ccaa7516d258f7eb742ed619a8615f7b2191e5229674730e90accfaa1711d6730c458e60c2b142840a62e526127257632233ea";
+ sha512 = "5c4fb75c7fdf6c1af7e20b724abd3590ee5a891374dad9ca52a4a3f66a8be094be1e7ea7f7fef492ce507cf02a17432c593cbd7419de653f81e247003b52e4c9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/sk/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/sk/firefox-56.0.2.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha512 = "c2afd8ec0f78f6d8db747500c8dafa3a188a10ba6c1cf713d3997bfc349a02f8dff58663b51ab24d545f74308d4b7db29c2d6a5a92f9efa3520b42e84795696a";
+ sha512 = "5c72b34e74d7df2dc939d34ed82199232c985ad3125e8244785c081637f43a1b9cc0aa788b881d6749ff64749ac1cbf19a62aea078e5cb972bffc48e28c452fd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/sl/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/sl/firefox-56.0.2.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha512 = "75d545f89dc2da70737910f0288a91a6a745675419aa2ed41e0652072dfce0696b0b01197f0cb7dbffbbcfc4e8350394e94c621d2f8e36c65fa95163e70db50d";
+ sha512 = "f205e1b81d3fa145cfbc960ef97161af098b2607059f0279d94b24dc26fc06172891da20c5f6630b120216033486df19fd866a29182ddb16a176fa7605e45a77";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/son/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/son/firefox-56.0.2.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha512 = "0baf5dc181eca057107b2d2ea89fdbd5662a0e443f7ad7adc286773da3b0ba922a90583b4961908607f6b6f1f1849c56ca219e661b8ec3ecde2ae4e1dbec0f63";
+ sha512 = "789ba111b0ee5843fc2296430bed5d609476666e4b7b7981e18323f0651c8f3882e45b972f13540d5cb72f7c1c3700ee70c293936b2cd2758c0dc4f8f7ecd70e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/sq/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/sq/firefox-56.0.2.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha512 = "9d220d7177945732d27c77fede9528043f1ced0e26968c9589aab75c727d808440897b8246b0ecc72c91a375f532c2add002d2bd8d59e3fb0f5f9474f42e144b";
+ sha512 = "2e899d0223dcaa283941e50ae6bfd866a6ac26f3451a76c482379ecb886c6d13ea5084fc2127300473f4fc1f6ce36b4167cd2811971e89c27a950e2dbd753619";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/sr/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/sr/firefox-56.0.2.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha512 = "8e9ac8e24c3af617ec99e77ac849267712ef095d01b177c78e8e8a0c35ca28b4567b93fc9ce1eb5c5e7cc16f9e1e9ad19df30f483db86d25e01e665c73380838";
+ sha512 = "a50e3c6cb8b0b4b2ab4201b613a0aa0d6c2b8d5b1ea934736681415aba3d2a8a9d4c4dca16b5bb479e0273137ab3b30315b5b2077907adb114bba07da9a413e5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/sv-SE/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/sv-SE/firefox-56.0.2.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha512 = "4a5895a1304c24c19ab270496f6de03a46059ac7d47edb834f36ec2ab39ab363af59eb742f2b11c325b69616cf4bfe93abe2a6720ebb5654cbf56e6868d07508";
+ sha512 = "5a81f87d54f0b6bed0372dff02461bf85b6d29045c1e1cf57ccf625fc79ad02831a00d64ad3e3506f2c98b64efd8257a9955653efa14510ce2a56df2eadb5102";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ta/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/ta/firefox-56.0.2.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha512 = "00d6ef2853eff0f6e867087e0fbdc16f6243d349b14ada2c540c8d3bebb520b682248165725ca842c77925d71b07e27ec15426cc215fc256caf34f56055351af";
+ sha512 = "d486a95034ae5671ab0c65992a0bd4d53cc015f3a89a7c90a7aa2534bc98823428daadf2c72ce891fdf9fa84a6492c61a0ffdb36ca28e05060a020989b3c9f7b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/te/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/te/firefox-56.0.2.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha512 = "ca9b12ba9c26bf12c709b8204206cf5766a819cbafee1d71fe4e12897fe76fc9144cb281e11b94f35243af6cb7d8deff2dd3d05444fc92a18a8babc8de9bb72a";
+ sha512 = "22b04c05ee13140cab8196e218d6d2756fd8b108d0511ebb15d19260a20b3a153bac792bd7ce153d816139429fb1039ead270e80196aae801db9e0ff65c37b93";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/th/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/th/firefox-56.0.2.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha512 = "d58decde55543eb8ae134335d3dc10f478b8354a723c0f0de2cef89d76c885ad442f989590bf5746a60e9bd46627ea520cc296f6811452d6ac4188da261ac941";
+ sha512 = "a57bcad31e7682742756cb1b53eb4cd31d531305b0e7bf51ff49c1eb6be0e0c1a9ad054056cc5afde2f4fdf4e4094a558fa0fccb1d2e763dc841708e21c91eda";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/tr/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/tr/firefox-56.0.2.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha512 = "1852fe5c47454a7b5bffc236f12843f0fc7491311979bb0793cc8150943f6bbc39852b30c597a6167d23b8b3199da77347bcaaf8a7d58f50f65019dc6db5a8b2";
+ sha512 = "af694bb0faec36e3406f238f9726179ca6f2c5273f46a689f36f32d4b8baccdd69ce096446f0e09c88c065d86bb23058edc4900a96a2d14ed583c83eb0b86e61";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/uk/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/uk/firefox-56.0.2.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha512 = "c908a9385c9bb07bbe55e62962f19af59da63753284dbc90fa4418fbb601a787f9ac6448906a45da73929e7fd66ffaa1d1c643e240ff288b21e66494e73b9e9c";
+ sha512 = "8aca0e9be3162dbcd8e9cdcb67cd8eba77bda79f140f5d7aa06902e78d2e3933d5e4e3d0419cc665800505321c55b29d1714d72ed95978dabe39442f35ab2c56";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ur/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/ur/firefox-56.0.2.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha512 = "e23aed0297c0605881baaed3df11f327db42467d8f0c764763ab0ac08697f1a7d3183ca0dbe8abe97d46503d6f71b9efaf046e5be68ac8e34027e8cc70c1c622";
+ sha512 = "effca2a2cab3972c2f521ec435c6fe1a5830cf7ad51e6fa3e533841961d55a6ef23ba96057fd82f5b9e34ef4e6936c5a18359969c6d25165267f7c8ae10b5d76";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/uz/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/uz/firefox-56.0.2.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha512 = "894e4bfa2919983c8879bdbed542b39da58ccc237e93a981a7dfcdbd0fb91fb338770f89c46cb97d4af3f3b8b9472983ce72c4fccb458d50f70d79b3da6591ab";
+ sha512 = "6521181bbb32ad0edab639465842d29442871697f22ff566e30959213f34750ee2b77f48ef862b1e60fcb348309c0e2d7211f77005391d6455ec160d113823aa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/vi/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/vi/firefox-56.0.2.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha512 = "5011071e8f1be873e69d7914c99b5fff3a510f74a064525f71c45373ea1444db4a2da46e806f0cc6f20032f96ef63a6147961acc4f6a7d9af161f08732b6b4bd";
+ sha512 = "fd4de5b14e6855f68a7a5e6fbf8f3def7bc81d8e63f26c98af0e06143f9f8b50375dd24c9f0104c7ca62a916f3921160f1326a862763fdc37205abe8f91e4db9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/xh/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/xh/firefox-56.0.2.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha512 = "9bb89e5614745a1fee19241d96abb15d7ba51a19b312c3d47d0a931d4e111b1e5796a47b97175af44331f4d7d86158d4c07d825b4f019383e5d93b2460a17ccf";
+ sha512 = "5a7fc7aede910ddffe3f15815091469b558b5a94dea2a1961442ebe3afe206825d182143a971c6603257760d959c133329418f319a3138833ac6e3a21ad29d81";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/zh-CN/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/zh-CN/firefox-56.0.2.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha512 = "2d9a2a0c2d0b21f5c3d58fd14cd7b9fdf3a7b45cb31b124ad17eff538e4dc64e55c035834373d0093615e93fcf61033fd16151b74b411d774541872ee4e1e914";
+ sha512 = "8080545c283f17964bdd08a10160633568dbbb3bed79e320f738a4fc1b01c67996d9f286faecf6327df7d28926186a80ef29f8ca1bce4cf049939282858e87af";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/zh-TW/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/zh-TW/firefox-56.0.2.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha512 = "2d55a1458104fcbd6b6f24d5ab6df1103ce1390d4bae44fa4552b6172a25a36d2456c5f5466abdf8a1eebbda926f1c354b12183b12bba497ea1b7739f804a167";
+ sha512 = "d5d4dd2ec14a5982ed77306cd257f76710e5d4191f0f30dc57150c5c6f6f37ad8fbf5521dc81fe66df8d22e70a7bc7e0f9d621f6ef82e8b3c3f7c831eba7c360";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ach/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/ach/firefox-56.0.2.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha512 = "f66fb15ed6671b27f03eeed20c42a93a31ec2589196160ab80d27b2db57f580ad52d3f23b03a3426e90753b8530ec766e35d3428561b837fac2444d0b9972e17";
+ sha512 = "bbad76abb597478e4e7b7cd5bfc6a94b430fcfa5565eb8e4a2acfd01cb5502a883e0823df78567879010126fcebc193e44dee74773fff9a0c66a0adac13d5234";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/af/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/af/firefox-56.0.2.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha512 = "41fa15ec74a0b53fccd6f572e4d350ede8eb637d1cdcfd38db1ef56e29672761abfaac76b2eed74b59c3a907238df02e5a193410829ba5b738a4a7d2ed74a0c0";
+ sha512 = "0dba3b898cf46397336dacb56c2e7e14584ff5da95e0217516697c1b028a1b62a5f62c3875e41e5cecb9f1e1e1008103cdd2f46ee2038f0553459c65d703f094";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/an/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/an/firefox-56.0.2.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha512 = "900409612c2ef05008c8c3b27852ab94038677df5fabb2ddf460ab731d57f5a39b9928b5cadb0996ffcce893983128bc04593ca6dbedb528ddd634199d92d311";
+ sha512 = "f5c7086004df5fa239d2f845bbba19ef7f2a1bfc2d81a42147aed859dc6f94fd0df134eef155b1a55899c2c8e4610d5384e51619e3dfd874b1010dbc5568f7a6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ar/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/ar/firefox-56.0.2.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha512 = "445af6192be988f8af74f2ef618c09c3ebb8f3bacedb0d622740b9068665b104146a7bb06306219193455cfdb1f508a924711a2480a31b5d1d554361a9ebf576";
+ sha512 = "710f15ee9fec1cbe7fbed9482c4f4593043626a90be783b63b923cff1bb51417f03240f0feaa605f42a0c0c1984b0a643f3924a1f6ba7f32abd1a4539de13fe4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/as/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/as/firefox-56.0.2.tar.bz2";
locale = "as";
arch = "linux-i686";
- sha512 = "9230c78a28845292164c311fdd882a2e0be590f09ed680c5fa91cb400570b1da8efce86efb96c1f006d166f61fa463871c9c8d7276a4f49a07bdd89c9a67442f";
+ sha512 = "39b2c110d3eadff569de5a11e32fd1bd487c2318eac97c7a5add79d7734754141c788e5d90a3ad1936e204bee386d082f5af6ef75931b07a682e06ca2300407e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ast/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/ast/firefox-56.0.2.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha512 = "8b313ba678e7beb14788fccda7ab1ff4dcf8c2adee8eee7a8a1224184219b167f8b84d81ae1c73400781bdd0b6c8a5e3e0e6bbb3e34b26587d5eda71130f2215";
+ sha512 = "d064c858258404e8facba40daf6b033d7a99caea2405d369d4cb8864f5baad9ace9ca808a7ed3f5c6a87553e3ffe654c6a34d081e4948a76df9a743099af1638";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/az/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/az/firefox-56.0.2.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha512 = "8092452d5e2197932a4fe126e891b8985c008fc28d24ae2ebcbc8554a55f1592de2eb0e0ec6b8d33d483aaca29c644b4b5956ea49719e6bd06b88d07ce200169";
+ sha512 = "fab2a1283b4f2588c44f5866f2dd8ecff3b9fe22e32bdacfcd825aa8994bd70f6067331946cbec755831bc13de2f97e82685d684a68012b33ee4f1de7e1c9165";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/be/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/be/firefox-56.0.2.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha512 = "6020147ec72cad49e2d1ca93f3eb4e7f5c3c435f6f0a85bbe0a39335c3791d52c628ad5b9b97dfaf52ecb61e7ba354e0bb5d00770cb88c79a58db0c002f2aac1";
+ sha512 = "d366fce83eceea67e3fee81d4dbfd607f2afd2ece13125ee0334e23e238fb2cb7bd2f6071abfa3103284aa035cb1d85c3613674709321dc073a5a7f02999b16c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/bg/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/bg/firefox-56.0.2.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha512 = "c34a98c08553a7961f3dd2af92e14f72c6bc9eb6fe0c613339570d9ecef1f015d0860ba5866107115cd1ea71a86b4c8177509c173f108db316b0d1a4feccf0b7";
+ sha512 = "3c2cf88be4ad5862cd04fa81fefa2334aa20221fd3ce1ac505bbee2be6adf84e9fcc78db6818d5f7013ad9f3c72ca9a8da71eb98e9a39127d0be85025125bf10";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/bn-BD/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/bn-BD/firefox-56.0.2.tar.bz2";
locale = "bn-BD";
arch = "linux-i686";
- sha512 = "d1157740fc765119441aab489252db93698e82e43a8bf2577a1c36be535adc782fb418a439c56c1954d58091514db4c9e33b7a8f281930387a9bbe6066062b52";
+ sha512 = "4af8e284f17919064ad630e32d0c0fddb0ca2d12ae5134c4d3354dcd23a7677d7e4a6223958f1097b47cfdb78afc81909b118130aca94ed491038786289c3842";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/bn-IN/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/bn-IN/firefox-56.0.2.tar.bz2";
locale = "bn-IN";
arch = "linux-i686";
- sha512 = "ada0aec0383e3f43bc46d72e0e79e3adc64cdba5d5d6fb76315077403e233e5ebb8622795b4e3d78bd16ca3b5978259218c0873f547828f420aacdfb53753e7d";
+ sha512 = "5ccd06a65c6c164bfa5fe766a6644fbfcf3852daef8a0d052e446ef78d20c96bb738f62556d83c6c4f72a107f2038636f3db7a4b34c58d456938d13634122841";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/br/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/br/firefox-56.0.2.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha512 = "714d2433d3716d1d9f08025115a7c4a20be975a7d66684ffd25439f68cea2b5dab2c37689c688b7d6eedddaf756e810556bd53366a28ee11437e1180a563388b";
+ sha512 = "8ce3cbbaf04799ea97bc4721572b90f82d8de839d2787925d45045571d46f6f7a97f0e6a42c484e486e01e78e937425eaf9a1ac26d74fb7fca173510dfb43313";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/bs/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/bs/firefox-56.0.2.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha512 = "836310bd3eafd70edc760390fe0fa33659ce2c1f0243ffa21d5da95d59462cf9301f50e89f8e413a91c02f5f362ddc34e18498f635ba19667ae8bb5d69bfcd57";
+ sha512 = "0eaca44c8f3bda580d58d26d089dab50d232553d3218226e5476b470501dc6d53ad8351043f14686ef77f4534d69d3df9af67fad99d702314c187ac22e15bb78";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ca/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/ca/firefox-56.0.2.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha512 = "51f2ce893ae1513c067dcdd0525b254a7c1049e952e56b31f86eb3249d741d131f7df529400039bc63b61a673cf1fc55e7dc12043679def7fcb583d748afe4e9";
+ sha512 = "810d5d81cbf07a2c62beacd97d1ad602a492d1d0a2ecbaa9cdd328f17fdb98657cccc1764cad9ac1bc71624c9f217c02cb8d3c48f6a7f5b0872e02f6418e75c2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/cak/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/cak/firefox-56.0.2.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha512 = "ed948b4f57118d0e0fe7deb5d8e117c1cf8d7df0c6d5c1f1721490586720bea76e81f05ee07553f2ffb42675b2ce5fd8e3dae342fbe9ec7836d489472d1ca673";
+ sha512 = "14df3c2cab46957dcca106999948b00edc2b570a06aed6091d8c544aa838e7993ed655e8baa41d0c84cab68bf2758816b8216af8bd2789fafe7fc1a0d1741acc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/cs/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/cs/firefox-56.0.2.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha512 = "2b16f351f4984310355f9f9b27d656bdaf15b2641ab5c83c08d6e590562284b9d4a89d7f26be605957ad3f4fc81775155255d1f0080ee0558dad96c05e6a5591";
+ sha512 = "baac4efbaeba22c651b625becd24867ccf39acdb744559e1b113811b35503eb5deaf2249565d936983d88f382135bdd28fcbf518c79203fae29730f962b2bcc5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/cy/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/cy/firefox-56.0.2.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha512 = "ad4719304c7ee807294853aacf1516e29339be23e5906bfb5725266ebc3105dc1bde876b29573609de0f38b180f75017fdcc40e8602f92d779578a450146f6c4";
+ sha512 = "ec2687e49101b76c787dedb4c21d886195a0a14aa5e653bb335675c300ae2c69f1cc07d71dd70145c1c52f6dff47d8e75bf9b7006f8e861b86b97df07e4667f5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/da/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/da/firefox-56.0.2.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha512 = "158c318c5b83dacc3ca737e387d47845a43cfdae5add8230b9b4055f936f212fd9f25d2837ad9b4e177e18beb949ae2afe5853b24331facea3fe410216b8cf78";
+ sha512 = "c0f9e29b66ed0eb7c47e1fc633a5dd3793d2f843827c2b37f51e48cccccd909031855c0f1d0acb8f3e796a0f74f847b019f01a207261c9c043a8ea6b2c4d3fe4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/de/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/de/firefox-56.0.2.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha512 = "f9ff911f2cadc837685b814e906d6e03f019a004f0daff5b5af902467e905269b873f101b63b9e6cc33e357b5be06834878b072b2f8b7e08cf9f16d46122f987";
+ sha512 = "6d079b71b7743c6cdf7f11e0768c122a957ecee5e8ca7094b0b71fda937560480de8222440e160e1b9a4987f4615347dcfd445fa7819efb32ae2985b3f106ae7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/dsb/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/dsb/firefox-56.0.2.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha512 = "d4d92ccb3073d038836c92ece1e7cb94e8c2ad1210c1f70608f99381fb02fc88aa61db5845cb123af11794cb39d14562e9e034be4f1519234bb9f8b2f685eb61";
+ sha512 = "701205540952a95e43b6b45e517f7013f04ecf4565e1fb8eb2d856b590b7249cc9f212c10c711350f030ec4197e53037da812aca15af7429a1376a9f354dbb12";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/el/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/el/firefox-56.0.2.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha512 = "6eff466dd1b04611fa8af686dc70bb2530e4392d2eabdfbf51f4b679060c7d5f96fd95120e60cc629eea8b23f2452f5342fa5e5dff6067b820d152906ac19882";
+ sha512 = "41bee5f59c100d6a5d66ff509286c3c694ed7de2d576a33d9ba1b555c44b75e1174344841f017b6ff86e467d9b5ae1e0318eac3a87dab36bfde8300fd8ffd71e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/en-GB/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/en-GB/firefox-56.0.2.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha512 = "e8193bc433fccb5d02254892f2e4869cbad215ab9022dade1167082d3559545c7d9a8c28b6b6454183e1a0ab707f0535709cf551977c97398459f816ecfb1b05";
+ sha512 = "35d159cd9eb069eebe84919cc2c29a2b962ebc62a28b0e6d8913e9dc98405b86f5433def34d14bc6da1eaf7cebd778ea1074e91f09a183c661768ac9bf306451";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/en-US/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/en-US/firefox-56.0.2.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha512 = "880084f39653f405a3a142267e0c6023779cac219932d89705750f1384e08e21d70025152dc010ed19a5a3c6c4059948892d6121135a44de96ba9c6dd185b5a6";
+ sha512 = "8bd6cb9e4762f4f5085a790ac1235a88e5b6610d4dc1e34c5bae13a3219b05a35f57b40483b6078ae93d60467ed728d75dce2355c913530974aa47884595a8e7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/en-ZA/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/en-ZA/firefox-56.0.2.tar.bz2";
locale = "en-ZA";
arch = "linux-i686";
- sha512 = "d42d7a3e9bc2c3d06b7579077a99db5bd609b62e807862e5e03717cc84c2b26e9202f8e785ea16bc16182aaa8ebd8b83ba2b0b73dae133dd6466ed46a75351fd";
+ sha512 = "5fa8d2f8186c35d8e6a01e90cf763e35b9a8f99b272bc6dc9d87f80b8ba252b48d0e51e8a60bdb0aafde34dd50c1be374844c87a79917e2b521db1eda4f60a67";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/eo/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/eo/firefox-56.0.2.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha512 = "2f1aae311a095e8d48df3106513b94e9b1fb2cb426c0b35782a61bd7cb02215f26039e3090b78401120fbe81a548b5de819c3e49cdc46a41431534735527cf40";
+ sha512 = "7beca78e35798d3f0f24c8c87e2e464aa2cead0fb64d5c0ae4a93caa831da4509ffaaf0cc84d0624d389f7f846a6033ef067b2d2c7c5b7be2b276dfc0f2012d0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/es-AR/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/es-AR/firefox-56.0.2.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha512 = "71b1c0ca8dd8483f6c40f62215b86b7633c76097aa9c2d94bb901eea5f6e8a9a5bd99255064c700308569d294caeafee7fd711191b9f393f0b607768edbe2488";
+ sha512 = "80110dc1761d36c02ba6d42e11b104c54056fba3b00788398f09ad83444968700487af348ac1d275ec0f303b63264fd0b4782fea02021dee63be044163a2c9da";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/es-CL/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/es-CL/firefox-56.0.2.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha512 = "065fe812e9a4001b0cb282efa5c667a999429456de1be2679fb656b88be7119d252164036a9c23829722e5f52b29512809ed4ebdd0824f6904c81865a1a96a1b";
+ sha512 = "64c69b812b0fed858aae85f17baa5acabcacbdcf494c164575bdfe18fce25cd26afa8d843003785883fdf3ada347d42cee3f2379692d81cedf841fe1605b47fb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/es-ES/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/es-ES/firefox-56.0.2.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha512 = "c2c22c22624e55d2463644fd0e3812556b22b7c664ef412613485278b5bb9e0cda8f17e9e57798cbe6b93a3a8acfad9c287abef425e1c064374757abc7465edf";
+ sha512 = "40ff4bc3cd70c2891825a6f68dcd356291957c45d064537fdcc95119235a7764fdb786d586504db1b6fcd92c010ea4559162344d69ccb085883634c4376e0170";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/es-MX/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/es-MX/firefox-56.0.2.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha512 = "e0c84c217ff11d3ed882d49edd68b8b72589b5a1689dc75d54a895dbe261166bcbc2a14f89f633749b5c9ebc865e39a01bb992904e897d518a45840846710e79";
+ sha512 = "2a05d20aab08a4f8745f93f011b1e1ecbef0920ef80204802c8dab7290ece35d4f351b68c1f417de3d547bd26523bb05cf62dba3d118c21a56b4e2f06433e4bb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/et/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/et/firefox-56.0.2.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha512 = "7639e65067d23d20f4ac96e1ec87efcf3fd6ba912dae1fb68e46c4eb23fa31352589bcd6841df66e292c08a332243dc305c1800ee26b4d91d6401b873d517607";
+ sha512 = "8a18de633eeb34b34c198c28b03914bf885cebe4e3ce15874b4fd99609d5931e703b82683450ab36ef732c99b974c0bb9d757717a3acf51c5567400a8a712e9c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/eu/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/eu/firefox-56.0.2.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha512 = "8251eab30eb48b0012d3df66ebfbe75d75d36fc4d2ef71947113f747741f42ae8942db7a40df777973245be3c72949a303fe013341bfa64753d30ff05407d592";
+ sha512 = "795683399a11c7e2ffb33566be6e087c8e499f2d7a8511aa36268a5c3372e1cfffa7f6b23402dcd40ea384f4231167fa3408d680e6de1cbb0a0371f2e477c6af";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/fa/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/fa/firefox-56.0.2.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha512 = "418c2ccaedc94c695dd77bacc399d7dda65cba53251eeea8e203c68a80fcc2fc83f7f6a75bd2d919a5e8f61a148b25da7ef4e4026bf2ab35eec99f39bbc4daf7";
+ sha512 = "dcf0c1f5d58826d05d7eef3a7dc9f50590dba939d1ae3f4f1509be246ea1dc7c1c65b5cd642368ca0857db5c31311112d3770f1144c2319c29a4dd93dc1bdbf4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ff/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/ff/firefox-56.0.2.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha512 = "eeb0f38f0aa9cca8c7d9530a60416685054394a016778006eee3fad363f05ef8a362425e1a318d18b9f88c409b60fe380dfd86080825929aa9cd2553392a8b79";
+ sha512 = "ccb5d1924c730ec816442fc4627680c1638464c42865252834572b7f0c6b163c773750a9885f711b523c119c11cee2049374fe61beb7115bd2ae51d3b7f6beca";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/fi/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/fi/firefox-56.0.2.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha512 = "678e4396e41c5674b8bb5a536c498b48312b2fc029ac8a34fe152b93392e6337f41f29c755157a0cbb3af39098eb9a821ca288b1b09d28da417164a46195f5f0";
+ sha512 = "e3422e1f91a9009e2bf29cb034a2ed001c3c2b32db7af4b55414a5db4979e8b7ab4ce415ba23c015e4fa86ff7c87bea8dc7e4d9372c4680923c24068cf0b9ccc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/fr/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/fr/firefox-56.0.2.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha512 = "2f94ad8820602f0687da70da22dd1d09ab7901e3697f55fb094f7e9ef2aee87b02aef529b58b528cbc7a3d3f7245f5fe2886949201fe902463febb1900c9e38d";
+ sha512 = "22fbf62da966b0f922bbc549eac956b74de8057c5acc4d6278f32c643268b809ecc117eb623ec937adb26be78e1f081f1e0eba025597937a613b0ddca085385d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/fy-NL/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/fy-NL/firefox-56.0.2.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha512 = "7641e748104314754fab92b8d08a3f1d45871b10997a7c42b1862bd69db8cb8df41251a8030488d673127b24da40159996f1f9d88869ddf90cd60f9017cdf1c8";
+ sha512 = "20439b3d0826fb166bf928a1b9e509d570b342ff3449a9c6ba5c402537b766ca75522f65cb5f1670b147038a98a5e7fe4d2aaecdd93e1c2b8c6db2d7dd83cdbb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ga-IE/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/ga-IE/firefox-56.0.2.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha512 = "8eaba21bf5b37552186db581f5f0da833170ccc1eb5c490911b51771a72d1c48678aa680f29ef5f1a3a3cc019ba5e9a58fddfdb9acd08b2356886a84eb5801b6";
+ sha512 = "00ece6e619eb647a4ee6643f8f174309b81ffe25c1b491610d0dd25fd3b294db79270cb2791d9818d5629206dac1a003859bf6dfcbbc180650c1ea1c7203c512";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/gd/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/gd/firefox-56.0.2.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha512 = "71508a24090f347738fc0511432d4331007e4982a69d2b07e8ef39a6c0917db55b6a0a1c4b5397f7bc96213c6ab67747a4252bba3625b1ec7ad3dbce4b6976a6";
+ sha512 = "c20d2cf4fe1748cedd3ea3c38d2b7bfdc72dfdb57009b47146bb0e01ddeae03bc48ed20e4f86c489044da8f06af7e3f67bc07c9149da346f142aef1eddd79a27";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/gl/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/gl/firefox-56.0.2.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha512 = "01f4fe34072d62b95e0197ce2622334dd851c14066bb988b2744a983bb766d60852f8a1144b2d2972ea0a7edc8bd974934e4e120b9e218ea8307744ec42ad268";
+ sha512 = "bf06db4a9871174d59fa5d53bd854fd0c3fcbb48e27614e626860fb4e2c248fc65be7047396b4c002c978bf8eb39ecb94d3cda0b80f583aa84aff16acfb4e6e9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/gn/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/gn/firefox-56.0.2.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha512 = "2857bad04c580841f58aa29d02d30c87fa72d5ca2695c124ee73f5cdcef93e5b7cd02daa42f2b93a569be6773b0edb9c9da55289bf49f2e442fc91c1cf97ac47";
+ sha512 = "a7c89f53425a614ce8ed10a7cb5f78a4da581f088ebdd9a7b685779bbeaf1daa26879442c0569b7370f7db38f1db90a894ad22af094653b9cf337bdb5efa403b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/gu-IN/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/gu-IN/firefox-56.0.2.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha512 = "8ec3538b7d0278caeaae64b19300132c76cefc3345e66a76bf686391ce35cb578be9674d14b6cc54fee2017792e319496777af337401f3b3419af99e86710462";
+ sha512 = "5beab230f4b7eddc9c7c1818e732a5a3dc3f182112ad8b0149534e6a2a4a948f02e3c8de1a0c4d8512c050a0897abf1f89b52cb085b71426015051510eb03e41";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/he/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/he/firefox-56.0.2.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha512 = "82324d45dda57df70520e878938a646e6692817f4f35d6d0f0518d8f8c7ce6183f968f9863e83304f5f41a5a6e135d77f613dbd6d277a66f6d5db9996381d949";
+ sha512 = "d5250c04dfd43b154d9a4b2f56912bae0a65c8eda8c393440659ed341d4371ddb543c75ddf254da96bcfbc873ff9d5d685701b0842e80b4e134f1631b7cfe7b2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/hi-IN/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/hi-IN/firefox-56.0.2.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha512 = "0359d570441db163c8d8346a0cf1e50704125e6f165a6e1d7bbfbcd0ffd89fede9487195de927d9eec5d4f23889dbf4ed69d8a7807ddf93291da79bae14267c0";
+ sha512 = "e3e8a6e5376f566190d9f25527eeae195d54d91c3d213a1d20464c2da197678a31de74030fde8c365b91ac032a711e57ce7a2d4a84a087800bc0c1db16d188a5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/hr/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/hr/firefox-56.0.2.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha512 = "fd3e94d57decd57ac00450b9b76cdda282bc2b528cea4630d6e835c5a1ff9d56c7be6c67e18e977ff4b3d00cc4e1db3d21b73debb7194bc094e29a49de405010";
+ sha512 = "44d5ee009da2735a042510c197e810116d13d82cf4662c34c44b651890065e4f0a8d1cf515c0a39bb9444764ee8312200e17887786cf5f970f4f02a07a9803fa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/hsb/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/hsb/firefox-56.0.2.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha512 = "0a6896110e471501194086932f155d0a5302fbae75fc0403cf437d13d5e5e3ecdc382ac748688f7918307e45d294e0b29100831fbab5684afb8d78f9031512bc";
+ sha512 = "5e0388ca340c6273bdef0b2b616c0788de6f0535fc6b25fa1b5c74008bb06b42e8a086655361248716f0d1ef001d27da4ee336bc3ae6851ba282915071ed071f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/hu/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/hu/firefox-56.0.2.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha512 = "ed27b99b71dbe5f51db4a981e4c93b59c35d7ebb2965b7d12719c70de41512201f37f4540aee2bb723ebdb7b2737df668babef889847d3c136d6083433e75c20";
+ sha512 = "04bba88955f56737153409553fe52d66bea6d2b0f22d0da520fe40d706d3463ec19c9462b6245a4e6346aa1cfcce583b49efa8089c8db329e4756b1c5875404f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/hy-AM/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/hy-AM/firefox-56.0.2.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha512 = "568c1e4bc95c26b5b0113c0784a305dd5ecfba56f5cb8318f71e135a676f9b86e38fe31675684785d2cbff7a1db46910c0ef7c60470791f9b6c0334422df83ec";
+ sha512 = "e4515485db9d85291028c06bbe19aff4fa894a7b82d1f826cf2cca91bdf08586009bbbe7b8f4df6f6a20a7a931f8ecad4fda970e01af7ec4f68574b3e99889ab";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/id/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/id/firefox-56.0.2.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha512 = "91e66bda4ef701bfd10e5170ba463fcd1849083651add4cd09103c5eb6532ce5f72bd30a15e0caa811e2e78326fa53429f7d232a27100ed03207f2a2110730bb";
+ sha512 = "5cc82fbd44b61cb1d48c7b51c91874de20b42b3249efb1b34cb69720a39e08dc52d814efe73be13d1f0a25be9640dbce5fcabcc83a212f1e0e887ebe47a9b7f4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/is/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/is/firefox-56.0.2.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha512 = "a9fe82f9045ca421c45bb9f2de9fd28b57b22329dc767b402a7393d0275acda591cd193d0285395a36907a9b497427a88d2d4da2c224bcd123dfbd53888b2e3b";
+ sha512 = "65d1236d88ef3ea9f4f9b8f86d59dbc4e2dc2522e5485542dff2d747989e7013f8ff1b7cacea00514bd3510ccc145b0a96224d48947b0fd916bd0742354e958a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/it/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/it/firefox-56.0.2.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha512 = "2ea32878113a4256eb9e264bfbf67a81803f8c89a63d74e3ba66a143ede3af2082e5fd13f1e761147f5545c29c70f578210b2a4e5dbf2985ce957ce79db2d568";
+ sha512 = "cad3506e98ec810aec450755090217b85145ac0b4bd2faacba35d1051a5a5419f0b8ea2d497040c6f05579875a2f727938be5f964dd6d5d2973cd681ba6a8716";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ja/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/ja/firefox-56.0.2.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha512 = "760b3c4ad18d6af0b1bc993dd9d12d76e30f6c197b1e58d9b4606d271ce502fb609b1208c0ccdea222bc7076f03dc8923e61cad092d23c0289ffb5bdd3d8442d";
+ sha512 = "fc8f6a902b8151479f427f58464acb8bed25dab2ddaa5ad21703cd79f74867c829b9b6838d0fc35f6471d6b0e59f005158bf80946ab8b3abbff9f71e13b10fcf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ka/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/ka/firefox-56.0.2.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha512 = "5a2c4a3249be869c5e70369c38a3795de3cfc2ad9bf30f933f82b4a286d72fb9c936d4df8e1320105a4ba20ebadaaef1659ecbec80eb9e8e21aa8f403d912c41";
+ sha512 = "783043bf2a638a5280a72dafcf96b7a4d2870dc91d07e85f7fe4fae7f66dea60def9ed5fac28b7923c5ab3328aea1c9eca38967f3daec57e5de53f501d6c7ce1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/kab/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/kab/firefox-56.0.2.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha512 = "7ef692ed2101c094a08b3593ba2d1738a616803b3649f83f650c0038316fd52b51e8cde53116015a54dcdfbfeb9d1209dea2273705142bf431b29c2f6b7611dd";
+ sha512 = "605761315426f05a5cd138804c205ed4e1c6d9ec8e78480f97f2f46e48ab4e040be237086af4dc63fa198ce9364972151d819e7de3add8243426c162b107454d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/kk/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/kk/firefox-56.0.2.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha512 = "bd88bc609a6638f9cf825e2ce9b7a615c555532275dea9dc3c6e79376cd2d814b886f5266631166a53ea38542e66011608f52797febd2867d15c18223d5f7788";
+ sha512 = "ce10569378e0b8b6f77da7534fd60a613a3bfc64726e2c7ce22042439d69e4f6819164029d8ef6e691031d263a0033c42e0921124286dc04afa7c81353b5645a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/km/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/km/firefox-56.0.2.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha512 = "b38ca1ff78eff732ef54d71cc956a31fe87922e76df5cef63ffc13016b01394aae904a17b7c8905d62120420bf715b8c37f73cd5fbe2468003d55b8c28db47c8";
+ sha512 = "e4ef8fc7ad18550ca93f679ec79b4a8e16cc34379ed52917dddcb7bcbdbeb6b82cff2dd16c31001dbe8232bf49cec6eb605ddba059f71c109079e4fea679c81c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/kn/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/kn/firefox-56.0.2.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha512 = "ae05bfa4914d479de80f0cb6842a570737b21097a60386b700cdd831374e6197cbc5d0b171b2091ce962e082bb7809fa46fcffb4a1281d7c38d5f57675b8e925";
+ sha512 = "9e841f2b2161feebc643956f92b3562db4842528b37180e0ba5d4c1357b6a23d11fed6a2a00f0b252d609a5a43a15dfad21b97e3ce012dc9f30dfc20ba23549d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ko/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/ko/firefox-56.0.2.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha512 = "20993f13768ea3b035b0b9d80db2baaae2d07757761a9d0a8e2a992df2e7ba3b891222c93dc3778f1b51b381ab99adf2671161560904f99a4756d5e4999cfc82";
+ sha512 = "d5fd6d0826d7a28b69f05cf620cfd45f66223fca21f2642228a4e3475623c34bc4d57bfef513348e96dfee1b7c5b47e994147b7004dfb5efc60d8261aa278651";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/lij/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/lij/firefox-56.0.2.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha512 = "0bf873490e9a6dc237d5bf2b8f32676b78eb1d6d9a8cf5f5ca9d1913b4b235e9694010463ba13bd082a90cae23d65f6eb33a15a8dd8e21092a5c966c2805ef54";
+ sha512 = "150f06608d1f7942277e30f7ba5dbd046dd826152183e30cef8438a7ffefa4297b4476e5fd4c4a2b4f376a1e8f1fe11381df36d41c6705e0ff1f14dd4b90fdd2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/lt/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/lt/firefox-56.0.2.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha512 = "0660a016305c84dc4601bc1e324864702233cd08a356673f515d8b9a9b7be443c6e265cc6072f144c49a097ab3d512b033ef0ca657be92117f6b646b6e2102f6";
+ sha512 = "47fc24786499a5eb770a9d949df4f7b6a0726e7f74a45fb767aaa30e1535d30583e5353223bc3cecafa89284626a5ea03c2633d1a264ec044e51b001b598ee91";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/lv/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/lv/firefox-56.0.2.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha512 = "6fa4d166fd871e1d76d8324cfe50217a468c6da073905504919ab69c6dd14521f585e0e347fc076c985afb5d41f86b3ae691f09492c97400ad5245ddbaaadcf1";
+ sha512 = "3863b8bbfe87f6ae9787f009a7c3694454d410140a138693ad1419185f398c6d2b5f74111484cc97b5c61217d3af904ceb876efc16d03238901c858840f69338";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/mai/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/mai/firefox-56.0.2.tar.bz2";
locale = "mai";
arch = "linux-i686";
- sha512 = "a18f5580bcf74d2dde0d2c1bed4413add943d0e7ce8529d3fb5ab55b91397352eb70ec8c393cf8f9dd89e3a32f4187b4cc93954800b63d1a10853bcf13202b10";
+ sha512 = "7a0a97c9ed2ba31e05eb33790f53e1d9d2d4752ed7c556bf7af74b76828d0de2ff36b89a9e4e77fbb8dae5198b142a62e09465210e62c0d23c4fe93fa726ffbd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/mk/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/mk/firefox-56.0.2.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha512 = "72248c99fd9bc40ce579992438cd94b050c18100b26cbfe575c6199ae3b986d1d8aeb8fcfb63c8b8464b7d4ec35f6b332fc32595e72603eb7d41f0b0dbf3c2b1";
+ sha512 = "9328d9a5151b6833f594f4ca8c523797a4f75d11f9c5f77cbcfddd7c99f6c3e792903c26d059f4025fd9d5b5e76175d52214963e541b5f01c6f3abdcb667873f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ml/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/ml/firefox-56.0.2.tar.bz2";
locale = "ml";
arch = "linux-i686";
- sha512 = "f9ae435602cfc796d93a2e5aa9ffe1216c1465de3beed4ecc6b04141c392df9d1b6280deb1d69c30330db4c9ac6568b3cc4849e57c8e84f8d3e69c47a473018f";
+ sha512 = "53a52a6e4999f116158c2043b2dace9711946ae2ed2638189c38af9677f70afe2b0e2434054b12ac34da531e40d58673b8be78b7dd6b7ef090b1fc8c26d16d41";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/mr/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/mr/firefox-56.0.2.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha512 = "0cff95fc291a1874926ec895150cbc99b8219b29f4e66782ab182c29670b2356a5ccb1a765e0eb734666f7ff4a7be7806c62012b38118ce8d2a8f7c47a1e936c";
+ sha512 = "90ff4ce1a1fb75fcfc0a2d5a38df9a095108b83cf3e6958793c962683668f5ec95c72274cc330e7bff616a313d1c267b3b55cc7be231f0bcbbb58764dee5e06e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ms/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/ms/firefox-56.0.2.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha512 = "1add2335e98ad3ea9a2b57ca733087830c50e50872f8add7d8d5f2571f2d858b4f4a866298a8509398237ba62c363eccce9bb358c978cbd7b1ac6cf1dcaffce5";
+ sha512 = "cd5c44219bea96b2b1d02dbfd80ed6b84fb40b19d1d0c170716484ddd6e07acda961b824631235f9f300017531e02e12433c39d90799acc2725bdd93cfc524b9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/my/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/my/firefox-56.0.2.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha512 = "901404d74cdd090c0a63b2c0e60d0fb7afcdf3fbabda7dff07205613680ea315c2c33ee33001c8e10174f91698cc1cb4f03dfcf96e1104a5bd2d4750666627b3";
+ sha512 = "f9f17da2d15b9f9850b97762b6cd6a7981ef9a64afcf659b280c23f6bc7c741e73537191dbdec90f89fae8ac7a552fac90039820b227b59ebeb197dd6ea63fac";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/nb-NO/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/nb-NO/firefox-56.0.2.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha512 = "50821c1cf2ff9b49c34f9e05007678068d73d9558e43083bb305049c47d62abeeb3c0a994d872de6c9dbe86971e4a5d70de716a9051180a0b2bd73df213416b6";
+ sha512 = "61875cea3c200d84a65f2cdbdacd438d6b9437d27f62f903b2f46735c2be5a36385bd2276572244da64ae77be785b268a54db9590c2d375e8205b87b0b859d0d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/nl/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/nl/firefox-56.0.2.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha512 = "a81331ef521173951d7b45e726dcc0d57fa4d1ae1d9c05a835163bd71bd6ec6ee410a355bd2d697b6c59f3a8d9d2a5122182e82ed800b0d8c1830ff759fff71c";
+ sha512 = "a769956109ce7867b7cab41720051afafc32fd9579b23fe2c2e79e389cc193b7f8521cf27e5e3be805fe3b7347f2f0ccb552e46e140391c800b66bae515f61da";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/nn-NO/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/nn-NO/firefox-56.0.2.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha512 = "9e8e1337557ab07c07ceb5395d6cdaca647a606650ff00d76244df125e6e041b3580828cc25dc1e300559b05a83121454e77c88e47c0708c30a561b00f18a86c";
+ sha512 = "84d13b0ecdfd3db9b8b72266a5a3a5fd300170cfb00aa116c006cf29a123d3e6ec87594125dee9f28a5c4a5effadb3a9a5c0ecfdafb32a221a72c043b28e958f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/or/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/or/firefox-56.0.2.tar.bz2";
locale = "or";
arch = "linux-i686";
- sha512 = "4dddf3bcc8b46c326a632f96844ec369c5593bbd70a846a4d041a5f14da29b953c3318aef820b46d4e77d25e79290fa77230ef17c0d57bd00802f830ae4a76a1";
+ sha512 = "61a95eb0ab54afa990a809d53039d887e477633462226de9c41f77474fcbbb85ba8ff253f0399cb1fe9a545c38d0a63e03669d34f5e0d34c94d781490c6235d4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/pa-IN/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/pa-IN/firefox-56.0.2.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha512 = "b22a57fb65257b25f2a7c083fbdfeb9ca0ff83919d5201fb6996a5af33a68a2722ed8174853d81a90d61beb79d811c6b756d1fca6dea6c70175165255dc92bda";
+ sha512 = "f27f374a770dee7b91751993b15e86c818a8c4d6758b3e9498e14f81fd7b3a5fb0397b99e87b2a4f95141d4ad788c120d32a94f37a70b5aa30b6d64dd7c92c08";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/pl/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/pl/firefox-56.0.2.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha512 = "76d98c31d80b581a910a703098a0f80d9b9dceebb8b8f5f69eb428a59d7b592ff3aea40f152b1c74a9a849c45cfe1334951261b84e84ed454afa3bf9d14afdd2";
+ sha512 = "ace6225fefc5149ade7ac1bc30992847529183c6aa903220ad2b366c0e233b9304322cf0fa546891d9ee040c3cc6e8d3ee769f0290130aafefbb2a4606c48fe9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/pt-BR/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/pt-BR/firefox-56.0.2.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha512 = "b22cce3b391df6c945a7d84294b3ca36c90438d1eeeda002f1af4230bb8638733db1313b36f3d907b8ad4b7b117eec58c601abb21400ca2cd228a44fc49a499d";
+ sha512 = "84876999b3f0717f34212d01014b2a3b2a4f95e73e7364fa53ad5366030df5c7dea65da6a468f7017f25a22dd659f314cae9ddf0167f413eacd2eb6e7ffd3501";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/pt-PT/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/pt-PT/firefox-56.0.2.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha512 = "7f0f627c170f8db91525a3aebbe1afe47a84745eba53da6fec79c14a95d857f8ca65ed7b52d67d966f371d3c4cf1bc4d734e1c8f427775e234aa80c318aeac52";
+ sha512 = "5d720a2d2bd56d6dcff128c267815a6c65af5f34011965f04ea1b789ed2e0a6b03cf682bdc9e3e1cd4a69aec45191eae32c7ed1e1d905b3c288dd68cd7f2e8c4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/rm/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/rm/firefox-56.0.2.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha512 = "3e7941441c09a0dbac44ae352b3817713b34c0a7cf694e465b75cdc53d977b97ae3e388ae580880bc33df134d11fbe941b4d1c63567ee6183f43bde31a2d9793";
+ sha512 = "9a0e915233bd0465fb8d336b1c54ac330d7d994d51018d9b28877f45d8c22a2d7f6ce0ad0d308967ff09789e7870c2954b570a552ed050e6ba3566b2b1f6743e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ro/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/ro/firefox-56.0.2.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha512 = "67d270f1eed7b761499967d1d3ae6c1c7e067f124689f6214be6ba5687f3eb212e70a6089573ab2a90315593d8749496e48d047cb8642b19c01877ee394ef86d";
+ sha512 = "dfde4ed0df604a0c62b177b3c6579236d75568551b9c522ea128fa3117ef2ded531a7b83982e618dc111620de9eec47931a89429b56a5a6b301433f325b1d695";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ru/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/ru/firefox-56.0.2.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha512 = "287e6a3fb2de71b31a0cfd74d3eca00ad8ae1cc68760fa5731c1cc9f58c4bcccecbfefab892b93864ffffca6433498d6daafd7928b9633f8a587de3c0787600e";
+ sha512 = "82011e90e588f6e1bd75fa9caf388ca928615ad21424c4f3ed4dde363a8ae90e96f520b8bafa66922a921ab81571f31582a695c10a29f9b57156e5113495eda4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/si/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/si/firefox-56.0.2.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha512 = "63260a1c9e333d05654ac7d912011228d0f787d2d2a5b084410ee6cef75b41ef3ee08dc305f95baf459d16fa4f206792e3811426500ded4d02eea0d6fbc0d5ce";
+ sha512 = "d9e1618815b1ab5f166a4d11c3744dc89ead59b1fff58bd2ae866074fa31cac52204ca086f5ada9466103e7a3d97feeb777f4eef65a706c15c27db322298cc51";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/sk/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/sk/firefox-56.0.2.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha512 = "339c3df4c1a12e14f6e2156ec0fc64aa62fb5d5e93897fcd412980ffa37edd2f6a55f3da991e0ee4c00aaa30e469f862e288cd8c950ac03bcebbe8b84d12f374";
+ sha512 = "93e44d8a94ed21c314a932e37acbfc7431231cec2660fc8301263e928000a4be6ff43966c0394587d5d1a0434a9467dfa87416c1554797d457ab835c8b12e39a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/sl/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/sl/firefox-56.0.2.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha512 = "793c89b07c0fb8e7929aecb67bd37a1a97156d48f50972ec13583728614703b3d69e50249efb12b592aa6e5643d3f2af2aa57854ea1bb88d080983ded11ef676";
+ sha512 = "810bc5d5a2cc55de6360cbd0837d1f301c3e02757f5607abb93e7bb0155a1a4a724b175a4e837580ff28c2329d861ce4440e3787237395b41abd03872da6d2c4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/son/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/son/firefox-56.0.2.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha512 = "51d941ebf974bc04f9aa7a02c14c14b4aa5190d3621604964262a92d298d68d36f3aaf84ed235760d1d9d766d29a97490ddd6df8cfc53ab215526741c8de0d31";
+ sha512 = "9f5596fb8f6b341cbdc7a9989d4c1cb3a177228c478028d5d1463224dbbb0ed9a234a5c900760fad64428a5c44602d410032f1c7d60afb24ee23165995739c4f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/sq/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/sq/firefox-56.0.2.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha512 = "44ee948b537e8774fbc37361639a83508fa3e7bb0978e12bce9ecd8c9a02d9bcf6ba28922093e8701deac71fd577eb4d85cd349c85e93fb04f5e5e6a02d6fa48";
+ sha512 = "53c3ccd14572fea76a4e0fd7bd25c3dab69b7f0c920c4bd880124f127dd95815500917368f6930b2869338bc8010224bc0f8d5fb4fa52e8349ef99c6ef01ea94";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/sr/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/sr/firefox-56.0.2.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha512 = "77e9dd47c3967435a83e191c335791d03e6e63206f1e303eece5e1a813bf5e0b88aede11eea033972e578974beb4ec6bde260194a01e15f7b9ed7fd915ace77d";
+ sha512 = "6dfe740e959ec3e9fc3276d47f21fccf7f7c1c316b8b597fd2820a9928d62eda046701fda74c5ffc2c661f15cfe5e96f1677ca8ea36746925becddf4cd514d8d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/sv-SE/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/sv-SE/firefox-56.0.2.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha512 = "945a718d39d665e4b51a57ee4bb819eca8d4572c2e9098c448bece63b76bfbb652764667908c66ab4f9ace0c82b2d476f51a6fae5ba0f24aab8f94e47f506085";
+ sha512 = "7cfab1450c3524cd9201eb9b99620dad1941c03ffe5f428f444e688d87d76d348185870e5bfd6d123dd6b3a45ac5687ed4e405bd541b07060952806c9df1d437";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ta/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/ta/firefox-56.0.2.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha512 = "17c5f121cee7d8b81fae8f1b2dec696e4fe02abeb0fb50124906dbb9d00c4a74a917d812760e671215f7391c408a391ecad2c590103956460dbbe5484595f457";
+ sha512 = "6542059db48fddfbe40b57fd14ceab40481f9452e8450c3ca3708a9eabf480750b908526a7ea9d52dd085825ca9f6ebd1220718c7ac686628ca6eb3e460e830e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/te/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/te/firefox-56.0.2.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha512 = "0f14c88d99afa7f299bff4d456d10a08bd4d359bd5ffae74b51eb907274e0ac5da1b762f357b845f7039e2b43fffa1b20c1a7fbd895ac57eb42615516ef0329e";
+ sha512 = "a455b8b07ef4525d99901eaffd475d172bd78b45322b300ca9281f4be3394d6bd4e86ee6c0b09dfc68ec78497accd892c1008d9744408e71840137554f683fa2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/th/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/th/firefox-56.0.2.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha512 = "2727f304314911aabbd34f46afda1c035fe018cd2efcfd2ab89cd71a265de176b5fef36f176086f93c28e0d456464634dd36f6e048761b24d276aecd0dc7fb97";
+ sha512 = "b9096450cacc6c959a4cba831f85bde93c99f78eb0840296522f294edd4d671ab51a6426901630dd950687557cc66499188d2fb255cdeda1683baa6c05a97248";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/tr/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/tr/firefox-56.0.2.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha512 = "74b31af4b6622d286aa145e41567b09e9d1f0d922dd256647f09c959f09c2637889d11a346ec303c0fc871c8b1a382707756b8d0fc38d7093387b0247d143ff5";
+ sha512 = "ab70b6887618fff2be785a46a886acce9daa2a7729016aba55e0b20dfae5bfbf6c2a6489956f2e753d8ee6984096d11551dd3b742933bd85bdadce0d2ebc10ad";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/uk/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/uk/firefox-56.0.2.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha512 = "a9373c5d8379a7ab483d4587fdc3df8adee0371d2a40b7886033d0505022b8adb516f7164d67da7b504e170aa5ed105218124274173d29c232e2dab7f7279921";
+ sha512 = "14c81a64dd663e5244cee0846a36d0bdbd75c1abbf6155cf96f3eae999a9c487dbf4326ed1a7bc5f9cba7ad8fe40c5acf1e44a6811611195043e62bbc1350d0a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ur/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/ur/firefox-56.0.2.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha512 = "78578c99aefea3eb46d70d563868d2eb0bf43cc6a905b908305cf61ffe5b49064bf2845661af48c861e93cf50aa5e9d8dfaa755f11732760c1574cc0c88e5718";
+ sha512 = "9b8d3387406d36a299716eceed02ea5e61456b3ff5f51071ca4411873fc2904713c7e7719d92199b112476aa27d477e818a696d406edf1b09502f66ec5359e58";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/uz/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/uz/firefox-56.0.2.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha512 = "0739b4d60e55b1d4e0ef5984050dca5ef484edb73ed590f948d8e4c4c2303cc0fcd177dbcca4ef66bf61821172675a4805aeaaf3349df1dad5a3080544316aa4";
+ sha512 = "22ba14001b2b19362c9a89911152154c72212e557ea557f8092287d3f3e56d2b7d532557ec4725338f54926a990a866a3c1ce5765740593cfccfa909c5ade974";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/vi/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/vi/firefox-56.0.2.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha512 = "9e0185b988338a333e7d89a384bd42dcf6f6ca8db4eedd56236357909f9d43ec09685e8099fe25833dcd60c301297760972770bbca7b61aba87622abc2623428";
+ sha512 = "a21554b9e20b626896e3af8032911a9fdd67fa459bd20f068c2e7d6682187ecfd613c53616e048360786e786f77eb63d52dbee3553abc2ce58da5bc00b567168";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/xh/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/xh/firefox-56.0.2.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha512 = "63c1cd434edcb6069959085526cc14845de1fbf4da135a1e705433fae305dacaccfc958b98e0905b5cb2627f50b768db0940aeb728a4ab84e4592b596e50a895";
+ sha512 = "751a8257df614c570c215c8888e593de84182087c3bf1c339b573872d3289498fcb05290cb6f819eb4f691a239291d475a26a05fcf2d98e2f4bf99088846a7d9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/zh-CN/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/zh-CN/firefox-56.0.2.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha512 = "a8c2473a2e172eb7bb34a66a4ce145218ba1cdbf951d3865561512cecd6cdda2a9741c6b383706f37537eea646fa1b282174ce9634bc69105c7611879c851a69";
+ sha512 = "49fd08071f5bdc5ad425ea3be8cb6526342bebfa648c75f735982266d2e7aef0bcea23b492a70b1c99cdd6c38e934146d222b28ce136d22e9f45366a99328c49";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/zh-TW/firefox-55.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/zh-TW/firefox-56.0.2.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha512 = "f40193e6390f143cac3cdc0c230fedf2e791792d16e8446becf2038b4916274b47522bf5f239454696a8cbfffbb001556ade3b1bee2bdd239843f3bc3448b03f";
+ sha512 = "09c61ea179a2b8331eae57dd3f435edf72d9b3afdc2892953ef3ce80d7f96ee59258e984d1d70e96d9994affac2062a5c552d4236027a38c4dd6c2e5dfab8eec";
}
];
}
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index de19e6118511..b8f57eb2edb8 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -8,8 +8,7 @@
, yasm, mesa, sqlite, unzip, makeWrapper
, hunspell, libevent, libstartup_notification, libvpx
, cairo, icu, libpng, jemalloc
-, autoconf213, which, gnused, cargo, rustc
-
+, autoconf213, which, gnused, cargo, rustc, llvmPackages
, debugBuild ? false
### optionals
@@ -20,6 +19,7 @@
, pulseaudioSupport ? true, libpulseaudio
, ffmpegSupport ? true, gstreamer, gst-plugins-base
, gtk3Support ? !isTorBrowserLike, gtk2, gtk3, wrapGAppsHook
+, gssSupport ? true, kerberos
## privacy-related options
@@ -50,6 +50,7 @@ assert stdenv.cc ? libc && stdenv.cc.libc != null;
let
flag = tf: x: [(if tf then "--enable-${x}" else "--disable-${x}")];
+ gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
in
stdenv.mkDerivation (rec {
@@ -72,7 +73,10 @@ stdenv.mkDerivation (rec {
++ lib.optional alsaSupport alsaLib
++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed
++ lib.optionals ffmpegSupport [ gstreamer gst-plugins-base ]
- ++ lib.optional gtk3Support gtk3;
+ ++ lib.optional gtk3Support gtk3
+ ++ lib.optional gssSupport kerberos;
+
+ NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss";
nativeBuildInputs =
[ autoconf213 which gnused pkgconfig perl python cargo rustc ]
@@ -88,6 +92,12 @@ stdenv.mkDerivation (rec {
make -f client.mk configure-files
configureScript="$(realpath ./configure)"
+
+ cxxLib=$( echo -n ${gcc}/include/c++/* )
+ archLib=$cxxLib/$( ${gcc}/bin/gcc -dumpmachine )
+
+ test -f layout/style/ServoBindings.toml && sed -i -e '/"-DMOZ_STYLO"/ a , "-cxx-isystem", "'$cxxLib'", "-isystem", "'$archLib'"' layout/style/ServoBindings.toml
+
cd obj-*
'' + lib.optionalString googleAPISupport ''
# Google API key used by Chromium and Firefox.
@@ -120,6 +130,11 @@ stdenv.mkDerivation (rec {
"--disable-gconf"
"--enable-default-toolkit=cairo-gtk${if gtk3Support then "3" else "2"}"
]
+ ++ lib.optionals (stdenv.lib.versionAtLeast version "56" && !stdenv.hostPlatform.isi686) [
+ # on i686-linux: --with-libclang-path is not available in this configuration
+ "--with-libclang-path=${llvmPackages.clang-unwrapped}/lib"
+ "--with-clang-path=${llvmPackages.clang}/bin/clang"
+ ]
# TorBrowser patches these
++ lib.optionals (!isTorBrowserLike) [
@@ -143,6 +158,7 @@ stdenv.mkDerivation (rec {
++ flag alsaSupport "alsa"
++ flag pulseaudioSupport "pulseaudio"
++ flag ffmpegSupport "ffmpeg"
+ ++ flag gssSupport "negotiateauth"
++ lib.optional (!ffmpegSupport) "--disable-gstreamer"
++ flag webrtcSupport "webrtc"
++ flag geolocationSupport "mozril-geoloc"
@@ -207,6 +223,7 @@ stdenv.mkDerivation (rec {
gtk = gtk2;
inherit nspr;
inherit ffmpegSupport;
+ inherit gssSupport;
} // lib.optionalAttrs gtk3Support { inherit gtk3; };
} // overrides)
diff --git a/pkgs/applications/networking/browsers/firefox/no-buildconfig.patch b/pkgs/applications/networking/browsers/firefox/no-buildconfig.patch
new file mode 100644
index 000000000000..83f9a1329bea
--- /dev/null
+++ b/pkgs/applications/networking/browsers/firefox/no-buildconfig.patch
@@ -0,0 +1,25 @@
+diff -ru -x '*~' firefox-55.0.3-orig/docshell/base/nsAboutRedirector.cpp firefox-55.0.3/docshell/base/nsAboutRedirector.cpp
+--- firefox-55.0.3-orig/docshell/base/nsAboutRedirector.cpp 2017-07-31 18:20:51.000000000 +0200
++++ firefox-55.0.3/docshell/base/nsAboutRedirector.cpp 2017-09-26 22:02:00.814151731 +0200
+@@ -40,10 +40,6 @@
+ nsIAboutModule::ALLOW_SCRIPT
+ },
+ {
+- "buildconfig", "chrome://global/content/buildconfig.html",
+- nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT
+- },
+- {
+ "checkerboard", "chrome://global/content/aboutCheckerboard.xhtml",
+ nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
+ nsIAboutModule::ALLOW_SCRIPT
+diff -ru -x '*~' firefox-55.0.3-orig/toolkit/content/jar.mn firefox-55.0.3/toolkit/content/jar.mn
+--- firefox-55.0.3-orig/toolkit/content/jar.mn 2017-07-31 18:20:52.000000000 +0200
++++ firefox-55.0.3/toolkit/content/jar.mn 2017-09-26 22:01:42.383350314 +0200
+@@ -40,7 +40,6 @@
+ content/global/plugins.css
+ content/global/browser-child.js
+ content/global/browser-content.js
+-* content/global/buildconfig.html
+ content/global/contentAreaUtils.js
+ #ifndef MOZ_FENNEC
+ content/global/customizeToolbar.css
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 83eb563a8e7e..a1d5df5029c1 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -6,16 +6,18 @@ rec {
firefox = common rec {
pname = "firefox";
- version = "55.0.3";
+ version = "56.0.2";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
- sha512 = "3cacc87b97871f3a8c5e97c17ef7025079cb5c81f32377d9402cdad45815ac6c4c4762c79187f1e477910161c2377c42d41de62a50b6741d5d7c1cd70e8c6416";
+ sha512 = "35f81e8163a254b7e134fc073acbcff63aa1025b9c6392377650a8f2d0a5f0c77211adb0ae3d8ac85f036bb387246934b8847f14a03fceb7fcbc5b3cf94c9392";
};
- patches = lib.optional stdenv.isi686 (fetchpatch {
- url = "https://hg.mozilla.org/mozilla-central/raw-rev/15517c5a5d37";
- sha256 = "1ba487p3hk4w2w7qqfxgv1y57vp86b8g3xhav2j20qd3j3phbbn7";
- });
+ patches =
+ [ ./no-buildconfig.patch ]
+ ++ lib.optional stdenv.isi686 (fetchpatch {
+ url = "https://hg.mozilla.org/mozilla-central/raw-rev/15517c5a5d37";
+ sha256 = "1ba487p3hk4w2w7qqfxgv1y57vp86b8g3xhav2j20qd3j3phbbn7";
+ });
meta = {
description = "A web browser built from Firefox source tree";
@@ -30,10 +32,10 @@ rec {
firefox-esr = common rec {
pname = "firefox-esr";
- version = "52.3.0esr";
+ version = "52.4.1esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
- sha512 = "36da8f14b50334e36fca06e09f15583101cadd10e510268255587ea9b09b1fea918da034d6f1d439ab8c34612f6cebc409a0b8d812dddb3f997afebe64d09fe9";
+ sha512 = "d80c7219548391d8a47b6e404662ea41e6acfa264a67d69365e76dd8943077e388ab24b030850919f8fc6681c11486bdbaaf170d441c861f4a12cedbe08955ab";
};
meta = firefox.meta // {
@@ -52,8 +54,7 @@ rec {
unpackPhase = ''
# fetchFromGitHub produces ro sources, root dir gets a name that
# is too long for shebangs. fixing
- cp -a $src .
- mv *-src tor-browser
+ cp -a $src tor-browser
chmod -R +w tor-browser
cd tor-browser
@@ -104,13 +105,15 @@ in rec {
# 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";
+ repo = "tor-browser";
+ # branch "tor-browser-45.8.0esr-6.5-2"
+ rev = "e4140ea01b9906934f0347e95f860cec207ea824";
+ sha256 = "0a1qk3a9a3xxrl56bp4zbknbchv5x17k1w5kgcf4j3vklcv6av60";
};
} // commonAttrs) {
stdenv = overrideCC stdenv gcc5;
ffmpegSupport = false;
+ gssSupport = false;
};
tor-browser-7-0 = common (rec {
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 1dd5c9191f00..7a7d1368cb23 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -9,6 +9,7 @@
, esteidfirefoxplugin
, vlc_npapi
, libudev
+, kerberos
}:
## configurability of the wrapper itself
@@ -25,6 +26,7 @@ let
cfg = stdenv.lib.attrByPath [ browserName ] {} config;
enableAdobeFlash = cfg.enableAdobeFlash or false;
ffmpegSupport = browser.ffmpegSupport or false;
+ gssSupport = browser.gssSupport or false;
jre = cfg.jre or false;
icedtea = cfg.icedtea or false;
@@ -46,6 +48,7 @@ let
++ lib.optional (cfg.enableVLC or false) vlc_npapi
);
libs = (if ffmpegSupport then [ ffmpeg ] else with gst_all; [ gstreamer gst-plugins-base ])
+ ++ lib.optional gssSupport kerberos
++ lib.optionals (cfg.enableQuakeLive or false)
(with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib libudev ])
++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash
@@ -129,6 +132,8 @@ in stdenv.mkDerivation {
passthru = { unwrapped = browser; };
+ disallowedRequisites = [ stdenv.cc ];
+
meta = browser.meta // {
description =
browser.meta.description
diff --git a/pkgs/applications/networking/browsers/jumanji/default.nix b/pkgs/applications/networking/browsers/jumanji/default.nix
index 7383e0ec0445..e013f54a39ea 100644
--- a/pkgs/applications/networking/browsers/jumanji/default.nix
+++ b/pkgs/applications/networking/browsers/jumanji/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "1dsbyz489fx7dp07i29q1rjkl7nhrfscc8ks8an2rdyhx3457asg";
};
- buildInputs = [ girara pkgconfig gtk webkitgtk makeWrapper gsettings_desktop_schemas ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ girara gtk webkitgtk makeWrapper gsettings_desktop_schemas ];
makeFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin/default.nix
index 1a0752c33c62..48d06d644dda 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin/default.nix
@@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
cd src
'';
- buildInputs = [ gtk2 openssl pcsclite pkgconfig opensc ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk2 openssl pcsclite opensc ];
buildPhase = ''
sed -i "s|opensc-pkcs11.so|${opensc}/lib/pkcs11/opensc-pkcs11.so|" Makefile
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
index 559c08ad4f38..8e24a3fb619a 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
@@ -73,7 +73,7 @@ let
in
stdenv.mkDerivation rec {
name = "flashplayer-${version}";
- version = "27.0.0.130";
+ version = "27.0.0.183";
src = fetchurl {
url =
@@ -84,14 +84,14 @@ stdenv.mkDerivation rec {
sha256 =
if debug then
if arch == "x86_64" then
- "1sj06x4kfwxi9cnc8adjkxk6p81acl39l2idnyqb429l2s84d1d9"
+ "1qn9hm9c303jihksfc8sb5yjpcasj711s66lhqlqmj5hd0r8bzya"
else
- "0f9vzdn523m408sw76r32zqf7d86l2mhcfsszbfh2bixg8p2cxzz"
+ "19d0d4fn2p2wvh27gshybgc4xpjp0ibgm2gg8g0jzrvbc3cqdz0j"
else
if arch == "x86_64" then
- "0qkdabcnqfpbfsbs8ssms9xk2pqvps6fbasvcyvhnywclra25ggc"
+ "0df8lbbvr226k9z6p2jwxandjb6yy0bqz5kaz79hpj0dwkiqwax1"
else
- "0qkwkc6s4ganja4b2jsz4yff0bziirvbzxg0wyf648hqlb3bw5a6";
+ "0vs63rlra5ccm24j908zrcxhffjlmvjr6pb2bb7a4fmnfjrk4idf";
};
nativeBuildInputs = [ unzip ];
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
index 7c0125ea1234..cf00f303e993 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
@@ -55,7 +55,7 @@ let
in
stdenv.mkDerivation rec {
name = "flashplayer-standalone-${version}";
- version = "27.0.0.130";
+ version = "27.0.0.183";
src = fetchurl {
url =
@@ -65,9 +65,9 @@ stdenv.mkDerivation rec {
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/27/flash_player_sa_linux.x86_64.tar.gz";
sha256 =
if debug then
- "0gqm90j8czjnzar3ia65msd18kydjhgq5l9iv1difgm8lqji5ii0"
+ "0vf28qdhb1ly5w3hhy3n20r4nyvwsxj5csb969s0r328nf1xaflj"
else
- "1agplangzlrp326dhz3xcvi6i325a644ggrh8g0cmgq9nfcpssnb";
+ "0jqbnbpdrmxh2jnai0bv4c8jzsvqmcnhsp1hzaygsvp0ri4vncs8";
};
nativeBuildInputs = [ unzip ];
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix
index 81a05b360162..30bae8792c2e 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "a679f3a0534d5f05fac10b16b49630a898c0b721cfa24d2c827fa45485476649";
};
- buildInputs = [ pkgconfig openssl libX11 gtk2 glib gettext intltool ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ openssl libX11 gtk2 glib gettext intltool ];
patches = [
./translation-xgettext-to-intltool.patch
./plugin-linkfix.patch
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix
index 07e152e91dbc..a5bfda9f26c9 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix
@@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
''
else "");
- buildInputs = [ pkgconfig browser (browser.gtk) libXpm gettext ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ browser (browser.gtk) libXpm gettext ];
installPhase = ''
mkdir -p $out/lib/mozilla/plugins
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix
index b3382ef05127..008c35964832 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix
@@ -24,7 +24,8 @@ stdenv.mkDerivation rec {
export configureFlags="$configureFlags --target-cpu=$(uname -m)"
'';
- buildInputs = [which pkgconfig file glib gtk2 gtk3 curl libXt];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [which file glib gtk2 gtk3 curl libXt];
preferLocalBuild = true;
diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix
index 52a2ce9164c9..0852b5c9d434 100644
--- a/pkgs/applications/networking/browsers/opera/default.nix
+++ b/pkgs/applications/networking/browsers/opera/default.nix
@@ -37,7 +37,7 @@
let
mirror = https://get.geo.opera.com/pub/opera/desktop;
- version = "46.0.2597.39";
+ version = "48.0.2685.52";
rpath = stdenv.lib.makeLibraryPath [
@@ -87,19 +87,10 @@ in stdenv.mkDerivation {
name = "opera-${version}";
- src =
- #if stdenv.system == "i686-linux" then
- # fetchurl {
- # url = "${mirror}/${version}/linux/opera-stable_${version}_i386.deb";
- # sha256 = "...";
- # }
- #else
- if stdenv.system == "x86_64-linux" then
- fetchurl {
- url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb";
- sha256 = "1ladvqilm5rr222wjybvribnyii2l0p8jbsd10xr06wps63g1kia";
- }
- else throw "Opera is not supported on ${stdenv.system} (only x86_64 linux is supported)";
+ src = fetchurl {
+ url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb";
+ sha256 = "027njqh2as4d0xsnvzamqiplghb8cxqnc19y0vqkvjnsw57v828p";
+ };
unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc .";
@@ -123,6 +114,7 @@ in stdenv.mkDerivation {
meta = {
homepage = http://www.opera.com;
description = "Web browser";
+ platforms = [ "x86_64-linux" ];
license = stdenv.lib.licenses.unfree;
};
}
diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix
index 4f179c29996f..e24c21b535bf 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.4.2";
+ version = "27.6.0";
src = fetchFromGitHub {
name = "palemoon-src";
owner = "MoonchildProductions";
repo = "Pale-Moon";
rev = version + "_Release";
- sha256 = "155c1a76kkx9p8cnz9d33xx30asjr32x10cccx0gyq1lm1b9ffbl";
+ sha256 = "1v5rbam93fcc7c1l69clr9chi2l0zv0dhjq12v535n8vv9lhahhl";
};
desktopItem = makeDesktopItem {
diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 025e4522f065..4f0e891dc496 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -2,10 +2,13 @@
, qtbase, pyqt5, jinja2, pygments, pyyaml, pypeg2, pyopengl, cssutils, glib_networking
, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2, libxslt
, gst-plugins-base, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-libav
-, qtwebkit-plugins
-, withWebEngineDefault ? false
+, qtwebkit-plugins ? null
+, attrs
+, withWebEngineDefault ? true
}:
+assert (! withWebEngineDefault) -> qtwebkit-plugins != null;
+
let
pdfjs = stdenv.mkDerivation rec {
name = "pdfjs-${version}";
@@ -25,30 +28,32 @@ let
};
in buildPythonApplication rec {
- name = "qutebrowser-${version}";
- version = "0.11.0";
+ name = "qutebrowser-${version}${fix_postfix}";
+ fix_postfix = "-1";
+ version = "1.0.3";
namePrefix = "";
src = fetchurl {
- url = "https://github.com/The-Compiler/qutebrowser/releases/download/v${version}/${name}.tar.gz";
- sha256 = "13ihx66jm1dd6vx8px7pm0kbzf2sf9x43hhivc1rp17kahnxxdyv";
+ url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${name}.tar.gz";
+ sha256 = "04d6hg2yf2wjwn0sd05bpx3zngnb93g7rizbdq17bbpmnwxchzap";
};
# Needs tox
doCheck = false;
buildInputs = [
- qtbase qtwebkit-plugins
+ qtbase
gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav
glib_networking
- ];
+ ]
+ ++ lib.optional (! withWebEngineDefault) qtwebkit-plugins;
nativeBuildInputs = [
makeWrapper wrapGAppsHook asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt
];
propagatedBuildInputs = [
- pyyaml pyqt5 jinja2 pygments pypeg2 cssutils pyopengl
+ pyyaml pyqt5 jinja2 pygments pypeg2 cssutils pyopengl attrs
];
postPatch = ''
@@ -62,7 +67,7 @@ in buildPythonApplication rec {
postInstall = ''
install -Dm644 doc/qutebrowser.1 "$out/share/man/man1/qutebrowser.1"
- install -Dm644 qutebrowser.desktop \
+ install -Dm644 misc/qutebrowser.desktop \
"$out/share/applications/qutebrowser.desktop"
for i in 16 24 32 48 64 128 256 512; do
install -Dm644 "icons/qutebrowser-''${i}x''${i}.png" \
@@ -73,8 +78,8 @@ in buildPythonApplication rec {
install -Dm755 -t "$out/share/qutebrowser/userscripts/" misc/userscripts/*
'';
- postFixup = lib.optionalString withWebEngineDefault ''
- wrapProgram $out/bin/qutebrowser --add-flags "--backend webengine"
+ postFixup = lib.optionalString (! withWebEngineDefault) ''
+ wrapProgram $out/bin/qutebrowser --add-flags "--backend webkit"
'';
meta = {
diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix
index 04d475f36f07..1aa9bf044b05 100644
--- a/pkgs/applications/networking/browsers/surf/default.nix
+++ b/pkgs/applications/networking/browsers/surf/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
version = "2.0";
src = fetchurl {
- url = "http://dl.suckless.org/surf/surf-${version}.tar.gz";
+ url = "https://dl.suckless.org/surf/surf-${version}.tar.gz";
sha256 = "07cmajyafljigy10d21kkyvv5jf3hxkx06pz3rwwk3y3c9x4rvps";
};
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
possible to embed it in another application. Furthermore, one can point
surf to another URI by setting its XProperties.
'';
- homepage = http://surf.suckless.org;
+ homepage = https://surf.suckless.org;
license = licenses.mit;
platforms = webkitgtk.meta.platforms;
maintainers = with maintainers; [ joachifm ];
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index 28cc273c679c..4af725d3c958 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -98,7 +98,7 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
# Upstream source
- version = "7.0.5";
+ version = "7.0.9";
lang = "en-US";
@@ -108,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 = "1ixa1pmh3fm82gwzkm7r3gbly1lrihpvk1irmpc8b8zsi2s49ghd";
+ sha256 = "0ykbpp0qr3glygmnnc6ac41kkvrxn52472z6kbpf7i6qzvk4ba0d";
};
"i686-linux" = fetchurl {
@@ -116,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 = "1kb0m4xikxcgj03h6l0ch5d53i8hxdacwm7q745a377g44q84nzb";
+ sha256 = "02alpzmvm3ldlp51sqppz41d12lx93n5qj6i3gqz6din96swm7j8";
};
};
in
@@ -246,6 +246,11 @@ stdenv.mkDerivation rec {
# having to synchronize between local state and store.
mv TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js defaults/pref/torbrowser.js
+ # Preload extensions by moving into the runtime instead of storing under the
+ # user's profile directory.
+ mv "$TBB_IN_STORE/TorBrowser/Data/Browser/profile.default/extensions/"* \
+ "$TBB_IN_STORE/browser/extensions"
+
# Hard-code paths to geoip data files. TBB resolves the geoip files
# relative to torrc-defaults_path but if we do not hard-code them
# here, these paths end up being written to the torrc in the user's
@@ -301,10 +306,6 @@ stdenv.mkDerivation rec {
# easily generated by firefox at startup.
rm -f "\$HOME/TorBrowser/Data/Browser/profile.default"/{compatibility.ini,extensions.ini,extensions.json}
- # Ensure that we're always using the up-to-date extensions.
- ln -snf "$TBB_IN_STORE/TorBrowser/Data/Browser/profile.default/extensions" \
- "\$HOME/TorBrowser/Data/Browser/profile.default/extensions"
-
${optionalString pulseaudioSupport ''
# Figure out some envvars for pulseaudio
: "\''${XDG_RUNTIME_DIR:=/run/user/\$(id -u)}"
@@ -349,7 +350,7 @@ stdenv.mkDerivation rec {
PULSE_SERVER="\''${PULSE_SERVER:-}" \
PULSE_COOKIE="\''${PULSE_COOKIE:-}" \
\
- APULSE_PLAYBACK_DEVICE="\''${APULSE_PLAYBACK_DEVICE:-plughw:0,0}" \
+ APULSE_PLAYBACK_DEVICE="\''${APULSE_PLAYBACK_DEVICE:-plug:dmix}" \
\
TOR_SKIP_LAUNCH="\''${TOR_SKIP_LAUNCH:-}" \
TOR_CONTROL_PORT="\''${TOR_CONTROL_PORT:-}" \
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix
new file mode 100644
index 000000000000..508ab6ec432e
--- /dev/null
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix
@@ -0,0 +1,348 @@
+{ stdenv
+, fetchgit
+, fetchurl
+, symlinkJoin
+
+, tor
+, tor-browser-unwrapped
+
+# Wrapper runtime
+, coreutils
+, hicolor_icon_theme
+, shared_mime_info
+, noto-fonts
+, noto-fonts-emoji
+
+# Audio support
+, audioSupport ? mediaSupport
+, apulse
+
+# Media support (implies audio support)
+, mediaSupport ? false
+, gstreamer
+, gst-plugins-base
+, gst-plugins-good
+, gst-ffmpeg
+, gmp
+, ffmpeg
+
+# Extensions, common
+, zip
+
+# HTTPS Everywhere
+, git
+, libxml2 # xmllint
+, python27
+, python27Packages
+, rsync
+
+# Pluggable transports
+, obfsproxy
+
+# Customization
+, extraPrefs ? ""
+, extraExtensions ? [ ]
+}:
+
+with stdenv.lib;
+
+let
+ tor-browser-build_src = fetchgit {
+ url = "https://git.torproject.org/builders/tor-browser-build.git";
+ rev = "refs/tags/tbb-7.5a5-build5";
+ sha256 = "0j37mqldj33fnzghxifvy6v8vdwkcz0i4z81prww64md5s8qcsa9";
+ };
+
+ firefoxExtensions = import ./extensions.nix {
+ inherit stdenv fetchurl fetchgit zip
+ git libxml2 python27 python27Packages rsync;
+ };
+
+ bundledExtensions = with firefoxExtensions; [
+ https-everywhere
+ noscript
+ torbutton
+ tor-launcher
+ ] ++ extraExtensions;
+
+ fontsEnv = symlinkJoin {
+ name = "tor-browser-fonts";
+ paths = [ noto-fonts noto-fonts-emoji ];
+ };
+
+ fontsDir = "${fontsEnv}/share/fonts";
+
+ gstPluginsPath = concatMapStringsSep ":" (x:
+ "${x}/lib/gstreamer-0.10") [
+ gstreamer
+ gst-plugins-base
+ gst-plugins-good
+ gst-ffmpeg
+ ];
+
+ gstLibPath = makeLibraryPath [
+ gstreamer
+ gst-plugins-base
+ gmp
+ ffmpeg
+ ];
+in
+stdenv.mkDerivation rec {
+ name = "tor-browser-bundle-${version}";
+ version = tor-browser-unwrapped.version;
+
+ buildInputs = [ tor-browser-unwrapped tor ];
+
+ unpackPhase = ":";
+
+ buildPhase = ":";
+
+ # The following creates a customized firefox distribution. For
+ # simplicity, we copy the entire base firefox runtime, to work around
+ # firefox's annoying insistence on resolving the installation directory
+ # relative to the real firefox executable. A little tacky and
+ # inefficient but it works.
+ installPhase = ''
+ TBBUILD=${tor-browser-build_src}/projects/tor-browser
+ TBDATA_PATH=TorBrowser-Data
+
+ self=$out/lib/tor-browser
+ mkdir -p $self && cd $self
+
+ TBDATA_IN_STORE=$self/$TBDATA_PATH
+
+ cp -dR ${tor-browser-unwrapped}/lib"/"*"/"* .
+ chmod -R +w .
+
+ # Prepare for autoconfig
+ cat >defaults/pref/autoconfig.js <mozilla.cfg <> $TBDATA_PATH/torrc-defaults
+ cat \
+ $bundleData/$bundlePlatform/Data/Browser/profile.default/preferences/extension-overrides.js \
+ $bundleData/PTConfigs/bridge_prefs.js \
+ >> defaults/pref/extension-overrides.js
+
+ # Configure geoip
+ #
+ # tor-launcher insists on resolving geoip data relative to torrc-defaults
+ # (and passes them directly on the tor command-line).
+ #
+ # Write the paths into torrc-defaults anyway, otherwise they'll be
+ # captured in the runtime torrc.
+ ln -s -t $TBDATA_PATH ${tor.geoip}/share/tor/geoip{,6}
+ cat >>$TBDATA_PATH/torrc-defaults <>$TBDATA_PATH/torrc-defaults <fonts,${fontsDir}," \
+ > $TBDATA_PATH/fonts.conf
+
+ # Generate a suitable wrapper
+ wrapper_PATH=${makeBinPath [ coreutils ]}
+ wrapper_XDG_DATA_DIRS=${concatMapStringsSep ":" (x: "${x}/share") [
+ hicolor_icon_theme
+ shared_mime_info
+ ]}
+
+ ${optionalString audioSupport ''
+ # apulse uses a non-standard library path ...
+ wrapper_LD_LIBRARY_PATH=${apulse}/lib/apulse''${wrapper_LD_LIBRARY_PATH:+:$wrapper_LD_LIBRARY_PATH}
+ ''}
+
+ ${optionalString mediaSupport ''
+ wrapper_LD_LIBRARY_PATH=${gstLibPath}''${wrapper_LD_LIBRARY_PATH:+:$wrapper_LD_LIBRARY_PATH}
+ ''}
+
+ mkdir -p $out/bin
+ cat >$out/bin/tor-browser <&2
+ exit 1
+ fi
+
+ mkdir -p "\$TBB_HOME"
+
+ HOME=\$TBB_HOME
+ cd "\$HOME"
+
+ # Re-init XDG basedir envvars
+ XDG_CACHE_HOME=\$HOME/.cache
+ XDG_CONFIG_HOME=\$HOME/.config
+ XDG_DATA_HOME=\$HOME/.local/share
+
+ # Initialize empty TBB runtime state directory hierarchy. Mirror the
+ # layout used by the official TBB, to avoid the hassle of working
+ # against the assumptions made by tor-launcher & co.
+ mkdir -p "\$HOME/TorBrowser" "\$HOME/TorBrowser/Data"
+
+ # Initialize the Tor data directory.
+ mkdir -p "\$HOME/TorBrowser/Data/Tor"
+
+ # TBB fails if ownership is too permissive
+ chmod 0700 "\$HOME/TorBrowser/Data/Tor"
+
+ # Initialize the browser profile state. Expect TBB to generate all data.
+ mkdir -p "\$HOME/TorBrowser/Data/Browser/profile.default"
+
+ # Files that capture store paths; re-generated by firefox at startup
+ rm -rf "\$HOME/TorBrowser/Data/Browser/profile.default"/{compatibility.ini,extensions.ini,extensions.json,startupCache}
+
+ # Clear out fontconfig caches
+ rm -f "\$HOME/.cache/fontconfig/"*.cache-*
+
+ # Lift-off!
+ #
+ # TZ is set to avoid stat()ing /etc/localtime over and over ...
+ #
+ # DBUS_SESSION_BUS_ADDRESS is inherited to avoid auto-launching a new
+ # dbus instance; to prevent using the session bus, set the envvar to
+ # an empty/invalid value prior to running tor-browser.
+ #
+ # FONTCONFIG_FILE is required to make fontconfig read the TBB
+ # fonts.conf; upstream uses FONTCONFIG_PATH, but FC_DEBUG=1024
+ # indicates the system fonts.conf being used instead.
+ #
+ # HOME, TMPDIR, XDG_*_HOME are set as a form of soft confinement;
+ # ideally, tor-browser should not write to any path outside TBB_HOME
+ # and should run even under strict confinement to TBB_HOME.
+ #
+ # XDG_DATA_DIRS is set to prevent searching system directories for
+ # mime and icon data.
+ #
+ # PULSE_{SERVER,COOKIE} is necessary for audio playback w/pulseaudio
+ #
+ # APULSE_PLAYBACK_DEVICE is for audio playback w/o pulseaudio (no capture yet)
+ #
+ # GST_PLUGIN_SYSTEM_PATH is for HD video playback
+ #
+ # GST_REGISTRY is set to devnull to minimize disk writes
+ #
+ # TOR_* is for using an external tor instance
+ #
+ # Parameters lacking a default value below are *required* (enforced by
+ # -o nounset).
+ exec env -i \
+ LD_LIBRARY_PATH=$wrapper_LD_LIBRARY_PATH \
+ \
+ TZ=":" \
+ \
+ DISPLAY="\$DISPLAY" \
+ XAUTHORITY="\$XAUTHORITY" \
+ DBUS_SESSION_BUS_ADDRESS="\$DBUS_SESSION_BUS_ADDRESS" \
+ \
+ HOME="\$HOME" \
+ TMPDIR="\$XDG_CACHE_HOME/tmp" \
+ XDG_CONFIG_HOME="\$XDG_CONFIG_HOME" \
+ XDG_DATA_HOME="\$XDG_DATA_HOME" \
+ XDG_CACHE_HOME="\$XDG_CACHE_HOME" \
+ XDG_RUNTIME_DIR="\$HOME/run" \
+ \
+ XDG_DATA_DIRS="$wrapper_XDG_DATA_DIRS" \
+ \
+ FONTCONFIG_FILE="$TBDATA_IN_STORE/fonts.conf" \
+ \
+ APULSE_PLAYBACK_DEVICE="\''${APULSE_PLAYBACK_DEVICE:-plug:dmix}" \
+ \
+ GST_PLUGIN_SYSTEM_PATH="${optionalString mediaSupport gstPluginsPath}" \
+ GST_REGISTRY="/dev/null" \
+ GST_REGISTRY_UPDATE="no" \
+ \
+ TOR_SKIP_LAUNCH="\''${TOR_SKIP_LAUNCH:-}" \
+ TOR_CONTROL_PORT="\''${TOR_CONTROL_PORT:-}" \
+ TOR_SOCKS_PORT="\''${TOR_SOCKS_PORT:-}" \
+ \
+ $self/firefox \
+ -no-remote \
+ -profile "\$HOME/TorBrowser/Data/Browser/profile.default" \
+ "\$@"
+ EOF
+ chmod +x $out/bin/tor-browser
+
+ echo "Syntax checking wrapper ..."
+ bash -n $out/bin/tor-browser
+
+ echo "Checking wrapper ..."
+ DISPLAY="" XAUTHORITY="" DBUS_SESSION_BUS_ADDRESS="" TBB_HOME=$(mktemp -d) \
+ $out/bin/tor-browser -version >/dev/null
+ '';
+
+ meta = with stdenv.lib; {
+ description = "An unofficial version of the tor browser bundle, built from source";
+ homepage = https://torproject.org/;
+ license = licenses.unfreeRedistributable; # TODO: check this
+ platforms = [ "x86_64-linux" ];
+ hydraPlatforms = [ ];
+ maintainers = with maintainers; [ joachifm ];
+ };
+}
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix
new file mode 100644
index 000000000000..86c2f53b9add
--- /dev/null
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix
@@ -0,0 +1,111 @@
+{ stdenv
+, fetchgit
+, fetchurl
+
+# common
+, zip
+
+# HTTPS Everywhere
+, git
+, libxml2 # xmllint
+, python27
+, python27Packages
+, rsync
+}:
+
+{
+ https-everywhere = stdenv.mkDerivation rec {
+ name = "https-everywhere-${version}";
+ version = "2017.10.4";
+
+ extid = "https-everywhere-eff@eff.org";
+
+ src = fetchgit {
+ url = "https://git.torproject.org/https-everywhere.git";
+ rev = "refs/tags/${version}";
+ sha256 = "1g7971xygnhagnb25xjdf6mli6091ai9igx42d0ww88g8i0cqfzj";
+ fetchSubmodules = true; # for translations, TODO: remove
+ };
+
+ nativeBuildInputs = [
+ git
+ libxml2 # xmllint
+ python27
+ python27Packages.lxml
+ rsync
+ zip
+ ];
+
+ buildPhase = ''
+ $shell ./makexpi.sh ${version} --no-recurse
+ '';
+
+ installPhase = ''
+ install -m 444 -D pkg/https-everywhere-$version-eff.xpi "$out/$extid.xpi"
+ '';
+ };
+
+ noscript = stdenv.mkDerivation rec {
+ name = "noscript-${version}";
+ version = "5.1.2";
+
+ extid = "{73a6fe31-595d-460b-a920-fcc0f8843232}";
+
+ src = fetchurl {
+ url = "https://secure.informaction.com/download/releases/noscript-${version}.xpi";
+ sha256 = "1fzspdiwhjabwz1yxb3gzj7giz9jbc1xxm65i93rvhzcp537cs42";
+ };
+
+ unpackPhase = ":";
+
+ installPhase = ''
+ install -m 444 -D $src "$out/$extid.xpi"
+ '';
+ };
+
+ torbutton = stdenv.mkDerivation rec {
+ name = "torbutton-${version}";
+ version = "1.9.8.1";
+
+ extid = "torbutton@torproject.org";
+
+ src = fetchgit {
+ url = "https://git.torproject.org/torbutton.git";
+ rev = "refs/tags/${version}";
+ sha256 = "1amp0c9ky0a7fsa0bcbi6n6ginw7s2g3an4rj7kvc1lxmrcsm65l";
+ };
+
+ nativeBuildInputs = [ zip ];
+
+ buildPhase = ''
+ $shell ./makexpi.sh
+ '';
+
+ installPhase = ''
+ install -m 444 -D pkg/torbutton-$version.xpi "$out/$extid.xpi"
+ '';
+ };
+
+ tor-launcher = stdenv.mkDerivation rec {
+ name = "tor-launcher-${version}";
+ version = "0.2.13";
+
+ extid = "tor-launcher@torproject.org";
+
+ src = fetchgit {
+ url = "https://git.torproject.org/tor-launcher.git";
+ rev = "refs/tags/${version}";
+ sha256 = "1f98v88y2clwvjiw77kxqc9cacp5h0489a540nc2wmsx7vnskrq0";
+ };
+
+ nativeBuildInputs = [ zip ];
+
+ buildPhase = ''
+ make package
+ '';
+
+ installPhase = ''
+ install -m 444 -D pkg/tor-launcher-$version.xpi "$out/$extid.xpi"
+ '';
+ };
+}
diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix
index 28a4de16ea05..c654723f4c2c 100644
--- a/pkgs/applications/networking/browsers/vimb/default.nix
+++ b/pkgs/applications/networking/browsers/vimb/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "0d9rankzgmnx5423pyfkbxy0qxw3ck2vrdjdnlhddy15wkk87i9f";
};
- buildInputs = [ makeWrapper gtk2 libsoup pkgconfig webkit gsettings_desktop_schemas ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ makeWrapper gtk2 libsoup webkit gsettings_desktop_schemas ];
makeFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix
index 162ad8533bdc..e6275b2f9592 100644
--- a/pkgs/applications/networking/browsers/vimprobable2/default.nix
+++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "13jdximksh9r3cgd2f8vms0pbsn3x0gxvyqdqiw16xp5fmdx5kzr";
};
- buildInputs = [ makeWrapper gtk2 libsoup libX11 perl pkgconfig webkit gsettings_desktop_schemas ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ makeWrapper gtk2 libsoup libX11 perl webkit gsettings_desktop_schemas ];
hardeningDisable = [ "format" ];
@@ -34,7 +35,7 @@ stdenv.mkDerivation rec {
featureset might be considered "minimalistic", but not as minimalistic as
being completely featureless.
'';
- homepage = http://sourceforge.net/apps/trac/vimprobable;
+ homepage = https://sourceforge.net/apps/trac/vimprobable;
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.aforemny ];
platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc-r1.patch b/pkgs/applications/networking/browsers/vivaldi/chromium-gcc-r1.patch
similarity index 100%
rename from pkgs/applications/networking/browsers/chromium/patches/chromium-gcc-r1.patch
rename to pkgs/applications/networking/browsers/vivaldi/chromium-gcc-r1.patch
diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r1.patch b/pkgs/applications/networking/browsers/vivaldi/chromium-gcc5-r1.patch
similarity index 100%
rename from pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r1.patch
rename to pkgs/applications/networking/browsers/vivaldi/chromium-gcc5-r1.patch
diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r14.patch b/pkgs/applications/networking/browsers/vivaldi/chromium-gn-bootstrap-r14.patch
similarity index 100%
rename from pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r14.patch
rename to pkgs/applications/networking/browsers/vivaldi/chromium-gn-bootstrap-r14.patch
diff --git a/pkgs/applications/networking/browsers/vivaldi/chromium-gn-bootstrap-r8.patch b/pkgs/applications/networking/browsers/vivaldi/chromium-gn-bootstrap-r8.patch
deleted file mode 100644
index d9f389aaf588..000000000000
--- a/pkgs/applications/networking/browsers/vivaldi/chromium-gn-bootstrap-r8.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: tools/gn/bootstrap/bootstrap.py
-diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
-index 6f2f5b1264519ea38cc36fb0b7e2cc24c378ca7a..0b03d2626b358fb90ab39d737679ee47bd60303b 100755
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -487,6 +487,7 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/sys_info.cc',
- 'base/task_runner.cc',
- 'base/task_scheduler/delayed_task_manager.cc',
-+ 'base/task_scheduler/environment_config.cc',
- 'base/task_scheduler/post_task.cc',
- 'base/task_scheduler/priority_queue.cc',
- 'base/task_scheduler/scheduler_lock_impl.cc',
diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index a1238cb5964f..410e88663608 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -7,17 +7,17 @@
, glib, gtk3, pango, gdk_pixbuf, cairo, atk, gnome3
, nss, nspr
, patchelf, makeWrapper
-, proprietaryCodecs ? true, vivaldi-ffmpeg-codecs ? null
+, proprietaryCodecs ? false, vivaldi-ffmpeg-codecs ? null
}:
stdenv.mkDerivation rec {
name = "${product}-${version}";
product = "vivaldi";
- version = "1.11.917.39-1";
+ version = "1.12.955.38-1";
src = fetchurl {
url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb";
- sha256 = "0rsggp4ayj462g217zb9y9grhvbrcxa51a77l8l4qzhd9lg7zvx6";
+ sha256 = "1bq1ss6vkpr6rw5n0sw9zipxx19vficvxys1lra9symcxk1b4gqw";
};
unpackPhase = ''
diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
index b8b6bde50a40..542bcbc41b0d 100644
--- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
name = "${product}-${version}";
product = "vivaldi-ffmpeg-codecs";
- version = "60.0.3112.90";
+ version = "61.0.3163.91";
src = fetchurl {
url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz";
- sha512 = "2p7pjjsxpglxjmh0asyykagqh33ccrjwj4b2aski4h31wkxv9b9najy8aqk6j1bi06n9wd35vis4hz4fr6kvgckllg1pjqrb3bpwmq5";
+ sha512 = "3f07vwbxllrwy3agqxa6ndcix23vai18i178zscmk0y68flhzffyjdvrwlg7dzlwgiqypj2cyl21qb4qmcay2ilgw9vnr9fql2x0w7p";
};
buildInputs = [ ];
@@ -21,7 +21,9 @@ stdenv.mkDerivation rec {
];
patches = [
- ./chromium-gn-bootstrap-r8.patch
+ ./chromium-gn-bootstrap-r14.patch
+ ./chromium-gcc-r1.patch
+ ./chromium-gcc5-r1.patch
];
configurePhase = ''
@@ -51,5 +53,6 @@ stdenv.mkDerivation rec {
license = licenses.lgpl21;
maintainers = with maintainers; [ lluchs ];
platforms = [ "x86_64-linux" ];
+ broken = true;
};
}
diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix
index e7641eb773dc..f65e2fe1851b 100644
--- a/pkgs/applications/networking/browsers/w3m/default.nix
+++ b/pkgs/applications/networking/browsers/w3m/default.nix
@@ -40,7 +40,8 @@ stdenv.mkDerivation rec {
})
] ++ optional (graphicsSupport && !x11Support) [ ./no-x11.patch ];
- buildInputs = [ pkgconfig ncurses boehmgc gettext zlib ]
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ ncurses boehmgc gettext zlib ]
++ optional sslSupport openssl
++ optional mouseSupport gpm-ncurses
++ optional graphicsSupport imlib2
diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm.nix b/pkgs/applications/networking/cluster/docker-machine/kvm.nix
index a73ec99cb9fb..5d47302960f7 100644
--- a/pkgs/applications/networking/cluster/docker-machine/kvm.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/kvm.nix
@@ -15,7 +15,8 @@ buildGoPackage rec {
sha256 = "1p7s340wlcjvna3xa2x13nsnixfhbn5b7dhf9cqvxds2slizlm3p";
};
- buildInputs = [ libvirt pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libvirt ];
meta = with stdenv.lib; {
homepage = https://github.com/dhiltgen/docker-machine-kvm;
diff --git a/pkgs/applications/networking/cluster/habitat/default.nix b/pkgs/applications/networking/cluster/habitat/default.nix
index 605312611404..1656e5a09a6b 100644
--- a/pkgs/applications/networking/cluster/habitat/default.nix
+++ b/pkgs/applications/networking/cluster/habitat/default.nix
@@ -14,7 +14,7 @@ buildRustPackage rec {
sha256 = "0pqrm85pd9hqn5fwqjbyyrrfh4k7q9mi9qy9hm8yigk5l8mw44y1";
};
- depsSha256 = "1ahfm5agvabqqqgjsyjb95xxbc7mng1mdyclcakwp1m1qdkxx9py";
+ cargoSha256 = "1ahfm5agvabqqqgjsyjb95xxbc7mng1mdyclcakwp1m1qdkxx9p0";
buildInputs = [ libsodium libarchive openssl ];
@@ -35,5 +35,6 @@ buildRustPackage rec {
license = licenses.asl20;
maintainers = [ maintainers.rushmorem ];
platforms = [ "x86_64-linux" "x86_64-darwin" ];
+ broken = true; # mark temporary as broken due git dependencies
};
}
diff --git a/pkgs/applications/networking/cluster/kanif/default.nix b/pkgs/applications/networking/cluster/kanif/default.nix
index bac0cc37af33..5b543854473d 100644
--- a/pkgs/applications/networking/cluster/kanif/default.nix
+++ b/pkgs/applications/networking/cluster/kanif/default.nix
@@ -4,8 +4,6 @@ stdenv.mkDerivation rec {
version = "1.2.2";
name = "kanif-${version}";
- propagateBuildInputs = [ perl taktuk ];
-
src = fetchurl {
url = "http://gforge.inria.fr/frs/download.php/26773/${name}.tar.gz";
sha256 = "3f0c549428dfe88457c1db293cfac2a22b203f872904c3abf372651ac12e5879";
diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix
index e036fb2f38bd..ff7cb245ae2a 100644
--- a/pkgs/applications/networking/cluster/kops/default.nix
+++ b/pkgs/applications/networking/cluster/kops/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "kops-${version}";
- version = "1.6.2";
+ version = "1.7.1";
goPackagePath = "k8s.io/kops";
@@ -10,7 +10,7 @@ buildGoPackage rec {
rev = version;
owner = "kubernetes";
repo = "kops";
- sha256 = "0bxknjhzj9xiws6sjw9knwqma3fjh496vnm90skl766bk4pafq9l";
+ sha256 = "0wii6w6hs9hjz3vvgqwa5ilwdi8a3qknmqsg3izazmgmnhl712wd";
};
buildInputs = [go-bindata];
@@ -39,7 +39,7 @@ buildGoPackage rec {
description = "Easiest way to get a production Kubernetes up and running";
homepage = https://github.com/kubernetes/kops;
license = licenses.asl20;
- maintainers = with maintainers; [offline];
+ maintainers = with maintainers; [offline zimbatm];
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix
new file mode 100644
index 000000000000..7f17bd57c194
--- /dev/null
+++ b/pkgs/applications/networking/cluster/kubecfg/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildGoPackage, fetchFromGitHub, ... }:
+
+let version = "0.5.0"; in
+
+buildGoPackage {
+ name = "kubecfg-${version}";
+
+ src = fetchFromGitHub {
+ owner = "ksonnet";
+ repo = "kubecfg";
+ rev = "v${version}";
+ sha256 = "1s8w133p8qkj3dr73jimajm9ddp678lw9k9symj8rjw5p35igr93";
+ };
+
+ goPackagePath = "github.com/ksonnet/kubecfg";
+
+ meta = {
+ description = "A tool for managing Kubernetes resources as code";
+ homepage = https://github.com/ksonnet/kubecfg;
+ license = lib.licenses.asl20;
+ maintainers = with lib.maintainers; [ benley ];
+ platforms = lib.platforms.unix;
+ };
+}
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index e76d3cf5d08c..e8686ade5900 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -18,13 +18,13 @@ with lib;
stdenv.mkDerivation rec {
name = "kubernetes-${version}";
- version = "1.7.1";
+ version = "1.7.9";
src = fetchFromGitHub {
owner = "kubernetes";
repo = "kubernetes";
rev = "v${version}";
- sha256 = "1frf2nxk45lsbkq73fj72gxgr76icqdrsdqh20f5gpwiqn23n7c3";
+ sha256 = "0lxagvv8mysw6n0vp5vsccl87b628dgsjrf298dx2dqx7wn7zjgi";
};
buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ];
diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix
index 0506f7c154d2..909242273930 100644
--- a/pkgs/applications/networking/cluster/mesos/default.nix
+++ b/pkgs/applications/networking/cluster/mesos/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, lib, makeWrapper, fetchurl, curl, sasl, openssh, autoconf
-, automake, libtool, unzip, gnutar, jdk, maven, python, wrapPython
+{ stdenv, lib, makeWrapper, fetchurl, curl, sasl, openssh
+, unzip, gnutar, jdk, python, wrapPython
, setuptools, boto, pythonProtobuf, apr, subversion, gzip, systemd
, leveldb, glog, perf, utillinux, libnl, iproute, openssl, libevent
-, ethtool, coreutils, which, iptables
-, bash
+, ethtool, coreutils, which, iptables, maven
+, bash, autoreconfHook
}:
let
@@ -21,7 +21,7 @@ let
});
in stdenv.mkDerivation rec {
- version = "1.1.1";
+ version = "1.4.0";
name = "mesos-${version}";
enableParallelBuilding = true;
@@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://apache/mesos/${version}/${name}.tar.gz";
- sha256 = "0f46ebb130d2d4a9732f95d0a71d80c8c5967f3c172b110f2ece316e05922115";
+ sha256 = "0c08kd226nrjwm2z2drpq4vi97h9r8b1xkdvkgh1114fxg7cyvys";
};
patches = [
@@ -40,11 +40,13 @@ in stdenv.mkDerivation rec {
# see https://github.com/cstrahan/mesos/tree/nixos-${version}
./nixos.patch
];
-
+ nativeBuildInputs = [
+ autoreconfHook
+ ];
buildInputs = [
- makeWrapper autoconf automake libtool curl sasl jdk maven
+ makeWrapper curl sasl jdk
python wrapPython boto setuptools leveldb
- subversion apr glog openssl libevent
+ subversion apr glog openssl libevent maven
] ++ lib.optionals stdenv.isLinux [
libnl
];
@@ -52,27 +54,24 @@ in stdenv.mkDerivation rec {
propagatedBuildInputs = [
pythonProtobuf
];
-
- # note that we *must* statically link libprotobuf.
- # if we dynamically link the lib, we get these errors:
- # https://github.com/NixOS/nixpkgs/pull/19064#issuecomment-255082684
preConfigure = ''
# https://issues.apache.org/jira/browse/MESOS-6616
configureFlagsArray+=(
"CXXFLAGS=-O2 -Wno-error=strict-aliasing"
)
+ substituteInPlace 3rdparty/stout/include/stout/jsonify.hpp \
+ --replace '' ''
# Fix cases where makedev(),major(),minor() are referenced through
# instead of
sed 1i'#include ' -i src/linux/fs.cpp
sed 1i'#include ' -i src/slave/containerizer/mesos/isolators/gpu/isolator.cpp
-
substituteInPlace 3rdparty/stout/include/stout/os/posix/chown.hpp \
--subst-var-by chown ${coreutils}/bin/chown
substituteInPlace 3rdparty/stout/Makefile.am \
--replace "-lprotobuf" \
- "${pythonProtobuf.protobuf}/lib/libprotobuf.so"
+ "${pythonProtobuf.protobuf}/lib/libprotobuf.a"
substituteInPlace 3rdparty/stout/include/stout/os/posix/fork.hpp \
--subst-var-by sh ${bash}/bin/bash
@@ -100,7 +99,7 @@ in stdenv.mkDerivation rec {
substituteInPlace src/python/native_common/ext_modules.py.in \
--replace "-lprotobuf" \
- "${pythonProtobuf.protobuf}/lib/libprotobuf.so"
+ "${pythonProtobuf.protobuf}/lib/libprotobuf.a"
substituteInPlace src/slave/containerizer/mesos/isolators/gpu/volume.cpp \
--subst-var-by cp ${coreutils}/bin/cp \
@@ -125,7 +124,7 @@ in stdenv.mkDerivation rec {
substituteInPlace src/Makefile.am \
--subst-var-by mavenRepo ${mavenRepo} \
--replace "-lprotobuf" \
- "${pythonProtobuf.protobuf}/lib/libprotobuf.so"
+ "${pythonProtobuf.protobuf}/lib/libprotobuf.a"
'' + lib.optionalString stdenv.isLinux ''
@@ -179,7 +178,7 @@ in stdenv.mkDerivation rec {
"--enable-libevent"
"--with-libevent=${libevent.dev}"
"--with-protobuf=${pythonProtobuf.protobuf}"
- "PROTOBUF_JAR=${mavenRepo}/com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.jar"
+ "PROTOBUF_JAR=${mavenRepo}/com/google/protobuf/protobuf-java/3.3.0/protobuf-java-3.3.0.jar"
] ++ lib.optionals stdenv.isLinux [
"--with-network-isolator"
"--with-nl=${libnl.dev}"
diff --git a/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh b/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh
index f4a4588dbe41..cf7318ecb273 100644
--- a/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh
+++ b/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh
@@ -1127,10 +1127,12 @@ fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.pom
fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.pom.sha1
fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.jar
fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.jar.sha1
-fetchArtifact com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.pom
-fetchArtifact com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.pom.sha1
-fetchArtifact com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.jar
-fetchArtifact com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.jar.sha1
+fetchArtifact com/google/protobuf/protobuf-java/3.3.0/protobuf-java-3.3.0.pom
+fetchArtifact com/google/protobuf/protobuf-java/3.3.0/protobuf-java-3.3.0.pom.sha1
+fetchArtifact com/google/protobuf/protobuf-java/3.3.0/protobuf-java-3.3.0.jar
+fetchArtifact com/google/protobuf/protobuf-java/3.3.0/protobuf-java-3.3.0.jar.sha1
+fetchArtifact com/google/protobuf/protobuf-parent/3.3.0/protobuf-parent-3.3.0.pom
+fetchArtifact com/google/protobuf/protobuf-parent/3.3.0/protobuf-parent-3.3.0.pom.sha1
fetchArtifact com/google/google/1/google-1.pom
fetchArtifact com/google/google/1/google-1.pom.sha1
fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.pom
diff --git a/pkgs/applications/networking/cluster/mesos/mesos-deps.nix b/pkgs/applications/networking/cluster/mesos/mesos-deps.nix
index 1edb4a755d89..642c660edb69 100644
--- a/pkgs/applications/networking/cluster/mesos/mesos-deps.nix
+++ b/pkgs/applications/networking/cluster/mesos/mesos-deps.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
outputHashAlgo = "sha256";
outputHashMode = "recursive";
- outputHash = "066ikswavq3l37x1s3pfdncyj77pvpa0kj14ax5dqb9njmsg0s11";
+ outputHash = "10h0qs7svw0cqjkyxs8z6s3qraa8ga920zfrr59rdlanbwg4klly";
buildInputs = [ curl ];
diff --git a/pkgs/applications/networking/cluster/mesos/nixos.patch b/pkgs/applications/networking/cluster/mesos/nixos.patch
index 78e374b8d6bc..a6fea024b087 100644
--- a/pkgs/applications/networking/cluster/mesos/nixos.patch
+++ b/pkgs/applications/networking/cluster/mesos/nixos.patch
@@ -1,20 +1,7 @@
-diff --git a/3rdparty/stout/include/stout/os/posix/chown.hpp b/3rdparty/stout/include/stout/os/posix/chown.hpp
-index c82e2e574..15d332107 100644
---- a/3rdparty/stout/include/stout/os/posix/chown.hpp
-+++ b/3rdparty/stout/include/stout/os/posix/chown.hpp
-@@ -34,7 +34,7 @@ inline Try chown(
- // TODO(bmahler): Consider walking the file tree instead. We would need
- // to be careful to not miss dotfiles.
- std::string command =
-- "chown -R " + stringify(uid) + ':' + stringify(gid) + " '" + path + "'";
-+ "@chown@ -R " + stringify(uid) + ':' + stringify(gid) + " '" + path + "'";
-
- int status = os::system(command);
- if (status != 0) {
-diff --git a/3rdparty/stout/include/stout/os/posix/fork.hpp b/3rdparty/stout/include/stout/os/posix/fork.hpp
-index a29967dcb..290b98b50 100644
---- a/3rdparty/stout/include/stout/os/posix/fork.hpp
-+++ b/3rdparty/stout/include/stout/os/posix/fork.hpp
+diff --git i/3rdparty/stout/include/stout/os/posix/fork.hpp w/3rdparty/stout/include/stout/os/posix/fork.hpp
+index a29967d..290b98b 100644
+--- i/3rdparty/stout/include/stout/os/posix/fork.hpp
++++ w/3rdparty/stout/include/stout/os/posix/fork.hpp
@@ -369,7 +369,7 @@ private:
if (exec.isSome()) {
// Execute the command (via '/bin/sh -c command').
@@ -24,11 +11,11 @@ index a29967dcb..290b98b50 100644
EXIT(EXIT_FAILURE)
<< "Failed to execute '" << command << "': " << os::strerror(errno);
} else if (wait.isSome()) {
-diff --git a/3rdparty/stout/include/stout/posix/os.hpp b/3rdparty/stout/include/stout/posix/os.hpp
-index c37e64db6..d3d87b7f0 100644
---- a/3rdparty/stout/include/stout/posix/os.hpp
-+++ b/3rdparty/stout/include/stout/posix/os.hpp
-@@ -375,7 +375,7 @@ inline Option getenv(const std::string& key)
+diff --git i/3rdparty/stout/include/stout/posix/os.hpp w/3rdparty/stout/include/stout/posix/os.hpp
+index 8511dfd..1e7be01 100644
+--- i/3rdparty/stout/include/stout/posix/os.hpp
++++ w/3rdparty/stout/include/stout/posix/os.hpp
+@@ -366,7 +366,7 @@ inline Try> pids(Option group, Option session)
inline Try tar(const std::string& path, const std::string& archive)
{
Try tarOut =
@@ -37,11 +24,11 @@ index c37e64db6..d3d87b7f0 100644
if (tarOut.isError()) {
return Error("Failed to archive " + path + ": " + tarOut.error());
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 3bcc0f2df..e5cbc57e8 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1545,7 +1545,7 @@ if HAS_JAVA
+diff --git i/src/Makefile.am w/src/Makefile.am
+index 68fff14..c572f92 100644
+--- i/src/Makefile.am
++++ w/src/Makefile.am
+@@ -1775,7 +1775,7 @@ if HAS_JAVA
$(MESOS_JAR): $(MESOS_JAR_SOURCE) $(MESOS_JAR_GENERATED) java/mesos.pom
@echo "Building mesos-$(PACKAGE_VERSION).jar ..."
@@ -50,10 +37,10 @@ index 3bcc0f2df..e5cbc57e8 100644
# Convenience library for JNI bindings.
# TODO(Charles Reiss): We really should be building the Java library
-diff --git a/src/cli/mesos-scp b/src/cli/mesos-scp
-index a71ab0708..1043d1b3c 100755
---- a/src/cli/mesos-scp
-+++ b/src/cli/mesos-scp
+diff --git i/src/cli/mesos-scp w/src/cli/mesos-scp
+index a71ab07..1043d1b 100755
+--- i/src/cli/mesos-scp
++++ w/src/cli/mesos-scp
@@ -19,7 +19,8 @@ if sys.version_info < (2,6,0):
@@ -64,11 +51,11 @@ index a71ab0708..1043d1b3c 100755
try:
process = subprocess.Popen(
cmd,
-diff --git a/src/common/command_utils.cpp b/src/common/command_utils.cpp
-index 09e805140..90bf65896 100644
---- a/src/common/command_utils.cpp
-+++ b/src/common/command_utils.cpp
-@@ -140,7 +140,7 @@ Future tar(
+diff --git i/src/common/command_utils.cpp w/src/common/command_utils.cpp
+index c50be76..388cc53 100644
+--- i/src/common/command_utils.cpp
++++ w/src/common/command_utils.cpp
+@@ -142,7 +142,7 @@ Future tar(
argv.emplace_back(input);
@@ -77,7 +64,7 @@ index 09e805140..90bf65896 100644
.then([]() { return Nothing(); });
}
-@@ -162,7 +162,7 @@ Future untar(
+@@ -164,7 +164,7 @@ Future untar(
argv.emplace_back(directory.get());
}
@@ -86,7 +73,7 @@ index 09e805140..90bf65896 100644
.then([]() { return Nothing(); });
}
-@@ -170,7 +170,7 @@ Future untar(
+@@ -172,7 +172,7 @@ Future untar(
Future sha512(const Path& input)
{
#ifdef __linux__
@@ -95,7 +82,7 @@ index 09e805140..90bf65896 100644
vector argv = {
cmd,
input // Input file to compute shasum.
-@@ -206,7 +206,7 @@ Future gzip(const Path& input)
+@@ -208,7 +208,7 @@ Future gzip(const Path& input)
input
};
@@ -104,7 +91,7 @@ index 09e805140..90bf65896 100644
.then([]() { return Nothing(); });
}
-@@ -219,7 +219,7 @@ Future decompress(const Path& input)
+@@ -221,7 +221,7 @@ Future decompress(const Path& input)
input
};
@@ -113,41 +100,45 @@ index 09e805140..90bf65896 100644
.then([]() { return Nothing(); });
}
-diff --git a/src/launcher/fetcher.cpp b/src/launcher/fetcher.cpp
-index 4456c2813..e22c8fc03 100644
---- a/src/launcher/fetcher.cpp
-+++ b/src/launcher/fetcher.cpp
-@@ -68,13 +68,13 @@ static Try extract(
+diff --git i/src/launcher/fetcher.cpp w/src/launcher/fetcher.cpp
+index 42980f5..3aebeed 100644
+--- i/src/launcher/fetcher.cpp
++++ w/src/launcher/fetcher.cpp
+@@ -80,17 +80,17 @@ static Try extract(
strings::endsWith(sourcePath, ".tar.bz2") ||
strings::endsWith(sourcePath, ".txz") ||
strings::endsWith(sourcePath, ".tar.xz")) {
-- command = "tar -C '" + destinationDirectory + "' -xf";
-+ command = "@tar@ -C '" + destinationDirectory + "' -xf";
+- command = {"tar", "-C", destinationDirectory, "-xf", sourcePath};
++ command = {"@tar@", "-C", destinationDirectory, "-xf", sourcePath};
} else if (strings::endsWith(sourcePath, ".gz")) {
string pathWithoutExtension = sourcePath.substr(0, sourcePath.length() - 3);
string filename = Path(pathWithoutExtension).basename();
-- command = "gzip -dc > '" + destinationDirectory + "/" + filename + "' <";
-+ command = "@gzip@ -dc > '" + destinationDirectory + "/" + filename + "' <";
+ string destinationPath = path::join(destinationDirectory, filename);
+
+- command = {"gunzip", "-d", "-c"};
++ command = {"@gunzip@", "-d", "-c"};
+ in = Subprocess::PATH(sourcePath);
+ out = Subprocess::PATH(destinationPath);
} else if (strings::endsWith(sourcePath, ".zip")) {
-- command = "unzip -o -d '" + destinationDirectory + "'";
-+ command = "@unzip@ -o -d '" + destinationDirectory + "'";
+- command = {"unzip", "-o", "-d", destinationDirectory, sourcePath};
++ command = {"@unzip@", "-o", "-d", destinationDirectory, sourcePath};
} else {
return false;
}
-@@ -162,7 +162,7 @@ static Try copyFile(
+@@ -193,7 +193,7 @@ static Try copyFile(
const string& sourcePath,
const string& destinationPath)
{
-- const string command = "cp '" + sourcePath + "' '" + destinationPath + "'";
-+ const string command = "@cp@ '" + sourcePath + "' '" + destinationPath + "'";
+- int status = os::spawn("cp", {"cp", sourcePath, destinationPath});
++ int status = os::spawn("cp", {"@cp@", sourcePath, destinationPath});
- LOG(INFO) << "Copying resource with command:" << command;
-
-diff --git a/src/linux/perf.cpp b/src/linux/perf.cpp
-index aa31982eb..8b5331b17 100644
---- a/src/linux/perf.cpp
-+++ b/src/linux/perf.cpp
-@@ -127,7 +127,7 @@ private:
+ if (status == -1) {
+ return ErrnoError("Failed to copy '" + sourcePath + "'");
+diff --git i/src/linux/perf.cpp w/src/linux/perf.cpp
+index b301e25..356a2cf 100644
+--- i/src/linux/perf.cpp
++++ w/src/linux/perf.cpp
+@@ -128,7 +128,7 @@ private:
// NOTE: The supervisor childhook places perf in its own process group
// and will kill the perf process when the parent dies.
Try _perf = subprocess(
@@ -156,19 +147,10 @@ index aa31982eb..8b5331b17 100644
argv,
Subprocess::PIPE(),
Subprocess::PIPE(),
-@@ -319,7 +319,7 @@ bool valid(const set& events)
- ostringstream command;
-
- // Log everything to stderr which is then redirected to /dev/null.
-- command << "perf stat --log-fd 2";
-+ command << "@perf@ stat --log-fd 2";
- foreach (const string& event, events) {
- command << " --event " << event;
- }
-diff --git a/src/linux/systemd.cpp b/src/linux/systemd.cpp
-index 6318f48fc..394d88d47 100644
---- a/src/linux/systemd.cpp
-+++ b/src/linux/systemd.cpp
+diff --git i/src/linux/systemd.cpp w/src/linux/systemd.cpp
+index 6318f48..394d88d 100644
+--- i/src/linux/systemd.cpp
++++ w/src/linux/systemd.cpp
@@ -196,13 +196,21 @@ bool exists()
// This is static as the init system should not change while we are running.
static const bool exists = []() -> bool {
@@ -209,10 +191,10 @@ index 6318f48fc..394d88d47 100644
Try daemonReload = os::shell("systemctl daemon-reload");
if (daemonReload.isError()) {
return Error("Failed to reload systemd daemon: " + daemonReload.error());
-diff --git a/src/python/cli/src/mesos/cli.py b/src/python/cli/src/mesos/cli.py
-index f342992e0..354abf443 100644
---- a/src/python/cli/src/mesos/cli.py
-+++ b/src/python/cli/src/mesos/cli.py
+diff --git i/src/python/cli/src/mesos/cli.py w/src/python/cli/src/mesos/cli.py
+index 4a9b558..c08a8b9 100644
+--- i/src/python/cli/src/mesos/cli.py
++++ w/src/python/cli/src/mesos/cli.py
@@ -40,7 +40,7 @@ def resolve(master):
import subprocess
@@ -222,10 +204,10 @@ index f342992e0..354abf443 100644
stdin=None,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
-diff --git a/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp b/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp
-index af9f3736b..f8554d414 100644
---- a/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp
-+++ b/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp
+diff --git i/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp w/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp
+index 5b630c1..d63ad69 100644
+--- i/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp
++++ w/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp
@@ -499,7 +499,7 @@ Future> DockerVolumeIsolatorProcess::_prepare(
// unsafe arbitrary commands).
CommandInfo* command = launchInfo.add_pre_exec_commands();
@@ -235,11 +217,11 @@ index af9f3736b..f8554d414 100644
command->add_arguments("mount");
command->add_arguments("-n");
command->add_arguments("--rbind");
-diff --git a/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp b/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp
-index df16b8fee..4a17475bd 100644
---- a/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp
-+++ b/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp
-@@ -159,9 +159,9 @@ Try LinuxFilesystemIsolatorProcess::create(const Flags& flags)
+diff --git i/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp w/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp
+index d7fe9a8..1361a4e 100644
+--- i/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp
++++ w/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp
+@@ -154,9 +154,9 @@ Try LinuxFilesystemIsolatorProcess::create(const Flags& flags)
// here because 'create' will only be invoked during
// initialization.
Try mount = os::shell(
@@ -252,7 +234,7 @@ index df16b8fee..4a17475bd 100644
workDir->c_str(),
workDir->c_str(),
workDir->c_str(),
-@@ -180,8 +180,8 @@ Try LinuxFilesystemIsolatorProcess::create(const Flags& flags)
+@@ -175,8 +175,8 @@ Try LinuxFilesystemIsolatorProcess::create(const Flags& flags)
LOG(INFO) << "Making '" << workDir.get() << "' a shared mount";
Try mount = os::shell(
@@ -263,7 +245,7 @@ index df16b8fee..4a17475bd 100644
workDir->c_str(),
workDir->c_str());
-@@ -404,7 +404,7 @@ Try> LinuxFilesystemIsolatorProcess::getPreExecCommands(
+@@ -422,7 +422,7 @@ Try> LinuxFilesystemIsolatorProcess::getPreExecCommands(
CommandInfo command;
command.set_shell(false);
@@ -272,7 +254,7 @@ index df16b8fee..4a17475bd 100644
command.add_arguments("mount");
command.add_arguments("-n");
command.add_arguments("--rbind");
-@@ -569,7 +569,7 @@ Try> LinuxFilesystemIsolatorProcess::getPreExecCommands(
+@@ -610,7 +610,7 @@ Try> LinuxFilesystemIsolatorProcess::getPreExecCommands(
// TODO(jieyu): Consider the mode in the volume.
CommandInfo command;
command.set_shell(false);
@@ -281,11 +263,11 @@ index df16b8fee..4a17475bd 100644
command.add_arguments("mount");
command.add_arguments("-n");
command.add_arguments("--rbind");
-diff --git a/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp b/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp
-index a1283e5ee..a918427bf 100644
---- a/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp
-+++ b/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp
-@@ -207,7 +207,7 @@ Future> SharedFilesystemIsolatorProcess::prepare(
+diff --git i/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp w/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp
+index 927d95b..576dc63 100644
+--- i/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp
++++ w/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp
+@@ -208,7 +208,7 @@ Future> SharedFilesystemIsolatorProcess::prepare(
}
launchInfo.add_pre_exec_commands()->set_value(
@@ -294,11 +276,11 @@ index a1283e5ee..a918427bf 100644
}
return launchInfo;
-diff --git a/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp b/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp
-index e3756c920..cfe458b59 100644
---- a/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp
-+++ b/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp
-@@ -355,7 +355,7 @@ Future> NvidiaGpuIsolatorProcess::_prepare(
+diff --git i/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp w/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp
+index 25636b5..33ec315 100644
+--- i/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp
++++ w/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp
+@@ -401,7 +401,7 @@ Future> NvidiaGpuIsolatorProcess::_prepare(
}
launchInfo.add_pre_exec_commands()->set_value(
@@ -307,11 +289,11 @@ index e3756c920..cfe458b59 100644
volume.HOST_PATH() + " " + target);
}
-diff --git a/src/slave/containerizer/mesos/isolators/gpu/volume.cpp b/src/slave/containerizer/mesos/isolators/gpu/volume.cpp
-index 478752f37..ab527f0cd 100644
---- a/src/slave/containerizer/mesos/isolators/gpu/volume.cpp
-+++ b/src/slave/containerizer/mesos/isolators/gpu/volume.cpp
-@@ -281,7 +281,7 @@ Try NvidiaVolume::create()
+diff --git i/src/slave/containerizer/mesos/isolators/gpu/volume.cpp w/src/slave/containerizer/mesos/isolators/gpu/volume.cpp
+index 536a3c7..e2819dd 100644
+--- i/src/slave/containerizer/mesos/isolators/gpu/volume.cpp
++++ w/src/slave/containerizer/mesos/isolators/gpu/volume.cpp
+@@ -274,7 +274,7 @@ Try NvidiaVolume::create()
string path = path::join(hostPath, "bin", binary);
if (!os::exists(path)) {
@@ -320,7 +302,7 @@ index 478752f37..ab527f0cd 100644
Try which = os::shell(command);
if (which.isSome()) {
-@@ -295,7 +295,7 @@ Try NvidiaVolume::create()
+@@ -288,7 +288,7 @@ Try NvidiaVolume::create()
: "No such file or directory"));
}
@@ -329,7 +311,7 @@ index 478752f37..ab527f0cd 100644
Try cp = os::shell(command);
if (cp.isError()) {
return Error("Failed to os::shell '" + command + "': " + cp.error());
-@@ -367,7 +367,7 @@ Try NvidiaVolume::create()
+@@ -360,7 +360,7 @@ Try NvidiaVolume::create()
Path(realpath.get()).basename());
if (!os::exists(libraryPath)) {
@@ -338,11 +320,11 @@ index 478752f37..ab527f0cd 100644
Try cp = os::shell(command);
if (cp.isError()) {
return Error("Failed to os::shell '" + command + "':"
-diff --git a/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp b/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp
-index 0d9ec57d9..a177e4476 100644
---- a/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp
-+++ b/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp
-@@ -94,7 +94,7 @@ Future> NamespacesPidIsolatorProcess::prepare(
+diff --git i/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp w/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp
+index 42bc2e1..2f9066e 100644
+--- i/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp
++++ w/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp
+@@ -131,7 +131,7 @@ Future> NamespacesPidIsolatorProcess::prepare(
//
// TOOD(jieyu): Consider unmount the existing /proc.
launchInfo.add_pre_exec_commands()->set_value(
@@ -351,11 +333,11 @@ index 0d9ec57d9..a177e4476 100644
return launchInfo;
}
-diff --git a/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp b/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp
-index c87e6715a..6601cd1b3 100644
---- a/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp
-+++ b/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp
-@@ -262,9 +262,9 @@ Try NetworkCniIsolatorProcess::create(const Flags& flags)
+diff --git i/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp w/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp
+index fc68f04..267b040 100644
+--- i/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp
++++ w/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp
+@@ -205,9 +205,9 @@ Try NetworkCniIsolatorProcess::create(const Flags& flags)
// here because 'create' will only be invoked during
// initialization.
Try mount = os::shell(
@@ -368,7 +350,7 @@ index c87e6715a..6601cd1b3 100644
rootDir->c_str(),
rootDir->c_str(),
rootDir->c_str(),
-@@ -284,8 +284,8 @@ Try NetworkCniIsolatorProcess::create(const Flags& flags)
+@@ -227,8 +227,8 @@ Try NetworkCniIsolatorProcess::create(const Flags& flags)
LOG(INFO) << "Making '" << rootDir.get() << "' a shared mount";
Try mount = os::shell(
@@ -379,11 +361,11 @@ index c87e6715a..6601cd1b3 100644
rootDir->c_str(),
rootDir->c_str());
-diff --git a/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp b/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp
-index b470f0c82..6110a43ee 100644
---- a/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp
-+++ b/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp
-@@ -303,7 +303,7 @@ Try PortMapper::addPortMapping(
+diff --git i/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp w/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp
+index 43cf3e4..94bad8b 100644
+--- i/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp
++++ w/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp
+@@ -301,7 +301,7 @@ Try PortMapper::addPortMapping(
# Check if the `chain` exists in the iptable. If it does not
# exist go ahead and install the chain in the iptables NAT
# table.
@@ -392,7 +374,7 @@ index b470f0c82..6110a43ee 100644
if [ $? -ne 0 ]; then
# NOTE: When we create the chain, there is a possibility of a
# race due to which a container launch can fail. This can
-@@ -317,25 +317,25 @@ Try PortMapper::addPortMapping(
+@@ -315,25 +315,25 @@ Try PortMapper::addPortMapping(
# since it can happen only when the chain is created the first
# time and two commands for creation of the chain are executed
# simultaneously.
@@ -422,7 +404,7 @@ index b470f0c82..6110a43ee 100644
chain,
chain,
chain,
-@@ -362,7 +362,7 @@ Try PortMapper::delPortMapping()
+@@ -360,7 +360,7 @@ Try PortMapper::delPortMapping()
# The iptables command searches for the DNAT rules with tag
# "container_id: ", and if it exists goes ahead
# and deletes it.
@@ -431,11 +413,11 @@ index b470f0c82..6110a43ee 100644
chain,
getIptablesRuleTag()).get();
-diff --git a/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp b/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp
-index 20fb6ab35..46c160977 100644
---- a/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp
-+++ b/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp
-@@ -1393,19 +1393,19 @@ Try PortMappingIsolatorProcess::create(const Flags& flags)
+diff --git i/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp w/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp
+index 57d4ccd..68c9577 100644
+--- i/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp
++++ w/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp
+@@ -1394,19 +1394,19 @@ Try PortMappingIsolatorProcess::create(const Flags& flags)
// Check the availability of a few Linux commands that we will use.
// We use the blocking os::shell here because 'create' will only be
// invoked during initialization.
@@ -458,7 +440,7 @@ index 20fb6ab35..46c160977 100644
if (checkCommandIp.isError()) {
return Error("Check command 'ip' failed: " + checkCommandIp.error());
}
-@@ -1925,9 +1925,9 @@ Try PortMappingIsolatorProcess::create(const Flags& flags)
+@@ -1940,9 +1940,9 @@ Try PortMappingIsolatorProcess::create(const Flags& flags)
// visible. It's OK to use the blocking os::shell here because
// 'create' will only be invoked during initialization.
Try mount = os::shell(
@@ -471,7 +453,7 @@ index 20fb6ab35..46c160977 100644
bindMountRoot->c_str(),
bindMountRoot->c_str(),
bindMountRoot->c_str(),
-@@ -1944,8 +1944,8 @@ Try PortMappingIsolatorProcess::create(const Flags& flags)
+@@ -1959,8 +1959,8 @@ Try PortMappingIsolatorProcess::create(const Flags& flags)
// shared mount yet (possibly due to slave crash while preparing
// the work directory mount). It's safe to re-do the following.
Try mount = os::shell(
@@ -482,7 +464,7 @@ index 20fb6ab35..46c160977 100644
bindMountRoot->c_str(),
bindMountRoot->c_str());
-@@ -1964,8 +1964,8 @@ Try PortMappingIsolatorProcess::create(const Flags& flags)
+@@ -1979,8 +1979,8 @@ Try PortMappingIsolatorProcess::create(const Flags& flags)
// so that they are in different peer groups.
if (entry.shared() == bindMountEntry->shared()) {
Try mount = os::shell(
@@ -493,7 +475,7 @@ index 20fb6ab35..46c160977 100644
bindMountRoot->c_str(),
bindMountRoot->c_str());
-@@ -3911,6 +3911,8 @@ Try PortMappingIsolatorProcess::removeHostIPFilters(
+@@ -3927,6 +3927,8 @@ Try PortMappingIsolatorProcess::removeHostIPFilters(
// TODO(jieyu): Use the Subcommand abstraction to remove most of the
// logic here. Completely remove this function once we can assume a
// newer kernel where 'setns' works for mount namespaces.
@@ -502,7 +484,7 @@ index 20fb6ab35..46c160977 100644
string PortMappingIsolatorProcess::scripts(Info* info)
{
ostringstream script;
-@@ -3921,7 +3923,7 @@ string PortMappingIsolatorProcess::scripts(Info* info)
+@@ -3937,7 +3939,7 @@ string PortMappingIsolatorProcess::scripts(Info* info)
// Mark the mount point PORT_MAPPING_BIND_MOUNT_ROOT() as slave
// mount so that changes in the container will not be propagated to
// the host.
@@ -511,7 +493,7 @@ index 20fb6ab35..46c160977 100644
// Disable IPv6 when IPv6 module is loaded as IPv6 packets won't be
// forwarded anyway.
-@@ -3929,7 +3931,7 @@ string PortMappingIsolatorProcess::scripts(Info* info)
+@@ -3945,7 +3947,7 @@ string PortMappingIsolatorProcess::scripts(Info* info)
<< " echo 1 > /proc/sys/net/ipv6/conf/all/disable_ipv6\n";
// Configure lo and eth0.
@@ -520,7 +502,7 @@ index 20fb6ab35..46c160977 100644
<< " mtu " << hostEth0MTU << " up\n";
// NOTE: This is mostly a kernel issue: in veth_xmit() the kernel
-@@ -3938,12 +3940,12 @@ string PortMappingIsolatorProcess::scripts(Info* info)
+@@ -3954,12 +3956,12 @@ string PortMappingIsolatorProcess::scripts(Info* info)
// when we receive a packet with a bad checksum. Disabling rx
// checksum offloading ensures the TCP layer will checksum and drop
// it.
@@ -537,7 +519,7 @@ index 20fb6ab35..46c160977 100644
// Restrict the ephemeral ports that can be used by the container.
script << "echo " << info->ephemeralPorts.lower() << " "
-@@ -3972,19 +3974,19 @@ string PortMappingIsolatorProcess::scripts(Info* info)
+@@ -3988,19 +3990,19 @@ string PortMappingIsolatorProcess::scripts(Info* info)
}
// Set up filters on lo and eth0.
@@ -561,7 +543,7 @@ index 20fb6ab35..46c160977 100644
<< " protocol ip"
<< " prio " << Priority(IP_FILTER_PRIORITY, NORMAL).get() << " u32"
<< " flowid ffff:0"
-@@ -3995,7 +3997,7 @@ string PortMappingIsolatorProcess::scripts(Info* info)
+@@ -4011,7 +4013,7 @@ string PortMappingIsolatorProcess::scripts(Info* info)
foreach (const PortRange& range,
getPortRanges(info->nonEphemeralPorts + info->ephemeralPorts)) {
// Local traffic inside a container will not be redirected to eth0.
@@ -570,7 +552,7 @@ index 20fb6ab35..46c160977 100644
<< " protocol ip"
<< " prio " << Priority(IP_FILTER_PRIORITY, HIGH).get() << " u32"
<< " flowid ffff:0"
-@@ -4004,7 +4006,7 @@ string PortMappingIsolatorProcess::scripts(Info* info)
+@@ -4020,7 +4022,7 @@ string PortMappingIsolatorProcess::scripts(Info* info)
// Traffic going to host loopback IP and ports assigned to this
// container will be redirected to lo.
@@ -579,7 +561,7 @@ index 20fb6ab35..46c160977 100644
<< " protocol ip"
<< " prio " << Priority(IP_FILTER_PRIORITY, NORMAL).get() << " u32"
<< " flowid ffff:0"
-@@ -4016,14 +4018,14 @@ string PortMappingIsolatorProcess::scripts(Info* info)
+@@ -4032,14 +4034,14 @@ string PortMappingIsolatorProcess::scripts(Info* info)
}
// Do not forward the ICMP packet if the destination IP is self.
@@ -596,8 +578,8 @@ index 20fb6ab35..46c160977 100644
<< " protocol ip"
<< " prio " << Priority(ICMP_FILTER_PRIORITY, NORMAL).get() << " u32"
<< " flowid ffff:0"
-@@ -4032,9 +4034,9 @@ string PortMappingIsolatorProcess::scripts(Info* info)
- << net::IPNetwork::LOOPBACK_V4().address() << "\n";
+@@ -4048,9 +4050,9 @@ string PortMappingIsolatorProcess::scripts(Info* info)
+ << net::IP::Network::LOOPBACK_V4().address() << "\n";
// Display the filters created on eth0 and lo.
- script << "tc filter show dev " << eth0
@@ -608,7 +590,7 @@ index 20fb6ab35..46c160977 100644
<< " parent " << ingress::HANDLE << "\n";
// If throughput limit for container egress traffic exists, use HTB
-@@ -4046,9 +4048,9 @@ string PortMappingIsolatorProcess::scripts(Info* info)
+@@ -4062,9 +4064,9 @@ string PortMappingIsolatorProcess::scripts(Info* info)
// throughput. TBF requires other parameters such as 'burst' that
// HTB already has default values for.
if (egressRateLimitPerContainer.isSome()) {
@@ -620,7 +602,7 @@ index 20fb6ab35..46c160977 100644
<< CONTAINER_TX_HTB_HANDLE << " classid "
<< CONTAINER_TX_HTB_CLASS_ID << " htb rate "
<< egressRateLimitPerContainer.get().bytes() * 8 << "bit\n";
-@@ -4059,12 +4061,12 @@ string PortMappingIsolatorProcess::scripts(Info* info)
+@@ -4075,12 +4077,12 @@ string PortMappingIsolatorProcess::scripts(Info* info)
// fq_codel, which has a larger buffer and better control on
// buffer bloat.
// TODO(cwang): Verity that fq_codel qdisc is available.
@@ -636,24 +618,24 @@ index 20fb6ab35..46c160977 100644
}
return script.str();
-diff --git a/src/slave/containerizer/mesos/isolators/posix/disk.cpp b/src/slave/containerizer/mesos/isolators/posix/disk.cpp
-index db0583386..542586370 100644
---- a/src/slave/containerizer/mesos/isolators/posix/disk.cpp
-+++ b/src/slave/containerizer/mesos/isolators/posix/disk.cpp
-@@ -540,7 +540,7 @@ private:
+diff --git i/src/slave/containerizer/mesos/isolators/posix/disk.cpp w/src/slave/containerizer/mesos/isolators/posix/disk.cpp
+index eb23025..db268ea 100644
+--- i/src/slave/containerizer/mesos/isolators/posix/disk.cpp
++++ w/src/slave/containerizer/mesos/isolators/posix/disk.cpp
+@@ -572,7 +572,7 @@ private:
// NOTE: The supervisor childhook will watch the parent process and kill
// the 'du' process in case that the parent die.
Try s = subprocess(
- "du",
+ "@du@",
command,
- Subprocess::PATH("/dev/null"),
+ Subprocess::PATH(os::DEV_NULL),
Subprocess::PIPE(),
-diff --git a/src/slave/containerizer/mesos/isolators/volume/image.cpp b/src/slave/containerizer/mesos/isolators/volume/image.cpp
-index 210e67ad0..60b3a15e4 100644
---- a/src/slave/containerizer/mesos/isolators/volume/image.cpp
-+++ b/src/slave/containerizer/mesos/isolators/volume/image.cpp
-@@ -214,7 +214,7 @@ Future> VolumeImageIsolatorProcess::_prepare(
+diff --git i/src/slave/containerizer/mesos/isolators/volume/image.cpp w/src/slave/containerizer/mesos/isolators/volume/image.cpp
+index 35966aa..b62fc86 100644
+--- i/src/slave/containerizer/mesos/isolators/volume/image.cpp
++++ w/src/slave/containerizer/mesos/isolators/volume/image.cpp
+@@ -231,7 +231,7 @@ Future> VolumeImageIsolatorProcess::_prepare(
CommandInfo* command = launchInfo.add_pre_exec_commands();
command->set_shell(false);
@@ -662,11 +644,11 @@ index 210e67ad0..60b3a15e4 100644
command->add_arguments("mount");
command->add_arguments("-n");
command->add_arguments("--rbind");
-diff --git a/src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp b/src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp
-index 7b976d292..474dcd486 100644
---- a/src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp
-+++ b/src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp
-@@ -240,7 +240,7 @@ Future> VolumeSandboxPathIsolatorProcess::prepare(
+diff --git i/src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp w/src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp
+index b321b86..8ed3e78 100644
+--- i/src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp
++++ w/src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp
+@@ -265,7 +265,7 @@ Future> VolumeSandboxPathIsolatorProcess::prepare(
CommandInfo* command = launchInfo.add_pre_exec_commands();
command->set_shell(false);
@@ -675,58 +657,60 @@ index 7b976d292..474dcd486 100644
command->add_arguments("mount");
command->add_arguments("-n");
command->add_arguments("--rbind");
-diff --git a/src/slave/containerizer/mesos/provisioner/backends/copy.cpp b/src/slave/containerizer/mesos/provisioner/backends/copy.cpp
-index 9c5354e5f..a73a9692e 100644
---- a/src/slave/containerizer/mesos/provisioner/backends/copy.cpp
-+++ b/src/slave/containerizer/mesos/provisioner/backends/copy.cpp
-@@ -147,7 +147,7 @@ Future CopyBackendProcess::_provision(
+diff --git i/src/slave/containerizer/mesos/provisioner/backends/copy.cpp w/src/slave/containerizer/mesos/provisioner/backends/copy.cpp
+index 69faa03..01a3ed6 100644
+--- i/src/slave/containerizer/mesos/provisioner/backends/copy.cpp
++++ w/src/slave/containerizer/mesos/provisioner/backends/copy.cpp
+@@ -266,7 +266,7 @@ Future CopyBackendProcess::_provision(
#endif // __APPLE__ || __FreeBSD__
Try s = subprocess(
- "cp",
+ "@cp@",
args,
- Subprocess::PATH("/dev/null"),
- Subprocess::PATH("/dev/null"),
-@@ -180,7 +180,7 @@ Future CopyBackendProcess::destroy(const string& rootfs)
+ Subprocess::PATH(os::DEV_NULL),
+ Subprocess::PATH(os::DEV_NULL),
+@@ -313,7 +313,7 @@ Future CopyBackendProcess::destroy(const string& rootfs)
vector argv{"rm", "-rf", rootfs};
Try s = subprocess(
- "rm",
+ "@rm@",
argv,
- Subprocess::PATH("/dev/null"),
+ Subprocess::PATH(os::DEV_NULL),
Subprocess::FD(STDOUT_FILENO),
-diff --git a/src/uri/fetchers/copy.cpp b/src/uri/fetchers/copy.cpp
-index 2cfef5ab0..8a62f7699 100644
---- a/src/uri/fetchers/copy.cpp
-+++ b/src/uri/fetchers/copy.cpp
-@@ -97,7 +97,7 @@ Future CopyFetcherPlugin::fetch(
- const vector argv = {"cp", "-a", uri.path(), directory};
+diff --git i/src/uri/fetchers/copy.cpp w/src/uri/fetchers/copy.cpp
+index 17f69be..831b08a 100644
+--- i/src/uri/fetchers/copy.cpp
++++ w/src/uri/fetchers/copy.cpp
+@@ -97,8 +97,8 @@ Future CopyFetcherPlugin::fetch(
+ VLOG(1) << "Copying '" << uri.path() << "' to '" << directory << "'";
- Try s = subprocess(
-- "cp",
-+ "@cp@",
- argv,
- Subprocess::PATH("/dev/null"),
- Subprocess::PIPE(),
-diff --git a/src/uri/fetchers/curl.cpp b/src/uri/fetchers/curl.cpp
-index 7b746d619..12bbb04df 100644
---- a/src/uri/fetchers/curl.cpp
-+++ b/src/uri/fetchers/curl.cpp
-@@ -107,7 +107,7 @@ Future CurlFetcherPlugin::fetch(
+ #ifndef __WINDOWS__
+- const char* copyCommand = "cp";
+- const vector argv = {"cp", "-a", uri.path(), directory};
++ const char* copyCommand = "@cp@";
++ const vector argv = {"@cp@", "-a", uri.path(), directory};
+ #else // __WINDOWS__
+ const char* copyCommand = os::Shell::name;
+ const vector argv =
+diff --git i/src/uri/fetchers/curl.cpp w/src/uri/fetchers/curl.cpp
+index f34daf2..6a50341 100644
+--- i/src/uri/fetchers/curl.cpp
++++ w/src/uri/fetchers/curl.cpp
+@@ -109,7 +109,7 @@ Future CurlFetcherPlugin::fetch(
};
Try s = subprocess(
- "curl",
+ "@curl@",
argv,
- Subprocess::PATH("/dev/null"),
+ Subprocess::PATH(os::DEV_NULL),
Subprocess::PIPE(),
-diff --git a/src/uri/fetchers/docker.cpp b/src/uri/fetchers/docker.cpp
-index 3f38dddfb..fd991ee74 100644
---- a/src/uri/fetchers/docker.cpp
-+++ b/src/uri/fetchers/docker.cpp
+diff --git i/src/uri/fetchers/docker.cpp w/src/uri/fetchers/docker.cpp
+index 91db13b..82a7fc4 100644
+--- i/src/uri/fetchers/docker.cpp
++++ w/src/uri/fetchers/docker.cpp
@@ -114,7 +114,7 @@ static Future curl(
// TODO(jieyu): Kill the process if discard is called.
@@ -734,14 +718,14 @@ index 3f38dddfb..fd991ee74 100644
- "curl",
+ "@curl@",
argv,
- Subprocess::PATH("/dev/null"),
+ Subprocess::PATH(os::DEV_NULL),
Subprocess::PIPE(),
-@@ -213,7 +213,7 @@ static Future download(
+@@ -229,7 +229,7 @@ static Future download(
// TODO(jieyu): Kill the process if discard is called.
Try s = subprocess(
- "curl",
+ "@curl@",
argv,
- Subprocess::PATH("/dev/null"),
+ Subprocess::PATH(os::DEV_NULL),
Subprocess::PIPE(),
diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index b601bb00c200..00ee3a3771eb 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -15,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.7.5";
+ localkube-version = "1.8.0";
localkube-binary = fetchurl {
url = "https://storage.googleapis.com/minikube/k8sReleases/v${localkube-version}/localkube-linux-amd64";
- sha256 = "1kn4lwnn961r19hqnkgr13np80zqk2fhp8xkhrvxzq6v6shk7gfz";
+ sha256 = "09mv1g9i0d14brvvp2wxgmfqvgp0na5dbm4z76a660q1fxszvgqc";
};
in buildGoPackage rec {
pname = "minikube";
name = "${pname}-${version}";
- version = "0.22.2";
+ version = "0.23.0";
goPackagePath = "k8s.io/minikube";
@@ -31,7 +31,7 @@ in buildGoPackage rec {
owner = "kubernetes";
repo = "minikube";
rev = "v${version}";
- sha256 = "04h0hp0mkps3ilcig6xnmp41rlgaxhhpxakc86lsknvkk9kmrx89";
+ sha256 = "1f7kjn26y7knmab5avj8spb40ny1y0jix5j5p0dqfjvg9climl0h";
};
# kubernetes is here only to shut up a loud warning when generating the completions below. minikube checks very eagerly
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index cc7a93bdb537..e6e3585a4d13 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -91,8 +91,8 @@ in {
};
terraform_0_10 = pluggable (generic {
- version = "0.10.2";
- sha256 = "1q7za7jcfqv914a3ynfl7hrqbgwcahgm418kivjrac6p1q26w502";
+ version = "0.10.7";
+ sha256 = "0gjvrra255m973nzi7rpqp5dn5npnd79cnv8vjcs7wmkdj1hli0l";
patches = [ ./provider-path.patch ];
passthru = { inherit plugins; };
});
diff --git a/pkgs/applications/networking/cluster/terraform/providers/data.nix b/pkgs/applications/networking/cluster/terraform/providers/data.nix
index 0778e221c125..d29bd9648609 100644
--- a/pkgs/applications/networking/cluster/terraform/providers/data.nix
+++ b/pkgs/applications/networking/cluster/terraform/providers/data.nix
@@ -11,8 +11,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-archive";
- version = "0.1.0";
- sha256 = "1g7bjak1vgxpnmp4b9cb3mq8gqp1a7738fj0sxzflfk8k35p27ri";
+ version = "1.0.0";
+ sha256 = "0z85fpd70m2w59vxp82d8ipylaazf6l890rkjca4dm14rkq352zn";
};
arukas =
{
@@ -32,8 +32,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-aws";
- version = "0.1.4";
- sha256 = "0hqyvp1bgyfqq2lkjq5m5qxybagnxl9zrqiqfnlrfigdp0y31iz8";
+ version = "1.0.0";
+ sha256 = "1x3ldlx2iryxwfaws8ng9n0k06p7n8xqc6sjyxw73jdasxbh8wgi";
};
azure =
{
@@ -46,8 +46,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-azurerm";
- version = "0.1.6";
- sha256 = "01hjr42gpkpwpz0chnkw8pf0yid0hqpdnfz65q5h2p8h627hg0c6";
+ version = "0.2.2";
+ sha256 = "1jdkj1zylrlcd2qkfkl81i0ybdpmvbvvsk0f4ahafiqp550srf2d";
};
bitbucket =
{
@@ -102,15 +102,15 @@
{
owner = "terraform-providers";
repo = "terraform-provider-consul";
- version = "0.1.0";
- sha256 = "1d179m42iv2dy6wjzldllffwg6qxbg6gnvxrp6nzy75v7qp2aq94";
+ version = "1.0.0";
+ sha256 = "1008lrvdqn3kk8gwvq094nwknh00b429jmwi0hq4brick7vyvbvz";
};
datadog =
{
owner = "terraform-providers";
repo = "terraform-provider-datadog";
- version = "0.1.0";
- sha256 = "1k3p0zxffhabs1xb6aw9189vbmh3ax10q4xi1qgjfjvla22byqmk";
+ version = "0.1.1";
+ sha256 = "0nyqybi3fl9qlhpx2n0vjz7kn3bqhf4wy93zhq3j3853zxpcjpzc";
};
digitalocean =
{
@@ -130,8 +130,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-dns";
- version = "0.1.1";
- sha256 = "0ccp02rbvfvrb808mg053q5y7ghvxsl7p1gzw7pkm934i6j90g9n";
+ version = "1.0.0";
+ sha256 = "05ismwpmpkv9qxn6g5i29y18s1pw4yf2pyvv9ak8hj8idh4z6gz2";
};
dnsimple =
{
@@ -151,15 +151,15 @@
{
owner = "terraform-providers";
repo = "terraform-provider-dyn";
- version = "0.1.0";
- sha256 = "1w727r2gz5hjmbzw9zir0n5nrr818adh4qj50n3vijqwbxciyq2p";
+ version = "1.0.0";
+ sha256 = "0ph3516syca8f1zxmz66mh6y5kd8sc74kl0n8zixcgd6rvq0dysr";
};
external =
{
owner = "terraform-providers";
repo = "terraform-provider-external";
- version = "0.1.0";
- sha256 = "160f0avv6wbh11z54wy0qcq0zrcj4s31kn7a9x6zikv7v4hfnbza";
+ version = "1.0.0";
+ sha256 = "1sh0m8d6wp76h1b89j820yl3caji0f0wlgq3pwa5nk99h73rlndn";
};
fastly =
{
@@ -186,8 +186,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-google";
- version = "0.1.3";
- sha256 = "1aa1hz0yc4g746m6dl04hc70rcrzx0py8kpdch3kim475bspclnf";
+ version = "1.0.1";
+ sha256 = "0l0bpcfjnzlgf3g60iyfr3axw0244w99cf04z7y3bcszk5njipri";
};
grafana =
{
@@ -207,8 +207,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-http";
- version = "0.1.0";
- sha256 = "1iy5fsl1j4wswbajnw0k6lagc2sz52idnswj1vmfc66x87ls0mah";
+ version = "1.0.0";
+ sha256 = "1lks997sxfydm6a9s6vfyljs3j1r7qpg1k1s5ilpg5ckv77nad6g";
};
icinga2 =
{
@@ -221,8 +221,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-ignition";
- version = "0.2.0";
- sha256 = "07qsyjzbz34nh7qrmw97sg0zrqbchky9r3ywrdz96pmpr1yjmwr7";
+ version = "1.0.0";
+ sha256 = "0hr2zshrx4qfb7xdknsxsa4522kkf84rsqqbliz7ac9nsqpaarf4";
};
influxdb =
{
@@ -249,8 +249,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-local";
- version = "0.1.0";
- sha256 = "02m0wg0jasnzrayamjsc2hzi0ibj83v4d0hmw2xbrxk7vmk71lgq";
+ version = "1.0.0";
+ sha256 = "1dxdpmai8f0g1gj6khgv769lhg6ssfmgqskg4c5qf1jnv8yn8mkd";
};
logentries =
{
@@ -284,8 +284,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-nomad";
- version = "0.1.0";
- sha256 = "03sb31l59hxpp6zmnizxdm21jipz4mrzz9czk6ahhx7c8q0n0na8";
+ version = "1.0.0";
+ sha256 = "01fvw7yw8dhjclipnn9h1blagbp2849ahmnqj3ysh13i0x1qbq4r";
};
ns1 =
{
@@ -298,8 +298,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-null";
- version = "0.1.0";
- sha256 = "069yhsqi4jc14cay1gk7mwwmrg8xv90kj1k5qy3a2ypfbss4fcjp";
+ version = "1.0.0";
+ sha256 = "12vpa09xrq8z1pjq0bwzq3889c4fl6c5kvynwqy0z1pdx21m60ha";
};
oneandone =
{
@@ -312,15 +312,15 @@
{
owner = "terraform-providers";
repo = "terraform-provider-opc";
- version = "0.1.2";
- sha256 = "0c4ywav89lln9417zwflrp3qhcs7qf96rgcvm1msmpgglrhzwp2i";
+ version = "0.1.3";
+ sha256 = "00h531pikjrmra2sr24lnx2z0dvycshd0qpz3wa733mkvvm47p07";
};
openstack =
{
owner = "terraform-providers";
repo = "terraform-provider-openstack";
- version = "0.2.1";
- sha256 = "1zsswsgv7lzhfd0v8llbm18gsfg6xji0r3f9rnvpjqkffj4088ca";
+ version = "0.2.2";
+ sha256 = "1027pqv1cvyvakn4kgivd720g9na38nam5bb5fjyd4d04xpq9v90";
};
opsgenie =
{
@@ -340,8 +340,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-packet";
- version = "0.1.0";
- sha256 = "0dk10d4b10pdlhqgm6fqg0cn0ff78ss1x76inj6gfwrnbn2amhp0";
+ version = "1.0.0";
+ sha256 = "0ibz9k1yfqkfsmqmv1pl2jwzbld0l6f7zd8y80iw0v5wswclswya";
};
pagerduty =
{
@@ -375,22 +375,22 @@
{
owner = "terraform-providers";
repo = "terraform-provider-rabbitmq";
- version = "0.1.0";
- sha256 = "0vn8456f2al1f6rs1gn157c86qz1fxz8sqphbr9lvdhy1jw1q2vp";
+ version = "0.2.0";
+ sha256 = "1pbib43d1iqy8xl03zqwnz77362cb9cq8awcpid714n1sz7nd4im";
};
rancher =
{
owner = "terraform-providers";
repo = "terraform-provider-rancher";
- version = "0.2.0";
- sha256 = "05aci6cjrs7rv6hqhvcqy1i0nr8azds8flnrc7vba0nyy6v192qg";
+ version = "1.0.0";
+ sha256 = "1fs8p0l8f79b1s2g0p5zlq1has9i7w3bmv76vrm79076v7w2v0d6";
};
random =
{
owner = "terraform-providers";
repo = "terraform-provider-random";
- version = "0.1.0";
- sha256 = "1lbv5yiw4qfsqm3gxf37gwadgp7g6ki0n70mj00d8l6v6jd0mdl5";
+ version = "1.0.0";
+ sha256 = "0im4dsnbpbc9qln92lxcrygm9d705bvlhigpx492172cq1fqnw61";
};
rundeck =
{
@@ -431,29 +431,29 @@
{
owner = "terraform-providers";
repo = "terraform-provider-template";
- version = "0.1.1";
- sha256 = "1qrslnkvcj18jzxmsbf72gm54s8dnw5k5z15nffwgy09vv7mzpcn";
+ version = "1.0.0";
+ sha256 = "0jl6bp6gwg96sdk5j6s13vv1j9gxjpy2yva3barmzv9138i665mz";
};
terraform =
{
owner = "terraform-providers";
repo = "terraform-provider-terraform";
- version = "0.1.0";
- sha256 = "1w465853gwffpydb7idvg7bk8ygadgy08s04fxsqc8i2683jbpiz";
+ version = "1.0.0";
+ sha256 = "0icyyi4h48yh5235p5svm4p0jzbqqm1f3846dqy37czhjfcrn3gh";
};
tls =
{
owner = "terraform-providers";
repo = "terraform-provider-tls";
- version = "0.1.0";
- sha256 = "1n1k4dcqm8lp7mgj88xj8xc09mn769np4wg3cggnpcs6igbgdgg7";
+ version = "1.0.0";
+ sha256 = "063ai5zipmkwq0nr5c25gqsr970r8aba12ynxg9x8cnay0zn9s95";
};
triton =
{
owner = "terraform-providers";
repo = "terraform-provider-triton";
- version = "0.1.2";
- sha256 = "1jyrmc7932w7d8q96lmd0axf32psfic5d7hmwm1a25vzjzfn9nlw";
+ version = "0.2.1";
+ sha256 = "0ds2anr65xx9kdjv6x68lcxgl3js6l0m2cbx3kwx5465m01m3gxz";
};
ultradns =
{
@@ -480,7 +480,7 @@
{
owner = "terraform-providers";
repo = "terraform-provider-vsphere";
- version = "0.2.2";
- sha256 = "0d5d4wip57zmv9kqh4zr9mz8ylffa2qcf1vmx827rwyqdr25xvaz";
+ version = "0.4.1";
+ sha256 = "0afxvjx9zb9ym0cs8j15s6nfp20rmmifjdc098wcfjmgnw6p7f01";
};
}
diff --git a/pkgs/applications/networking/corebird/default.nix b/pkgs/applications/networking/corebird/default.nix
index 412335094ff3..54fc72fbfae4 100644
--- a/pkgs/applications/networking/corebird/default.nix
+++ b/pkgs/applications/networking/corebird/default.nix
@@ -3,14 +3,14 @@
, glib_networking }:
stdenv.mkDerivation rec {
- version = "1.6";
+ version = "1.7.1";
name = "corebird-${version}";
src = fetchFromGitHub {
owner = "baedert";
repo = "corebird";
rev = version;
- sha256 = "1bxjlamdy5d2j3xdahmxf6lwc7f6xdfxbzi712ppvh1dwggw654v";
+ sha256 = "1g6wkzrl6j0mmgafpv0jpqa906s1x7p5hmiqdgs9qwm7q2wlwrqd";
};
preConfigure = ''
diff --git a/pkgs/applications/networking/dropbox-cli/default.nix b/pkgs/applications/networking/dropbox-cli/default.nix
index 18c55c80fc08..d3141675b418 100644
--- a/pkgs/applications/networking/dropbox-cli/default.nix
+++ b/pkgs/applications/networking/dropbox-cli/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation {
sha256 = "1ai6vi5227z2ryxl403693xi63b42ylyfmzh8hbv4shp69zszm9c";
};
- buildInputs = [ pkgconfig python ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ python ];
phases = "unpackPhase installPhase";
diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index b9dae2d42006..d15b1d545b44 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -1,52 +1,23 @@
-{ mkDerivation, stdenv, lib, fetchurl, makeDesktopItem
-, makeWrapper, patchelf
-, dbus_libs, fontconfig, freetype, gcc, glib
-, libdrm, libffi, libICE, libSM
-, libX11, libXcomposite, libXext, libXmu, libXrender, libxcb
-, libxml2, libxslt, ncurses, zlib
-, qtbase, qtdeclarative, qtwebkit, wmctrl
-}:
+{ stdenv, lib, buildFHSUserEnv, writeScript, makeDesktopItem }:
-# this package contains the daemon version of dropbox
-# it's unfortunately closed source
-#
-# note: the resulting program has to be invoced as
-# 'dropbox' because the internal python engine takes
-# uses the name of the program as starting point.
+let platforms = [ "i686-linux" "x86_64-linux" ]; in
-# Dropbox ships with its own copies of some libraries.
-# Unfortunately, upstream makes changes to the source of
-# some libraries, rendering them incompatible with the
-# open-source versions. Wherever possible, we must try
-# to make the bundled libraries work, rather than replacing
-# them with our own.
+assert lib.elem stdenv.system platforms;
+# Dropbox client to bootstrap installation.
+# The client is self-updating, so the actual version may be newer.
let
- # NOTE: When updating, please also update in current stable,
- # as older versions stop working
- version = "35.4.20";
- sha256 = {
- "x86_64-linux" = "09qxr94bcyjn5ky20yapljxi2n2nbk6ldcpx2h0ysy8jp6zbrn78";
- "i686-linux" = "1rd4b26dbjf779g085si65lac74bk6lcx8k7i3nqk3vrvbva9n40";
- }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
+ version = "38.4.27";
arch = {
"x86_64-linux" = "x86_64";
"i686-linux" = "x86";
- }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
+ }.${stdenv.system};
- # relative location where the dropbox libraries are stored
- appdir = "opt/dropbox";
-
- libs = [
- dbus_libs fontconfig freetype gcc.cc glib libdrm libffi libICE libSM
- libX11 libXcomposite libXext libXmu libXrender libxcb libxml2 libxslt
- ncurses zlib
-
- qtbase qtdeclarative qtwebkit
- ];
- ldpath = stdenv.lib.makeLibraryPath libs;
+ installer = "https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.${arch}-${version}.tar.gz";
+in
+let
desktopItem = makeDesktopItem {
name = "dropbox";
exec = "dropbox";
@@ -56,93 +27,37 @@ let
categories = "Network;FileTransfer;";
startupNotify = "false";
};
+in
-in mkDerivation {
- name = "dropbox-${version}";
- src = fetchurl {
- name = "dropbox-${version}.tar.gz";
- url = "https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.${arch}-${version}.tar.gz";
- inherit sha256;
- };
+buildFHSUserEnv {
+ name = "dropbox";
- sourceRoot = ".dropbox-dist";
-
- nativeBuildInputs = [ makeWrapper patchelf ];
- buildInputs = libs;
- dontStrip = true; # already done
-
- installPhase = ''
- runHook preInstall
-
- mkdir -p "$out/${appdir}"
- cp -r --no-preserve=mode "dropbox-lnx.${arch}-${version}"/* "$out/${appdir}/"
-
- # Vendored libraries interact poorly with our graphics drivers
- rm "$out/${appdir}/libdrm.so.2"
- rm "$out/${appdir}/libffi.so.6"
- rm "$out/${appdir}/libGL.so.1"
- rm "$out/${appdir}/libX11-xcb.so.1"
-
- # Cannot use vendored Qt libraries due to problem with xkbcommon
- rm "$out/${appdir}/"libQt5*.so.5
- rm "$out/${appdir}/qt.conf"
- rm -fr "$out/${appdir}/plugins"
+ targetPkgs = pkgs: with pkgs; with xlibs; [
+ libICE libSM libX11 libXcomposite libXdamage libXext libXfixes libXrender
+ libXxf86vm libxcb
+ curl dbus fontconfig freetype gcc glib gnutar libxml2 libxslt zlib
+ ];
+ extraInstallCommands = ''
mkdir -p "$out/share/applications"
cp "${desktopItem}/share/applications/"* $out/share/applications
-
- mkdir -p "$out/share/icons"
- ln -s "$out/${appdir}/images/hicolor" "$out/share/icons/hicolor"
-
- mkdir -p "$out/bin"
- RPATH="${ldpath}:$out/${appdir}"
- chmod 755 $out/${appdir}/dropbox
- makeWrapper "$out/${appdir}/dropbox" "$out/bin/dropbox" \
- --prefix LD_LIBRARY_PATH : "$RPATH"
-
-
- rm $out/${appdir}/wmctrl
- ln -s ${wmctrl}/bin/wmctrl $out/${appdir}/wmctrl
-
- runHook postInstall
'';
- preFixup = ''
- INTERP=$(cat $NIX_CC/nix-support/dynamic-linker)
- RPATH="${ldpath}:$out/${appdir}"
- getType='s/ *Type: *\([A-Z]*\) (.*/\1/'
- find "$out/${appdir}" -type f -print | while read obj; do
- dynamic=$(readelf -S "$obj" 2>/dev/null | grep "DYNAMIC" || true)
- if [[ -n "$dynamic" ]]; then
-
- if readelf -l "$obj" 2>/dev/null | grep "INTERP" >/dev/null; then
- echo "patching interpreter path in $type $obj"
- patchelf --set-interpreter "$INTERP" "$obj"
- fi
-
- type=$(readelf -h "$obj" 2>/dev/null | grep 'Type:' | sed -e "$getType")
- if [ "$type" == "EXEC" ] || [ "$type" == "DYN" ]; then
-
- echo "patching RPATH in $type $obj"
- oldRPATH=$(patchelf --print-rpath "$obj")
- patchelf --set-rpath "''${oldRPATH:+$oldRPATH:}$RPATH" "$obj"
-
- else
-
- echo "unknown ELF type \"$type\"; not patching $obj"
-
- fi
- fi
- done
-
- paxmark m $out/${appdir}/dropbox
+ runScript = writeScript "install-and-start-dropbox" ''
+ if ! [ -d "$HOME/.dropbox-dist" ]; then
+ # Dropbox is not installed.
+ # Download and unpack the client. If a newer version is available,
+ # the client will update itself when run.
+ curl '${installer}' | tar -C "$HOME" -x -z
+ fi
+ exec "$HOME/.dropbox-dist/dropboxd"
'';
meta = with lib; {
description = "Online stored folders (daemon version)";
- homepage = http://www.dropbox.com;
- maintainers = with maintainers; [ ttuegel ];
+ homepage = http://www.dropbox.com/;
license = licenses.unfree;
+ maintainers = with maintainers; [ ttuegel ];
platforms = [ "i686-linux" "x86_64-linux" ];
};
}
diff --git a/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/pkgs/applications/networking/dyndns/cfdyndns/default.nix
index a79404e77c85..d1eeaa48bb7b 100644
--- a/pkgs/applications/networking/dyndns/cfdyndns/default.nix
+++ b/pkgs/applications/networking/dyndns/cfdyndns/default.nix
@@ -12,7 +12,7 @@ buildRustPackage rec {
sha256 = "1mcdjykrgh0jq6k6y664lai8sbgzk6j7k0r944f43vg63d1jql5b";
};
- depsSha256 = "0whs3fgmpb6g1mjajs3qs9g613x5dal4x6ghzzkpl73a9pgydkpn";
+ cargoSha256 = "0k9d6pxsb4gvkqs00g71c1nnz773iccg4vajgn33qdym6m6qsjwy";
buildInputs = [ makeWrapper openssl ];
diff --git a/pkgs/applications/networking/feedreaders/newsbeuter/default.nix b/pkgs/applications/networking/feedreaders/newsbeuter/default.nix
index cf7e4fdcb140..b681f74ed222 100644
--- a/pkgs/applications/networking/feedreaders/newsbeuter/default.nix
+++ b/pkgs/applications/networking/feedreaders/newsbeuter/default.nix
@@ -36,6 +36,11 @@ stdenv.mkDerivation rec {
url = "https://github.com/akrennmair/newsbeuter/commit/26f5a4350f3ab5507bb8727051c87bb04660f333.patch";
sha256 = "1jjxj4z3s4f1n8rfpwyd42a40gjnziykqas6a26s1lsdkklnbp6q";
})
+ # https://github.com/akrennmair/newsbeuter/issues/591 / CVE-2017-12904
+ (fetchpatch {
+ url = "https://github.com/akrennmair/newsbeuter/commit/d1460189f6f810ca9a3687af7bc43feb7f2af2d9.patch";
+ sha256 = "1a8k73ckziszsbdwdhcmkfvlmgy955gssg9v4sqvg20v91l5rmai";
+ })
];
installFlags = [ "DESTDIR=$(out)" "prefix=" ];
diff --git a/pkgs/applications/networking/feedreaders/newsbeuter/dev.nix b/pkgs/applications/networking/feedreaders/newsbeuter/dev.nix
deleted file mode 100644
index 93865eb1875f..000000000000
--- a/pkgs/applications/networking/feedreaders/newsbeuter/dev.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ stdenv, fetchgit, sqlite, curl, pkgconfig, libxml2, stfl, json-c-0-11, ncurses
-, gettext, libiconv, makeWrapper, perl }:
-
-stdenv.mkDerivation rec {
- name = "newsbeuter-dev-20140309";
-
- src = fetchgit {
- url = "https://github.com/akrennmair/newsbeuter.git";
- rev = "1427bdb0705806368db39576a9b803df82fa0415";
- sha256 = "1g47b8pxkz84r5m3avkjb7p2i88crcrp9gxwhq7xdfywrgg9pgnd";
- };
-
- buildInputs
- # use gettext instead of libintlOrEmpty so we have access to the msgfmt
- # command
- = [ pkgconfig sqlite curl libxml2 stfl json-c-0-11 ncurses gettext perl libiconv ]
- ++ stdenv.lib.optional stdenv.isDarwin makeWrapper;
-
- preBuild = ''
- sed -i -e 110,114d config.sh
- sed -i "1 s%^.*$%#!${perl}/bin/perl%" txt2h.pl
- export LDFLAGS=-lncursesw
- '';
-
- NIX_CFLAGS_COMPILE =
- "-I${libxml2.dev}/include/libxml2 -I${json-c-0-11}/include/json-c";
-
- NIX_LDFLAGS = "-lsqlite3 -lcurl -lxml2 -lstfl -ljson";
-
- installPhase = ''
- DESTDIR=$out prefix=\"\" make install
- '' + stdenv.lib.optionalString stdenv.isDarwin ''
- for prog in $out/bin/*; do
- wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib"
- done
- '';
-
- meta = with stdenv.lib; {
- homepage = http://www.newsbeuter.org;
- description = "An open-source RSS/Atom feed reader for text terminals";
- maintainers = with maintainers; [ lovek323 ];
- license = licenses.mit;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/applications/networking/firehol/default.nix b/pkgs/applications/networking/firehol/default.nix
index 0f1928fff2b2..cf41ca1b0b3b 100644
--- a/pkgs/applications/networking/firehol/default.nix
+++ b/pkgs/applications/networking/firehol/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
name = "firehol-${version}";
- version = "3.1.4";
+ version = "3.1.5";
src = fetchFromGitHub {
owner = "firehol";
repo = "firehol";
rev = "v${version}";
- sha256 = "121kjq5149r11k58lr9mkqns2k8jbdbjg2k93v8v7axhng6js7s9";
+ sha256 = "15cy1zxfpprma2zkmhj61zzhmw1pfnyhln7pca5lzvr1ifn2d0y0";
};
patches = [
diff --git a/pkgs/applications/networking/firehol/iprange.nix b/pkgs/applications/networking/firehol/iprange.nix
index d1f3ad696879..bb245928f07c 100644
--- a/pkgs/applications/networking/firehol/iprange.nix
+++ b/pkgs/applications/networking/firehol/iprange.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "iprange-${version}";
- version = "1.0.3";
+ version = "1.0.4";
src = fetchurl {
url = "https://github.com/firehol/iprange/releases/download/v${version}/iprange-${version}.tar.xz";
- sha256 = "0lwgl5ybrhsv43llq3kgdjpvgyfl43f3nxm0g8a8cd7zmn754bg2";
+ sha256 = "0rymw4ydn09dng34q4g5111706fyppzs2gd5br76frgvfj4x2f71";
};
meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix
index 9e5e90996bcb..105239aca024 100644
--- a/pkgs/applications/networking/flexget/default.nix
+++ b/pkgs/applications/networking/flexget/default.nix
@@ -24,9 +24,6 @@ buildPythonApplication rec {
# unicode-capable filesystem (and setting LC_ALL doesn't work).
# setlocale: LC_ALL: cannot change locale (en_US.UTF-8)
postPatch = ''
- sed -i '/def test_non_ascii/i\ import pytest\
- @pytest.mark.skip' flexget/tests/test_filesystem.py
-
substituteInPlace requirements.txt \
--replace "chardet==3.0.3" "chardet" \
--replace "rebulk==0.8.2" "rebulk" \
@@ -35,7 +32,13 @@ buildPythonApplication rec {
--replace "sqlalchemy==1.1.10" "sqlalchemy" \
--replace "zxcvbn-python==4.4.15" "zxcvbn-python" \
--replace "flask-cors==3.0.2" "flask-cors" \
- --replace "certifi==2017.4.17" "certifi"
+ --replace "certifi==2017.4.17" "certifi" \
+ --replace "apscheduler==3.3.1" "apscheduler" \
+ --replace "path.py==10.3.1" "path.py" \
+ --replace "tempora==1.8" "tempora" \
+ --replace "cheroot==5.5.0" "cheroot" \
+ --replace "six==1.10.0" "six" \
+ --replace "aniso8601==1.2.1" "aniso8601"
'';
checkPhase = ''
@@ -47,7 +50,8 @@ buildPythonApplication rec {
and not test_double_episodes \
and not test_inject_force \
and not test_double_prefered \
- and not test_double"
+ and not test_double \
+ and not test_non_ascii"
'';
buildInputs = [ pytest mock vcrpy pytest-catchlog boto3 ];
diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix
index a7d324949128..210d78369da6 100644
--- a/pkgs/applications/networking/ftp/filezilla/default.nix
+++ b/pkgs/applications/networking/ftp/filezilla/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext
, pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla, nettle }:
-let version = "3.27.1"; in
+let version = "3.29.0"; in
stdenv.mkDerivation {
name = "filezilla-${version}";
src = fetchurl {
url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2";
- sha256 = "14lsplbp9fy7lk6cpwi3aj6jskz4j82h67x0fik82z1bns0zm2a3";
+ sha256 = "0najf2w6p5j4qc8jmglx6j63mph749s5p90lz2nkmwwwy5sfvlga";
};
configureFlags = [
diff --git a/pkgs/applications/networking/gmailieer/default.nix b/pkgs/applications/networking/gmailieer/default.nix
new file mode 100644
index 000000000000..b3a9634c8a16
--- /dev/null
+++ b/pkgs/applications/networking/gmailieer/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchFromGitHub, python3Packages }:
+
+python3Packages.buildPythonApplication rec {
+ name = "gmailieer";
+ version = "0.3";
+
+ src = fetchFromGitHub {
+ owner = "gauteh";
+ repo = "gmailieer";
+ rev = "v${version}";
+ sha256 = "1app783gf0p9p196nqsgbyl6s1bp304dfav86fqiq86h1scld787";
+ };
+
+ propagatedBuildInputs = with python3Packages; [
+ notmuch
+ oauth2client
+ google_api_python_client
+ tqdm
+ ];
+
+ meta = with stdenv.lib; {
+ description = "Fast email-fetching and two-way tag synchronization between notmuch and GMail";
+ longDescription = ''
+ This program can pull email and labels (and changes to labels)
+ from your GMail account and store them locally in a maildir with
+ the labels synchronized with a notmuch database. The changes to
+ tags in the notmuch database may be pushed back remotely to your
+ GMail account.
+ '';
+ homepage = https://github.com/gauteh/gmailieer;
+ repositories.git = https://github.com/gauteh/gmailieer.git;
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ kaiha ];
+ };
+}
diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix
index bec700367da8..6e86cfb3d023 100644
--- a/pkgs/applications/networking/gns3/default.nix
+++ b/pkgs/applications/networking/gns3/default.nix
@@ -2,7 +2,7 @@
let
stableVersion = "2.0.3";
- previewVersion = "2.1.0rc1";
+ previewVersion = "2.1.0rc4";
addVersion = args:
let version = if args.stable then stableVersion else previewVersion;
branch = if args.stable then "stable" else "preview";
@@ -16,7 +16,7 @@ in {
};
guiPreview = mkGui {
stable = false;
- sha256Hash = "0rmvanzc0fjw9giqwnf98yc49cxaz637w8b865dv08lcf1fg9j8l";
+ sha256Hash = "10p8i45n6qsf431d0xpy5dk3g5qh6zdlnfj82jn9xdyccgxs4x3s";
};
serverStable = mkServer {
@@ -25,6 +25,6 @@ in {
};
serverPreview = mkServer {
stable = false;
- sha256Hash = "181689fpjxq4hy2lyxk4zciqhgnhj5srvb4xsxdlbf68n89fj2zf";
+ sha256Hash = "1z8a3s90k86vmi4rwsd3v74gwvml68ci6f3zgxaji3z1sm22zcyd";
};
}
diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix
index 9d7bf6f5a3ab..6e3280b99019 100644
--- a/pkgs/applications/networking/gns3/server.nix
+++ b/pkgs/applications/networking/gns3/server.nix
@@ -4,7 +4,23 @@
let
pythonPackages = python3Packages;
- yarl = if (!stable) then pythonPackages.yarl
+ # TODO: Not sure if all these overwrites are really required...
+ # Upstream seems to have some reasons (bugs, incompatibilities) though.
+ multidict_3_1_3 =
+ (stdenv.lib.overrideDerivation pythonPackages.multidict (oldAttrs:
+ rec {
+ pname = "multidict";
+ version = "3.1.3";
+ name = "${pname}-${version}";
+ src = pythonPackages.fetchPypi {
+ inherit pname version;
+ sha256 = "04kdxh19m41c6vbshwk8jfbidsfsqn7mn0abvx09nyg78sh80pw7";
+ };
+ doInstallCheck = false;
+ }));
+ yarl = if (!stable)
+ then (stdenv.lib.overrideDerivation pythonPackages.yarl (oldAttrs:
+ { propagatedBuildInputs = [ multidict_3_1_3 ]; }))
else (stdenv.lib.overrideDerivation pythonPackages.yarl (oldAttrs:
rec {
pname = "yarl";
@@ -15,7 +31,19 @@ let
sha256 = "1v2dsmr7bqp0yx51pwhbxyvzza8m2f88prsnbd926mi6ah38p0d7";
};
}));
- aiohttp = if (!stable) then pythonPackages.aiohttp
+ aiohttp = if (!stable)
+ then (stdenv.lib.overrideDerivation pythonPackages.aiohttp (oldAttrs:
+ rec {
+ pname = "aiohttp";
+ version = "2.2.5";
+ name = "${pname}-${version}";
+ src = pythonPackages.fetchPypi {
+ inherit pname version;
+ sha256 = "1g6kzkf5in0briyscwxsihgps833dq2ggcq6lfh1hq95ck8zsnxg";
+ };
+ propagatedBuildInputs = [ yarl multidict_3_1_3 ]
+ ++ (with pythonPackages; [ async-timeout chardet ]);
+ }))
else (stdenv.lib.overrideDerivation pythonPackages.aiohttp (oldAttrs:
rec {
pname = "aiohttp";
@@ -28,7 +56,9 @@ let
propagatedBuildInputs = [ yarl ]
++ (with pythonPackages; [ async-timeout chardet multidict ]);
}));
- aiohttp-cors = if (!stable) then pythonPackages.aiohttp-cors
+ aiohttp-cors = if (!stable)
+ then (stdenv.lib.overrideDerivation pythonPackages.aiohttp-cors (oldAttrs:
+ { propagatedBuildInputs = [ aiohttp ]; }))
else (stdenv.lib.overrideDerivation pythonPackages.aiohttp-cors (oldAttrs:
rec {
pname = "aiohttp-cors";
diff --git a/pkgs/applications/networking/ids/bro/default.nix b/pkgs/applications/networking/ids/bro/default.nix
index f3962811a8ac..7ae3e8c73611 100644
--- a/pkgs/applications/networking/ids/bro/default.nix
+++ b/pkgs/applications/networking/ids/bro/default.nix
@@ -2,11 +2,11 @@
, geoip, gperftools, python, swig }:
stdenv.mkDerivation rec {
- name = "bro-2.5.1";
+ name = "bro-2.5.2";
src = fetchurl {
url = "http://www.bro.org/downloads/${name}.tar.gz";
- sha256 = "04cmm0vs8q31mgaq3pxybjk834py3ji16qp4qcir7vjbhq1fav1c";
+ sha256 = "0w5rynw278nl6pdl5s7gsmxjwkl6z1g5pcm6byg930k26yyb35db";
};
nativeBuildInputs = [ cmake flex bison file ];
diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix
index f5406d9fe629..c2d17fd3308d 100644
--- a/pkgs/applications/networking/instant-messengers/baresip/default.nix
+++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz";
sha256 = "0yi80gi2vb600n7wi6mk81zfdi1n5pg1dsz7458sb3z5cv5gj8yg";
};
- buildInputs = [zlib openssl libre librem pkgconfig
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [zlib openssl libre librem
cairo mpg123 gstreamer gst-ffmpeg gst-plugins-base gst-plugins-bad gst-plugins-good
alsaLib SDL libv4l celt libsndfile srtp ffmpeg gsm speex portaudio spandsp libuuid
ccache libvpx
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix
index 61e7203a83c5..fd05948864c0 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "1m91x3208z9zxppz998i6060alcalfly9ix9jxismj45xyp6mdx7";
};
- buildInputs = [ bitlbee autoconf automake libtool pkgconfig glib libgcrypt ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ bitlbee autoconf automake libtool glib libgcrypt ];
preConfigure = ''
export BITLBEE_PLUGINDIR=$out/lib/bitlbee
diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix
index eff9b71daa63..80e6af9c1ef5 100644
--- a/pkgs/applications/networking/instant-messengers/dino/default.nix
+++ b/pkgs/applications/networking/instant-messengers/dino/default.nix
@@ -2,7 +2,7 @@
, vala, cmake, wrapGAppsHook, pkgconfig, gettext
, gobjectIntrospection, gnome3, glib, gdk_pixbuf, gtk3, glib_networking
, xorg, libXdmcp, libxkbcommon
-, libnotify
+, libnotify, libsoup
, libgcrypt
, epoxy
, at_spi2_core
@@ -13,13 +13,13 @@
}:
stdenv.mkDerivation rec {
- name = "dino-unstable-2017-06-21";
+ name = "dino-unstable-2017-09-26";
src = fetchFromGitHub {
owner = "dino";
repo = "dino";
- rev = "3f0089db86e2057293a33453361678989919147f";
- sha256 = "011wd6qi8nagig8418hibgnsmznd76dvp3p2dzzr4wyrb7d6cgcb";
+ rev = "9d8e1e88ec61403659a8cc410d5c4414e3bd3a96";
+ sha256 = "1p8sda99n8zsb49qd6wzwb8hddlgrzr2hp7il5v7yqxjjm2vgqfl";
fetchSubmodules = true;
};
@@ -42,6 +42,7 @@ stdenv.mkDerivation rec {
libnotify
gpgme
libgcrypt
+ libsoup
pcre
xorg.libxcb
xorg.libpthreadstubs
diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix
index a238009cd11b..c2e6528e637e 100644
--- a/pkgs/applications/networking/instant-messengers/franz/default.nix
+++ b/pkgs/applications/networking/instant-messengers/franz/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, makeDesktopItem
+{ stdenv, fetchurl, makeDesktopItem, makeWrapper
, xorg, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig
-, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify }:
+, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }:
let
bits = if stdenv.system == "x86_64-linux" then "x64"
@@ -39,6 +39,8 @@ in stdenv.mkDerivation rec {
# don't remove runtime deps
dontPatchELF = true;
+ buildInputs = [ makeWrapper ];
+
unpackPhase = ''
tar xzf $src
'';
@@ -59,6 +61,7 @@ in stdenv.mkDerivation rec {
postFixup = ''
paxmark m $out/opt/franz/Franz
+ wrapProgram $out/opt/franz/Franz --prefix PATH : ${xdg_utils}/bin
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/instant-messengers/freetalk/default.nix b/pkgs/applications/networking/instant-messengers/freetalk/default.nix
index ca8d7f2076ec..5146f3a0e391 100644
--- a/pkgs/applications/networking/instant-messengers/freetalk/default.nix
+++ b/pkgs/applications/networking/instant-messengers/freetalk/default.nix
@@ -19,8 +19,9 @@ stdenv.mkDerivation rec {
./autogen.sh
'';
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- guile pkgconfig glib loudmouth gmp libidn readline libtool
+ guile glib loudmouth gmp libidn readline libtool
libunwind ncurses curl jansson texinfo
autoconf automake
];
diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix
index 326f95630707..4e116e685c60 100644
--- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix
@@ -4,7 +4,7 @@
let
- version = "4.29.4.1662";
+ version = "4.30.0.1663";
rpath = stdenv.lib.makeLibraryPath [
xdg_utils
@@ -44,7 +44,7 @@ let
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb";
- sha256 = "1cz9zv9aj8xdrjs6dgi7fpm4q9l9find4m8l0nmvac2s4r60vw6y";
+ sha256 = "13mh49nx75pvaygzi70sg96iad3mn9ym0p4p3ja46amkxbdkq7h7";
}
else
throw "HipChat is not supported on ${stdenv.system}";
diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix
index bc6e7a5f7def..6545b90980e3 100644
--- a/pkgs/applications/networking/instant-messengers/jackline/default.nix
+++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix
@@ -3,14 +3,14 @@
assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.02.2";
stdenv.mkDerivation rec {
- version = "2017-05-24";
+ version = "2017-08-17";
name = "jackline-${version}";
src = fetchFromGitHub {
owner = "hannesm";
repo = "jackline";
- rev = "49a326d5696aa24f3ac18534c8860e03d0d58548";
- sha256 = "0p741mzq4kkqyly8njga1f5dxdnfz31wy2lpvs5542pq0iwvdj7k";
+ rev = "26688f07c3edc3b83e7aa0b9136cd1e9dcb58ed5";
+ sha256 = "0yspgjhp7zy9rzvwl4pxppf5wkpa07y0122s7n09kvr0fzsh6aqf";
};
buildInputs = with ocamlPackages; [
diff --git a/pkgs/applications/networking/instant-messengers/kadu/default.nix b/pkgs/applications/networking/instant-messengers/kadu/default.nix
index 904002c3b442..d5595fc85aff 100644
--- a/pkgs/applications/networking/instant-messengers/kadu/default.nix
+++ b/pkgs/applications/networking/instant-messengers/kadu/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation {
sha256 = "1a5q5b8pm253cwg6ahahjdm8jxj0pv41apyi1nvvy08bs38bn1yn";
};
- buildInputs = [ cmake qt4 libgadu libXScrnSaver libsndfile libX11 alsaLib aspell libidn qca2 phonon pkgconfig
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ cmake qt4 libgadu libXScrnSaver libsndfile libX11 alsaLib aspell libidn qca2 phonon
];
configureFlags = "CPPFLAGS=-DQT_NO_DEBUG";
diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix
index dcffa2f14f46..607fdbc7e3e1 100644
--- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix
+++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "1ggh865p1rf10ffsnf4g6qv9i8bls36dxdb1nzs5r9vdqci2rz04";
};
- buildInputs = [ openssl ncurses pkgconfig glib loudmouth libotr gpgme ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ openssl ncurses glib loudmouth libotr gpgme ];
configureFlags = "--with-openssl=${openssl.dev} --enable-modules --enable-otr";
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/Gemfile
index 66b17ff87607..0eed9808ab4f 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/Gemfile
+++ b/pkgs/applications/networking/instant-messengers/mikutter/Gemfile
@@ -11,13 +11,13 @@ group :default do
gem 'oauth', '>= 0.5.1'
gem 'json_pure', '~> 1.8'
gem 'addressable', '~> 2.3'
- gem 'memoist', '~> 0.14'
+ gem 'memoist', '>= 0.16', '< 0.17'
gem 'ruby-hmac', '~> 0.4'
gem 'typed-array', '~> 0.1'
gem 'delayer', '~> 0.0'
gem 'pluggaloid', '>= 1.1.1', '< 2.0'
- gem 'delayer-deferred', '>= 1.0.4', '< 2.0'
- gem 'twitter-text', '1.14.2'
+ gem 'delayer-deferred', '>= 1.0.4', '< 1.1'
+ gem 'twitter-text', '>= 1.14.6'
end
group :test do
@@ -31,7 +31,10 @@ end
group :plugin do
- Dir.glob(File.expand_path(File.join(File.dirname(__FILE__), "core/plugin/*/Gemfile"))){ |path|
+ Dir.glob(File.expand_path(File.join(__dir__, 'core/plugin/*/Gemfile'))){ |path|
+ eval File.open(path).read
+ }
+ Dir.glob(File.join(File.expand_path(ENV['MIKUTTER_CONFROOT'] || '~/.mikutter'), 'plugin/*/Gemfile')){ |path|
eval File.open(path).read
}
end
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock b/pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock
index 58f41087919e..69530be4a446 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock
+++ b/pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock
@@ -1,67 +1,72 @@
GEM
remote: https://rubygems.org/
specs:
- addressable (2.5.1)
- public_suffix (~> 2.0, >= 2.0.2)
- atk (3.1.1)
- glib2 (= 3.1.1)
- cairo (1.15.7)
- native-package-installer
- pkg-config (>= 1.1.5)
+ addressable (2.5.2)
+ public_suffix (>= 2.0.2, < 4.0)
+ atk (3.1.9)
+ glib2 (= 3.1.9)
+ cairo (1.15.10)
+ native-package-installer (>= 1.0.3)
+ pkg-config (>= 1.2.2)
+ cairo-gobject (3.1.9)
+ cairo
+ glib2 (= 3.1.9)
crack (0.4.3)
safe_yaml (~> 1.0.0)
delayer (0.0.2)
- delayer-deferred (1.1.1)
+ delayer-deferred (1.0.4)
delayer (>= 0.0.2, < 0.1)
- gdk_pixbuf2 (3.1.1)
- gio2 (= 3.1.1)
+ gdk_pixbuf2 (3.1.9)
+ gio2 (= 3.1.9)
gettext (3.0.9)
locale (>= 2.0.5)
text
- gio2 (3.1.1)
- glib2 (= 3.1.1)
- gobject-introspection (= 3.1.1)
- glib2 (3.1.1)
- pkg-config
- gobject-introspection (3.1.1)
- glib2 (= 3.1.1)
- gtk2 (3.1.1)
- atk (= 3.1.1)
- gdk_pixbuf2 (= 3.1.1)
- pango (= 3.1.1)
- hashdiff (0.3.4)
+ gio2 (3.1.9)
+ glib2 (= 3.1.9)
+ gobject-introspection (= 3.1.9)
+ glib2 (3.1.9)
+ native-package-installer (>= 1.0.3)
+ pkg-config (>= 1.2.2)
+ gobject-introspection (3.1.9)
+ glib2 (= 3.1.9)
+ gtk2 (3.1.9)
+ atk (= 3.1.9)
+ gdk_pixbuf2 (= 3.1.9)
+ pango (= 3.1.9)
+ hashdiff (0.3.7)
httpclient (2.8.3)
instance_storage (1.0.0)
json_pure (1.8.6)
locale (2.1.2)
- memoist (0.15.0)
+ memoist (0.16.0)
metaclass (0.0.4)
- mini_portile2 (2.1.0)
+ mini_portile2 (2.3.0)
mocha (0.14.0)
metaclass (~> 0.0.1)
moneta (1.0.0)
- native-package-installer (1.0.1)
- nokogiri (1.7.2)
- mini_portile2 (~> 2.1.0)
- oauth (0.5.1)
- pango (3.1.1)
+ native-package-installer (1.0.4)
+ nokogiri (1.8.1)
+ mini_portile2 (~> 2.3.0)
+ oauth (0.5.3)
+ pango (3.1.9)
cairo (>= 1.14.0)
- glib2 (= 3.1.1)
- pkg-config (1.2.0)
+ cairo-gobject (= 3.1.9)
+ gobject-introspection (= 3.1.9)
+ pkg-config (1.2.8)
pluggaloid (1.1.1)
delayer
instance_storage (>= 1.0.0, < 2.0.0)
- power_assert (1.0.2)
- public_suffix (2.0.5)
+ power_assert (1.1.1)
+ public_suffix (3.0.0)
rake (10.5.0)
ruby-hmac (0.4.0)
ruby-prof (0.16.2)
safe_yaml (1.0.4)
- test-unit (3.2.3)
+ test-unit (3.2.6)
power_assert
text (1.3.1)
totoridipjp (0.1.0)
- twitter-text (1.14.2)
+ twitter-text (1.14.7)
unf (~> 0.1.0)
typed-array (0.1.2)
unf (0.1.4)
@@ -79,12 +84,12 @@ PLATFORMS
DEPENDENCIES
addressable (~> 2.3)
delayer (~> 0.0)
- delayer-deferred (>= 1.0.4, < 2.0)
+ delayer-deferred (>= 1.0.4, < 1.1)
gettext (~> 3.0.1)
- gtk2 (= 3.1.1)
+ gtk2 (= 3.1.9)
httpclient
json_pure (~> 1.8)
- memoist (~> 0.14)
+ memoist (>= 0.16, < 0.17)
mocha (~> 0.14)
moneta
nokogiri
@@ -95,10 +100,10 @@ DEPENDENCIES
ruby-prof
test-unit (~> 3.0)
totoridipjp
- twitter-text (= 1.14.2)
+ twitter-text (>= 1.14.6)
typed-array (~> 0.1)
watch (~> 0.1)
webmock (~> 1.17)
BUNDLED WITH
- 1.14.4
+ 1.14.6
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/gtk/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/gtk/Gemfile
index 4015fbec1bc9..b7d19db37630 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/gtk/Gemfile
+++ b/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/gtk/Gemfile
@@ -1,3 +1,3 @@
source 'https://rubygems.org'
-gem 'gtk2', '3.1.1'
+gem 'gtk2', '3.1.9'
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/pkgs/applications/networking/instant-messengers/mikutter/default.nix
index 1fa7a2fe7e95..6b17eb0a8975 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/default.nix
+++ b/pkgs/applications/networking/instant-messengers/mikutter/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "mikutter-${version}";
- version = "3.5.7";
+ version = "3.5.13";
src = fetchurl {
url = "https://mikutter.hachune.net/bin/mikutter.${version}.tar.gz";
- sha256 = "1vh5ap92q869j69hmmbznailaflmdp0km4sqdv06cpq7v8pwm28w";
+ sha256 = "2e01cd6cfe0caad663a381e5263f6d8030f0fb7cd8d4f858d320166516c7c320";
};
env = bundlerEnv {
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix b/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix
index d6d99f3d55b7..ef7091689b37 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix
+++ b/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix
@@ -3,28 +3,37 @@
dependencies = ["public_suffix"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1i8q32a4gr0zghxylpyy7jfqwxvwrivsxflg9mks6kx92frh75mh";
+ sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk";
type = "gem";
};
- version = "2.5.1";
+ version = "2.5.2";
};
atk = {
dependencies = ["glib2"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "17x88g596s3pqfxplm5ia7anpcmd9kxs4nzmpf2h74bqwkbq2jrz";
+ sha256 = "18l99gv6828rn59q8k6blxg146b025fj44klrcisffw6h9s9qqxm";
type = "gem";
};
- version = "3.1.1";
+ version = "3.1.9";
};
cairo = {
dependencies = ["native-package-installer" "pkg-config"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "115ksrswbs7pg7kdfi2w8bi9xxv9gzmfvcjj8qj4dxy8dkvp3k4d";
+ sha256 = "1f0n057cj6cjz7f38pwnflrkbwkl8pm3g9ssa51flyxr7lcpcw7c";
type = "gem";
};
- version = "1.15.7";
+ version = "1.15.10";
+ };
+ cairo-gobject = {
+ dependencies = ["cairo" "glib2"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1qnsd9203qc6hl2i4hfzngr8v06rfk4vxfn6sbr8b4c1q4n0lq26";
+ type = "gem";
+ };
+ version = "3.1.9";
};
crack = {
dependencies = ["safe_yaml"];
@@ -47,19 +56,19 @@
dependencies = ["delayer"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1bw48i6qbxmjf2al4a0mw23nlkcrjrwsrdrabbwz62v8sdmdynpc";
+ sha256 = "1rp2hpik8gs1kzwwq831jwj1iv5bhfwd3dmm9nvizy3nqpz1gvvb";
type = "gem";
};
- version = "1.1.1";
+ version = "1.0.4";
};
gdk_pixbuf2 = {
dependencies = ["gio2"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0x9fzsazfi6f3iq7zkqc0vjl6311876dvff0000vg41rajv3rhh1";
+ sha256 = "0x7vna77qw26479dydzfs1sq7xmq31xfly2pn5fvh35wg0q4y07d";
type = "gem";
};
- version = "3.1.1";
+ version = "3.1.9";
};
gettext = {
dependencies = ["locale" "text"];
@@ -74,45 +83,45 @@
dependencies = ["glib2" "gobject-introspection"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ki9yxp860xk5cf04hrgvh386n93bkr0pf4c0kl3fx6pnwr4w3v0";
+ sha256 = "1dxyaxp32m19mynw20x39vkb50wa4jcxczwmbkq7pcg55j76wwhm";
type = "gem";
};
- version = "3.1.1";
+ version = "3.1.9";
};
glib2 = {
- dependencies = ["pkg-config"];
+ dependencies = ["native-package-installer" "pkg-config"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "131jd26n2wwp2lrkyyfq5nb3qriasaym1zpygm991qzcaq79i444";
+ sha256 = "1y1ws895345a88wikqil1x87cpd7plmwfi635piam7il6vsb4h73";
type = "gem";
};
- version = "3.1.1";
+ version = "3.1.9";
};
gobject-introspection = {
dependencies = ["glib2"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0fbi1pxyq73d674cwznya6kda38yjp4ahc2xgxi9shsdqmqcx3vs";
+ sha256 = "04gla6z9y8g0d69wlwl0wr7pwyzqg132pfs1n9fq6fgkjb6l7sm3";
type = "gem";
};
- version = "3.1.1";
+ version = "3.1.9";
};
gtk2 = {
dependencies = ["atk" "gdk_pixbuf2" "pango"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "00cbfl306xkglk0cc758vsvv1saaa24gvwh0m2jnzwgfwxk7mc5w";
+ sha256 = "1mshgsw2x0w5wfcp17qnsja50aafbjxy2g42kvk5sr19l0chkkkq";
type = "gem";
};
- version = "3.1.1";
+ version = "3.1.9";
};
hashdiff = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1n6hj7k7b9hazac0j48ypbak2nqi5wy4nh5cjra6xl3a92r8db0a";
+ sha256 = "0yj5l2rw8i8jc725hbcpc4wks0qlaaimr3dpaqamfjkjkxl0hjp9";
type = "gem";
};
- version = "0.3.4";
+ version = "0.3.7";
};
httpclient = {
source = {
@@ -149,10 +158,10 @@
memoist = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0yd3rd7bnbhn9n47qlhcii5z89liabdjhy3is3h6gq77gyfk4f5q";
+ sha256 = "0pq8fhqh8w25qcw9v3vzfb0i6jp0k3949ahxc3wrwz2791dpbgbh";
type = "gem";
};
- version = "0.15.0";
+ version = "0.16.0";
};
metaclass = {
source = {
@@ -165,10 +174,10 @@
mini_portile2 = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1y25adxb1hgg1wb2rn20g3vl07qziq6fz364jc5694611zz863hb";
+ sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11";
type = "gem";
};
- version = "2.1.0";
+ version = "2.3.0";
};
mocha = {
dependencies = ["metaclass"];
@@ -190,44 +199,44 @@
native-package-installer = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1zh5x87y9dr16ic7vif2c3rnpr5k5wfs6kihpy4dnb9s0mqyqhsj";
+ sha256 = "0svj2sg7y7izl90qrvzd2fcb1rkq8bv3bd6lr9sh1ml18v3w882a";
type = "gem";
};
- version = "1.0.1";
+ version = "1.0.4";
};
nokogiri = {
dependencies = ["mini_portile2"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0jd8q3pr5rkrxx1vklvhcqcgl8kmfv5c8ny36ni3z5mirw6cm70c";
+ sha256 = "105xh2zkr8nsyfaj2izaisarpnkrrl9000y3nyflg9cbzrfxv021";
type = "gem";
};
- version = "1.7.2";
+ version = "1.8.1";
};
oauth = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1awhy8ddhixch44y68lail3h1d214rnl3y1yzk0msq5g4z2l62ky";
+ sha256 = "1a5cfg9pm3mxsmlk1slj652vza8nha2lpbpbmf3rrk0lh6zi4d0b";
type = "gem";
};
- version = "0.5.1";
+ version = "0.5.3";
};
pango = {
- dependencies = ["cairo" "glib2"];
+ dependencies = ["cairo" "cairo-gobject" "gobject-introspection"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "18cc24lz4dmb7pavfspivbhbsypf40fhcbdzj8885zs0zr0dknby";
+ sha256 = "0swld0s01djjlqrari0ib75703mb7qr4ydn00cqfhdr7xim66hjk";
type = "gem";
};
- version = "3.1.1";
+ version = "3.1.9";
};
pkg-config = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0fklf2dnk354ahxma3iki5cx7b8yn9khby162pz17z6f1f3xk84g";
+ sha256 = "056qb6cwbw2l9riq376wazx4kwd67cdilyclpa6j38mfsswpmzws";
type = "gem";
};
- version = "1.2.0";
+ version = "1.2.8";
};
pluggaloid = {
dependencies = ["delayer" "instance_storage"];
@@ -241,18 +250,18 @@
power_assert = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "168ac459nv45a2lhdf86zv35lv9nr569ny5nh3kfnglnxyzyx0kr";
+ sha256 = "0h0s1clasynlbk3782801c61yx24pdv959fpw53g5yl8gxqj34iz";
type = "gem";
};
- version = "1.0.2";
+ version = "1.1.1";
};
public_suffix = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "040jf98jpp6w140ghkhw2hvc1qx41zvywx5gj7r2ylr1148qnj7q";
+ sha256 = "0snaj1gxfib4ja1mvy3dzmi7am73i0mkqr0zkz045qv6509dhj5f";
type = "gem";
};
- version = "2.0.5";
+ version = "3.0.0";
};
rake = {
source = {
@@ -290,10 +299,10 @@
dependencies = ["power_assert"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1kngxp21sqbm7kv7wnxfqk99ik3wv1bjab519vcbj8xj30a5y4py";
+ sha256 = "1gl5b2d6bysnm0a1zx54qn6iwd67f6gsjy0c7zb68ag0453rqcnv";
type = "gem";
};
- version = "3.2.3";
+ version = "3.2.6";
};
text = {
source = {
@@ -315,10 +324,10 @@
dependencies = ["unf"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0lld6d8rzj1zrgs6b227mp675bn8ds56f1c9w9wvx321f6ibn6np";
+ sha256 = "1732h7hy1k152w8wfvjsx7b79alk45i5imwd37ia4qcx8hfm3gvg";
type = "gem";
};
- version = "1.14.2";
+ version = "1.14.7";
};
typed-array = {
source = {
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/shell.nix b/pkgs/applications/networking/instant-messengers/mikutter/shell.nix
index efa57175b237..bc83767af32a 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/shell.nix
+++ b/pkgs/applications/networking/instant-messengers/mikutter/shell.nix
@@ -8,6 +8,7 @@ pkgs.stdenv.mkDerivation {
];
shellHook = ''
+ export MIKUTTER_CONFROOT="/homeless-shelter"
truncate --size 0 Gemfile.lock
bundle lock
bundle package --path=vendor/bundle --no-install
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix
index 8bf940093357..60fd5af0a1ab 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
makeFlags = [ "PURPLE_PLUGIN_DIR=$(out)/lib/pidgin" ];
- buildInputs = [ libxml2 pidgin pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libxml2 pidgin ];
meta = with stdenv.lib; {
homepage = https://github.com/gkdr/carbons;
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix
index f68b8306fc84..7ab9b1947915 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix
@@ -11,9 +11,12 @@ stdenv.mkDerivation rec {
sha256 = "1lxpz316jmns6i143v4j6sd6k0a4a54alw08rvwjckf2rig57lj2";
};
- sourceRoot = "skype4pidgin-${version}-src/skypeweb";
+ setSourceRoot = ''
+ sourceRoot=$(echo */skypeweb)
+ '';
- buildInputs = [ pkgconfig pidgin json_glib ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ pidgin json_glib ];
makeFlags = [
"PLUGIN_DIR_PURPLE=/lib/pidgin/"
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix
index 6e96719fd896..632f2543f57c 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix
@@ -52,7 +52,8 @@ in stdenv.mkDerivation rec {
cp pidgin/libpurple/protocols/facebook/.libs/*.so $out/lib/purple-2/
'';
- buildInputs = [pidgin glib json_glib mercurial autoreconfHook];
+ nativeBuildInputs = [ autoreconfHook ];
+ buildInputs = [pidgin glib json_glib mercurial];
meta = with stdenv.lib; {
inherit (src.meta) homepage;
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix
index c4ec4b2614c2..07cf66e572a7 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "purple-hangouts-hg-${version}";
- version = "2016-12-22";
+ version = "2017-10-08";
src = fetchhg {
url = "https://bitbucket.org/EionRobb/purple-hangouts/";
- rev = "754e3bb971cfe913b90c7fd028fe47a42f9e83cb";
- sha256 = "0b826hj5jgfdckzh9wyycxxhpyxhrhxm3n0mhaf3f57gqarriics";
+ rev = "5e769791d282a6e5ae4d94dc66a1ff9d6904ec9c";
+ sha256 = "0cs7dcd44lkc2anradyddjvmfvnl46ixw4idaf1m9fd7j35mg7b1";
};
buildInputs = [ pidgin glib json_glib protobuf protobufc ];
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix
index bb1ed52baba3..d02c437945e0 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix
@@ -29,7 +29,8 @@ stdenv.mkDerivation rec {
postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-otr";
- buildInputs = [ pidgin pkgconfig libnotify gdk_pixbuf glib dbus dbus_glib ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ pidgin libnotify gdk_pixbuf glib dbus dbus_glib ];
meta = {
homepage = https://github.com/novas0x2a/skype4pidgin;
diff --git a/pkgs/applications/networking/instant-messengers/pond/default.nix b/pkgs/applications/networking/instant-messengers/pond/default.nix
index 8190be65e75b..002d0345a000 100644
--- a/pkgs/applications/networking/instant-messengers/pond/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pond/default.nix
@@ -20,7 +20,8 @@ buildGoPackage rec {
goDeps = ./deps.nix;
- buildInputs = [ trousers pkgconfig gtk3 gtkspell3 ]
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ trousers gtk3 gtkspell3 ]
++ stdenv.lib.optional isx86_64 dclxvi
++ stdenv.lib.optionals gui [ wrapGAppsHook ];
buildFlags = stdenv.lib.optionalString (!gui) "-tags nogui";
diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix
index 68f632d4b6f7..74dc36bc7ac0 100644
--- a/pkgs/applications/networking/instant-messengers/profanity/default.nix
+++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix
@@ -1,14 +1,18 @@
{ stdenv, fetchurl, pkgconfig, glib, openssl, expat, libmesode
, ncurses, libotr, curl, readline, libuuid
-, autoAwaySupport ? false, libXScrnSaver ? null, libX11 ? null
-, notifySupport ? false, libnotify ? null, gdk_pixbuf ? null
-, traySupport ? false, gnome2 ? null
+, autoAwaySupport ? false, libXScrnSaver ? null, libX11 ? null
+, notifySupport ? false, libnotify ? null, gdk_pixbuf ? null
+, traySupport ? false, gnome2 ? null
+, pgpSupport ? true, gpgme ? null
+, pythonPluginSupport ? true, python ? null
}:
-assert autoAwaySupport -> libXScrnSaver != null && libX11 != null;
-assert notifySupport -> libnotify != null && gdk_pixbuf != null;
-assert traySupport -> gnome2 != null;
+assert autoAwaySupport -> libXScrnSaver != null && libX11 != null;
+assert notifySupport -> libnotify != null && gdk_pixbuf != null;
+assert traySupport -> gnome2 != null;
+assert pgpSupport -> gpgme != null;
+assert pythonPluginSupport -> python != null;
with stdenv.lib;
@@ -21,12 +25,25 @@ stdenv.mkDerivation rec {
sha256 = "1f7ylw3mhhnii52mmk40hyc4kqhpvjdr3hmsplzkdhsfww9kflg3";
};
+ enableParallelBuilding = true;
+
+ nativeBuildInputs = [ pkgconfig ];
+
buildInputs = [
- pkgconfig readline libuuid libmesode
+ readline libuuid libmesode
glib openssl expat ncurses libotr curl
- ] ++ optionals autoAwaySupport [ libXScrnSaver libX11 ]
- ++ optionals notifySupport [ libnotify gdk_pixbuf ]
- ++ optionals traySupport [ gnome2.gtk ];
+ ] ++ optionals autoAwaySupport [ libXScrnSaver libX11 ]
+ ++ optionals notifySupport [ libnotify gdk_pixbuf ]
+ ++ optionals traySupport [ gnome2.gtk ]
+ ++ optionals pgpSupport [ gpgme ]
+ ++ optionals pythonPluginSupport [ python ];
+
+ # Enable feature flags, so that build fail if libs are missing
+ configureFlags = [ "--enable-c-plugins" "--enable-otr" ]
+ ++ optionals notifySupport [ "--enable-notifications" ]
+ ++ optionals traySupport [ "--enable-icons" ]
+ ++ optionals pgpSupport [ "--enable-pgp" ]
+ ++ optionals pythonPluginSupport [ "--enable-python-plugins" ];
meta = {
description = "A console based XMPP client";
diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix
index aee739256746..9cf6f4f2a408 100644
--- a/pkgs/applications/networking/instant-messengers/qtox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix
@@ -2,29 +2,29 @@
libtoxcore,
libpthreadstubs, libXdmcp, libXScrnSaver,
qtbase, qtsvg, qttools, qttranslations,
- ffmpeg, filter-audio, libsodium, libopus,
+ ffmpeg, filter-audio, libexif, libsodium, libopus,
libvpx, openal, opencv, pcre, qrencode, sqlcipher }:
mkDerivation rec {
name = "qtox-${version}";
- version = "1.11.0";
+ version = "1.12.1";
src = fetchFromGitHub {
- owner = "tux3";
+ owner = "qTox";
repo = "qTox";
rev = "v${version}";
- sha256 = "0h8v359h1xn2xm6xa9q56mjiw58ap1bpiwx1dxxmphjildxadwck";
+ sha256 = "1l1k8s10jj6nm9i33m8xhjwdhikvp7csdp6x1gxjxdj526aak8q9";
};
buildInputs = [
libtoxcore
libpthreadstubs libXdmcp libXScrnSaver
- qtbase qtsvg qttools qttranslations
- ffmpeg filter-audio libopus libsodium
+ qtbase qtsvg qttranslations
+ ffmpeg filter-audio libexif libopus libsodium
libvpx openal opencv pcre qrencode sqlcipher
];
- nativeBuildInputs = [ cmake pkgconfig ];
+ nativeBuildInputs = [ cmake pkgconfig qttools ];
enableParallelBuilding = true;
@@ -37,6 +37,7 @@ mkDerivation rec {
meta = with lib; {
description = "Qt Tox client";
+ homepage = https://tox.chat;
license = licenses.gpl3;
maintainers = with maintainers; [ viric jgeerds akaWolf peterhoeg ];
platforms = platforms.all;
diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
index a2510c777385..08625d321235 100644
--- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix
+++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
@@ -2,7 +2,7 @@
mkDerivation rec {
name = "quaternion-git-${version}";
- version = "2017-06-29";
+ version = "2017-10-07";
# quaternion and tensor share the same libqmatrixclient library as a git submodule
#
@@ -13,8 +13,8 @@ mkDerivation rec {
src = fetchgit {
url = "https://github.com/QMatrixClient/Quaternion.git";
- rev = "1febc0178fd3d02b7426f58981b54924ad60c84d";
- sha256 = "1whjhlphdhk7kgw2zqc0wj3k2i9gkp79qq2bnrh4mbcp3qmcqngr";
+ rev = "1007f2ca4ad5e8cc5dba437d6a0cdea07d1f1332";
+ sha256 = "0hvc81ld7fcwyrxsr2q3yvzh0rzhgmflby4nmyzcbjds7b7pv0xq";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/networking/instant-messengers/rambox/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/bare.nix
new file mode 100644
index 000000000000..ceb922624a12
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/rambox/bare.nix
@@ -0,0 +1,61 @@
+{ stdenv, fetchFromGitHub, fetchNodeModules, nodejs-8_x, ruby, sencha }:
+
+stdenv.mkDerivation rec {
+ name = "rambox-bare-${version}";
+ version = "0.5.13";
+
+ src = fetchFromGitHub {
+ owner = "saenzramiro";
+ repo = "rambox";
+ rev = version;
+ sha256 = "0c770a9z017y6gcrpyri7s1gifm8zi5f29bq5nvh3zzg4wgqh326";
+ };
+
+ nativeBuildInputs = [ nodejs-8_x ruby sencha ];
+
+ node_modules = fetchNodeModules {
+ inherit src;
+
+ nodejs = nodejs-8_x;
+ sha256 = "1y3q8ggyvfywxqi5hn9mvr1sjfylspis43iyf4b7snyr1a1br3r4";
+ };
+
+ patches = [ ./hide-check-for-updates.patch ./isDev.patch ];
+
+ # These credentials are only for this derivation. If you want to get credentials
+ # for another distribution, go to https://auth0.com. If you want to reuse the same
+ # domain, drop a line at yegortimoshenko@gmail.com!
+ auth0ClientID = "0spuNKfIGeLAQ_Iki9t3fGxbfJl3k8SU";
+ auth0Domain = "nixpkgs.auth0.com";
+
+ configurePhase = ''
+ echo 'var auth0Cfg = { clientID: "${auth0ClientID}", domain: "${auth0Domain}" };' > env.js
+ ln -s ${node_modules} node_modules
+ '';
+
+ buildPhase = ''
+ mkdir ../rambox-build
+ npm run sencha:compile:build
+ '';
+
+ installPhase = ''
+ mv ../rambox-build/ $out
+
+ # https://github.com/saenzramiro/rambox/issues/1281
+ echo '{"name": "rambox", "version": "${version}", "main": "electron/main.js"}' > $out/package.json
+
+ # https://github.com/saenzramiro/rambox/issues/1282
+ cp --parents ext/packages/ext-locale/build/ext-locale-*.js $out
+
+ # Symbolic link causes `Uncaught Error: Cannot find module 'immutable'`
+ cp -r ${node_modules} $out/node_modules
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Messaging and emailing app that combines common web applications into one";
+ homepage = http://rambox.pro;
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ gnidorah ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix
index 38d489de02af..1523d16be56e 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix
@@ -1,63 +1,36 @@
-{ stdenv, fetchurl, dpkg
-, xorg, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig
-, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify }:
+{ stdenv, newScope, makeWrapper, electron, xdg_utils, makeDesktopItem }:
let
- bits = if stdenv.system == "x86_64-linux" then "x64"
- else "ia32";
-
- version = "0.5.12";
-
- runtimeDeps = [
- udev libnotify
- ];
- deps = (with xorg; [
- libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes
- libXrender libX11 libXtst libXScrnSaver libxcb
- ]) ++ [
- gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
- gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc
- ] ++ runtimeDeps;
-in stdenv.mkDerivation rec {
- name = "rambox-${version}";
- src = fetchurl {
- url = "https://github.com/saenzramiro/rambox/releases/download/${version}/Rambox_${version}-${bits}.deb";
- sha256 = if bits == "x64" then
- "1jlvpq7wryz4vf6xlsb9c38jrhjiv18rdf2ndlv76png60wl8418" else
- "063j3gcpp18wdvspy7d43cgv7i5v8c42hn2zpp083jixw9ddsqwa";
+ callPackage = newScope self;
+ self = {
+ fetchNodeModules = callPackage ./fetchNodeModules.nix {};
+ rambox-bare = callPackage ./bare.nix {};
+ sencha = callPackage ./sencha {};
};
+ desktopItem = makeDesktopItem rec {
+ name = "Rambox";
+ exec = "rambox";
+ icon = "${self.rambox-bare}/resources/Icon.png";
+ desktopName = name;
+ genericName = "Rambox messenger";
+ categories = "Network;";
+ };
+in
- # don't remove runtime deps
- dontPatchELF = true;
+with self;
- buildInputs = [ dpkg ];
+stdenv.mkDerivation {
+ name = "rambox-${rambox-bare.version}";
- unpackPhase = "dpkg-deb -x $src .";
+ nativeBuildInputs = [ makeWrapper ];
+
+ unpackPhase = ":";
installPhase = ''
- patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" opt/Rambox/rambox
- patchelf --set-rpath "$out/opt/Rambox:${stdenv.lib.makeLibraryPath deps}" opt/Rambox/rambox
-
- mkdir -p $out/bin
- cp -r opt $out
- ln -s $out/opt/Rambox/rambox $out/bin
-
- # provide resources
- cp -r usr/share $out
- substituteInPlace $out/share/applications/rambox.desktop \
- --replace Exec=\"/opt/Rambox/rambox\" Exec=rambox
+ makeWrapper ${electron}/bin/electron $out/bin/rambox \
+ --add-flags "${rambox-bare} --without-update" \
+ --prefix PATH : ${xdg_utils}/bin
+ mkdir -p $out/share/applications
+ ln -s ${desktopItem}/share/applications/* $out/share/applications
'';
-
- postFixup = ''
- paxmark m $out/opt/Rambox/rambox
- '';
-
- meta = with stdenv.lib; {
- description = "Free and Open Source messaging and emailing app that combines common web applications into one";
- homepage = http://rambox.pro;
- license = licenses.mit;
- maintainers = [ maintainers.gnidorah ];
- platforms = ["i686-linux" "x86_64-linux"];
- hydraPlatforms = [];
- };
}
diff --git a/pkgs/applications/networking/instant-messengers/rambox/fetchNodeModules.nix b/pkgs/applications/networking/instant-messengers/rambox/fetchNodeModules.nix
new file mode 100644
index 000000000000..047890a932ca
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/rambox/fetchNodeModules.nix
@@ -0,0 +1,26 @@
+{ stdenv, jq }: { src, nodejs, sha256 }:
+
+# Only npm >= 5.4.2 is deterministic, see:
+# https://github.com/npm/npm/issues/17979#issuecomment-332701215
+assert stdenv.lib.versionAtLeast nodejs.version "8.9.0";
+
+stdenv.mkDerivation {
+ name = "node_modules";
+
+ outputHashAlgo = "sha256";
+ outputHash = sha256;
+ outputHashMode = "recursive";
+
+ nativeBuildInputs = [ jq nodejs ];
+
+ buildCommand = ''
+ cp -r ${src}/* .
+ HOME=. npm install --force --ignore-scripts --only=production
+ for f in $(find node_modules -name package.json); do
+ # https://github.com/npm/npm/issues/10393
+ jq -S 'delpaths(keys | map(select(startswith("_")) | [.]))' $f > $f.tmp
+ mv $f.tmp $f
+ done
+ mv node_modules $out
+ '';
+}
diff --git a/pkgs/applications/networking/instant-messengers/rambox/hide-check-for-updates.patch b/pkgs/applications/networking/instant-messengers/rambox/hide-check-for-updates.patch
new file mode 100644
index 000000000000..8363baef2dfc
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/rambox/hide-check-for-updates.patch
@@ -0,0 +1,35 @@
+https://github.com/saenzramiro/rambox/issues/1283
+
+diff -urNZ a/electron/menu.js b/electron/menu.js
+--- a/electron/menu.js 2017-11-02 22:02:59.753119865 +0000
++++ b/electron/menu.js 2017-11-02 22:08:34.419698562 +0000
+@@ -220,14 +220,6 @@
+ }
+ },
+ {
+- label: locale['menu.help[5]'],
+- click(item, win) {
+- const webContents = win.webContents;
+- const send = webContents.send.bind(win.webContents);
+- send('autoUpdater:check-update');
+- }
+- },
+- {
+ label: locale['menu.help[6]'],
+ click() {
+ sendAction('showAbout')
+@@ -290,14 +282,6 @@
+ type: 'separator'
+ });
+ helpSubmenu.push({
+- label: `&`+locale['menu.help[5]'],
+- click(item, win) {
+- const webContents = win.webContents;
+- const send = webContents.send.bind(win.webContents);
+- send('autoUpdater:check-update');
+- }
+- });
+- helpSubmenu.push({
+ label: `&`+locale['menu.help[6]'],
+ click() {
+ sendAction('showAbout')
diff --git a/pkgs/applications/networking/instant-messengers/rambox/isDev.patch b/pkgs/applications/networking/instant-messengers/rambox/isDev.patch
new file mode 100644
index 000000000000..b918144c7662
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/rambox/isDev.patch
@@ -0,0 +1,14 @@
+https://github.com/saenzramiro/rambox/issues/1280
+
+diff -urNZ a/electron/main.js b/electron/main.js
+--- a/electron/main.js 2017-11-02 14:58:06.085127616 +0000
++++ b/electron/main.js 2017-11-02 14:58:18.316887679 +0000
+@@ -8,7 +8,7 @@
+ // Configuration
+ const Config = require('electron-config');
+ // Development
+-const isDev = require('electron-is-dev');
++const isDev = false;
+ // Updater
+ const updater = require('./updater');
+ // File System
diff --git a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix
new file mode 100644
index 000000000000..5f68e6d86295
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchurl, gzip, which, unzip, jdk }:
+
+let
+ version = "6.5.2";
+ srcs = {
+ i686-linux = fetchurl {
+ url = "https://cdn.sencha.com/cmd/${version}/no-jre/SenchaCmd-${version}-linux-i386.sh.zip";
+ sha256 = "18gcqw9434xab97skcb97iw4p4s2pgggvq7jaisblap0ja00kqjr";
+ };
+ x86_64-linux = fetchurl {
+ url = "https://cdn.sencha.com/cmd/${version}/no-jre/SenchaCmd-${version}-linux-amd64.sh.zip";
+ sha256 = "1b8jv99k37q1bi7b29f23lfzxc66v5fqdmr1rxsrqchwcrllc0z7";
+ };
+ };
+in
+
+stdenv.mkDerivation rec {
+ inherit version;
+
+ name = "sencha-bare-${version}";
+ src = srcs.${stdenv.system};
+
+ nativeBuildInputs = [ gzip which unzip ];
+ buildInputs = [ jdk ];
+
+ sourceRoot = ".";
+
+ configurePhase = ''
+ substituteAll ${./response.varfile} response.varfile
+ '';
+
+ installPhase = ''
+ ./SenchaCmd*.sh -q -dir $out -varfile response.varfile
+ # disallow sencha writing into /nix/store/repo
+ echo "repo.local.dir=$TMP/repo" >> $out/sencha.cfg
+ rm $out/shell-wrapper.sh $out/Uninstaller
+ '';
+
+ meta = with stdenv.lib; {
+ license = licenses.unfree;
+ platforms = attrNames srcs;
+ };
+}
diff --git a/pkgs/applications/networking/instant-messengers/rambox/sencha/default.nix b/pkgs/applications/networking/instant-messengers/rambox/sencha/default.nix
new file mode 100644
index 000000000000..1ca04a9e1686
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/rambox/sencha/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, callPackage, makeWrapper }:
+
+let
+ sencha-bare = callPackage ./bare.nix {};
+in
+
+stdenv.mkDerivation {
+ name = "sencha-${sencha-bare.version}";
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ unpackPhase = ":";
+
+ installPhase = ''
+ makeWrapper ${sencha-bare}/sencha $out/bin/sencha
+ '';
+}
diff --git a/pkgs/applications/networking/instant-messengers/rambox/sencha/response.varfile b/pkgs/applications/networking/instant-messengers/rambox/sencha/response.varfile
new file mode 100644
index 000000000000..0ff6f0a30d50
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/rambox/sencha/response.varfile
@@ -0,0 +1,13 @@
+addToPath$Integer=1
+parentDir=.
+sys.adminRights$Boolean=false
+sys.component.148$Boolean=true
+sys.component.157$Boolean=true
+sys.component.26$Boolean=true
+sys.component.30$Boolean=true
+sys.component.90$Boolean=true
+sys.component.91$Boolean=true
+sys.component.92$Boolean=true
+sys.component.94$Boolean=true
+sys.installationDir=@out@
+sys.languageId=en
\ No newline at end of file
diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix
index 4f360c831a25..9ff1799ddd2d 100644
--- a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix
+++ b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix
@@ -1,7 +1,12 @@
-{stdenv, fetchurl, python27Packages, file }:
+{ stdenv, fetchurl, python27Packages, file }:
let
inherit (python27Packages) python;
+ requirements = (import ./requirements.nix {
+ inherit stdenv fetchurl;
+ pythonPackages = python27Packages;
+ });
+
in
stdenv.mkDerivation rec {
name = "salut-a-toi";
@@ -13,12 +18,15 @@ in
sha256 = "0kn9403n8fpzl0hsb9kkzicsmzq2fjl627l31yykbqzc4nsr780d";
};
- buildInputs = with python27Packages;
+ buildInputs = with python27Packages;
[
python twisted urwid wxPython pygobject2
- wokkel dbus-python pyfeed wrapPython setuptools file
+ dbus-python wrapPython setuptools file
pycrypto pyxdg
- ];
+ ] ++ (with requirements; [
+ pyfeed
+ wokkel
+ ]);
configurePhase = ''
sed -i "/use_setuptools/d" setup.py
@@ -26,7 +34,7 @@ in
sed -e "1aexport PATH=\"\$PATH\":\"$out/bin\":\"${python27Packages.twisted}/bin\"" -i src/sat.sh
sed -e "1aexport PYTHONPATH=\"\$PYTHONPATHPATH\":\"$PYTHONPATH\":"$out/${python.sitePackages}"" -i src/sat.sh
- echo 'import wokkel.muc' | python
+ echo 'import wokkel.muc' | python
'';
buildPhase = ''
@@ -39,7 +47,7 @@ in
for i in "$out/bin"/*; do
head -n 1 "$i" | grep -E '[/ ]python( |$)' && {
wrapProgram "$i" --prefix PYTHONPATH : "$PYTHONPATH:$out/${python.sitePackages}"
- } || true
+ } || true
done
'';
diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix
new file mode 100644
index 000000000000..1a6811182453
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix
@@ -0,0 +1,67 @@
+{ fetchurl
+, stdenv
+, pythonPackages
+}:
+
+let
+ buildPythonPackage = pythonPackages.buildPythonPackage;
+
+ xe = buildPythonPackage rec {
+ url = "http://www.blarg.net/%7Esteveha/xe-0.7.4.tar.gz";
+ name = stdenv.lib.nameFromURL url ".tar";
+ src = fetchurl {
+ inherit url;
+ sha256 = "0v9878cl0y9cczdsr6xjy8v9l139lc23h4m5f86p4kpf2wlnpi42";
+ };
+
+ # error: invalid command 'test'
+ doCheck = false;
+
+ meta = {
+ homepage = "http://home.blarg.net/~steveha/xe.html";
+ description = "XML elements";
+ };
+ };
+
+in {
+
+ pyfeed = (buildPythonPackage rec {
+ url = "http://www.blarg.net/%7Esteveha/pyfeed-0.7.4.tar.gz";
+
+ name = stdenv.lib.nameFromURL url ".tar";
+
+ src = fetchurl {
+ inherit url;
+ sha256 = "1h4msq573m7wm46h3cqlx4rsn99f0l11rhdqgf50lv17j8a8vvy1";
+ };
+
+ propagatedBuildInputs = [ xe ];
+
+ # error: invalid command 'test'
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ homepage = "http://home.blarg.net/~steveha/pyfeed.html";
+ description = "Tools for syndication feeds";
+ };
+
+ });
+
+ wokkel = buildPythonPackage (rec {
+ url = "http://wokkel.ik.nu/releases/0.7.0/wokkel-0.7.0.tar.gz";
+ name = stdenv.lib.nameFromURL url ".tar";
+ src = fetchurl {
+ inherit url;
+ sha256 = "0rnshrzw8605x05mpd8ndrx3ri8h6cx713mp8sl4f04f4gcrz8ml";
+ };
+
+ propagatedBuildInputs = with pythonPackages; [twisted dateutil];
+
+ meta = with stdenv.lib; {
+ description = "Some (mainly XMPP-related) additions to twisted";
+ homepage = "http://wokkel.ik.nu/";
+ license = licenses.mit;
+ };
+ });
+
+}
diff --git a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix
index a388b77dab96..441bc020868e 100644
--- a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix
+++ b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix
@@ -1,15 +1,15 @@
{ stdenv, fetchurl, python3Packages }:
-let version = "1.58";
+let version = "1.63";
in python3Packages.buildPythonPackage {
name = "scudcloud-${version}";
src = fetchurl {
url = "https://github.com/raelgc/scudcloud/archive/v${version}.tar.gz";
- sha256 = "1j84qdc2j3dvl1nhrjqm0blc8ww723p9a6hqprkkp8alw77myq1l";
+ sha256 = "e0d1cb72115d0fda17db92d28be51558ad8fe250972683fac3086dbe8d350d22";
};
- propagatedBuildInputs = with python3Packages; [ pyqt5 dbus-python ];
+ propagatedBuildInputs = with python3Packages; [ pyqt5 dbus-python jsmin ];
meta = with stdenv.lib; {
description = "Non-official desktop client for Slack";
diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
new file mode 100644
index 000000000000..0376fb79c9be
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -0,0 +1,88 @@
+{ stdenv, lib, fetchurl, dpkg, gnome2, atk, cairo, gdk_pixbuf, glib, freetype,
+fontconfig, dbus, libX11, xlibs, libXi, libXcursor, libXdamage, libXrandr,
+libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss,
+nspr, alsaLib, cups, expat, udev
+}:
+let
+ rpath = lib.makeLibraryPath [
+ alsaLib
+ atk
+ cairo
+ cups
+ dbus
+ expat
+ fontconfig
+ freetype
+ gdk_pixbuf
+ glib
+ gnome2.GConf
+ gnome2.gtk
+ gnome2.pango
+ libX11
+ libXScrnSaver
+ libXcomposite
+ libXcursor
+ libXdamage
+ libXext
+ libXfixes
+ libXi
+ libXrandr
+ libXrender
+ libXtst
+ nspr
+ nss
+ stdenv.cc.cc
+ udev
+ xlibs.libxcb
+ ];
+
+in
+ stdenv.mkDerivation rec {
+ name = "signal-desktop-${version}";
+
+ version = "1.0.35";
+
+ src =
+ if stdenv.system == "x86_64-linux" then
+ fetchurl {
+ url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
+ sha256 = "d9f9d4d54f4121efc8eadf1cf0ff957828088b313e53b66dc540b851c44c1860";
+ }
+ else
+ throw "Signal for Desktop is not currently supported on ${stdenv.system}";
+
+ phases = [ "unpackPhase" "installPhase" ];
+ nativeBuildInputs = [ dpkg ];
+ unpackPhase = "dpkg-deb -x $src .";
+ installPhase = ''
+ mkdir -p $out
+ cp -R opt $out
+
+ mv ./usr/share $out/share
+ mv $out/opt/Signal $out/libexec
+ rmdir $out/opt
+
+ chmod -R g-w $out
+
+ # Patch signal
+ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+ --set-rpath ${rpath}:$out/libexec $out/libexec/signal-desktop
+
+ # Symlink to bin
+ mkdir -p $out/bin
+ ln -s $out/libexec/signal-desktop $out/bin/signal-desktop
+
+ # Fix the desktop link
+ substituteInPlace $out/share/applications/signal-desktop.desktop \
+ --replace /opt/Signal/signal-desktop $out/bin/signal-desktop
+ '';
+
+ meta = {
+ description = "Signal Private Messenger for the Desktop.";
+ homepage = https://signal.org/;
+ license = lib.licenses.gpl3;
+ platforms = [
+ "x86_64-linux"
+ ];
+ };
+ }
diff --git a/pkgs/applications/networking/instant-messengers/silc-client/default.nix b/pkgs/applications/networking/instant-messengers/silc-client/default.nix
index df85c55dbee0..dca7d1257f65 100644
--- a/pkgs/applications/networking/instant-messengers/silc-client/default.nix
+++ b/pkgs/applications/networking/instant-messengers/silc-client/default.nix
@@ -27,7 +27,8 @@ stdenv.mkDerivation {
configureFlags="$configureFlags --with-silc-plugin=$out/lib/irssi"
'';
- buildInputs = [ perl pkgconfig glib ncurses ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ perl glib ncurses ];
meta = {
homepage = http://silcnet.org/;
diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
index 37bbfef65bba..bfccc4bfcb6c 100644
--- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
@@ -4,7 +4,7 @@
let
- version = "5.4.0.1";
+ version = "5.5.0.1";
rpath = stdenv.lib.makeLibraryPath [
alsaLib
@@ -54,7 +54,7 @@ let
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb";
- sha256 = "1idjgmn0kym7jml30xq6zrcp8qinx64kgnxlw8m0ys4z6zlw0c8z";
+ sha256 = "1r65qlsjwp0n0fmlhvbp71h03b3x73r26jk9f4q687sjqnzmkvcr";
}
else
throw "Skype for linux is not supported on ${stdenv.system}";
diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index 93bc6feff3c2..8f107c4f3c37 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -4,7 +4,7 @@
let
- version = "2.8.0";
+ version = "2.8.2";
rpath = stdenv.lib.makeLibraryPath [
alsaLib
@@ -46,7 +46,7 @@ let
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb";
- sha256 = "02khqi0qf8ryj6bkfla95mr3scvb99zrhihwdprdjqpgvy06wqhm";
+ sha256 = "019gzij6m1y9bv561nhbhgf2njp2svjqi5hs907pdjf7xwciwrkm";
}
else
throw "Slack is not supported on ${stdenv.system}";
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix
index 05ea0fda8353..b4fd71b01d44 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "1argdzbif1vdmwp5vqbgkadq9ancjmgdm2ncp0qfckni715ss4rh";
};
- buildInputs = [ pkgconfig glib telepathy_glib dbus_glib libxslt telepathy_glib.python (stdenv.lib.getLib gnome3.dconf) makeWrapper ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ glib telepathy_glib dbus_glib libxslt telepathy_glib.python (stdenv.lib.getLib gnome3.dconf) makeWrapper ];
preFixup = ''
wrapProgram "$out/libexec/telepathy-idle" \
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
index 37d5ea2e17b8..0bd6c2e5f2b5 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
@@ -12,11 +12,10 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0";
- buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib pkgconfig intltool makeWrapper
+ nativeBuildInputs = [ makeWrapper pkgconfig ];
+ buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib intltool libxslt
gobjectIntrospection dbus_libs telepathy_glib.python (stdenv.lib.getLib gnome3.dconf) ];
- nativeBuildInputs = [ libxslt ];
-
configureFlags = "--enable-call";
preFixup = ''
diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix
index d74d3fe38657..9c208dd52a83 100644
--- a/pkgs/applications/networking/instant-messengers/utox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/utox/default.nix
@@ -1,33 +1,35 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, libtoxcore, filter-audio, dbus, libvpx, libX11, openal, freetype, libv4l
-, libXrender, fontconfig, libXext, libXft, utillinux, git, libsodium }:
+, libXrender, fontconfig, libXext, libXft, utillinux, git, libsodium, libopus, check }:
stdenv.mkDerivation rec {
name = "utox-${version}";
- # >= 0.14 should have unit tests and dbus support
- version = "0.13.1";
+
+ version = "0.16.1";
src = fetchFromGitHub {
owner = "uTox";
repo = "uTox";
rev = "v${version}";
- sha256 = "07aa92isknxf7531jr9kgk89wl5rvv34jrvir043fs9xvim5zq99";
+ sha256 = "0ak10925v67yaga2pw9yzp0xkb5j1181srfjdyqpd29v8mi9j828";
};
buildInputs = [
libtoxcore dbus libvpx libX11 openal freetype
libv4l libXrender fontconfig libXext libXft filter-audio
- libsodium
+ libsodium libopus
];
nativeBuildInputs = [
- cmake git pkgconfig
+ cmake git pkgconfig check
];
cmakeFlags = [
"-DENABLE_UPDATER=OFF"
- ];
+ ] ++ stdenv.lib.optional (!doCheck) "-DENABLE_TESTS=OFF";
- doCheck = false;
+ doCheck = true;
+
+ checkTarget = "test";
meta = with stdenv.lib; {
description = "Lightweight Tox client";
diff --git a/pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix b/pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix
new file mode 100644
index 000000000000..8c7e80b3ff8d
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchFromGitHub, xmpppy }:
+
+stdenv.mkDerivation {
+ name = "weechat-jabber-2017-08-30";
+
+ src = fetchFromGitHub {
+ repo = "weechat-xmpp";
+ owner = "sleduc";
+ sha256 = "0s02xs0ynld9cxxzj07al364sfglyc5ir1i82133mq0s8cpphnxv";
+ rev = "8f6c21f5a160c9318c7a2d8fd5dcac7ab2e0d843";
+ };
+
+ installPhase = ''
+ mkdir -p $out/share
+ cp jabber.py $out/share/jabber.py
+ '';
+
+ buildInputs = [ xmpppy ];
+
+ postPatch = ''
+ substituteInPlace jabber.py \
+ --replace "__NIX_OUTPUT__" "${xmpppy}/lib/python2.7/site-packages"
+ '';
+
+ patches = [
+ ./libpath.patch
+ ];
+
+ meta = with stdenv.lib; {
+ description = "A fork of the jabber plugin for weechat";
+ homepage = "https://github.com/sleduc/weechat-xmpp";
+ maintainers = with maintainers; [ ma27 ];
+ license = licenses.gpl3Plus;
+ };
+}
diff --git a/pkgs/applications/networking/instant-messengers/weechat-xmpp/libpath.patch b/pkgs/applications/networking/instant-messengers/weechat-xmpp/libpath.patch
new file mode 100644
index 000000000000..d3faab33a8e5
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/weechat-xmpp/libpath.patch
@@ -0,0 +1,16 @@
+diff --git a/jabber.py b/jabber.py
+index 27006a3..e53c2c0 100644
+--- a/jabber.py
++++ b/jabber.py
+@@ -95,6 +95,11 @@ SCRIPT_COMMAND = SCRIPT_NAME
+ import re
+ import warnings
+
++import sys
++
++sys.path.append('__NIX_OUTPUT__')
++
++
+ import_ok = True
+
+ try:
diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index 91c77fc9d7ca..b6a4e7944d3c 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -4,11 +4,11 @@
let
- version = "2.0.98253.0707";
+ version = "2.0.106600.0904";
srcs = {
x86_64-linux = fetchurl {
url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz";
- sha256 = "1znw7459pzfl2jzmj9akfwq3z10sndfb1swdr1p3rrjpiwqh3p7r";
+ sha256 = "1dcr0rqgjingjqbqv37hqjhhwy8axnjyirrnmjk44b5xnh239w9s";
};
};
@@ -53,6 +53,7 @@ in stdenv.mkDerivation {
xorg.libXrender
xorg.libXcomposite
xorg.libXScrnSaver
+ xorg.libXrandr
stdenv.cc.cc
];
diff --git a/pkgs/applications/networking/ipfs-migrator/default.nix b/pkgs/applications/networking/ipfs-migrator/default.nix
new file mode 100644
index 000000000000..6a4afdb1c17d
--- /dev/null
+++ b/pkgs/applications/networking/ipfs-migrator/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+ name = "ipfs-migrator-${version}";
+ version = "6";
+
+ goPackagePath = "github.com/ipfs/fs-repo-migrations";
+
+ goDeps = ./deps.nix;
+
+ src = fetchFromGitHub {
+ owner = "ipfs";
+ repo = "fs-repo-migrations";
+ rev = "a89e9769b9cac25ad9ca31c7e9a4445c7966d35b";
+ sha256 = "0x4mbkx7wlqjmkg6852hljq947v9y9k3hjd5yfj7kka1hpvxd7bn";
+ };
+
+ patches = [ ./lru-repo-path-fix.patch ];
+
+ meta = with stdenv.lib; {
+ description = "Migration tool for ipfs repositories";
+ homepage = https://ipfs.io/;
+ license = licenses.mit;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ elitak ];
+ };
+}
diff --git a/pkgs/applications/networking/ipfs-migrator/deps.nix b/pkgs/applications/networking/ipfs-migrator/deps.nix
new file mode 100644
index 000000000000..2d52ca0ef70a
--- /dev/null
+++ b/pkgs/applications/networking/ipfs-migrator/deps.nix
@@ -0,0 +1,56 @@
+[
+ {
+ goPackagePath = "github.com/dustin/go-humanize";
+ fetch = {
+ type = "git";
+ url = https://github.com/dustin/go-humanize;
+ rev = "79e699ccd02f240a1f1fbbdcee7e64c1c12e41aa";
+ sha256 = "0awfqszgjw8qrdw31v74jnvj1jbp7czhd8aq59j57yyj4hy50fzj";
+ };
+ }
+ {
+ goPackagePath = "github.com/jbenet/goprocess";
+ fetch = {
+ type = "git";
+ url = https://github.com/jbenet/goprocess;
+ rev = "b497e2f366b8624394fb2e89c10ab607bebdde0b";
+ sha256 = "1lnvkzki7vnqn5c4m6bigk0k85haicmg27w903kwg30rdvblm82s";
+ };
+ }
+ {
+ goPackagePath = "github.com/jbenet/go-random";
+ fetch = {
+ type = "git";
+ url = https://github.com/jbenet/go-random;
+ rev = "384f606e91f542a98e779e652eed88051618f0f7";
+ sha256 = "0gcshzl9n3apzc0jaxqrjsc038yfrzfyhpdqgbpcnajin83l2msa";
+ };
+ }
+ {
+ goPackagePath = "github.com/jbenet/go-random-files";
+ fetch = {
+ type = "git";
+ url = https://github.com/jbenet/go-random-files;
+ rev = "737479700b40b4b50e914e963ce8d9d44603e3c8";
+ sha256 = "1klpdc4qkrfy31r7qh00fcz42blswzabmcnry9byd5adhszxj9bw";
+ };
+ }
+ {
+ goPackagePath = "github.com/hashicorp/golang-lru";
+ fetch = {
+ type = "git";
+ url = https://github.com/hashicorp/golang-lru;
+ rev = "0a025b7e63adc15a622f29b0b2c4c3848243bbf6";
+ sha256 = "1iq7lbpsz7ks052mpznmkf8s4k43p51z4dik2n9ivrxk666q2wxi";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/net";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/net";
+ rev = "71a035914f99bb58fe82eac0f1289f10963d876c";
+ sha256 = "06m16c9vkwc8m2mcxcxa7p8mb26ikc810lgzd5m8k1r6lp3hc8wm";
+ };
+ }
+]
diff --git a/pkgs/applications/networking/ipfs-migrator/lru-repo-path-fix.patch b/pkgs/applications/networking/ipfs-migrator/lru-repo-path-fix.patch
new file mode 100644
index 000000000000..a933a7b5358b
--- /dev/null
+++ b/pkgs/applications/networking/ipfs-migrator/lru-repo-path-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/ipfs-1-to-2/go-datastore/lru/datastore.go b/ipfs-1-to-2/go-datastore/lru/datastore.go
+index 7eb18eb..cd8dcb7 100644
+--- a/ipfs-1-to-2/go-datastore/lru/datastore.go
++++ b/ipfs-1-to-2/go-datastore/lru/datastore.go
+@@ -3,7 +3,7 @@ package lru
+ import (
+ "errors"
+
+- lru "github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/golang-lru"
++ lru "github.com/hashicorp/golang-lru"
+
+ ds "github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/go-datastore"
+ dsq "github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/go-datastore/query"
diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix
index ba0f557d0ffc..2c38965e100a 100644
--- a/pkgs/applications/networking/ipfs/default.nix
+++ b/pkgs/applications/networking/ipfs/default.nix
@@ -2,15 +2,15 @@
buildGoPackage rec {
name = "ipfs-${version}";
- version = "0.4.10";
- rev = "4679f806bd00c0a5299c22c82d1fbfdbad928e6d";
+ version = "0.4.11";
+ rev = "v${version}";
goPackagePath = "github.com/ipfs/go-ipfs";
extraSrcPaths = [
(fetchgx {
inherit name src;
- sha256 = "1khlsahv9vqx3h2smif5wdyb56jrza415hqid7883pqimfi66g3x";
+ sha256 = "1n8xr9xg23wm255zjm7nxd761xapmsv11a0giks2gaibh4nps1jl";
})
];
@@ -18,7 +18,7 @@ buildGoPackage rec {
owner = "ipfs";
repo = "go-ipfs";
inherit rev;
- sha256 = "1j3az0nhjisb5dxp1a4g8w17y17xjikvcsy4qrg0fm43ybpkhhvw";
+ sha256 = "1qi87sq490xpj4mip1d30x4v77gkacnw4idm0mwla92pg44v6wh9";
};
meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/ipget/default.nix b/pkgs/applications/networking/ipget/default.nix
new file mode 100644
index 000000000000..23c9d7df8120
--- /dev/null
+++ b/pkgs/applications/networking/ipget/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, buildGoPackage, fetchFromGitHub, fetchgx }:
+
+buildGoPackage rec {
+ name = "ipget-${version}";
+ version = "0.2.5";
+ rev = "v${version}";
+
+ goPackagePath = "github.com/ipfs/ipget";
+
+ extraSrcPaths = [
+ (fetchgx {
+ inherit name src;
+ sha256 = "1d4w8zl5mcppn3d4bl7qdkiqlf8gi3z2a62nygx17bqpa3da8cf3";
+ })
+ ];
+
+ goDeps = ../../../tools/package-management/gx/deps.nix;
+
+ src = fetchFromGitHub {
+ owner = "ipfs";
+ repo = "ipget";
+ inherit rev;
+ sha256 = "0a8yxqhl469ipiznrgkp3yi1xz3xzcbpx60wabqppq8hccrdiybk";
+ };
+
+ meta = with stdenv.lib; {
+ description = "Retrieve files over IPFS and save them locally";
+ homepage = https://ipfs.io/;
+ license = licenses.mit;
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix
index a2ad7e4d7b2f..75c4f9ac5c93 100644
--- a/pkgs/applications/networking/irc/irssi/default.nix
+++ b/pkgs/applications/networking/irc/irssi/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintlOrEmpty }:
stdenv.mkDerivation rec {
- version = "1.0.4";
+ version = "1.0.5";
name = "irssi-${version}";
src = fetchurl {
url = "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz";
- sha256 = "1a7f9g3hlccqlf9xj1csbxw4wgl6jfywg2xvkir6ww5viagkbzs8";
+ sha256 = "1lasb8flic4qc1sd3pvfg9aig5skcxlyx6iy9bk73147r8vzaq75";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/networking/irc/irssi/fish/default.nix b/pkgs/applications/networking/irc/irssi/fish/default.nix
index 64e3d216ac08..aefc48d4a3ee 100644
--- a/pkgs/applications/networking/irc/irssi/fish/default.nix
+++ b/pkgs/applications/networking/irc/irssi/fish/default.nix
@@ -21,7 +21,8 @@ stdenv.mkDerivation rec {
cp src/.libs/libfish.so $out/lib/irssi/modules
'';
- buildInputs = [ gmp automake autoconf libtool openssl glib pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gmp automake autoconf libtool openssl glib ];
meta = {
homepage = https://github.com/falsovsky/FiSH-irssi;
diff --git a/pkgs/applications/networking/irc/irssi/otr/default.nix b/pkgs/applications/networking/irc/irssi/otr/default.nix
index 1141f5639181..8d7bf677983c 100644
--- a/pkgs/applications/networking/irc/irssi/otr/default.nix
+++ b/pkgs/applications/networking/irc/irssi/otr/default.nix
@@ -14,7 +14,8 @@ stdenv.mkDerivation rec {
preConfigure = "sh ./bootstrap";
- buildInputs = [ libotr automake autoconf libtool glib pkgconfig irssi ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libotr automake autoconf libtool glib irssi ];
NIX_CFLAGS_COMPILE="-I ${irssi}/include/irssi -I ${irssi}/include/irssi/src/core -I ${irssi}/include/irssi/src/";
diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix
index d631f4aa2146..78646f7a8b2f 100644
--- a/pkgs/applications/networking/irc/quassel/default.nix
+++ b/pkgs/applications/networking/irc/quassel/default.nix
@@ -65,6 +65,9 @@ in with stdenv; mkDerivation rec {
++ edf withKDE "WITH_KDE";
preFixup =
+ lib.optionalString daemon ''
+ wrapProgram "$out/bin/quasselcore" --suffix PATH : "${qtbase.bin}/bin"
+ '' +
lib.optionalString buildClient ''
wrapProgram "$out/bin/quassel${lib.optionalString client "client"}" \
--prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules"
diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index e9484044fcc6..1b730af54fea 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -1,81 +1,129 @@
-{ stdenv, fetchurl, ncurses, openssl, aspell, gnutls
-, zlib, curl , pkgconfig, libgcrypt
+{ stdenv, fetchurl, fetchpatch, lib
+, ncurses, openssl, aspell, gnutls
+, zlib, curl, pkgconfig, libgcrypt
, cmake, makeWrapper, libobjc, libresolv, libiconv
+, writeScriptBin, symlinkJoin # for withPlugins
, asciidoctor # manpages
, guileSupport ? true, guile
, luaSupport ? true, lua5
, perlSupport ? true, perl
-, pythonPackages
+, pythonSupport ? true, pythonPackages
, rubySupport ? true, ruby
, tclSupport ? true, tcl
-, extraBuildInputs ? [] }:
-
-assert guileSupport -> guile != null;
-assert luaSupport -> lua5 != null;
-assert perlSupport -> perl != null;
-assert rubySupport -> ruby != null;
-assert tclSupport -> tcl != null;
+, extraBuildInputs ? []
+, configure ? null
+, runCommand }:
let
inherit (pythonPackages) python pycrypto pync;
-in
+ plugins = [
+ { name = "perl"; enabled = perlSupport; cmakeFlag = "ENABLE_PERL"; buildInputs = [ perl ]; }
+ { name = "tcl"; enabled = tclSupport; cmakeFlag = "ENABLE_TCL"; buildInputs = [ tcl ]; }
+ { name = "ruby"; enabled = rubySupport; cmakeFlag = "ENABLE_RUBY"; buildInputs = [ ruby ]; }
+ { name = "guile"; enabled = guileSupport; cmakeFlag = "ENABLE_GUILE"; buildInputs = [ guile ]; }
+ { name = "lua"; enabled = luaSupport; cmakeFlag = "ENABLE_LUA"; buildInputs = [ lua5 ]; }
+ { name = "python"; enabled = pythonSupport; cmakeFlag = "ENABLE_PYTHON"; buildInputs = [ python ]; }
+ ];
+ enabledPlugins = builtins.filter (p: p.enabled) plugins;
-stdenv.mkDerivation rec {
- version = "1.9";
- name = "weechat-${version}";
+ weechat =
+ assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
+ stdenv.mkDerivation rec {
+ version = "1.9.1";
+ name = "weechat-${version}";
- src = fetchurl {
- url = "http://weechat.org/files/src/weechat-${version}.tar.bz2";
- sha256 = "0xfnhaxmvxdxs3ic0qs5lwq3yl4pi5ib99p0p5lv3v2vldqlm4lc";
- };
+ src = fetchurl {
+ url = "http://weechat.org/files/src/weechat-${version}.tar.bz2";
+ sha256 = "1kgi079bq4n0wb7hc7mz8p7ay1b2m0a4wpvb92sfsxrnh10qr5m1";
+ };
- outputs = [ "out" "man" ];
+ patches = [
+ # TODO: Remove this patch when weechat is updated to a release that
+ # incorporates weechat/weechat#971
+ (fetchpatch {
+ url = https://github.com/lheckemann/weechat/commit/45a4f0565cc745b9c6e943f20199015185696df0.patch;
+ sha256 = "0x7vv7g0k3b2hj444x2cinyv1mq5bkr6m18grfnyy6swbymzc9bj";
+ })
+ ];
- enableParallelBuilding = true;
- cmakeFlags = with stdenv.lib; [
- "-DENABLE_MAN=ON"
- "-DENABLE_DOC=ON"
- ]
- ++ optionals stdenv.isDarwin ["-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib" "-DCMAKE_FIND_FRAMEWORK=LAST"]
- ++ optional (!guileSupport) "-DENABLE_GUILE=OFF"
- ++ optional (!luaSupport) "-DENABLE_LUA=OFF"
- ++ optional (!perlSupport) "-DENABLE_PERL=OFF"
- ++ optional (!rubySupport) "-DENABLE_RUBY=OFF"
- ++ optional (!tclSupport) "-DENABLE_TCL=OFF"
- ;
+ outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins;
- buildInputs = with stdenv.lib; [
- ncurses python openssl aspell gnutls zlib curl pkgconfig
- libgcrypt pycrypto makeWrapper
- cmake
- asciidoctor
+ enableParallelBuilding = true;
+ cmakeFlags = with stdenv.lib; [
+ "-DENABLE_MAN=ON"
+ "-DENABLE_DOC=ON"
]
- ++ optionals stdenv.isDarwin [ pync libobjc libresolv ]
- ++ optional guileSupport guile
- ++ optional luaSupport lua5
- ++ optional perlSupport perl
- ++ optional rubySupport ruby
- ++ optional tclSupport tcl
- ++ extraBuildInputs;
+ ++ optionals stdenv.isDarwin ["-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib" "-DCMAKE_FIND_FRAMEWORK=LAST"]
+ ++ map (p: "-D${p.cmakeFlag}=" + (if p.enabled then "ON" else "OFF")) plugins
+ ;
- NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}"
- # Fix '_res_9_init: undefined symbol' error
- + (stdenv.lib.optionalString stdenv.isDarwin "-DBIND_8_COMPAT=1 -lresolv");
+ buildInputs = with stdenv.lib; [
+ ncurses openssl aspell gnutls zlib curl pkgconfig
+ libgcrypt makeWrapper cmake asciidoctor
+ ]
+ ++ optionals stdenv.isDarwin [ libobjc libresolv ]
+ ++ concatMap (p: p.buildInputs) enabledPlugins
+ ++ extraBuildInputs;
- postInstall = with stdenv.lib; ''
- NIX_PYTHONPATH="$out/lib/${python.libPrefix}/site-packages"
- wrapProgram "$out/bin/weechat" \
- ${optionalString perlSupport "--prefix PATH : ${perl}/bin"} \
- --prefix PATH : ${pythonPackages.python}/bin \
- --prefix PYTHONPATH : "$PYTHONPATH" \
- --prefix PYTHONPATH : "$NIX_PYTHONPATH"
- '';
+ NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}"
+ # Fix '_res_9_init: undefined symbol' error
+ + (stdenv.lib.optionalString stdenv.isDarwin "-DBIND_8_COMPAT=1 -lresolv");
- meta = {
- homepage = http://www.weechat.org/;
- description = "A fast, light and extensible chat client";
- license = stdenv.lib.licenses.gpl3;
- maintainers = with stdenv.lib.maintainers; [ lovek323 garbas the-kenny ];
- platforms = stdenv.lib.platforms.unix;
- };
-}
+ postInstall = with stdenv.lib; ''
+ for p in ${concatMapStringsSep " " (p: p.name) enabledPlugins}; do
+ from=$out/lib/weechat/plugins/$p.so
+ to=''${!p}/lib/weechat/plugins/$p.so
+ mkdir -p $(dirname $to)
+ mv $from $to
+ done
+ '';
+
+ meta = {
+ homepage = http://www.weechat.org/;
+ description = "A fast, light and extensible chat client";
+ license = stdenv.lib.licenses.gpl3;
+ maintainers = with stdenv.lib.maintainers; [ lovek323 garbas the-kenny lheckemann ];
+ platforms = stdenv.lib.platforms.unix;
+ };
+ };
+in if configure == null then weechat else
+ let
+ perlInterpreter = perl;
+ config = configure {
+ availablePlugins = let
+ simplePlugin = name: {pluginFile = "${weechat.${name}}/lib/weechat/plugins/${name}.so";};
+ in rec {
+ python = {
+ pluginFile = "${weechat.python}/lib/weechat/plugins/python.so";
+ withPackages = pkgsFun: (python // {
+ extraEnv = ''
+ export PYTHONHOME="${pythonPackages.python.withPackages pkgsFun}"
+ '';
+ });
+ };
+ perl = (simplePlugin "perl") // {
+ extraEnv = ''
+ export PATH="${perlInterpreter}/bin:$PATH"
+ '';
+ };
+ tcl = simplePlugin "tcl";
+ ruby = simplePlugin "ruby";
+ guile = simplePlugin "guile";
+ lua = simplePlugin "lua";
+ };
+ };
+
+ inherit (config) plugins;
+
+ pluginsDir = runCommand "weechat-plugins" {} ''
+ mkdir -p $out/plugins
+ for plugin in ${lib.concatMapStringsSep " " (p: p.pluginFile) plugins} ; do
+ ln -s $plugin $out/plugins
+ done
+ '';
+ in writeScriptBin "weechat" ''
+ #!${stdenv.shell}
+ export WEECHAT_EXTRA_LIBDIR=${pluginsDir}
+ ${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins}
+ exec ${weechat}/bin/weechat "$@"
+ ''
diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/applications/networking/linssid/default.nix
index ad571888a9ca..4bd0f2e73e6f 100644
--- a/pkgs/applications/networking/linssid/default.nix
+++ b/pkgs/applications/networking/linssid/default.nix
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "13d35rlcjncd8lx3khkgn9x8is2xjd5fp6ns5xsn3w6l4xj9b4gl";
};
- nativeBuildInputs = [ qmake ];
- buildInputs = [ qtbase qtsvg pkgconfig boost qwt6 ];
+ nativeBuildInputs = [ pkgconfig qmake ];
+ buildInputs = [ qtbase qtsvg boost qwt6 ];
patches = [ ./0001-unbundled-qwt.patch ];
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Graphical wireless scanning for Linux";
- homepage = http://sourceforge.net/projects/linssid/;
+ homepage = https://sourceforge.net/projects/linssid/;
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix
index 8ba53b343f30..0324012b278b 100644
--- a/pkgs/applications/networking/mailreaders/astroid/default.nix
+++ b/pkgs/applications/networking/mailreaders/astroid/default.nix
@@ -1,31 +1,30 @@
-{ stdenv, fetchFromGitHub, scons, pkgconfig, gnome3, gmime, webkitgtk24x-gtk3
+{ stdenv, fetchFromGitHub, scons, pkgconfig, gnome3, gmime3, webkitgtk24x-gtk3
, libsass, notmuch, boost, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "astroid-${version}";
- version = "0.9.1";
+ version = "0.10.2";
src = fetchFromGitHub {
owner = "astroidmail";
repo = "astroid";
rev = "v${version}";
- sha256 = "0ha2jd3fvc54amh0x8f58s9ac4r8xgyhvkwd4jvs0h4mfh6cg496";
+ sha256 = "0y1i40xbjjvnylqpdkvj0m9fl6f5k9zk1z4pqg3vhj8x1ys8am1c";
};
nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ];
- buildInputs = [ gnome3.gtkmm gmime webkitgtk24x-gtk3 libsass gnome3.libpeas
- notmuch boost gnome3.gsettings_desktop_schemas
- gnome3.adwaita-icon-theme ];
+ buildInputs = [ gnome3.gtkmm gmime3 webkitgtk24x-gtk3 libsass gnome3.libpeas
+ notmuch boost gnome3.gsettings_desktop_schemas ];
buildPhase = "scons --propagate-environment --prefix=$out build";
installPhase = "scons --propagate-environment --prefix=$out install";
- meta = {
+ meta = with stdenv.lib; {
homepage = https://astroidmail.github.io/;
description = "GTK+ frontend to the notmuch mail system";
- maintainers = [ stdenv.lib.maintainers.bdimcheff ];
- license = stdenv.lib.licenses.gpl3Plus;
- platforms = stdenv.lib.platforms.linux;
+ maintainers = with maintainers; [ bdimcheff SuprDewd ];
+ license = licenses.gpl3Plus;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
index 01978a4da7e1..cccfdbc75608 100644
--- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix
+++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
@@ -39,6 +39,8 @@ stdenv.mkDerivation rec {
sha256 = "0hlm2jipyr4z6izlrpvabpz4ivh49i13avnm848kr1nv68pkq2cd";
};
+ outputs = [ "out" "dev" ];
+
patches = [ ./mime.patch ];
hardeningDisable = [ "format" ];
diff --git a/pkgs/applications/networking/mailreaders/lumail/default.nix b/pkgs/applications/networking/mailreaders/lumail/default.nix
index d28144f92ba8..2c1678e994fb 100644
--- a/pkgs/applications/networking/mailreaders/lumail/default.nix
+++ b/pkgs/applications/networking/mailreaders/lumail/default.nix
@@ -12,8 +12,9 @@ stdenv.mkDerivation {
sha256 = "1rni5lbic36v4cd1r0l28542x0hlmfqkl6nac79gln491in2l2sc";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig lua5_2 file ncurses gmime pcre-cpp
+ lua5_2 file ncurses gmime pcre-cpp
perl perlPackages.JSON perlPackages.NetIMAPClient
];
diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix
index 6b8cf89fc75b..b1ca80fc7e47 100644
--- a/pkgs/applications/networking/mailreaders/mailnag/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix
@@ -1,9 +1,14 @@
-{ stdenv, fetchurl, gettext, gtk3, python2Packages
+{ stdenv, fetchurl, gettext, gtk3, pythonPackages
, gdk_pixbuf, libnotify, gst_all_1
-, libgnome_keyring3 ? null, networkmanager ? null
+, libgnome_keyring3, networkmanager
+, wrapGAppsHook, gnome3
+# otherwise passwords are stored unencrypted
+, withGnomeKeyring ? true
}:
-python2Packages.buildPythonApplication rec {
+let
+ inherit (pythonPackages) python;
+in pythonPackages.buildPythonApplication rec {
name = "mailnag-${version}";
version = "1.2.1";
@@ -13,26 +18,23 @@ python2Packages.buildPythonApplication rec {
};
buildInputs = [
- gettext gtk3 python2Packages.pygobject3 python2Packages.dbus-python
- python2Packages.pyxdg gdk_pixbuf libnotify gst_all_1.gstreamer
+ gettext gtk3 gdk_pixbuf libnotify gst_all_1.gstreamer
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
- gst_all_1.gst-plugins-bad libgnome_keyring3 networkmanager
+ gst_all_1.gst-plugins-bad
+ gnome3.defaultIconTheme
+ ] ++ stdenv.lib.optional withGnomeKeyring libgnome_keyring3;
+
+ nativeBuildInputs = [
+ wrapGAppsHook
];
- preFixup = ''
- for script in mailnag mailnag-config; do
- wrapProgram $out/bin/$script \
- --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
- --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
- --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
- --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" \
- --prefix PYTHONPATH : "$PYTHONPATH"
- done
- '';
+ propagatedBuildInputs = with pythonPackages; [
+ pygobject3 dbus-python pyxdg
+ ];
buildPhase = "";
- installPhase = "python2 setup.py install --prefix=$out";
+ installPhase = "${python}/bin/python setup.py install --prefix=$out";
doCheck = false;
diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix
index e18d95dc1220..4b522518e3f2 100644
--- a/pkgs/applications/networking/mailreaders/neomutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix
@@ -1,27 +1,43 @@
-{ stdenv, fetchFromGitHub, which, autoreconfHook, ncurses, perl
-, cyrus_sasl, gss, gpgme, kerberos, libidn, notmuch, openssl, lmdb, libxslt, docbook_xsl }:
+{ stdenv, fetchFromGitHub, which, autoreconfHook, writeScript, ncurses, perl
+, cyrus_sasl, gss, gpgme, kerberos, libidn, notmuch, openssl, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42 }:
-stdenv.mkDerivation rec {
- version = "20170912";
+let
+ muttWrapper = writeScript "mutt" ''
+ #!${stdenv.shell} -eu
+
+ echo 'The neomutt project has renamed the main binary from `mutt` to `neomutt`.'
+ echo ""
+ echo 'This wrapper is provided for compatibility purposes only. You should start calling `neomutt` instead.'
+ echo ""
+ read -p 'Press any key to launch NeoMutt...' -n1 -s
+ exec neomutt "$@"
+ '';
+
+in stdenv.mkDerivation rec {
+ version = "20171027";
name = "neomutt-${version}";
src = fetchFromGitHub {
owner = "neomutt";
repo = "neomutt";
rev = "neomutt-${version}";
- sha256 = "0qndszmaihly3pp2wqiqm31nxbv9ys3j05kzffaqhzngfilmar9g";
+ sha256 = "0pwc5zdxc9h23658dfkzndfj1ld3ijyvcxmsiv793y3i4dig0s3n";
};
- nativeBuildInputs = [ autoreconfHook docbook_xsl libxslt.bin which ];
buildInputs = [
cyrus_sasl gss gpgme kerberos libidn ncurses
notmuch openssl perl lmdb
];
+ nativeBuildInputs = [ autoreconfHook docbook_xsl docbook_xml_dtd_42 libxslt.bin which ];
+
+ enableParallelBuilding = true;
+
postPatch = ''
- for f in doc/*.xsl ; do
+ for f in doc/*.{xml,xsl}* ; do
substituteInPlace $f \
- --replace http://docbook.sourceforge.net/release/xsl/current ${docbook_xsl}/share/xml/docbook-xsl
+ --replace http://docbook.sourceforge.net/release/xsl/current ${docbook_xsl}/share/xml/docbook-xsl \
+ --replace http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd ${docbook_xml_dtd_42}/xml/dtd/docbook/docbookx.dtd
done
'';
@@ -29,14 +45,14 @@ stdenv.mkDerivation rec {
"--enable-debug"
"--enable-gpgme"
"--enable-notmuch"
- "--with-homespool=mailbox"
- "--with-gss"
- "--with-mailpath="
- "--with-ssl"
- "--with-sasl"
"--with-curses"
+ "--with-gss"
+ "--with-homespool=mailbox"
"--with-idn"
"--with-lmdb"
+ "--with-mailpath="
+ "--with-sasl"
+ "--with-ssl"
# Look in $PATH at runtime, instead of hardcoding /usr/bin/sendmail
"ac_cv_path_SENDMAIL=sendmail"
@@ -47,9 +63,9 @@ stdenv.mkDerivation rec {
# like pgpring, pgpewrap, ...
NIX_LDFLAGS = "-lidn";
- configureScript = "./prepare";
-
- enableParallelBuilding = true;
+ postInstall = ''
+ cp ${muttWrapper} $out/bin/mutt
+ '';
meta = with stdenv.lib; {
description = "A small but very powerful text-based mail client";
diff --git a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix
index ae6033556faf..f5d48d03c96a 100644
--- a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "0mz0llf1ggl1k46brgrqj3i8qlg1ycmkc5a3a0kg8fg4s1c1m6xk";
};
- buildInputs = [ pkgconfig glib notmuch ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ glib notmuch ];
# Required until notmuch-addrlookup can be compiled against notmuch >= 0.25
patches = [ ./0001-notmuch-0.25-compatibility-fix.patch ];
diff --git a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix
new file mode 100644
index 000000000000..dbdd64d06b5e
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, gawk, mercury, pandoc, ncurses, gpgme }:
+
+stdenv.mkDerivation rec {
+ name = "notmuch-bower-${version}";
+ version = "2017-09-27";
+
+ src = fetchFromGitHub {
+ owner = "wangp";
+ repo = "bower";
+ rev = "e4918ed581984bf2813f51f007a0aaaa7fa0da7f";
+ sha256 = "13np5yharjik1pp23cfgffi0g0ikl6pl5sqqyy0ki7gk7gyy913i";
+ };
+
+ nativeBuildInputs = [ gawk mercury pandoc ];
+
+ buildInputs = [ ncurses gpgme ];
+
+ makeFlags = [ "PARALLEL=-j$(NIX_BUILD_CORES)" "bower" "man" ];
+
+ installPhase = ''
+ mkdir -p $out/bin
+ mv bower $out/bin/
+ mkdir -p $out/share/man/man1
+ mv bower.1 $out/share/man/man1/
+ '';
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/wangp/bower;
+ description = "A curses terminal client for the Notmuch email system";
+ maintainers = with maintainers; [ erictapen ];
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index 74e43a728d7f..93d180a327b7 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -25,8 +25,9 @@ stdenv.mkDerivation rec {
sha256 = "02z6d87ip1hkipz8d7w0sfklg8dd5fd5vlgp768640ixg0gqvlk5";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig gnupg # undefined dependencies
+ gnupg # undefined dependencies
xapian gmime talloc zlib # dependencies described in INSTALL
doxygen perl # (optional) api docs
pythonPackages.sphinx pythonPackages.python # (optional) documentation -> doc/INSTALL
diff --git a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix
index c008c478d22b..b865622efe42 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
url = "http://www.muchsync.org/src/${name}.tar.gz";
sha256 = "1dqp23a043kkzl0g2f4j3m7r7lg303gz7a0fsj0dm5ag3kpvp5f1";
};
- buildInputs = [ notmuch openssl pkgconfig sqlite xapian zlib ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ notmuch openssl sqlite xapian zlib ];
meta = {
description = "Synchronize maildirs and notmuch databases";
platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
index ed811cf82ae1..7ac8091e1c11 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
@@ -1,595 +1,595 @@
{
- version = "52.3.0";
+ version = "52.4.0";
sources = [
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ar/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ar/thunderbird-52.4.0.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha512 = "55c80c62ad45ece24f90b99a994d35aa130e2a42be5512e6efcebbcf66a6b26905cd28a42944bddc1b1c0c6ba9c488331c88ff478983c8ff8ab61c3fa7c6d234";
+ sha512 = "28a0114c665250f419d77f1f3898af6533e1b8b82b546ecd3ca9baf801751fd189239093eaecdabab9a9318fd47020b647086a31676158a21656ff7c477dbbf8";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ast/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ast/thunderbird-52.4.0.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha512 = "714006603d091000b777130c45bfb5a0e4e2ed3c782d7bf17c1244d4c860a13dc0be58adaf447307149a2a5da90a1a08c3aac0a598c764d2bd491eef5c161c1e";
+ sha512 = "f7b9d53202597ef666ca87eb1f8cbb439af386eb78460558e8bef33502a7eac591d43751beb52319d046d780fb38a78e685fa8cb3baaa6abfef439bed6ab3d1a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/be/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/be/thunderbird-52.4.0.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha512 = "be529be10ab41deab394e8a2b18f5247e64dd00fccb16cd3f95924baf0a9f1924a05f1fea97346ea171d416d44b4cdb9e5d38ea678ad1f64912aac0224f4ee63";
+ sha512 = "a9a39cf4477e469774f2ce7b7012948911009ff2ab26948a177f3efa9e8ccbcb7d7f3d3ab609742fe1d177253dcdeacb78f7b4a9874f3156f6f54203d0ed42ef";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/bg/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/bg/thunderbird-52.4.0.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha512 = "4726efa8ca6b72fea6acec1f8c0aec6b208f495b3dfaa68d6e26797f4998c5e3150e4e3b725e0042dc953c7b9d88c97468fa03e382b636b057c8dd451126710c";
+ sha512 = "38fc89a687344467f98cb2e31967aa53f3c502a8f288b5d65e6aa91a578b250c17750ea998d32d58511920a0a5a1224e77e2691a381b7526585e341712d82cbd";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/bn-BD/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/bn-BD/thunderbird-52.4.0.tar.bz2";
locale = "bn-BD";
arch = "linux-x86_64";
- sha512 = "d0f16014b3dce0b6de06233038a8585ee6a8ec2b7a45ae406dbb71370d931bdd51100d1d68ce29ddd2329efb6eed033d1856ddf29b6515484247e6f11c4f7dd7";
+ sha512 = "437d943339c4955b5264f95bdd4aaa2a91d448a393e6561bbb41c078a960100962c1d51bad73172c5f5cd691f713ab34c218ff5c3e3cde3641d8a6ad604f6d75";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/br/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/br/thunderbird-52.4.0.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha512 = "c52c416dda11dd69e78a7ace3d6309b1cc8327adaac74cf831af42b75bf4da9dabec50771014189128dec79487d224f0ad6e9c335a5343c75bf54f828829058d";
+ sha512 = "5c43e3cc4366792b7c7a44ae36fe2bd9e6b459f540868dcee767193826648b03a4e4a447f83f5787036e48c96e75639a305304e050a91f0925d9ee4db97e5b75";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ca/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ca/thunderbird-52.4.0.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha512 = "d0ab90bd0262476565ac48d597c699529cdfa2d4773397f1a458f7d97989b982bd9dc34c2a689d03a1a0f67c53d67ff86af1010bb0e5db55f61bfc68db96011b";
+ sha512 = "c2243ee5f160f786ebced364432b4a3b489699a3f024a8da327cfaa3c5e2d0d58884870311416fcb019723d5bfec8294440c701c6c453c15346f5f765c4449c0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/cs/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/cs/thunderbird-52.4.0.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha512 = "ae3e3c12f0e75b449ea6d6d24858bf6036e9db8b7d6a08156d5a9026cbdb53d736a1b459109cc6dddae3d0d6c08856e829beabc8a53c20ba8741cfc0c18d395f";
+ sha512 = "332faf549d1d988defdce1531fb4cc81e5f1565423f3e24ebfe16581275224539ed50857dec04c8aa66cc55372a76b676816831d08842bbafd227ca3058f9b5b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/cy/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/cy/thunderbird-52.4.0.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha512 = "c6ff55856517ed5b99ad30e649b1ac31d7d529706eb8154eb235817f4b168331e57e845d6648e2bcea574b3233587cadb63c118614598e0dcfabe3ae3d5370b1";
+ sha512 = "bfe220ed1e1d8d156f0c1cf7ea11b0778bc0b23f7335b90c65bf581c9e2cd22db9a7f5d48d7a6a95f1d21693714a216d2a24249f36aed7ce097f205d4d05d6f3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/da/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/da/thunderbird-52.4.0.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha512 = "c0bff66366fcd9b7c62c352dbd25bec95a444b3bcc513598ec834191e7eef47a07cd0ab6a72dbe7b9f14dd323c085f4b8bb4b31ac0f2536d08b08d1c86693bb6";
+ sha512 = "dcff4359821cb6b24ba129671a1716394afd642a5c4b887a1905baf82cf5d2a94512a547780cd42b1478f443f59db5a3363a52d719824af050dd69af54f97a02";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/de/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/de/thunderbird-52.4.0.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha512 = "010b56755f7107e32df25481a2febc7d0468bd27a6ec5521af32d80382c96653a2989a70e2dd7350452ebfb25f5691a161ff5fd74228b9b3670475942f7b0f6b";
+ sha512 = "f5071c052814eab801f3d2c98751c05486b211f23b511b27a1ad5810634b763ada3bd890288e4934c16a28742ef023ef089de9d84a188f6e19d07f471b289583";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/dsb/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/dsb/thunderbird-52.4.0.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha512 = "735d07ecbbff46b242a103676fb8190e082fe71f8a64f19f82f18a42dae50328cd4e473bd06722a20521cbce50afceb24b61d144b4ebdd1cb83a8ff3b041530a";
+ sha512 = "522d365f32b28620a7936cf5a8fb230db6fee8c1ae055a27e6649cff8559811684168eacf019ec16d6268e405607a576d46e1d5ba4759c1e3fd10736d7560370";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/el/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/el/thunderbird-52.4.0.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha512 = "29361a698dab6b4d3f369393ec4c06797c1a37fe4bbce8b48f0f5216225fb26125b4f0c814255c0c964a24fb37c2865dce64197d1584385c01f0e655947d9884";
+ sha512 = "ecf3dcadb1a82310494063cc317ee248b91c30594ba89a9c58a71349a423cf9e66c5bd06be4d1488ee6cd5027187bae1364144037b9ac3cd4bc8af7cd4396810";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/en-GB/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/en-GB/thunderbird-52.4.0.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha512 = "8d3fc25a21aa2f38089bbfa8013104de0c6c6e95407289ecc82f5c003e732d51bf160106dff07b202d6a6d0fee989a08e75bf616cd98ac1b080605b631c2be69";
+ sha512 = "8ddde6cd0270cffc26cdb4c4513213405b71ea4315d69a3b1bef602bbd58eca30bc09d0ddd41996cd77881e2d678dd13a93d07fa833210780dba146a931db383";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/en-US/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/en-US/thunderbird-52.4.0.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha512 = "ce05330aa7032f0cae542578cb49f7e8bbc7971be455817126bc77212ebd35ec701691ed91758e7c5b663f4731ed19c2864728908816e71023be36d13ba98bfb";
+ sha512 = "edf130b3b061f15137e6eb83c9674642f0f475de56b293d4acde60f1e7ebcf0d262085fa2a513787ac201ceec5552c029167cec5ad0556baa7b0dd3b52ae4c3f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/es-AR/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/es-AR/thunderbird-52.4.0.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha512 = "52058cd4b0eaa68756fd7b7ffa294fe0720a876fe176199cc67892b3d33615a92238c4fc90ce7cf9b70b3a57f3272ca7bdab8499b3d6d864775e97ab2f91c68a";
+ sha512 = "931644cbf5e7b4f032f607a52a78f553a7a2ee8fc77fb7d0e73e6d276a6a1ba4a724cc91921c5ef5ac5ad21a3536ffbff264b80eb8d8a658133a24ca0b869456";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/es-ES/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/es-ES/thunderbird-52.4.0.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha512 = "f447cfcf7c4febbe5244f5004e2b6a19bd03a7dc1cac5b609af8726bf9cd915e1ca2ff81aac65ac62386390b28aa1d3a6f2283d8c479b4d97c6df34e54918544";
+ sha512 = "c2673d9f6b347493e3fc807cec86f55300a6e894c9c1edd7f7bec63cb073fdda2e9cf7794269f02f744280788bbcb8e42ee6249c317aabc57f91cbaa3635492f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/et/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/et/thunderbird-52.4.0.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha512 = "46744b2d6cd187ae58967e1be2962ae7cc4e3d4a32d195767777634d4c8b9843979896524ec90a00fe8bb1d367c7ae9d540da5705a9529d0126a165b4b7148d4";
+ sha512 = "dd634f76848fb990b4fb1bd28e2cceafca651280ece9ead3aad6b9746d0eaeef76b5ad925163a68367d84f66949e799e2649cf358ad0949ee4f2538c71b8914b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/eu/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/eu/thunderbird-52.4.0.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha512 = "c00558d88e6f8d9e89dc5717d677caa2a1bcb319a06b03f20e951b94d8dd79bb6d2d8875dde07f59be344330a8b36db00d0c57c7542877207f344e25dda91488";
+ sha512 = "1c9f04cc1b32ffb21bfacb186f327aa945f36f12ae316a9cff8b2a4f8584ff8847ac5be1c8bd898ea1a71fbf3294a2f54b270eb6f0b63abb3da3178c6a125600";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/fi/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/fi/thunderbird-52.4.0.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha512 = "668d7f4793fa0c700b1abb75f185a26b9734da8f9d9faf327ad08503802017e93726de3124818650099570de58650709f3886dc6d8af24731d83c16486a54acd";
+ sha512 = "03880d8334ede087a419443e9fb56bcf6727c652f435a366b4b49fb6116a62225686297ba82f298378e03267dc1aa50e90d75b81ea277a7afeb93331c45c3459";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/fr/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/fr/thunderbird-52.4.0.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha512 = "aabeea2843ac8c126c53d862054b27263b03f65f3ba848445a55615ef7e6f972792b2e634133877cbeeabd74e455a2b47d36ff76e5a4162fb7caeac3856f10d1";
+ sha512 = "6f9909df3329a32d6d0c2203b484fdaa8b54a17849283bffcb04298601a284a6fe30eac20ec6b3a97ad2e8e3d4e0360c6145e87baa2af11049ae0d94fe9dcd44";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/fy-NL/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/fy-NL/thunderbird-52.4.0.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha512 = "a0e1132009e63654dc5fdde6989f758c88ce02327dc4b2e870c925886fd350867ee78958095743b582bfa77af4f2f80a497980cb3e5308dac47bcdeef88c493e";
+ sha512 = "b20f130ad4a9b0f8448707945773cc76198e04854a0114a06379fd33c3d5abd9abb1f14e4f145df9c1c46e5d1e09522af640ded99f4f20543fd444e365d81fb9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ga-IE/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ga-IE/thunderbird-52.4.0.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha512 = "ff43e823765ec9354edc3c0009ec5a2e004e31c01602b875f538b01957bb4953e15f8a60c4ea5695af6e541566d21e4d4ea7ef4d8d3464f4dd59072269cc2eec";
+ sha512 = "3fd6839351470d65f14165e3633c80950270ede2c4c9e658c001424126ffbf29c7bde86a720ca33e50cbe9a5306f0339c5cd491371e3ad03a6ee575c75889d63";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/gd/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/gd/thunderbird-52.4.0.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha512 = "d2f1c25cef09c4e3946050af1bfadb3f8ee70bea6c9ac2d8c25e2f422a160c3cabd76373679b4fefdfe838722f69e4ce138c50c03de221c31e71878d66377d22";
+ sha512 = "a7aae188c866586606f9adb82d5110bc2b89a6bd757191e798b9b2dc799916ae56cbc82932f4b8da76e88a3c1f5ffc828c58aee0cd8f83ede19bde2be2164b79";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/gl/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/gl/thunderbird-52.4.0.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha512 = "3ef058fa97459f41f204ea80393f27a0b572039bec4a49eef80db0402579620e28acda8613adbfe6c2cc267386a5cdb8d95fac4dfff2358a9bf4ba22a1bc24c5";
+ sha512 = "3cdab0c553f1d09cdb4dfd1160371eec3d1f878329dcf2f81a177f17647f8dd9b73566a56427d2a593f70f6aecfec951e3dfc2a389c838a4069e5f4db68c10eb";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/he/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/he/thunderbird-52.4.0.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha512 = "b54188bf2ba0e2e6470db0a938c77710c66e1b1d359be2ae3f306a7a2ecf34501f797baf9348609c63fdc68d1374382855509ccfe619c444150a4214ee819bf2";
+ sha512 = "b71593a5c7cf8fe3960c701f5bce270366f5717b7ccd2a5f20dcdf402d1435b79db06662629deb4bd28e24b251fd2fa1a71a9e932f132e2df7a25ab5a8849de3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/hr/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/hr/thunderbird-52.4.0.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha512 = "bc5ca4099fa6d5f7884f7fefb1942aecac4aa6cdc338d8608433f3aca9ce14c8838e68aa79e48e88b453498d5d0b992a583daf6abf6f97bb4cda5d7ffdcf8194";
+ sha512 = "d55deeebb9605565ae3c062c8617d7e351f2f514c13f00507d75a5da4ef8e8d845247147d2aa111d4e78c57ceb01404ed3ac2bb69883bddab7b59ce0ff5eff35";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/hsb/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/hsb/thunderbird-52.4.0.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha512 = "5b8c7468fd777d9a4f046224ad516a740fd4acabc5dd30578dfc843f772dc1d0f08b4fb257db7d4d39d58eeb6468126ddd9267c1562e8ee7d23f07e02e4babbe";
+ sha512 = "c177a0e3c6074eef1abf086fa34e95b09f39a1529ce640927b7be6ee8b7ee8c740ba4e2afbadefe3fa83314cb7c3223499b1a5f08e3b4e381b60bee1ffbdac7c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/hu/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/hu/thunderbird-52.4.0.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha512 = "3dfb629b804513e40852d810ce5ed3e0af0cd8c7bb92a44dc6c08f2e3a45de45d2c3ccb75616a9f9d7019a8ce9b4856e27baa283647eb63e953071fd410dd418";
+ sha512 = "1442a03fa4367d1f33337d0e88a193de8a6992ab8aa91e28e4a46b8f1860a3cc346d15c00d745b5074b8dec1beca5dba182b5fe2e87827e7ea83b82aba28b721";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/hy-AM/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/hy-AM/thunderbird-52.4.0.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha512 = "4dfc61099b3f8502add36f3b215283140b8084504048d95ac31b948cb8e53fca658076fc7164cd2c20742edafb8f7ad5e08f2cdcb8c9cc764573e2e065364b20";
+ sha512 = "c01325976516765a14a196ff04eb3296a2dfd81670cbf4d693682e78795b14b54f4d2801566f0ccd52c52f0b7100b6040f4e3540c4f3cb8c8b92038e059df45d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/id/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/id/thunderbird-52.4.0.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha512 = "5525d0507fbf7c7503b9a58c50ec248932e70d899ff88c1b8cdb18484d3cf4ce76fa1121a7cb5adfa3c19e1c83ecc5e888d652275400a2f92dce3e0fdbe51353";
+ sha512 = "db56686b1d8713da9584e03633bcb2b14706c0b44d24484d6625de638eddcbdad1b1afacecf7dba52db6d18b2bbaaa15ea5f4d492366c24c5e2e212050f16c12";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/is/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/is/thunderbird-52.4.0.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha512 = "1fe92018d666ccfe1bf063dd191d88f3c9fbd452e7820065e45b79de534baad9d8750d4cefbc39902d49d532fd5500f4b3a167ddd7dcec61677f490daad01d9e";
+ sha512 = "5423202ebccaddd114393e5a2038b2efbe93fd528dc3d7b659987ab5aa2a4ad82921b3b835249285135be67216eed03de6d58b72800d9c7bf87ec812a37f21ab";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/it/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/it/thunderbird-52.4.0.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha512 = "80d6036462d74bb180b0f3d4d384be3b644dda9b3fc008a8d63478ec877462defc88b6f3dc2eb2358489956ef20e057975fbff9f7cf5afd0d894926e617d3225";
+ sha512 = "b64e31155c73f13cd84bb4488e63df5c95473957c792f63f8cf25308d2b860b084aa6beb519a7666fde83d3db25e28ffb1064ddd0abca73ff631924cfa83d7f6";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ja/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ja/thunderbird-52.4.0.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha512 = "d1185fda652104759bc84a095b289ccf6a3721425d60c8f0781578eaf113349de9fca18dd1138f73dd13081ea5388d0f04fd0cfb47142236c1354a167d0362d9";
+ sha512 = "8852c526663f69b038ded6bb1382e02de700eab741cb04ccb8d3e329ee4534477a6ea402134a76fe82a020bad279c66e70bc06b0ed8d0fbaea9aaeaafa051b44";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/kab/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/kab/thunderbird-52.4.0.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha512 = "4bb2184a4a968f6b33c29fab44b11f06743f88b8ecb8d83e5a892c608a03dbe3f643c2e8b5a5fc9ef844801b8bfc2891c9bbbbb306b94698bac5441051c22783";
+ sha512 = "b08dc52afb713142e11805c5b99f73a11bd3c16756dc5bbb6a0c3de13cc801f27438887d8733cf4b97d70d4741abcb0d8782b9e6f6ffc359f38318f1702fcb7f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ko/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ko/thunderbird-52.4.0.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha512 = "49dc08f3a98205e433e81c9bdbeab3f6ed7dca5f3df9af1b6a01470dcfb1a3fb72ce3447ead492fd8f0d49dfcf9028194c94a4cc6e20b1b4c28c64a706975615";
+ sha512 = "0de39397e4401ad939dbce0c02e35505c593398bc2078ad19d680a797a8cfa3f0950a810c8650634e3d40ea3b5265f9e193b77408f1588b51575d87446a336c9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/lt/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/lt/thunderbird-52.4.0.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha512 = "e8b35d834e122dce0b9996060b7582a5b2c0bcd06e1ee7a4b12298bc4aa501ab18bc140fe0f0e2fd63ffad97ec9d287d1614ed76718525c86296ad1167658f9a";
+ sha512 = "13842d9f210dd192e2072c138d8d0778e85d028dde92b08e616dff6ba62f84b6aa36363a259dca69bb006850de2fb8c42fd93874a4befa970d817aad34d47b57";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/nb-NO/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/nb-NO/thunderbird-52.4.0.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha512 = "5efba8423c744c61be72d679e4943e901488984415cbdae9533ef5a26010d0ba072f107cf8a53389f831559e8093b35c01f6eddc76b8a361f60af8166c781207";
+ sha512 = "ec9c96abe94ac17139e9fa83ac2d7ca8ddc6889e7286a4d31e61625db6daea3969fcbaa0796ae0bea41e3a433ed3e170a73c4be1a177bedcbfcf705e306e28e9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/nl/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/nl/thunderbird-52.4.0.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha512 = "b4c6c95cf6df97ffc65d03f04af7221d819ec28b464fcb8173beebb9d810af9b78f64b39e0750d11446ff88a209677512f3735d8f38ebe91ab9842abbf183e65";
+ sha512 = "52e117078f1871bfc7b549a47617d277c763267f7033136c9715223d8f876184c0b5012b193a5f497e1fdba78b902a3c38651e0115829b0f5ca7f0cbb1c439d3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/nn-NO/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/nn-NO/thunderbird-52.4.0.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha512 = "3bc0ea3e17a1161345d4c1313c774a312e591248f07be7c11d9b6c738aea2d91aeee202f2a67ad38df9fda43f5f853aa162990475dcf9248667fc546370b4083";
+ sha512 = "24258bbf5e3643544ba5db26fab9678f7e2a44b390ee993be4a304d148b5a57674158afd308d6ef93a86c8e525b37e1aee55ed07be6953301f164a2da00688d4";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/pa-IN/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/pa-IN/thunderbird-52.4.0.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha512 = "2fef099c73db55dd082f4a9e207ff47096870caef6ef4e9346c7faf3e40dab4d3b0e1e68d1a9dd7a427d97ae65aa347976641aef1872a4c7a6764e8a8c2cfe5b";
+ sha512 = "e9d8b4e6019d4cf1ce562e6cc9b9aeac0e93d8b9ac9283c7e8f260b4d611fe2bd0bf6d71c9f82c9d2cbfba5770659d21cfb03fc2deb36b80be0a424178a65936";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/pl/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/pl/thunderbird-52.4.0.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha512 = "f523fd0d1b1656e80b52dcd8d2f52f7403c22f46eeea850c75c78fb3c1903ba4edc44ae69db755c0a105379855c0c9c33f149fb83d8016a182a32cd5bbea113f";
+ sha512 = "81ced2424282fe6dc7ca6f5e043f6c42ae87cddef900b73fddfe6cd8c488a90e3099824b57d0971816a60c3f43ce66e1799195ae21369958b2e8085018017267";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/pt-BR/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/pt-BR/thunderbird-52.4.0.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha512 = "6428f601375bc877def880aef3ff6b8ff4856696a2040381ca22c60df8e1364cef12e1c878db6b7863d10f8cb02143c06cc58d5df6cc83d1c25e90c846be3fc4";
+ sha512 = "4120b94c13a9fcf1aa31a2abc3fdde27ef8c0354550ae8511b61641745cdd5eaec16e1ddd1d22193ca6680f070b71c188d94cdc75a40fa1596fa88ed59545b28";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/pt-PT/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/pt-PT/thunderbird-52.4.0.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha512 = "6dc2fed4b003f4f120c79a0673d9d7455c0b6362dadc06e15ff612a29758c521d87cea073ca0b81018e57872e6262a09c5efc6e9fdf7b494c152ae4e992260de";
+ sha512 = "a89dd739da5262713c99aa9aa28544e48710e80b83770810b240681ff0546c3b3faa37b48ae56c018a6d1d625f0411df557ced12eddfb3a1198eea474418eb68";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/rm/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/rm/thunderbird-52.4.0.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha512 = "b22bcdbe338fec3267f352ec5554b8e5bd732961917496c6d06a6eef188cabe337bf3fcaac1afce49cd16c891fe7604fa77c13b3eedc7706b262957d5d01171f";
+ sha512 = "3665bad7a0d1f2d725d0a44ad55918228c2d9cef49112fb19d2c3d885d1ec62af89c15aa0ce96ddebdabf97c8a5e10fdd58d892c085e5b9d17bab6658e7bf444";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ro/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ro/thunderbird-52.4.0.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha512 = "cd2f67456fcd20ed48effa2363f4088e48d91f93df66e803527e83a3f8f2f3a74ba22fc0d5c4ef736bc38ad6a6416830833948210ee900600bc36ebde81a9976";
+ sha512 = "07afa28b22705e0e84e17026d04111cb9a5283838fcb94225e2c05da1fa0692770b17052c52d8cfcdb7bd3372fdbba9cd9ed9bc16f6f59f2e3ab6f4308543d91";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ru/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ru/thunderbird-52.4.0.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha512 = "1b6b0adb47f3c52230297b86ead0d259acd12fc56353ed5de9afb84042d82d74193785b4cbb4be2caad302283ff54f8630b69fcc9b846009fa7dc6fdcd7e2525";
+ sha512 = "189c40a8d950496d62f980180502ad342621caf3a2ddffb0fe4f813c9c2d4a25aa375d8ad70c8b7e8ff85f09607bc2ced3366524346a70eed731bd8d9409e5d2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/si/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/si/thunderbird-52.4.0.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha512 = "95c4864692410aa7f9a071f9d4629614b52a05a4a2d8f3d898feb7bbb75e766a8efb8daec9e3badb32c3dc8b4bb1a2b3be80452dbc9bbeb625c9275862396d95";
+ sha512 = "0b6ee1e5ca86472a5cc67cdc242a6b62aeea50609661e369c8dd3dfac5a774f50eaf0a68973b1fe5d6d9bdf6a385c52a90b8711c80facbf9fb301981a7aae395";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/sk/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/sk/thunderbird-52.4.0.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha512 = "04d594a095a4862ac32e8385ad7740afb2033d0601f520206ea504c9b367d685a2c84c43a0279f39105ef56628b66f13f2875c5b6f19f5252a3b63f6d549d876";
+ sha512 = "9c1f164a2da43aeb51e8b64115618590ba0e9284f3eca8b16d3792b33e269a0acc253314ab7943cbaee94ffc2ae321247b4982798d9d48608e85a935afcb6faf";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/sl/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/sl/thunderbird-52.4.0.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha512 = "fe46ca8960024da81fcef7b2aad12bb58431f0cbb4d4c107fdfa8096764221f07feba468bdd2ef5d99665afd0404ae286b37bf2afe8cb6e6fc2a8ae98f9a0ef6";
+ sha512 = "5d4698be05af9f9181af63eb3ca6718feb1c74c81f0a6fbc82217791c911dc5f14ab433d32f6484ced2cd75d5db4b76aff3bbe420d619afcddfcbcaef25873e7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/sq/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/sq/thunderbird-52.4.0.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha512 = "f44325e596690d0f383699debeb8450f02b7969232f1291ba0b02f657a80552ea09caa899948506674818159a98b646217d53c386908cfbb926791dc61a36e82";
+ sha512 = "32d62e6dfe28c67cc7b0e2cd27c96fd7c7e1079790eb73a8731af44e8a62f8fd1ea2e7298dc772e3014fc8255f022f38bbd5478430629140d0dca9ba0daa401e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/sr/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/sr/thunderbird-52.4.0.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha512 = "67ceca6c23768094799eb266cfc09a7340941fc49ae82c608ae6593a7bb1c9d22cf5525577e7815a1c5c8ee64744d7f6c5b790b3e5b46ceef1fde0001a9209ad";
+ sha512 = "6aca04c1b4378489239cef6b5032ef6dfd6d39d84308c335d03e97ea7c48acf021f6cffe35d652e117f71e6ae3f31f54e5ca73a44b4dc51dedcb3f5faf7d016f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/sv-SE/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/sv-SE/thunderbird-52.4.0.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha512 = "7f4ca5dca587ccc3a20c9e962d266ed1f7127d9e0707f585407efc58596e590d6650e8322bd13889afff73eeb7025942d636f3a17c327f9c2dece946ca67e50b";
+ sha512 = "099e22013b8d6791857c378c0f94373ca42d35bbc442cf273c9de2360ab8e64d712eccaedd5a13915ee19a195b6c9f04748ba738e7bbf9b8153edc4c66070d31";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ta-LK/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ta-LK/thunderbird-52.4.0.tar.bz2";
locale = "ta-LK";
arch = "linux-x86_64";
- sha512 = "6a0024f3da37a0ecd2015c9fc574ef3ca3d3f62d75324b006bc32c3be901054549525cef79597489edf22c5de1cd65c1826167132d1e5f7e62a23f12bc966ea3";
+ sha512 = "d3c95f37ffbbc5ef78b7c050a4e091bd9f36fa9529ed7c38e25f5495694c1b792d0bfcf53d15b74b52239acb21bd0d235ceb07c7f68f99e1b31e59e6f6282aaf";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/tr/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/tr/thunderbird-52.4.0.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha512 = "fc897cc02261f65d45ce243367f6cec3f08f08d6e6f64083e81a848c3efbc9098228e3b1bb0d4f9914fe5315748cc8b07d662a204ac4ee2e0e1bd075070614d5";
+ sha512 = "2f79b9d45d747424a65271033a75a86ff503694d88a30238452fbf817ba153c4638395d3e59f5f6cc662ab3361d2304d5a4c925957d9d6e6d7bddf34947acdf7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/uk/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/uk/thunderbird-52.4.0.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha512 = "9c1aa0abdc9d008a40c5681ceac5add498f91fa9454b1b46ac199609e714d01a941705f729f99bc478a37db53cbf0e3c2f2c49e5d4b04a25b629f3fcfa29ad7b";
+ sha512 = "e0d891b4cc082e32d3f6af318f9224e996a8ed3c7e1385bb86a5e2f963239999712c444fed00d779320f6b06efb38f3eb97023e353f91eeb7831b44a870c6394";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/vi/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/vi/thunderbird-52.4.0.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha512 = "84441bc6c6a9882e0b90f9942148e70a5fe3a5d353819fed7aaaf38a7ec985d061e89a99c46e6d42c3c057dd07b44c8123f85a3db0f62b630575e51703d138d6";
+ sha512 = "5a9e13e126c7bc8ef435b8edde1896b9773ce1dfc39fe3fe1bb31e54fe4f592acdb3db360fe0890eb35b1896aeed0954bbd051fde6116b07cb513b1390ee56e7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/zh-CN/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/zh-CN/thunderbird-52.4.0.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha512 = "c1cd1d26ffc425986abdd08b1c3695bb9904087de1f6f192e2bb7ec187f0f433faacd6bc98700b31a11d75e28cb4c9e6f7dd2239d79ef2d0a5b866a58badb9b2";
+ sha512 = "b0374f022c2a259076d52bc0dc142098975f9f1d3a886192332fd1c1b2a5c9dabc0d3fc1a7fc0f28f6f17979931b9c78a9682be1226ff751446c5427a5219a51";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/zh-TW/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/zh-TW/thunderbird-52.4.0.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha512 = "dae4fff5b67b90db1e1e48ca24d63c294b8628cfc64f90227e2100d5f02459757131c7cf51efeba166273fa25a38d5addc035ebb5e945b31826d152f140eb3cd";
+ sha512 = "7e289afc737339be5a3db5869125d891da65fb75a62b7670c3880943ae11bda33122f81cab46bfa95223c45662684b8fb66ec11cfc5f375e024f4d57be098684";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ar/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ar/thunderbird-52.4.0.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha512 = "1bc9384d57827d3d42ba4b2ccaf1ee83077301c855cb98c9ebb58453f96c37429387df7cebbf381fd6a711263584c857e5f6f1c52c915584c97f56051cb03df4";
+ sha512 = "872ceb5933a562d352cb3bfc6e9cc95a7485625e5256380cae367d38a560f75bd7964fed1becfa5359db3befbe4aa249f114df307cf14e2db75dd047d87e5c53";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ast/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ast/thunderbird-52.4.0.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha512 = "11f718f280c3cb0e1b759b721d4133dd76cae85e6e1217f66403956cb08c637de99cecc4954e58f6f1d9e8275dc8607e501e6fbbe3bf71051831336d583042ca";
+ sha512 = "9955dde6ae54c096dbc5e5a28729963a72997fda97505657ccec6e0b5f95f35508815fe663f266932c79ef91463ef6c5da79ace4c19149b17dde9655dbe8017f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/be/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/be/thunderbird-52.4.0.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha512 = "fc376bcd502ae98da16e48e72234e1b8c860aa9e42153c7e89d6ad829d9f4b2696aa7dee75bd240fc25cc7aa291a808184236ace14978a6f203997433db24148";
+ sha512 = "94106fb12bf932f3a8217f3252b4f76394f13cb19c602d1b4a67e4477c3a0c781c3481ac973e40af7b306fdb32c88d4c70f8302b14e693c7270e2afab0dc2539";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/bg/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/bg/thunderbird-52.4.0.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha512 = "076184b227fdb364fa8f09f121735a6b6752b11c4f8537b45374db550c2fa9f6e81bb0c2cd145508973df8cbc2901de793d1f4c47696ab2165f5c819db659640";
+ sha512 = "194a420d07f952f7d088cb15fd14dce30e352dac13e543321e94fc60b7780678ea1ba51d450aac2d7566a8f23a583cba70e3aed373602ac896e0be13d234f8f2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/bn-BD/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/bn-BD/thunderbird-52.4.0.tar.bz2";
locale = "bn-BD";
arch = "linux-i686";
- sha512 = "604fb9985b6a69cf563b86bbaabd890f487ca3e510a93b612949af5759b339e10b67c70c17aab9b35d1fe8ac126e69ea1a6123aae75a0eca6a9b4f133fbe1fd9";
+ sha512 = "08a439a7fe40121f318131b035e7a5a1b44a56a6f3434b2854136103b0e11fd720540352ed04bde23f33c7ef75cb57eabbe86425c8f2e440f92c9260ddf1a902";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/br/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/br/thunderbird-52.4.0.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha512 = "f5706905bb9da0c3ec9e841b7694619db321ecedc85ab20e52fe9bd2e2ea2e1ad0cd9e0dbaee4159237881000fd2d3d4eeb1c86911c0c5ca13fb718c7cbf75e3";
+ sha512 = "68984b8fb564e24f3e331504a0c8a2e88cc1021319b2a47beeffd145eb42a19bd555aca495ac60612efb191830c273c473e0c3cd5844f109e78a4908834926b1";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ca/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ca/thunderbird-52.4.0.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha512 = "a240c6653153c35f4cf40c7266eda3ebf499cd95cae7a62e0f2025bfb8b0c46538710a9b3b5486e1fea88354d7bd654f50faa06a6d246d2c97c0913e51e62257";
+ sha512 = "2202c43a63bb283d9eef16c27e0d6125d43284b9c1acdb8cbbdc71f3a9d6f6d527c4a03363dced911321f28399a86ef25defd294befddb8fae41912e17c2fdef";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/cs/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/cs/thunderbird-52.4.0.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha512 = "3f639e7244a32891c2cbe0059456edb241895d7f5f5aeb2636699dccb5b71d4bae855f31352575957c7edbcf4925506e76ddfa0f0b83a81a61d9a8d9b543c564";
+ sha512 = "d01c6ba52794d3850656c1538e46b64eb69a7c1e3a17347ab5cfda9fb1e91976a4bfc7096f7d12bdf2f15625387aec7066b0a25879d979687c955058b92ce6c7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/cy/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/cy/thunderbird-52.4.0.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha512 = "26c6ae97d0982d9e91bffe04918b27da55489ec00fbfa1783acfe69cd2136bd139fa9cb434a473b5f63097adb2768e73a929f8f06bec97a13ad6750837f1cf5b";
+ sha512 = "3d056c91e1599e91249774cb21d8fbc887b7bab38546aca1815ca9c49fbf4d641bab2427f03ea993a72dc29793feb1cb0cb26217a4f6827e9e0d9d3cb5e3ca0c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/da/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/da/thunderbird-52.4.0.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha512 = "f516ecbf3124df27cb5c4dcc00505f2a1ab8806c3965755ae28ea3db7e06be173a82e5b171493af977686e31bd623984a0428d5781268cd7ab4094510ee88ec9";
+ sha512 = "c940d26284c8ab0a45bc6a55b67b467df7ac160c8774f0e2e2deb9082ea9500142a1d3c8851031a7e7a1763fdf5348c14de57d7168c3f1bb23fed3cf31a1b09e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/de/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/de/thunderbird-52.4.0.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha512 = "053ddf755cdb5b76174b18f674169c1b478b636ac90af21d5c5108a7fb9463e4e247567421abe1fdb6cf1cab1f83b2426e2fad5d0d0a2b259b3526f5dc477bd9";
+ sha512 = "b1b63590885f30797ae9825f2286deca69a82a73e7c407be87fa92280b904c0605e7047a402bf6ce1e13936933a27efaa2b35d534b23f745a2ab4a9538d31b47";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/dsb/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/dsb/thunderbird-52.4.0.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha512 = "0217fa4e1ceb68a9bdd8d99d93bd2d523c2ecc649154eb7c22b970389a285efaaa8b2dd20f590214483cfbabdec5cac8b6120315d9b500d80038e85bf8dda80f";
+ sha512 = "fc81fbfcc6533d34fde2e08351dea6d7e2a561a3620a6d0d225dc1081f59d9927ceb0abfca7c2d21b1cc727c0319646a2f386c022524178e90aa6bba344371c3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/el/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/el/thunderbird-52.4.0.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha512 = "8fea2697ca07a8f0007a5987e59ee2ab56d9f7a4753f3e4656e872e7201f001eb80831eba64167444d0391cf05c8af5f3d44f3aaedcd8b2d8fe48838e5097240";
+ sha512 = "baf8d0a52fbb12afdccd003209614ce8d5b4062336744ee783a6c3e7eb5a542c4da233fb680f320226f3681b440ab1d0717616a3664051d231b6638729903b00";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/en-GB/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/en-GB/thunderbird-52.4.0.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha512 = "269217e4eddac4a29a4c3b045240b63cf623e276d6dfbf7d874ed732fb63748ab82072ca1a482012c8d25d5852ddd0b9bef8fa756723372d4be35ef4b067fca8";
+ sha512 = "0f5fac2fd3da05cbdece404fe3d170ef49574b5abff07a17120d189338140fadbc0971c7be05656544819df2b1987fd86c0f9fdfcd312e540035e70877212342";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/en-US/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/en-US/thunderbird-52.4.0.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha512 = "c436d084accd3b195f9dd0b9c96d9e45ecaec730bf5a35e35db65c7ef6328383fa82ebeb3b143f2c92bfbcb3f7983f451e35e68443f6fe24fc43baf686610207";
+ sha512 = "1f3a640d140fa305e115158d98aadf95d180b396aa3935de4505f0f94f510d206ae6e45adf36572cb160175383d0aaad11c3244003e4a99dae613e1a749430cf";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/es-AR/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/es-AR/thunderbird-52.4.0.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha512 = "8d6491206cc1bb41132da43eb812d1f548e7ff8414b7644809d2f42819b94c583793baafc94815b70345b43c2ad3922c5d116379a6fe0c85e1c09c7cf7431067";
+ sha512 = "42525a75e154fdf263f276330a998f127de697519a79b447d4860403c40ca2a6caec0a225a978461ae776e56218313a3fa31441817cbb13db34cd47afb9a5eb8";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/es-ES/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/es-ES/thunderbird-52.4.0.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha512 = "21ffc568d5aaf6ff9188846c9b6ab0483831d5c6db84c0504cbe95a5ccc2dee3ae4a8df2ddbf81a9a02c328fbf452d569cfae5f0b85f029bd62836795db41e0c";
+ sha512 = "86b47481b760206b49f87d15a917754d875203d83613c0c8b83e181f95986e6252ff26cd6dd6f7c6545f9d4da4801f6f236fa82dcce0d0172f19228b4eb5fe33";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/et/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/et/thunderbird-52.4.0.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha512 = "aa73dd4e5cc8ba643584b88fef3accd56b71b030a91035aca342ce4281b79372af8ee9a67a9fdb9eec2b869d0d9815f00a40e1ca6988b71f174b6e0412a31d40";
+ sha512 = "4bbfa1fde3a6270b49989747b4b27c284abb89819c46119cc3f2f90f0cad1648e49a2e1e01a35ef193eed4cf504a3e027138ea30a225c3d75347aa062d56afeb";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/eu/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/eu/thunderbird-52.4.0.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha512 = "53f6223554a11340ff5f435438e31406682bb5364bd4cc69a9909b42293095fb4a040882cc038d95ca8ea3b85dbaef31d6e6a3ce5de58e99fb5a5b7427501052";
+ sha512 = "292fd0f2db956e5bc86a84d5edf51e3e36141610c99f75b1dd8af0f086fa8bc4a4e5a4e1c3d085587b6bf2d6e3435bc70ee66d379809886a391d67e2c243d762";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/fi/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/fi/thunderbird-52.4.0.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha512 = "eb143cc250bca4043476764e08ad1d7d8020318db832a4be7577036be2ec933518c5c2c9ceb2cb3c11d5e402aaf9ba41e251b95f505c6eca63cd28d52bec7ebf";
+ sha512 = "b8df95d4ca36efdc4370821068590b1d7e3fb9f348afeb18a0a02c977027312457aaa59c38ee02908e944f166d485576522ea0cb087b28fa857963107e43ced7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/fr/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/fr/thunderbird-52.4.0.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha512 = "16bed03812d5a4163a5d52e35ab1b9b8d91be8d772929730cd5dc92bfc62139d0778526e6e9d88d40ddb981020f6b02a19915f5dfd8993f0f477589a873c2435";
+ sha512 = "7880654b4133e50ee248b6e287d52ba867361b900fbbdd149c6f06c9d5df1d0b57ce6d9d9bed3e1ab68e90b0ddf874d0b2427553b24ea39f267f576c63357bca";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/fy-NL/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/fy-NL/thunderbird-52.4.0.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha512 = "3c1093eab90febc62ddbd69cdeb559fc95fa6b2e67893b2d9e8ee38e67387825cfd0b50475268b7b489ad69c80f2667abbbc4cc5be3a2b81747b5858d5cf0126";
+ sha512 = "4784b06aeb705141d84103bf46635e6ba6a7f7795b40e654f63c783a63ee19d54843c211eac90c4246c5131ecc8808940e560f2fd2a2543522cef13bf3828938";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ga-IE/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ga-IE/thunderbird-52.4.0.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha512 = "153dc5005e913f36dbe1840d46a91d235207fc393a7f8f294518f1095ff590f706ff7015c823dda5da6e200a43b2f278c93f910d97517452eaab972ccedc6bef";
+ sha512 = "91b4145d82a4748ef2cfe6d4d46c9e92c3a54a55f72ab1c28135363471d68ee028064ec0c0bb334fb731c6577305177a06d85b2a9d820d9e2a44fb01ac961beb";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/gd/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/gd/thunderbird-52.4.0.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha512 = "253a9cecce89ffdd771c70b06d23216046689a0a8e70dd922328590a4a39137d93919b4052c7e928b180f2c8fe088199583c67f96602e9de150927ea08be65b4";
+ sha512 = "4e979ce305a014de612c0f3797b9f8c8d89445f05972a24d8c13cd01160aa2c15007b0e505f9a0cb354f8cf65e286ba52eae8a6bbdcf4c7cf4e89809e0ce530a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/gl/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/gl/thunderbird-52.4.0.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha512 = "b77978888a918d297419897f008f0fe05a09903d7a0364c43b20adcad883f926a9c51af3e7132825bf19dd487d7058c83209112d5ebb09f202c49a5c8e126f58";
+ sha512 = "b3081eee4473c097b37b9070cdcdd8eb48e1cf69ee63fd76f1eee0d5ed84009b69d0b31fb38c36f7d5137b78d0ab32087a8e668f1ad01e6ef96984ecd973af11";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/he/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/he/thunderbird-52.4.0.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha512 = "56f1b9204c0ad5251011abf388cd3ed95b2e6cbddbb7993f967c68c8f8258c3695550025f437ddc3db455c3cbf0efbe146d0612bc40d8ad3a3482648c4bace46";
+ sha512 = "2781cc8fcac549ea394629ba1d7c43c683ea25b4d3c5807f7a4da50541e47ba18ed4d4080e7f3c785be8e71e0a8e2ae0cb9a24e348f830b71b7398efd06863e5";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/hr/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/hr/thunderbird-52.4.0.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha512 = "c225c39f93bd12f822fdb523bdce20ca64266d81f007acba861466d61d155bded183e305bbb829aafdd0b64cc10d6d7054752bc3e99286b90a29864425cdf6b7";
+ sha512 = "d42587bb96454e3ee24b964dee1de0f51283b2c3316dd25e798a8809d2289306bf6eba6078f664f87720e7038b14f009640fdb4d3acf211195dc881e6e207c6c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/hsb/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/hsb/thunderbird-52.4.0.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha512 = "b7c85448a5dbc2f820d866d8e307e8221ae58d66187ae259df3d93e761fa484e0c7909c61030682efa5817613104d88813c1fb7e7286d0d7c45f6ee9dc4c5ccc";
+ sha512 = "49e3ee2559c124db79e2dbb2fe74291a377ccf1fbd75b450c8d4913000a055cea855fad03369e7420391faf114e160e35b02d432de847e673e352b731986bb84";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/hu/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/hu/thunderbird-52.4.0.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha512 = "6291b35868569e924a3efa54abded62742d7212d4a7dc039e09baa00d77ab3595a22adb042be753b75c1ce50342c20781931e366fe2b73d4b598065fb02a1d0f";
+ sha512 = "fad46a1ea3e8a1df49e4ba836c68b1744577fdfec319d9dc0b2bd8756d4dc859cb5af7484791b83f2260bd40d1ae64f19539f8f4b3977252a1f559b7df9fef35";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/hy-AM/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/hy-AM/thunderbird-52.4.0.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha512 = "ee0193ec3e1df85c3cfbc9118d479078ae3d61a70b36c582ea222338b49db4c5c2c8b0d10a0663154fdc465b23184e204b509734d2b55862c6075d1b48fd29d2";
+ sha512 = "6a34e03e5e272c847f674bd8c48cee66fb659cbf88251debe505c54011b029cea7b7e8a9722c61b3e603d66aaa4313a5971fdbf2035fd06d305cf229cd8b2afa";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/id/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/id/thunderbird-52.4.0.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha512 = "a882202254e23635dc51c10b332ae8953e61c6ffcdf42f9d5794cf3c2a7c665bb350171bda84da8388d2323b0359b1e0c3fd44a838c0979c35fa80387b312a21";
+ sha512 = "1cce3d3653b474219f00f4555990406b661a14c4198f3d246624def4e5a3ad3ea393a74f6c80e0f17b5799784e212778ccb8b56bda31c5e48a55193bef09c417";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/is/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/is/thunderbird-52.4.0.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha512 = "69ad01aa6a7a84630bfaf10f4eda5b8d04af7bf5cba742943fb474ea32e926908db0f94877c1d6f9904063802dd9e219b20fbcf597aa291490726f15f6ca1379";
+ sha512 = "f3604e918502d16ba92e65e9def425efbb829a261d2c433ce83ec89d6ebfebbfcddd1b01508f953ec3c26166c6d01112486cdab6d1a0fe1e6a582f0566900b89";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/it/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/it/thunderbird-52.4.0.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha512 = "d9a1897dc1665d69868dcf0b5d4998316a76a721ca67c5729d0b5cf2a8de516d7ec1ff92a6db1cf29dabe6544ea10482dc8ec58740fab8ee704a98596c69573b";
+ sha512 = "458bc19bd6b08f6834e310f7ec4591ad4e84067ae2373864ca9019c20551abbcbc067467fffada229000dda01369da3c28967df522182d8eda1a147d136b6315";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ja/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ja/thunderbird-52.4.0.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha512 = "c9b7e197cf9fb00292b39a7769dd06be243d3ac46ed90f5db19b612823872bebc06b330eab087295a6d91edc48ed8c40af04ac69a0b5ead05a11ad960dc36aba";
+ sha512 = "05faf43b8b0f616bf552988a577891e816fe36b208b7d6292c9896a6946386815e117278feef33063b4f2eb7b5ec89aebc59e1d4432021969bf3b95e750defa3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/kab/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/kab/thunderbird-52.4.0.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha512 = "065d73e3cb20593a18a556535aba02ee5b01e5aa07c146a02a76130ab9474962fcbf56ed5f5733638e2c73af1cfcccf9684b6799a30112e8e6da32069bea87ea";
+ sha512 = "594669d5518b0be87095527b3013799812c9f45254434523903ad19edb2ebd4bc32409df6f646b1d1e953098e126673427400238a056e0a8c44b672009a12a2c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ko/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ko/thunderbird-52.4.0.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha512 = "1260ecda4f82475857ac17c8e4825bb9e8aae458797a8fb92ce6fd90220dc2eafdc03447116f2063e5a66661a8869b10a4280bb481f3278b08e135466a0ab74b";
+ sha512 = "db3e6c9efbeeed833384256814a713a5bf3d2a220a74c88fd28f91ec0dd6c7600d77e18ce66c9dc9f1929f5da7452c5904f012fa8f5e4fa04084892e17b2647f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/lt/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/lt/thunderbird-52.4.0.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha512 = "3437bdfcd7ff3ed1f628558dfe34b82319fefb4f133062ffe8a04ddf1bb554b1d5ab881cc2a288cfe494c7e4520147bbf4c23fe38b7c0b0ddaae8a061d7ba839";
+ sha512 = "2b8e8b74bbba2a72dc88a8dba457189cad1c902c0bf2cbc54bf989c6444c8b164238f1d9e21c2c8e470df5198d8586cd613b40292b737c04f4c2d834d298dc13";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/nb-NO/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/nb-NO/thunderbird-52.4.0.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha512 = "e321b1ce86913287ad239f235f97e481c1f1a26931da1f17ac4827767735208a31ac0c418301476551ad1c73781dbae890da15ebd8113a59d11e45359d592537";
+ sha512 = "bf99756bb7bc5fa699cae5ef3da5a3614e57483b2892e2f6f769699ef3478e22847ddeaf63fc0c521cd1fbcccbdf9bc5054430a5cdbb50e26e371818cae404fb";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/nl/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/nl/thunderbird-52.4.0.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha512 = "656e6bec81d40f1dee9bd51d5313f6625485458f47c45a4f77b8f114df9463257765870982bf704f108f84df064d51a7c5c5500440e3b66a690b15d248977070";
+ sha512 = "80170d51276bb77de4af8d45d5869069c7d9c6db7ad6d5786fd4c2c5cfb0a20ceb1cdce7b5dbf99a79dca329efa5d9a53d4ed738cbe7f77bdcb65a8b6e2e7511";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/nn-NO/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/nn-NO/thunderbird-52.4.0.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha512 = "d7a460705e2debb51423612059425094e88a0ee552ce8b75097845763d4c65039fffabcba2f0d95bc655a84f3d1d1c7e1290905f56c5c8c461e14a9eaf87efc7";
+ sha512 = "f223dd33108a750563a498e92b53cd3e68e3d50fdb1a08e295a9c3e893c20908ea56c9c5312874469b2f96d1046f754df55bc38d1595d5b811b7ed659e267d98";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/pa-IN/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/pa-IN/thunderbird-52.4.0.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha512 = "ab12d8a23b649b5fd7cc71caa71dc0cf15f4a5baab69be44ec71daa4f643a2f5dd83974d88e6d5deb06c9e89bb7f39af3940edd551588c28d42d1304bc092f53";
+ sha512 = "a418fea2521ff6971d68d975823bd0917580450a7ff38975455b891c8e3cbcfdf51c40502fa072ebc1f43ce93a3b07ce93db369edfbd511beee5dfc5041a0a84";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/pl/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/pl/thunderbird-52.4.0.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha512 = "f85deb706d0ae38c53965951c09991bac85a05486b23e6c364871d9d68dab057b4ad963d4287bab4f1d6c3ba60841827ad6b1861c3dda15dbd29f42c9442dbf1";
+ sha512 = "05adc7298c91853b373756944d360589caeef6a999f6c5ea9babe3b12ff9409909040b69b641b69b78bd17bddda59f9828e294f5cd5f7d7061cc3f51eb3c48b3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/pt-BR/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/pt-BR/thunderbird-52.4.0.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha512 = "a3e955d25fc48b8e2051a131c437b1075a773b69fbc17f4cbb8ff60548d47449be70e3aab97d569802c925ffb57462bd144f3eeb0cdde7b2508ecff536a9193f";
+ sha512 = "4a2503e3a1daf5b9cb26acf25720c4d0fdc7a170bd454a185e4cf2cd9c9429dcbdee4c13e59e11a2a275d88513b1ae31dffae8bdf70c3196249e432360fbe705";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/pt-PT/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/pt-PT/thunderbird-52.4.0.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha512 = "051f55a3530c7d90a0f7791d6bf2ed1af015eb6813ffe3f1b43d7fd4da992c079bc6836e38eb027f7246aef7245f480e9300dfca9c512f55e62c3d851c7d9b16";
+ sha512 = "cb02054a64a74c2e1f936594f001dd721e3016cc68cf705c0413a732153bbe45aaa14736d38b22358bda5f3d059f7306087c27faf040d91bd7f92066403e65c1";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/rm/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/rm/thunderbird-52.4.0.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha512 = "f42c1f0cbd76b7425d986b26a1e2d0342c4c99c7d283bd2d6719179c5b14912853b7af20de214dcf06ef1f89bfa9d5a9eb0052effecab505738c80abf168b67b";
+ sha512 = "8e745e5d1e5a4d3f432bf8c5f90906a22c8d2fe4c6d77ec032cb7eccae1f2f9e7cf0620dd3ef378414d6f34cc25346ff44b7fbee05016f34c49a0c8c5959184c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ro/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ro/thunderbird-52.4.0.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha512 = "30cd95effe6597aeb0e686511a3b59f064269562337c924af06198600a9c19dee54931255cb9e5400e034de8d9c08f2e99943084ad9360eeedbd0615339df3fd";
+ sha512 = "20d9b9666704c87f73f4c8cbe8d09cf79349e811f4c4da93f2754886cc89fabf7c2388430f9f072a3918b38984742adab48ada320dd75761a7443f3be1198a8e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ru/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ru/thunderbird-52.4.0.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha512 = "3e8a7501295ad1a41f3b79efaff4c76c25e5201f2ddfb02749ce950b66d81b8cfd870da2570eddf4381e8928a6a355dae06906043bc6912da23feda3706ac12d";
+ sha512 = "ff7c64ed9a4403e24b7f0f9fb06bc4b96153fbe7d30b94ea7e145d33dc24bb1b2807db8d6e3398dc84e13f68d9c5c4fbaacc3027cd46ee58fecaa8b7b17b27a7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/si/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/si/thunderbird-52.4.0.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha512 = "ddaf492f1d6c219ff503fa50ae1f415c7d24dd6431cd55d02a222e5eec7265b80e96fcfb0ca38092e06aeea78f698ed5b229d8527785e90b49fed6ca69acb9a2";
+ sha512 = "b2358e6df5f5cda477c530dddd9d27e35a8919aa346b66521336fb0cddd2821bb7dd867f4ad005c135ce040a1eb64ad9f1feef81a268a299ca2170312f7c89ef";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/sk/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/sk/thunderbird-52.4.0.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha512 = "dec6bfebf69c1db120ebee8b61cec49eb3c27209f9bbc0fd914c4f22956829cd9759f0671cd7b6ca24dda6598dd45791d566a55db5395cc089ea15696d791a3a";
+ sha512 = "fc3eae35914d2a2ec6d44bf6348f71872f7ccb09d25ed974843b8010526f219437e6530c4d86825d027f1593da0943e0b9a5557bf41d4095e4e9d37108a94c3a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/sl/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/sl/thunderbird-52.4.0.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha512 = "3fd4b5dcc631b65f0509272156be238d4c9f99835fb7d23730d99267351f9ac58d370cc95f3a4839bf0b1a45fc0fd34b1b6cdb9efa88b75f991aa5fedf74521f";
+ sha512 = "532b87d22bd05194470801cccf242ffbae57685e69a836c8179e2fc562bdf2aba196f214b7a66006ef90d7fb1781d66e1ea62c2cf95820402deb9a73122ad143";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/sq/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/sq/thunderbird-52.4.0.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha512 = "a72d7db408855d53eda896280a114dbe667a914a5c5d17da7a242697a44b974f54f0b02d0884150c1f27602296df17cadc96f4b27057ae094df9680d3b48f6bb";
+ sha512 = "b621973b1f76f2d789afa854917e20b7b48e3381344da29e07b8c5bfd469162c47d51e9552ab2428895c45dab9662d8fdc2704e65c96faa4afbddc4649a77dec";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/sr/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/sr/thunderbird-52.4.0.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha512 = "dbd9862ca22f038defb83b8df9cde748eaab1a4d68afbbbe6dfe45c73334616bf7f64536d6ab2d42166d1196e548acf697fa29a5d37184e9ccb198bc713ecae8";
+ sha512 = "d26812c232168c30c6a76dad5f3f7e20fe88cd75fc63f863bca255fa353928b8d3988c56abbb649266e52b8d31d70182c59ded496607aae17d7d2d0409ecc53a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/sv-SE/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/sv-SE/thunderbird-52.4.0.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha512 = "7c3804d7681cffc6e979975a898b1cc2b1bac0d2e6a17058025629b8ad308cade808401f99e43cf0c1662a9597f2f6848d12839c3e1fe7606fca5926e6b484cf";
+ sha512 = "294e141cabec4edab0695e7c8e29149543e4cf4d451cfe9ba038a6997a822e02f223045ac3a8ac25b99a1e847740fac4d9d5c0b5ce0c5d69d331d823bf8e4899";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ta-LK/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ta-LK/thunderbird-52.4.0.tar.bz2";
locale = "ta-LK";
arch = "linux-i686";
- sha512 = "38e8a0370c8ea7c7b7936da47dea583dbd282eb0cbe504337ac9e35efaf67cb1e6e9d7220efec243581d7a04a19e4f6f78892fd1a84461b30035d01ab225920a";
+ sha512 = "9c9b79cf21e64461b8a78dd0f7816346ada2cce0ef4bce4da291497c9fd1aa414c199d57265390e5b885828b1efa38f9883882870b84a5b3a64ffffb47da79e1";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/tr/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/tr/thunderbird-52.4.0.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha512 = "053e0e6e88c92c6c8d398cb8c38d8ce9b1340c4ff4455a7c4b1225090d5d10387b8b14e6f71dfee2a159329478cada995f05b75986c6a57d01ae7c1e1a65772b";
+ sha512 = "61a671ae2804b06143e636c9e8ae0badb460bf9cbb3555213bf43aa2d56b2a9f13ca3a13362f2a9b7ecafb4b03451093ea2f817a104cc7d4555e11b1ffb18103";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/uk/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/uk/thunderbird-52.4.0.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha512 = "98cabbbd8314ba80d74a0f3a9b17ee49aced8b5832f13e5b6060896dd9dee4abff8a15e1b509387254416f6e49652fcf797a1cb6934b7ae6f65909ba85a8e01d";
+ sha512 = "629ede67d8bbfd6b1233d2030234fed7f99915045131caa11edce99b6e9c314b7cfd6ef457d26a0e628b525bb78c05426e8c078364ade5e606dfaba90200feee";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/vi/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/vi/thunderbird-52.4.0.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha512 = "2937330459ec576ba9678c465bd5aea7cb536002574a23e3043363d562bee2d1c58de1a6a73870ee27e363b9a64b82ae2a483dd21e3b6fc3b28bdda5d8c349f5";
+ sha512 = "728644651b7eff73be44bceccf8038bca79e020fbaad87d74fb1ff4856554766e6494e1e16a0d93187615f5f8cb663fc3233855d66e8cf0996fe597c9645273c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/zh-CN/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/zh-CN/thunderbird-52.4.0.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha512 = "80e640c07514c215f170606353a97b058fe2b6b8f03adeb1526d3f5e237cfe71123b945b82b00726b00101a11a3207930af622775e4a0b5c5f9c464aca34aad0";
+ sha512 = "ef5a81e04ed973fd2ed576d1654f1ada7d9cefb6943bf604bee53053fedc4b2127c780ac2ff3c9b568813699f29f744950e899bc71733cd8d385368e1d0c07c2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/zh-TW/thunderbird-52.3.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/zh-TW/thunderbird-52.4.0.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha512 = "9ea9bb1121f3f1731d3e1748af70ebce153a7cdf8bc44034928f618e21f2c1c1ac50f13f2e42d42e3105fbabe7cbb919bf785de032b615b2a1e732700c436ad9";
+ sha512 = "ddf5a00621d6916c6033f81589c9376a8aaba3bf12810a2fd41358af323d9f6354384a5b938f299855d27a1272d36e99ca3f45a8ab8299aa7afc118d942ae624";
}
];
}
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 51d90d11707f..2e1f8ed50701 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -22,11 +22,11 @@ let
wrapperTool = if enableGTK3 then wrapGAppsHook else makeWrapper;
in stdenv.mkDerivation rec {
name = "thunderbird-${version}";
- version = "52.3.0";
+ version = "52.4.0";
src = fetchurl {
url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
- sha512 = "10e6495d207328aae325a797be1de5e535b5d967df929b0af9d7554d0473b5a7931c8f9cb1793e843b1913f441f790169dd4ac1ad9e0e53e66bc8e1c1dd60e66";
+ sha512 = "6ac39cecca9e53b51754d7a8bd7cae228d197eb234b03a2386c16fd665f4f7a67f10bbdf981c20b3f7a21a5ef67e2771154a3dd9f249c6a884c48a9e59bcfc78";
};
# New sed no longer tolerates this mistake.
diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix
index 85e5abdc9b6e..1a409fc885a2 100644
--- a/pkgs/applications/networking/msmtp/default.nix
+++ b/pkgs/applications/networking/msmtp/default.nix
@@ -1,5 +1,6 @@
{ stdenv, lib, fetchurl, autoreconfHook, pkgconfig
, openssl, netcat-gnu, gnutls, gsasl, libidn, Security
+, withKeyring ? true, libsecret ? null
, systemd ? null }:
let
@@ -20,7 +21,9 @@ in stdenv.mkDerivation rec {
];
buildInputs = [ openssl gnutls gsasl libidn ]
- ++ stdenv.lib.optional stdenv.isDarwin Security;
+ ++ stdenv.lib.optional stdenv.isDarwin Security
+ ++ stdenv.lib.optional withKeyring libsecret;
+
nativeBuildInputs = [ autoreconfHook pkgconfig ];
configureFlags =
diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix
index 8c0bb8a884f8..63d7f29d7de6 100644
--- a/pkgs/applications/networking/newsreaders/pan/default.nix
+++ b/pkgs/applications/networking/newsreaders/pan/default.nix
@@ -15,7 +15,8 @@ stdenv.mkDerivation {
sha256 = "1fab2i6ngqp66lhls0g7j8d1c1rk75afiqr3r1x2sn3zk47k4pxz";
};
- buildInputs = [ pkgconfig gtk2 perl gmime gettext intltool dbus_glib libnotify ]
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk2 perl gmime gettext intltool dbus_glib libnotify ]
++ stdenv.lib.optional spellChecking gtkspell2;
enableParallelBuilding = true;
diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
index e8df906217a0..48b2d883849b 100644
--- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
+++ b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
sha256 = "1mqz0g69njmlghcra3izarjxbxi1jrhiwn4ww94b8jv8xb9cv682";
};
- buildInputs = [ cmake pkgconfig qt4 boost bzip2 libX11 pcre-cpp libidn lua5 miniupnpc aspell gettext ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ cmake qt4 boost bzip2 libX11 pcre-cpp libidn lua5 miniupnpc aspell gettext ];
patches = [
(fetchpatch {
diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix
index 3baa5a8e480d..03178b5cb75d 100644
--- a/pkgs/applications/networking/p2p/qbittorrent/default.nix
+++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix
@@ -6,15 +6,15 @@
}:
assert guiSupport -> (dbus_libs != null);
-
with stdenv.lib;
+
stdenv.mkDerivation rec {
name = "qbittorrent-${version}";
- version = "3.3.15";
+ version = "3.3.16";
src = fetchurl {
url = "mirror://sourceforge/qbittorrent/${name}.tar.xz";
- sha256 = "1bnfnbkdg0088h25zzhlpcdh30y0k1m76bkhjsj1aali765c1fx7";
+ sha256 = "0mxyn2pajvb55bhcaz55v64p2xzy15p0yy174s62b5y3f8cac27a";
};
nativeBuildInputs = [ pkgconfig which ];
@@ -22,9 +22,8 @@ stdenv.mkDerivation rec {
buildInputs = [ boost libtorrentRasterbar qtbase qttools ]
++ optional guiSupport dbus_libs;
- preConfigure = ''
- export QT_QMAKE=$(dirname "$QMAKE")
- '';
+ # Otherwise qm_gen.pri assumes lrelease-qt5, which does not exist.
+ QMAKE_LRELEASE = "lrelease";
configureFlags = [
"--with-boost-libdir=${boost.out}/lib"
@@ -33,11 +32,7 @@ stdenv.mkDerivation rec {
(if webuiSupport then "" else "--disable-webui")
] ++ optional debugSupport "--enable-debug";
- # The lrelease binary is named lrelease instead of lrelease-qt4
- patches = [ ./fix-lrelease.patch ];
-
- # https://github.com/qbittorrent/qBittorrent/issues/1992
- enableParallelBuilding = false;
+ enableParallelBuilding = true;
meta = {
description = "Free Software alternative to µtorrent";
diff --git a/pkgs/applications/networking/p2p/qbittorrent/fix-lrelease.patch b/pkgs/applications/networking/p2p/qbittorrent/fix-lrelease.patch
deleted file mode 100644
index a906803e4336..000000000000
--- a/pkgs/applications/networking/p2p/qbittorrent/fix-lrelease.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/qm_gen.pri b/qm_gen.pri
-index 5454440..2d5990c 100644
---- a/qm_gen.pri
-+++ b/qm_gen.pri
-@@ -5,12 +5,7 @@ isEmpty(QMAKE_LRELEASE) {
- win32|os2:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe
- else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
- unix {
-- equals(QT_MAJOR_VERSION, 4) {
-- !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease-qt4 }
-- }
-- equals(QT_MAJOR_VERSION, 5) {
-- !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease-qt5 }
-- }
-+ !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease }
- } else {
- !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease }
- }
diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix
new file mode 100644
index 000000000000..d37f5293ef80
--- /dev/null
+++ b/pkgs/applications/networking/p2p/tixati/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, glib, zlib, dbus, dbus_glib, gtk2, gdk_pixbuf, cairo, pango }:
+
+stdenv.mkDerivation rec {
+ name = "tixati-${version}";
+ version = "2.55";
+
+ src = fetchurl {
+ url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz";
+ sha256 = "02mha6lfcb0mg0y977bxa6xg8krpbsbzpm4b5xw6y6wign4d8a8w";
+ };
+
+ installPhase = ''
+ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+ --set-rpath ${stdenv.lib.makeLibraryPath [ glib zlib dbus dbus_glib gtk2 gdk_pixbuf cairo pango ]} \
+ tixati
+ install -D tixati $out/bin/tixati
+ install -D tixati.desktop $out/share/applications/tixati.desktop
+ install -D tixati.png $out/share/icons/tixati.png
+ '';
+
+ dontStrip = true;
+
+ meta = with stdenv.lib; {
+ description = "Torrent client";
+ homepage = http://www.tixati.com;
+ license = licenses.unfree;
+ platforms = [ "x86_64-linux" ];
+ maintainers = with maintainers; [ volth ];
+ };
+}
diff --git a/pkgs/applications/networking/p2p/transgui/default.nix b/pkgs/applications/networking/p2p/transgui/default.nix
index 3a6a71843a2d..a33f85551f3d 100644
--- a/pkgs/applications/networking/p2p/transgui/default.nix
+++ b/pkgs/applications/networking/p2p/transgui/default.nix
@@ -11,8 +11,9 @@ stdenv.mkDerivation rec {
sha256 = "0z83hvlhllm6p1z4gkcfi1x3akgn2xkssnfhwp74qynb0n5362pi";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig unzip fpc lazarus stdenv.cc
+ unzip fpc lazarus stdenv.cc
libX11 glib gtk2 gdk_pixbuf pango atk cairo openssl
];
diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix
index 6feeacc675a0..9b448f86736d 100644
--- a/pkgs/applications/networking/p2p/transmission/default.nix
+++ b/pkgs/applications/networking/p2p/transmission/default.nix
@@ -20,7 +20,8 @@ stdenv.mkDerivation rec {
sha256 = "0pykmhi7pdmzq47glbj8i2im6iarp4wnj4l1pyvsrnba61f0939s";
};
- buildInputs = [ pkgconfig intltool file openssl curl libevent zlib ]
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ intltool file openssl curl libevent zlib ]
++ optionals enableGTK3 [ gtk3 makeWrapper ]
++ optionals enableSystemd [ systemd ]
++ optionals stdenv.isLinux [ inotify-tools ];
diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix
index e5c0e30bce3a..9d26a74f8bb1 100644
--- a/pkgs/applications/networking/p2p/tribler/default.nix
+++ b/pkgs/applications/networking/p2p/tribler/default.nix
@@ -4,12 +4,11 @@
stdenv.mkDerivation rec {
pname = "tribler";
name = "${pname}-${version}";
- version = "7.0.0-rc2";
- revision = "1d3ddb8";
+ version = "7.0.0-rc3";
src = fetchurl {
url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.xz";
- sha256 = "0wlv32cw52c5khnrm218dccgn2l177933p4dhp7m50hipqfb0ly2";
+ sha256 = "0f1f8mzbk1ygkh8lv9y1s9mvslv12d94mxvmp3b4s2vm8w4syza7";
};
buildInputs = [
@@ -40,6 +39,8 @@ stdenv.mkDerivation rec {
pythonPackages.decorator
pythonPackages.feedparser
pythonPackages.service-identity
+ pythonPackages.psutil
+ pythonPackages.meliae
];
postPatch = ''
diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix
index e5a242662ce1..d30527ca6093 100644
--- a/pkgs/applications/networking/p2p/twister/default.nix
+++ b/pkgs/applications/networking/p2p/twister/default.nix
@@ -32,8 +32,9 @@ in stdenv.mkDerivation rec {
"--with-boost-libdir=${boost.out}/lib"
];
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- autoconf automake libtool pkgconfig python2
+ autoconf automake libtool python2
boost db openssl geoip miniupnpc libiconv
];
diff --git a/pkgs/applications/networking/p2p/vuze/default.nix b/pkgs/applications/networking/p2p/vuze/default.nix
new file mode 100644
index 000000000000..8725d5263fe3
--- /dev/null
+++ b/pkgs/applications/networking/p2p/vuze/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchsvn, jdk, jre, ant, swt, makeWrapper }:
+
+stdenv.mkDerivation rec {
+ name = "vuze-${version}";
+ version = "5750";
+
+ src = fetchsvn {
+ url = "http://svn.vuze.com/public/client/tags/RELEASE_${version}";
+ sha256 = "07w6ipyiy8hi88d6yxbbf3vkv26mj7dcz9yr8141hb2ig03v0h0p";
+ };
+
+ buildInputs = [ makeWrapper jdk ant ];
+
+ buildPhase = "ant";
+
+ installPhase = ''
+ install -D dist/Vuze_0000-00.jar $out/share/java/Vuze_${version}-00.jar
+ makeWrapper ${jre}/bin/java $out/bin/vuze \
+ --add-flags "-Xmx256m -Djava.library.path=${swt}/lib -cp $out/share/java/Vuze_${version}-00.jar:${swt}/jars/swt.jar org.gudy.azureus2.ui.swt.Main"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Torrent client";
+ homepage = http://www.vuze.com;
+ license = licenses.unfree;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ volth ];
+ };
+}
diff --git a/pkgs/applications/networking/pyload/beautifulsoup.nix b/pkgs/applications/networking/pyload/beautifulsoup.nix
new file mode 100644
index 000000000000..571df924e1f8
--- /dev/null
+++ b/pkgs/applications/networking/pyload/beautifulsoup.nix
@@ -0,0 +1,20 @@
+{ pythonPackages, isPy3k, pkgs }:
+
+pythonPackages.buildPythonPackage rec {
+ name = "beautifulsoup-3.2.1";
+ disabled = isPy3k;
+
+ src = pkgs.fetchurl {
+ url = "http://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-3.2.1.tar.gz";
+ sha256 = "1nshbcpdn0jpcj51x0spzjp519pkmqz0n0748j7dgpz70zlqbfpm";
+ };
+
+ # error: invalid command 'test'
+ doCheck = false;
+
+ meta = {
+ homepage = http://www.crummy.com/software/BeautifulSoup/;
+ license = "bsd";
+ description = "Undemanding HTML/XML parser";
+ };
+}
diff --git a/pkgs/applications/networking/pyload/default.nix b/pkgs/applications/networking/pyload/default.nix
index f8cd1ab1d00b..c331c4f287e6 100644
--- a/pkgs/applications/networking/pyload/default.nix
+++ b/pkgs/applications/networking/pyload/default.nix
@@ -1,5 +1,12 @@
-{ stdenv, fetchFromGitHub, fetchpatch, pythonPackages, gocr, unrar, rhino, spidermonkey }:
-pythonPackages.buildPythonApplication rec {
+{ stdenv, fetchFromGitHub, fetchpatch, pythonPackages, gocr, unrar, rhino, spidermonkey
+, pkgs }:
+
+let
+ beautifulsoup = pythonPackages.callPackage ./beautifulsoup.nix {
+ inherit pythonPackages;
+ };
+
+in pythonPackages.buildPythonApplication rec {
version = "0.4.9-next";
name = "pyLoad-" + version;
diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix
index c656ff24df84..f6be80e4a1d4 100644
--- a/pkgs/applications/networking/remote/citrix-receiver/default.nix
+++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix
@@ -1,4 +1,5 @@
{ stdenv
+, lib
, requireFile
, makeWrapper
, libredirect
@@ -20,149 +21,200 @@
, fontconfig
, gtk_engines
, alsaLib
+, libidn
+, zlib
+, version ? null
}:
-let versionRec = { major = "13"; minor = "4"; patch = "0"; };
-in stdenv.mkDerivation rec {
- name = "citrix-receiver-${version}";
- version = with versionRec; "${major}.${minor}.${patch}";
- homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html;
+let
+ versionInfo = {
+ "13.4.0" = rec {
+ major = "13";
+ minor = "4";
+ patch = "0";
+ x64hash = "133brs0sq6d0mgr19rc6ig1n9ahm3ryi23v5nrgqfh0hgxqcrrjb";
+ x86hash = "0r7jfl5yqv1s2npy8l9gsn0gbb82f6raa092ppkc8xy5pni5sh7l";
+ x64suffix = "10109380";
+ x86suffix = x64suffix;
+ homepage = https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-latest-13-4.html;
+ };
- prefixWithBitness = if stdenv.is64bit then "linuxx64" else "linuxx86";
+ "13.5.0" = rec {
+ major = "13";
+ minor = "5";
+ patch = "0";
+ x64hash = "1r24mhkpcc0z95n597p07fz92pd1b8qqzp2z6w07rmb9wb8mpd4x";
+ x86hash = "0pwxshlryzhkl86cj9ryybm54alhzjx0gpp67fnvdn5r64wy1nd1";
+ x64suffix = "10185126";
+ x86suffix = x64suffix;
+ homepage = https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-latest-13-5.html;
+ };
- src = with versionRec; requireFile rec {
- name = "${prefixWithBitness}-${version}.10109380.tar.gz";
- sha256 =
- if stdenv.is64bit
- then "133brs0sq6d0mgr19rc6ig1n9ahm3ryi23v5nrgqfh0hgxqcrrjb"
- else "0r7jfl5yqv1s2npy8l9gsn0gbb82f6raa092ppkc8xy5pni5sh7l";
- message = ''
- In order to use Citrix Receiver, you need to comply with the Citrix EULA and download
- the ${if stdenv.is64bit then "64-bit" else "32-bit"} binaries, .tar.gz from:
+ "13.6.0" = rec {
+ major = "13";
+ minor = "6";
+ patch = "0";
+ x64hash = "6e423be41d5bb8186bcca3fbb4ede54dc3f00b8d2aeb216ae4aabffef9310d34";
+ x86hash = "0ba3eba208b37844904d540b3011075ed5cecf429a0ab6c6cd52f2d0fd841ad2";
+ x64suffix = "10243651";
+ x86suffix = x64suffix;
+ homepage = https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-136.html;
+ };
- ${homepage}
-
- (if you do not find version ${version} there, try at
- https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-latest-${major}-${minor}.html
- or at https://www.citrix.com/downloads/citrix-receiver/ under "Earlier Versions of Receiver for Linux")
-
- Once you have downloaded the file, please use the following command and re-run the
- installation:
-
- nix-prefetch-url file://\$PWD/${name}
- '';
+ "13.7.0" = {
+ major = "13";
+ minor = "7";
+ patch = "0";
+ x64hash = "18fb374b9fb8e249b79178500dddca7a1f275411c6537e7695da5dcf19c5ba91";
+ x86hash = "4c68723b0327cf6f12da824056fce2b7853c38e6163a48c9d222b93dd8da75b6";
+ homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html; # Fix when updating version
+ x64suffix = "10276927";
+ x86suffix = "10276925";
+ };
};
- phases = [ "unpackPhase" "installPhase" ];
+ citrixReceiverForVersion = { major, minor, patch, x86hash, x64hash, x86suffix, x64suffix, homepage }:
+ stdenv.mkDerivation rec {
+ name = "citrix-receiver-${version}";
+ version = "${major}.${minor}.${patch}";
+ inherit homepage;
- sourceRoot = ".";
+ prefixWithBitness = if stdenv.is64bit then "linuxx64" else "linuxx86";
- buildInputs = [
- makeWrapper
- busybox
- file
- gtk2
- gdk_pixbuf
- ];
+ src = requireFile rec {
+ name = if stdenv.is64bit then "${prefixWithBitness}-${version}.${x64suffix}.tar.gz" else "${prefixWithBitness}-${version}.${x86suffix}.tar.gz";
+ sha256 = if stdenv.is64bit then x64hash else x86hash;
+ message = ''
+ In order to use Citrix Receiver, you need to comply with the Citrix EULA and download
+ the ${if stdenv.is64bit then "64-bit" else "32-bit"} binaries, .tar.gz from:
- libPath = stdenv.lib.makeLibraryPath [
- glib
- gtk2
- atk
- gdk_pixbuf
- cairo
- pango
- gnome3.dconf
- xlibs.libX11
- xlibs.libXext
- xlibs.libXrender
- xlibs.libXinerama
- xlibs.libXfixes
- libpng12
- gtk_engines
- freetype
- fontconfig
- alsaLib
- stdenv.cc.cc # Fixes: Can not load [..]/opt/citrix-icaclient/lib/ctxh264_fb.so:(null)
- ];
+ ${homepage}
- desktopItem = makeDesktopItem {
- name = "wfica";
- desktopName = "Citrix Receiver";
- genericName = "Citrix Receiver";
- exec = "wfica";
- icon = "wfica";
- comment = "Connect to remote Citrix server";
- categories = "GTK;GNOME;X-GNOME-NetworkSettings;Network;";
- mimeType = "application/x-ica";
- };
+ (if you do not find version ${version} there, try at
+ https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/
+ or at https://www.citrix.com/downloads/citrix-receiver/ under "Earlier Versions of Receiver for Linux")
- installPhase = ''
- export ICAInstDir="$out/opt/citrix-icaclient"
+ Once you have downloaded the file, please use the following command and re-run the
+ installation:
- sed -i \
- -e 's,^main_install_menu$,install_ICA_client,g' \
- -e 's,^integrate_ICA_client(),alias integrate_ICA_client=true\nintegrate_ICA_client_old(),g' \
- -e 's,^ANSWER=""$,ANSWER="$INSTALLER_YES",' \
- -e 's,/bin/true,true,g' \
- ./${prefixWithBitness}/hinst
+ nix-prefetch-url file://\$PWD/${name}
+ '';
+ };
- # Run the installer...
- ./${prefixWithBitness}/hinst CDROM "`pwd`"
+ phases = [ "unpackPhase" "installPhase" ];
- echo "Deleting broken links..."
- for link in `find $ICAInstDir -type l `
- do
- [ -f "$link" ] || rm -v "$link"
- done
+ sourceRoot = ".";
- echo "Expanding certificates..."
- # As explained in https://wiki.archlinux.org/index.php/Citrix#Security_Certificates
- pushd "$ICAInstDir/keystore/cacerts"
- awk 'BEGIN {c=0;} /BEGIN CERT/{c++} { print > "cert." c ".pem"}' < ${cacert}/etc/ssl/certs/ca-bundle.crt
- popd
+ buildInputs = [
+ makeWrapper
+ busybox
+ file
+ gtk2
+ gdk_pixbuf
+ ];
- echo "Patching executables..."
- find $ICAInstDir -type f -exec file {} \; |
- grep 'ELF.*executable' |
- cut -f 1 -d : |
- while read f
- do
- echo "Patching ELF intrepreter and rpath for $f"
- chmod u+w "$f"
- patchelf \
- --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
- --set-rpath "$ICAInstDir:$libPath" "$f"
- done
+ libPath = stdenv.lib.makeLibraryPath [
+ glib
+ gtk2
+ atk
+ gdk_pixbuf
+ cairo
+ pango
+ gnome3.dconf
+ xlibs.libX11
+ xlibs.libXext
+ xlibs.libXrender
+ xlibs.libXinerama
+ xlibs.libXfixes
+ libpng12
+ libidn
+ zlib
+ gtk_engines
+ freetype
+ fontconfig
+ alsaLib
+ stdenv.cc.cc # Fixes: Can not load [..]/opt/citrix-icaclient/lib/ctxh264_fb.so:(null)
+ ];
- echo "Wrapping wfica..."
- mkdir "$out/bin"
+ desktopItem = makeDesktopItem {
+ name = "wfica";
+ desktopName = "Citrix Receiver";
+ genericName = "Citrix Receiver";
+ exec = "wfica";
+ icon = "wfica";
+ comment = "Connect to remote Citrix server";
+ categories = "GTK;GNOME;X-GNOME-NetworkSettings;Network;";
+ mimeType = "application/x-ica";
+ };
- makeWrapper "$ICAInstDir/wfica" "$out/bin/wfica" \
- --add-flags "-icaroot $ICAInstDir" \
- --set ICAROOT "$ICAInstDir" \
- --set GTK_PATH "${gtk2.out}/lib/gtk-2.0:${gnome3.gnome_themes_standard}/lib/gtk-2.0" \
- --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
- --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
- --set LD_LIBRARY_PATH "$libPath" \
- --set NIX_REDIRECTS "/usr/share/zoneinfo=${tzdata}/share/zoneinfo:/etc/zoneinfo=${tzdata}/share/zoneinfo:/etc/timezone=$ICAInstDir/timezone"
+ installPhase = ''
+ export ICAInstDir="$out/opt/citrix-icaclient"
- echo "We arbitrarily set the timezone to UTC. No known consequences at this point."
- echo UTC > "$ICAInstDir/timezone"
+ sed -i \
+ -e 's,^main_install_menu$,install_ICA_client,g' \
+ -e 's,^integrate_ICA_client(),alias integrate_ICA_client=true\nintegrate_ICA_client_old(),g' \
+ -e 's,^ANSWER=""$,ANSWER="$INSTALLER_YES",' \
+ -e 's,/bin/true,true,g' \
+ ./${prefixWithBitness}/hinst
- echo "Installing desktop item..."
- mkdir -p $out/share/applications
- cp ${desktopItem}/share/applications/* $out/share/applications
+ # Run the installer...
+ ./${prefixWithBitness}/hinst CDROM "`pwd`"
- # We introduce a dependency on the source file so that it need not be redownloaded everytime
- echo $src >> "$out/share/nix_dependencies.pin"
- '';
+ echo "Deleting broken links..."
+ for link in `find $ICAInstDir -type l `
+ do
+ [ -f "$link" ] || rm -v "$link"
+ done
- meta = with stdenv.lib; {
- license = stdenv.lib.licenses.unfree;
- homepage = homepage;
- description = "Citrix Receiver";
- maintainers = with maintainers; [ obadz a1russell ];
- platforms = platforms.linux;
- };
-}
+ echo "Expanding certificates..."
+ # As explained in https://wiki.archlinux.org/index.php/Citrix#Security_Certificates
+ pushd "$ICAInstDir/keystore/cacerts"
+ awk 'BEGIN {c=0;} /BEGIN CERT/{c++} { print > "cert." c ".pem"}' < ${cacert}/etc/ssl/certs/ca-bundle.crt
+ popd
+
+ echo "Patching executables..."
+ find $ICAInstDir -type f -exec file {} \; |
+ grep 'ELF.*executable' |
+ cut -f 1 -d : |
+ while read f
+ do
+ echo "Patching ELF intrepreter and rpath for $f"
+ chmod u+w "$f"
+ patchelf \
+ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+ --set-rpath "$ICAInstDir:$libPath" "$f"
+ done
+
+ echo "Wrapping wfica..."
+ mkdir "$out/bin"
+
+ makeWrapper "$ICAInstDir/wfica" "$out/bin/wfica" \
+ --add-flags "-icaroot $ICAInstDir" \
+ --set ICAROOT "$ICAInstDir" \
+ --set GTK_PATH "${gtk2.out}/lib/gtk-2.0:${gnome3.gnome_themes_standard}/lib/gtk-2.0" \
+ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+ --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
+ --set LD_LIBRARY_PATH "$libPath" \
+ --set NIX_REDIRECTS "/usr/share/zoneinfo=${tzdata}/share/zoneinfo:/etc/zoneinfo=${tzdata}/share/zoneinfo:/etc/timezone=$ICAInstDir/timezone"
+
+ echo "We arbitrarily set the timezone to UTC. No known consequences at this point."
+ echo UTC > "$ICAInstDir/timezone"
+
+ echo "Installing desktop item..."
+ mkdir -p $out/share/applications
+ cp ${desktopItem}/share/applications/* $out/share/applications
+
+ # We introduce a dependency on the source file so that it need not be redownloaded everytime
+ echo $src >> "$out/share/nix_dependencies.pin"
+ '';
+
+ meta = with stdenv.lib; {
+ license = stdenv.lib.licenses.unfree;
+ inherit homepage;
+ description = "Citrix Receiver";
+ maintainers = with maintainers; [ obadz a1russell ];
+ platforms = platforms.linux;
+ };
+ };
+
+in citrixReceiverForVersion (lib.getAttr version versionInfo)
diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix
index 5e675c148bcd..4c1ddcef5cc8 100644
--- a/pkgs/applications/networking/remote/putty/default.nix
+++ b/pkgs/applications/networking/remote/putty/default.nix
@@ -1,12 +1,16 @@
-{ stdenv, fetchurl, ncurses, gtk2, pkgconfig, autoconf, automake, perl, halibut, libtool }:
+{ stdenv, fetchurl, autoconf, automake, pkgconfig, libtool
+, gtk2, halibut, ncurses, perl }:
stdenv.mkDerivation rec {
- version = "0.67";
+ version = "0.70";
name = "putty-${version}";
src = fetchurl {
- url = "http://the.earth.li/~sgtatham/putty/latest/${name}.tar.gz";
- sha256 = "0isak6dy5vmfzf9ckcq6jvhgrn3xfmfcmziaa7g2jqm4x1c286c0";
+ urls = [
+ "https://the.earth.li/~sgtatham/putty/${version}/${name}.tar.gz"
+ "ftp://ftp.wayne.edu/putty/putty-website-mirror/${version}/${name}.tar.gz"
+ ];
+ sha256 = "1gmhwwj1y7b5hgkrkxpf4jddjpk9l5832zq5ibhsiicndsfs92mv";
};
preConfigure = ''
@@ -19,7 +23,9 @@ stdenv.mkDerivation rec {
cd unix
'';
- buildInputs = [ gtk2 ncurses pkgconfig autoconf automake perl halibut libtool ];
+ nativeBuildInputs = [ autoconf automake halibut libtool perl pkgconfig ];
+ buildInputs = [ gtk2 ncurses ];
+ enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "A Free Telnet/SSH Client";
diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix
index 66e0cef23f5b..5cbee68551e5 100644
--- a/pkgs/applications/networking/remote/remmina/default.nix
+++ b/pkgs/applications/networking/remote/remmina/default.nix
@@ -32,7 +32,8 @@ in stdenv.mkDerivation {
sha256 = "1vfg8sfpj83ircp7ny6xsbn2ba5xbp3xrdl5wwyfcg1zrpdmi7f1";
};
- buildInputs = [ cmake pkgconfig wrapGAppsHook gsettings_desktop_schemas
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ cmake wrapGAppsHook gsettings_desktop_schemas
glib gtk3 gettext libxkbfile libgnome_keyring libX11
freerdp libssh libgcrypt gnutls
pcre webkitgtk libdbusmenu-gtk3 libappindicator-gtk3
diff --git a/pkgs/applications/networking/sniffers/etherape/default.nix b/pkgs/applications/networking/sniffers/etherape/default.nix
index 5bc5bafe7db8..f01a36cc65f5 100644
--- a/pkgs/applications/networking/sniffers/etherape/default.nix
+++ b/pkgs/applications/networking/sniffers/etherape/default.nix
@@ -9,8 +9,10 @@ stdenv.mkDerivation rec {
};
configureFlags = [ "--disable-scrollkeeper" ];
+
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig libtool gtk2 libpcap libglade libgnome libgnomeui gnomedocutils
+ libtool gtk2 libpcap libglade libgnome libgnomeui gnomedocutils
scrollkeeper libxslt
];
diff --git a/pkgs/applications/networking/sniffers/ettercap/default.nix b/pkgs/applications/networking/sniffers/ettercap/default.nix
index cc8e5dc4de08..13d536ccf1bb 100644
--- a/pkgs/applications/networking/sniffers/ettercap/default.nix
+++ b/pkgs/applications/networking/sniffers/ettercap/default.nix
@@ -1,5 +1,6 @@
-{ stdenv, fetchFromGitHub, cmake, libpcap, libnet, zlib, curl, pcre,
- openssl, ncurses, glib, gtk2, atk, pango, flex, bison }:
+{ stdenv, fetchFromGitHub, cmake, libpcap, libnet, zlib, curl, pcre
+, openssl, ncurses, glib, gtk2, atk, pango, flex, bison
+, fetchpatch }:
stdenv.mkDerivation rec {
name = "ettercap-${version}";
@@ -12,6 +13,19 @@ stdenv.mkDerivation rec {
sha256 = "1kvrzv2f8kxy7pndfadkzv10cs5wsyfkaa1ski20r2mq4wrvd0cd";
};
+ patches = [
+ (fetchpatch {
+ name = "CVE-2017-8366.patch";
+ url = "https://github.com/Ettercap/ettercap/commit/1083d604930ebb9f350126b83802ecd2cbc17f90.patch";
+ sha256 = "1ff6fp8fxisvd3fkkd01y4fjykgcj414kczzpfscdmi52ridwg8m";
+ })
+ (fetchpatch {
+ name = "CVE-2017-6430.patch";
+ url = "https://github.com/Ettercap/ettercap/commit/7f50c57b2101fe75592c8dc9960883bbd1878bce.patch";
+ sha256 = "0s13nc9yzxzp611rixsd1c8aw1b57q2lnvfq8wawxyrw07h7b2j4";
+ })
+ ];
+
buildInputs = [
cmake libpcap libnet zlib curl pcre openssl ncurses
glib gtk2 atk pango flex bison
diff --git a/pkgs/applications/networking/sniffers/kismet/default.nix b/pkgs/applications/networking/sniffers/kismet/default.nix
index 21bb95d45e8f..803e35307fe9 100644
--- a/pkgs/applications/networking/sniffers/kismet/default.nix
+++ b/pkgs/applications/networking/sniffers/kismet/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0dz28y4ay4lskhl0lawqy2dkcrhgfkbg06v22qxzzw8i6caizcmx";
};
- buildInputs = [ pkgconfig libpcap ncurses expat pcre libnl ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libpcap ncurses expat pcre libnl ];
postConfigure = ''
sed -e 's/-o $(INSTUSR)//' \
-e 's/-g $(INSTGRP)//' \
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index 20a0f947f105..2ed87c71a906 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -12,7 +12,7 @@ assert withQt -> !withGtk && qt5 != null;
with stdenv.lib;
let
- version = "2.4.1";
+ version = "2.4.2";
variant = if withGtk then "gtk" else if withQt then "qt" else "cli";
in stdenv.mkDerivation {
@@ -20,17 +20,17 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
- sha256 = "1k8zj44pkb2ny2x46f100y7cxddm1kh0zh7f6qggm78gn7wvrp82";
+ sha256 = "0zglapd3sz08p2z9x8a5va3jnz17b3n5a1bskf7f2dgx6m3v5b6i";
};
cmakeFlags = optional withGtk "-DBUILD_wireshark_gtk=TRUE";
nativeBuildInputs = [
- bison cmake extra-cmake-modules flex
+ bison cmake extra-cmake-modules flex pkgconfig
] ++ optional withGtk wrapGAppsHook;
buildInputs = [
- gettext pcre perl pkgconfig libpcap lua5 libssh openssl libgcrypt
+ gettext pcre perl libpcap lua5 libssh openssl libgcrypt
libgpgerror gnutls geoip c-ares python glib zlib
] ++ optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ])
++ optionals withGtk [ gtk3 librsvg gsettings_desktop_schemas ]
diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix
index 6dd6b5ebcedf..ad51703bd6fe 100644
--- a/pkgs/applications/networking/sync/rclone/default.nix
+++ b/pkgs/applications/networking/sync/rclone/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "rclone-${version}";
- version = "1.37";
+ version = "1.38";
goPackagePath = "github.com/ncw/rclone";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "ncw";
repo = "rclone";
rev = "v${version}";
- sha256 = "0krmdwzl4c68vxpbycqy2xba8vvqbka7xh3k2q6ldxsd8y2rypym";
+ sha256 = "0f56qm4lz55anzqf6dmjfywmvqy10zi5cl69zz8lda8lmvrpjm1d";
};
outputs = [ "bin" "out" "man" ];
diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 4e3f0a684239..ecdecd07eeb9 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -1,14 +1,14 @@
{ stdenv, lib, fetchFromGitHub, go, procps, removeReferencesTo }:
stdenv.mkDerivation rec {
- version = "0.14.38";
+ version = "0.14.40";
name = "syncthing-${version}";
src = fetchFromGitHub {
owner = "syncthing";
repo = "syncthing";
rev = "v${version}";
- sha256 = "0afid083azvrihv1v2cas09dprr2fflmj9gi7iy18gvwy2pg0jj8";
+ sha256 = "0fd4k09sb91d1bjqj2v1fh7raq98fdw45aaa58kramwhidsf9sy5";
};
buildInputs = [ go removeReferencesTo ];
diff --git a/pkgs/applications/networking/syncthing/inotify.nix b/pkgs/applications/networking/syncthing/inotify.nix
index c83d9a2fcd00..e33501a17158 100644
--- a/pkgs/applications/networking/syncthing/inotify.nix
+++ b/pkgs/applications/networking/syncthing/inotify.nix
@@ -25,8 +25,6 @@ buildGoPackage rec {
substitute $src/etc/linux-systemd/user/syncthing-inotify.service \
$bin/lib/systemd/user/syncthing-inotify.service \
--replace /usr/bin/syncthing-inotify $bin/bin/syncthing-inotify
- '' + stdenv.lib.optionalString stdenv.isDarwin ''
- install_name_tool -delete_rpath $out/lib -add_rpath $bin $bin/bin/syncthing-inotify
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/syncthing012/default.nix b/pkgs/applications/networking/syncthing012/default.nix
index 5735dd68bcd2..4b5359555f4a 100644
--- a/pkgs/applications/networking/syncthing012/default.nix
+++ b/pkgs/applications/networking/syncthing012/default.nix
@@ -5,8 +5,6 @@ buildGoPackage rec {
version = "0.12.15";
rev = "v${version}";
- buildFlags = "--tags noupgrade,release";
-
goPackagePath = "github.com/syncthing/syncthing";
src = fetchFromGitHub {
@@ -22,4 +20,8 @@ buildGoPackage rec {
# Mostly a cosmetic change
sed -i 's,unknown-dev,${version},g' cmd/syncthing/main.go
'';
+
+ preBuild = ''
+ export buildFlagsArray+=("-tags" "noupgrade release")
+ '';
}
diff --git a/pkgs/applications/networking/tcpkali/default.nix b/pkgs/applications/networking/tcpkali/default.nix
index d28c162874ec..79bc32dfa40d 100644
--- a/pkgs/applications/networking/tcpkali/default.nix
+++ b/pkgs/applications/networking/tcpkali/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
rev = "v${version}";
sha256 = "03cbmnc60wkd7f4bapn5cbm3c4zas2l0znsbpci2mn8ms8agif82";
};
- buildInputs = [autoreconfHook bison];
+ nativeBuildInputs = [ autoreconfHook ];
+ buildInputs = [ bison];
meta = {
description = "High performance TCP and WebSocket load generator and sink";
license = stdenv.lib.licenses.bsd2;
diff --git a/pkgs/applications/networking/testssl/default.nix b/pkgs/applications/networking/testssl/default.nix
new file mode 100644
index 000000000000..dc7c961856d6
--- /dev/null
+++ b/pkgs/applications/networking/testssl/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchFromGitHub, pkgs }:
+
+stdenv.mkDerivation rec {
+ version = "2.9.5-1";
+ name = "testssl.sh-${version}";
+
+ src = fetchFromGitHub {
+ owner = "drwetter";
+ repo = "testssl.sh";
+ rev = "v${version}";
+ sha256 = "0hz6g685jwl0c0jrdca746425xpwiwc8lnlc2gigga5hkcq8qzl9";
+ };
+
+ nativeBuildInputs = with pkgs; [
+ makeWrapper
+ ];
+
+ patches = [ ./testssl.patch ];
+
+ pwdBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ coreutils ])}/pwd";
+ opensslBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ openssl ])}/openssl";
+ postPatch = ''
+ sed -i -e "s|/bin/pwd|${pwdBinPath}|g" \
+ -e "s|TESTSSL_INSTALL_DIR:-\"\"|TESTSSL_INSTALL_DIR:-\"$out\"|g" \
+ -e "s|OPENSSL:-\"\"|OPENSSL:-\"${opensslBinPath}\"|g" \
+ testssl.sh
+ '';
+
+ installPhase = ''
+ mkdir -p $out/bin $out/etc
+ cp -r etc/ $out/
+ cp testssl.sh $out/bin/testssl.sh
+ '';
+
+ meta = with stdenv.lib; {
+ description = "CLI tool to check a server's TLS/SSL capabilities";
+ longDescription = ''
+ CLI tool which checks a server's service on any port for the support of
+ TLS/SSL ciphers, protocols as well as recent cryptographic flaws and more.
+ '';
+ homepage = https://testssl.sh/;
+ license = licenses.gpl2;
+ maintainers = [ maintainers.etu ];
+ };
+}
diff --git a/pkgs/applications/networking/testssl/testssl.patch b/pkgs/applications/networking/testssl/testssl.patch
new file mode 100644
index 000000000000..d5269c737084
--- /dev/null
+++ b/pkgs/applications/networking/testssl/testssl.patch
@@ -0,0 +1,10 @@
+--- testssl/testssl.sh 2017-09-24 16:53:29.395263437 +0200
++++ testssl-new/testssl.sh 2017-09-24 16:53:41.221154492 +0200
+@@ -165,6 +165,7 @@
+ # following variables make use of $ENV, e.g. OPENSSL= ./testssl.sh
+ # 0 means (normally) true here. Some of the variables are also accessible with a command line switch, see --help
+ declare -x OPENSSL OPENSSL_TIMEOUT
++OPENSSL=${OPENSSL:-""}
+ FAST_SOCKET=${FAST_SOCKET:-false} # EXPERIMENTAL feature to accelerate sockets -- DO NOT USE it for production
+ COLOR=${COLOR:-2} # 2: Full color, 1: b/w+positioning, 0: no ESC at all
+ COLORBLIND=${COLORBLIND:-false} # if true, swap blue and green in the output
diff --git a/pkgs/applications/networking/umurmur/default.nix b/pkgs/applications/networking/umurmur/default.nix
index 550445f73068..a1fe790b1190 100644
--- a/pkgs/applications/networking/umurmur/default.nix
+++ b/pkgs/applications/networking/umurmur/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "074px4ygmv4ydy2pqwxwnz17f0hfswqkz5kc9qfz0iby3h5i3fyl";
};
- buildInputs = [ autoreconfHook openssl protobufc libconfig ];
+ nativeBuildInputs = [ autoreconfHook ];
+ buildInputs = [ openssl protobufc libconfig ];
configureFlags = [
"--with-ssl=openssl"
diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix
index 18ece7a74019..1563cdf3d056 100644
--- a/pkgs/applications/office/abiword/default.nix
+++ b/pkgs/applications/office/abiword/default.nix
@@ -5,15 +5,19 @@
stdenv.mkDerivation rec {
name = "abiword-${version}";
- version = "3.0.1";
+ version = "3.0.2";
src = fetchurl {
- url = "http://www.abisource.org/downloads/abiword/${version}/source/${name}.tar.gz";
- sha256 = "1ik591rx15nn3n1297cwykl8wvrlgj78i528id9wbidgy3xzd570";
+ url = "http://www.abisource.com/downloads/abiword/${version}/source/${name}.tar.gz";
+ sha256 = "08imry821g81apdwym3gcs4nss0l9j5blqk31j5rv602zmcd9gxg";
};
enableParallelBuilding = true;
+ patches = [
+ ./patches/fix-13791.patch
+ ];
+
buildInputs =
[ pkgconfig gtk3 libglade librsvg bzip2 libgnomecanvas fribidi libpng popt
libgsf enchant wv libjpeg perl boost libxslt goffice makeWrapper iconTheme
@@ -29,6 +33,6 @@ stdenv.mkDerivation rec {
homepage = http://www.abisource.com/;
license = licenses.gpl3;
platforms = platforms.linux;
- maintainers = with maintainers; [ pSub ];
+ maintainers = with maintainers; [ pSub ylwghst ];
};
}
diff --git a/pkgs/applications/office/abiword/patches/fix-13791.patch b/pkgs/applications/office/abiword/patches/fix-13791.patch
new file mode 100644
index 000000000000..98004f01bcba
--- /dev/null
+++ b/pkgs/applications/office/abiword/patches/fix-13791.patch
@@ -0,0 +1,161 @@
+From 46388f407c893123d9b3824a7570b050fc3b049b Mon Sep 17 00:00:00 2001
+From: James Cameron
+Date: Thu, 17 Aug 2017 15:05:39 +1000
+Subject: [PATCH] Fix flickering
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+- in GR_Caret::s_blink_timeout, avoid repeated calls by stopping the
+ timer, it will be restarted when needed,
+
+- in GR_Caret::s_enable, avoid extra unnecessary _blink calls when blink
+ is enabled, as they serve no purpose,
+
+- in XAP_UnixFrameImpl::_fe::expose, use the Cairo clip rectangle
+ instead of the expose event area, thanks to Hubert Figuière in
+ 865c1dda7e13deff04573ffc42028b71fee07f9c,
+
+- in XAP_UnixFrameImpl::_fe::expose, do not return FALSE, as other
+ handlers will need to handle the draw event,
+
+- in GR_UnixCairoGraphics::flush, fix excessive draw events;
+ gtk_widget_queue_draw only marks the widget as needing redrawing,
+ which causes a draw event for each call to flush, therefore every
+ caret blink, so use gdk_flush instead,
+
+Fixes AbiSource #13791.
+Fixes Debian #851052.
+Fixes Fedora #1287835.
+Fixes Ubuntu LP: #1574278.
+Fixes Sugar Labs #4915.
+
+Signed-off-by: James Cameron
+---
+ src/af/gr/gtk/gr_UnixCairoGraphics.cpp | 4 +---
+ src/af/gr/xp/gr_Caret.cpp | 13 ++++---------
+ src/af/xap/gtk/xap_UnixFrameImpl.cpp | 27 ++++++++++++++++++---------
+ src/af/xap/gtk/xap_UnixFrameImpl.h | 2 +-
+ 4 files changed, 24 insertions(+), 22 deletions(-)
+
+diff --git a/src/af/gr/gtk/gr_UnixCairoGraphics.cpp b/src/af/gr/gtk/gr_UnixCairoGraphics.cpp
+index 509bd37..7c3c06f 100644
+--- a/src/af/gr/gtk/gr_UnixCairoGraphics.cpp
++++ b/src/af/gr/gtk/gr_UnixCairoGraphics.cpp
+@@ -577,9 +577,7 @@ void GR_UnixCairoGraphics::_endPaint()
+
+ void GR_UnixCairoGraphics::flush(void)
+ {
+- if (m_Widget) {
+- gtk_widget_queue_draw(m_Widget);
+- }
++ gdk_flush();
+ }
+
+ bool GR_UnixCairoGraphics::queryProperties(GR_Graphics::Properties gp) const
+diff --git a/src/af/gr/xp/gr_Caret.cpp b/src/af/gr/xp/gr_Caret.cpp
+index 5d5d116..a8aa451 100644
+--- a/src/af/gr/xp/gr_Caret.cpp
++++ b/src/af/gr/xp/gr_Caret.cpp
+@@ -155,22 +155,17 @@ void GR_Caret::s_enable(UT_Worker * _w)
+ {
+ GR_Caret * c = static_cast(_w->getInstanceData());
+
++ c->m_enabler->stop();
+ c->m_worker->stop();
+- c->_blink(true);
+- if (!c->m_bCursorIsOn)
+- c->_blink(true); // blink again
+- else
+- {
+- c->_blink(true); // ?? - MARCM
+- c->_blink(true);
+- }
+ c->m_worker->start();
+- c->m_enabler->stop();
++ c->_blink(true);
+ }
+
+ void GR_Caret::s_blink_timeout(UT_Worker * _w)
+ {
+ GR_Caret * c = static_cast(_w->getInstanceData());
++
++ c->m_blinkTimeout->stop();
+ if (c->isEnabled())
+ c->disable();
+ }
+diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.cpp b/src/af/xap/gtk/xap_UnixFrameImpl.cpp
+index 780000e..e81961a 100644
+--- a/src/af/xap/gtk/xap_UnixFrameImpl.cpp
++++ b/src/af/xap/gtk/xap_UnixFrameImpl.cpp
+@@ -1208,15 +1208,23 @@ gint XAP_UnixFrameImpl::_fe::delete_event(GtkWidget * w, GdkEvent * /*event*/, g
+ }
+
+ #if GTK_CHECK_VERSION(3,0,0)
+-gint XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr)
++gboolean XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr)
+ #else
+ gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent)
+ #endif
+ {
+ XAP_UnixFrameImpl * pUnixFrameImpl = static_cast(g_object_get_data(G_OBJECT(w), "user_data"));
+ FV_View * pView = static_cast(pUnixFrameImpl->getFrame()->getCurrentView());
++ double x, y, width, height;
+ #if GTK_CHECK_VERSION(3,0,0)
+- GdkEventExpose *pExposeEvent = reinterpret_cast(gtk_get_current_event());
++ cairo_clip_extents (cr, &x, &y, &width, &height);
++ width -= x;
++ height -= y;
++#else
++ x = pExposeEvent->area.x;
++ y = pExposeEvent->area.y;
++ width = pExposeEvent->area.width;
++ height = pExposeEvent->area.height;
+ #endif
+ /* Jean: commenting out next lines since the zoom update code does draw only
+ * part of what needs to be updated. */
+@@ -1230,20 +1238,21 @@ gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent)
+ UT_Rect rClip;
+ if (pGr->getPaintCount () > 0)
+ return TRUE;
+- xxx_UT_DEBUGMSG(("Expose area: x %d y %d width %d height %d \n",pExposeEvent->area.x,pExposeEvent->area.y,pExposeEvent->area.width,pExposeEvent->area.height));
+- rClip.left = pGr->tlu(pExposeEvent->area.x);
+- rClip.top = pGr->tlu(pExposeEvent->area.y);
+- rClip.width = pGr->tlu(pExposeEvent->area.width)+1;
+- rClip.height = pGr->tlu(pExposeEvent->area.height)+1;
+-#if GTK_CHECK_VERSION(3,0,0)
++ rClip.left = pGr->tlu(x);
++ rClip.top = pGr->tlu(y);
++ #if GTK_CHECK_VERSION(3,0,0)
++ rClip.width = pGr->tlu(width);
++ rClip.height = pGr->tlu(height);
+ static_cast(pGr)->setCairo(cr);
+ pView->draw(&rClip);
+ static_cast(pGr)->setCairo(NULL);
+ #else
++ rClip.width = pGr->tlu(width)+1;
++ rClip.height = pGr->tlu(height)+1;
+ pView->draw(&rClip);
+ #endif
+ }
+- return FALSE;
++ return TRUE;
+ }
+
+ static bool bScrollWait = false;
+diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.h b/src/af/xap/gtk/xap_UnixFrameImpl.h
+index 30ee5d8..26fbb2e 100644
+--- a/src/af/xap/gtk/xap_UnixFrameImpl.h
++++ b/src/af/xap/gtk/xap_UnixFrameImpl.h
+@@ -152,7 +152,7 @@ protected:
+ static gint key_release_event(GtkWidget* w, GdkEventKey* e);
+ static gint delete_event(GtkWidget * w, GdkEvent * /*event*/, gpointer /*data*/);
+ #if GTK_CHECK_VERSION(3,0,0)
+- static gint draw(GtkWidget * w, cairo_t * cr);
++ static gboolean draw(GtkWidget * w, cairo_t * cr);
+ #else
+ static gint expose(GtkWidget * w, GdkEventExpose* pExposeEvent);
+ #endif
+--
+2.11.0
+
diff --git a/pkgs/applications/office/beancount/bean-add.nix b/pkgs/applications/office/beancount/bean-add.nix
index 0a93efd3990d..9cee31b01eb7 100644
--- a/pkgs/applications/office/beancount/bean-add.nix
+++ b/pkgs/applications/office/beancount/bean-add.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, python3Packages }:
stdenv.mkDerivation rec {
- name = "bean-add-2017-09-13";
+ name = "bean-add-2017-10-31";
src = fetchFromGitHub {
owner = "simon-v";
repo = "bean-add";
- rev = "035f07a9e48a9dd23b49a27ba9c070ee9ddc4cc7";
- sha256 = "0lj8940bn2h8541am4x0sfqpfk5xfnyfdnf3jpajfgx6wyjm2frg";
+ rev = "9ac64272a17e76f8292bd94deb5aee45c14130d2";
+ sha256 = "1vcwbbi2jsf87yq8f2hyf7nz9br1973sb20qjnsx5fxlmcpn47jh";
};
propagatedBuildInputs = with python3Packages; [ python ];
diff --git a/pkgs/applications/office/beancount/default.nix b/pkgs/applications/office/beancount/default.nix
index 70d5180191e9..efc61dba7a49 100644
--- a/pkgs/applications/office/beancount/default.nix
+++ b/pkgs/applications/office/beancount/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchhg, pkgs, pythonPackages }:
pythonPackages.buildPythonApplication rec {
- version = "2.0b15";
+ version = "2.0rc1";
name = "beancount-${version}";
namePrefix = "";
src = pkgs.fetchurl {
url = "mirror://pypi/b/beancount/${name}.tar.gz";
- sha256 = "1dvnpgja4v4k5zagfsmdjavlib0z3r9r4z197yvj86szhzs0z86k";
+ sha256 = "12vlkck4q3dax9866krp6963c6d845b7inkkwrlkk4njh84n71wf";
};
buildInputs = with pythonPackages; [ nose ];
diff --git a/pkgs/applications/office/calligra/2.nix b/pkgs/applications/office/calligra/2.nix
new file mode 100644
index 000000000000..959a44a35c10
--- /dev/null
+++ b/pkgs/applications/office/calligra/2.nix
@@ -0,0 +1,56 @@
+{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig, kdelibs4, lcms2, libpng, eigen
+, exiv2, boost, sqlite, icu, vc, shared_mime_info, librevenge, libodfgen, libwpg
+, libwpd, poppler_qt4, ilmbase, gsl, qca2, marble, libvisio, libmysql, postgresql
+, freetds, fftw, glew, libkdcraw, pstoedit, opencolorio, kdepimlibs
+, kactivities, okular, git, oxygen-icons5, makeWrapper
+# TODO: not found
+#, xbase, openjpeg
+# TODO: package libWPS, Spnav, m2mml, LibEtonyek
+}:
+
+stdenv.mkDerivation rec {
+ name = "calligra-2.9.11";
+
+ src = fetchurl {
+ url = "mirror://kde/stable/${name}/${name}.tar.xz";
+ sha256 = "02gaahp7a7m53n0hvrp3868s8w37b457isxir0z7b4mwhw7jv3di";
+ };
+
+ nativeBuildInputs = [ automoc4 cmake perl pkgconfig makeWrapper ];
+
+ buildInputs = [
+ kdelibs4 lcms2 libpng eigen
+ exiv2 boost sqlite icu vc shared_mime_info librevenge libodfgen libwpg
+ libwpd poppler_qt4 ilmbase gsl qca2 marble libvisio libmysql postgresql
+ freetds fftw glew libkdcraw opencolorio kdepimlibs
+ kactivities okular git
+ ];
+
+ enableParallelBuilding = true;
+
+ postInstall = ''
+ for i in $out/bin/*; do
+ wrapProgram $i \
+ --prefix PATH ':' "${pstoedit.out}/bin" \
+ --prefix XDG_DATA_DIRS ':' "${oxygen-icons5}/share"
+ done
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A suite of productivity applications";
+ longDescription = ''
+ Calligra Suite is a set of applications written to help
+ you to accomplish your work. Calligra includes efficient
+ and capable office components: Words for text processing,
+ Sheets for computations, Stage for presentations, Plan for
+ planning, Flow for flowcharts, Kexi for database creation,
+ Krita for painting and raster drawing, and Karbon for
+ vector graphics.
+ '';
+ homepage = http://calligra.org;
+ maintainers = with maintainers; [ phreedom ebzzry ];
+ inherit (kdelibs4.meta) platforms;
+ license = licenses.gpl2;
+ broken = true;
+ };
+}
diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix
index 76027f29a707..bec19d675cb0 100644
--- a/pkgs/applications/office/calligra/default.nix
+++ b/pkgs/applications/office/calligra/default.nix
@@ -1,55 +1,65 @@
-{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig, kdelibs4, lcms2, libpng, eigen
-, exiv2, boost, sqlite, icu, vc, shared_mime_info, librevenge, libodfgen, libwpg
-, libwpd, poppler_qt4, ilmbase, gsl, qca2, marble, libvisio, libmysql, postgresql
-, freetds, fftw, glew, libkdcraw, pstoedit, opencolorio, kdepimlibs
-, kactivities, okular, git, oxygen-icons5, makeWrapper
-# TODO: not found
-#, xbase, openjpeg
-# TODO: package libWPS, Spnav, m2mml, LibEtonyek
+{
+ mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools, makeWrapper,
+ boost, qtwebkit, qtx11extras, shared_mime_info,
+ breeze-icons, kactivities, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets,
+ kcoreaddons, kdbusaddons, kdiagram, kguiaddons, khtml, ki18n,
+ kiconthemes, kitemviews, kjobwidgets, kcmutils, kdelibs4support, kio, kross,
+ knotifications, knotifyconfig, kparts, ktextwidgets, kwallet, kwidgetsaddons,
+ kwindowsystem, kxmlgui, sonnet, threadweaver,
+ kcontacts, akonadi, akonadi-calendar, akonadi-contacts,
+ eigen, git, gsl, ilmbase, kproperty, kreport, lcms2, marble, libgit2, libodfgen,
+ librevenge, libvisio, libwpd, libwpg, libwps, okular, openexr, openjpeg, phonon,
+ poppler, pstoedit, qca-qt5, vc
+# TODO: package Spnav, m2mml LibEtonyek, Libqgit2
}:
-stdenv.mkDerivation rec {
- name = "calligra-2.9.11";
+mkDerivation rec {
+ pname = "calligra";
+ version = "3.0.1";
+ name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://kde/stable/${name}/${name}.tar.xz";
- sha256 = "02gaahp7a7m53n0hvrp3868s8w37b457isxir0z7b4mwhw7jv3di";
+ url = "mirror://kde/stable/${pname}/${version}/${name}.tar.xz";
+ sha256 = "1cjdd7sx1zhas6lhw0dzhrnki790jkf93f88wn6z9yrww32dsas5";
};
- nativeBuildInputs = [ automoc4 cmake perl pkgconfig makeWrapper ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
buildInputs = [
- kdelibs4 lcms2 libpng eigen
- exiv2 boost sqlite icu vc shared_mime_info librevenge libodfgen libwpg
- libwpd poppler_qt4 ilmbase gsl qca2 marble libvisio libmysql postgresql
- freetds fftw glew libkdcraw opencolorio kdepimlibs
- kactivities okular git
+ boost qtwebkit qtx11extras shared_mime_info
+ kactivities karchive kcodecs kcompletion kconfig kconfigwidgets kcoreaddons
+ kdbusaddons kdiagram kguiaddons khtml ki18n kiconthemes kitemviews
+ kjobwidgets kcmutils kdelibs4support kio kross knotifications knotifyconfig kparts
+ ktextwidgets kwallet kwidgetsaddons kwindowsystem kxmlgui sonnet threadweaver
+ kcontacts akonadi akonadi-calendar akonadi-contacts
+ eigen git gsl ilmbase kproperty kreport lcms2 marble libgit2 libodfgen librevenge
+ libvisio libwpd libwpg libwps okular openexr openjpeg phonon poppler qca-qt5 vc
];
- enableParallelBuilding = true;
+ propagatedUserEnvPkgs = [ kproperty ];
+
+ NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
postInstall = ''
for i in $out/bin/*; do
wrapProgram $i \
--prefix PATH ':' "${pstoedit.out}/bin" \
- --prefix XDG_DATA_DIRS ':' "${oxygen-icons5}/share"
+ --prefix XDG_DATA_DIRS ':' "${breeze-icons}/share"
done
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "A suite of productivity applications";
longDescription = ''
Calligra Suite is a set of applications written to help
you to accomplish your work. Calligra includes efficient
and capable office components: Words for text processing,
- Sheets for computations, Stage for presentations, Plan for
- planning, Flow for flowcharts, Kexi for database creation,
- Krita for painting and raster drawing, and Karbon for
+ Sheets for computations, Plan for planning, and Karbon for
vector graphics.
'';
- homepage = http://calligra.org;
- maintainers = with maintainers; [ phreedom ebzzry ];
- inherit (kdelibs4.meta) platforms;
- license = licenses.gpl2;
+ homepage = https://www.calligra.org/;
+ maintainers = with maintainers; [ phreedom ebzzry zraexy ];
+ platforms = platforms.linux;
+ license = with licenses; [ gpl2 lgpl2 ];
};
}
diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix
index 7bc549dd0fc5..56a93e990095 100644
--- a/pkgs/applications/office/fava/default.nix
+++ b/pkgs/applications/office/fava/default.nix
@@ -1,42 +1,26 @@
-{ stdenv, pkgs, fetchurl, python3Packages, fetchFromGitHub, fetchzip, python3, beancount }:
+{ stdenv, python3, beancount }:
-python3Packages.buildPythonApplication rec {
- version = "1.3";
- name = "fava-${version}";
+let
+ inherit (python3.pkgs) buildPythonApplication fetchPypi;
+in
+buildPythonApplication rec {
+ pname = "fava";
+ version = "1.5";
+ name = "${pname}-${version}";
- src = fetchFromGitHub {
- owner = "beancount";
- repo = "fava";
- rev = "v${version}";
- sha256 = "0g0aj0qcmpny6dipi00nks7h3mf5a4jfd6bxjm1rb5807wswcpg8";
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0d3jncidzvfsxjplzg4cmflqr4mxrbrlj5bh6fpxj529pialpkk6";
};
- assets = fetchzip {
- url = "https://github.com/beancount/fava/releases/download/v${version}/fava-${version}.tar.gz";
- sha256 = "0yn2psbn436g1w5ixn94z8ca6dfd54izg98979arn0k7slpiccvz";
- };
+ doCheck = false;
- checkInputs = with python3Packages; [ pytest ];
-
- checkPhase = ''
- # pyexcel is optional
- # the other 2 tests fail due non-unicode locales
- PATH=$out/bin:$PATH pytest tests \
- --ignore tests/test_util_excel.py \
- --ignore tests/test_cli.py \
- --ignore tests/test_translations.py \
- '';
-
- postInstall = ''
- cp -r $assets/fava/static/gen $out/${python3.sitePackages}/fava/static
- '';
-
- propagatedBuildInputs = with python3Packages;
+ propagatedBuildInputs = with python3.pkgs;
[ flask dateutil pygments wheel markdown2 flaskbabel tornado
click beancount ];
meta = {
- homepage = https://github.com/aumayr/fava;
+ homepage = https://beancount.github.io/fava;
description = "Web interface for beancount";
license = stdenv.lib.licenses.mit;
maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ];
diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix
index 4ed150813127..f6c4728eb531 100644
--- a/pkgs/applications/office/gnucash/default.nix
+++ b/pkgs/applications/office/gnucash/default.nix
@@ -17,8 +17,9 @@ stdenv.mkDerivation rec {
sha256 = "058mgfwic6a2g7jq6iip5hv45md1qaxy25dj4lvlzjjr141wm4gx";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig libxml2 gconf glib gtk2 libgnomeui libgtkhtml gtkhtml
+ libxml2 gconf glib gtk2 libgnomeui libgtkhtml gtkhtml
libgnomeprint goffice enchant gettext intltool perl guile slibGuile
swig isocodes bzip2 makeWrapper libofx libglade libgsf libart_lgpl
perlPackages.DateManip perlPackages.FinanceQuote aqbanking gwenhywfar
diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix
index 69a96c6148e1..c6458e477186 100644
--- a/pkgs/applications/office/gnumeric/default.nix
+++ b/pkgs/applications/office/gnumeric/default.nix
@@ -25,9 +25,11 @@ in stdenv.mkDerivation rec {
--replace http://www.oasis-open.org/docbook/xml/4.5/ent/isogrk1.ent ${isogrk1}
'';
+ nativeBuildInputs = [ pkgconfig ];
+
# ToDo: optional libgda, introspection?
buildInputs = [
- pkgconfig intltool perl perlXMLParser bison
+ intltool perl perlXMLParser bison
goffice gtk3 makeWrapper gnome3.defaultIconTheme
python pygobject3 itstool
];
diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix
index 65a7c9730e9a..1d90e8be282a 100644
--- a/pkgs/applications/office/homebank/default.nix
+++ b/pkgs/applications/office/homebank/default.nix
@@ -2,10 +2,10 @@
, hicolor_icon_theme, libsoup, gnome3 }:
stdenv.mkDerivation rec {
- name = "homebank-5.1.5";
+ name = "homebank-5.1.6";
src = fetchurl {
url = "http://homebank.free.fr/public/${name}.tar.gz";
- sha256 = "03rkl4bvi1cmb8rqyvmhxhg63bdmb3nzqa3firfimsbphm3x6gsw";
+ sha256 = "1q4h890g6a6pm6kfiavbq9sbpsnap0f854sja2y5q3x0j0ay2q98";
};
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix
index ef21b37b59e8..e7b821834546 100644
--- a/pkgs/applications/office/jabref/default.nix
+++ b/pkgs/applications/office/jabref/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, makeDesktopItem, ant, jdk, jre }:
+{ stdenv, fetchurl, makeWrapper, makeDesktopItem, jdk, jre, wrapGAppsHook, gtk3, gsettings_desktop_schemas }:
stdenv.mkDerivation rec {
version = "3.8.1";
@@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
exec = "jabref";
};
- buildInputs = [ makeWrapper jdk ];
+ buildInputs = [ makeWrapper jdk wrapGAppsHook gtk3 gsettings_desktop_schemas ];
- phases = [ "installPhase" ];
+ unpackPhase = "#";
installPhase = ''
mkdir -p $out/bin $out/share/java $out/share/icons
diff --git a/pkgs/applications/office/kexi/default.nix b/pkgs/applications/office/kexi/default.nix
new file mode 100644
index 000000000000..66aee6bd9628
--- /dev/null
+++ b/pkgs/applications/office/kexi/default.nix
@@ -0,0 +1,47 @@
+{
+ mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools,
+ boost, qttools, qtwebkit,
+ breeze-icons, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets, kcoreaddons,
+ kcrash, kguiaddons, ki18n, kiconthemes, kitemviews, kio, ktexteditor, ktextwidgets,
+ kwidgetsaddons, kxmlgui,
+ kdb, kproperty, kreport, lcms2, libmysql, marble, postgresql
+}:
+
+mkDerivation rec {
+ pname = "kexi";
+ version = "3.0.2";
+ name = "${pname}-${version}";
+
+ src = fetchurl {
+ url = "mirror://kde/stable/${pname}/src/${name}.tar.xz";
+ sha256 = "1fjvjifi5ygx5gs2lzfg22j0x3r7kl4wk5jll09r8gc3dfxaiblf";
+ };
+
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+
+ buildInputs = [
+ boost qttools qtwebkit
+ breeze-icons karchive kcodecs kcompletion kconfig kconfigwidgets kcoreaddons
+ kcrash kguiaddons ki18n kiconthemes kitemviews kio ktexteditor ktextwidgets
+ kwidgetsaddons kxmlgui
+ kdb kproperty kreport lcms2 libmysql marble postgresql
+ ];
+
+ propagatedUserEnvPkgs = [ kproperty ];
+
+ meta = with lib; {
+ description = "A open source visual database applications creator, a long-awaited competitor for programs like MS Access or Filemaker";
+ longDescription = ''
+ Kexi is a visual database applications creator.
+ It can be used for creating database schemas,
+ inserting data, performing queries, and processing data.
+ Forms can be created to provide a custom interface to your data.
+ All database objects - tables, queries and forms - are stored in the database,
+ making it easy to share data and design.
+ '';
+ homepage = http://kexi-project.org/;
+ maintainers = with maintainers; [ zraexy ];
+ platforms = platforms.linux;
+ license = with licenses; [ gpl2 lgpl2 ];
+ };
+}
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 830692f08ebc..830ae68fd1b9 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -13,7 +13,7 @@
, librevenge, libe-book, libmwaw, glm, glew, gst_all_1
, gdb, commonsLogging, librdf_rasqal, makeWrapper, gsettings_desktop_schemas
, defaultIconTheme, glib, ncurses, xmlsec, epoxy, gpgme
-, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" "hu" ]
+, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" "hu" "it" ]
, withHelp ? true
, kdeIntegration ? false
}:
diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix
index dfe6e9470808..a3991b8b35c1 100644
--- a/pkgs/applications/office/libreoffice/still.nix
+++ b/pkgs/applications/office/libreoffice/still.nix
@@ -13,7 +13,7 @@
, librevenge, libe-book, libmwaw, glm, glew, gst_all_1
, gdb, commonsLogging, librdf_rasqal, makeWrapper, gsettings_desktop_schemas
, defaultIconTheme, glib, ncurses
-, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" "hu" ]
+, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" "hu" "it" ]
, withHelp ? true
, kdeIntegration ? false
}:
@@ -63,7 +63,7 @@ in stdenv.mkDerivation rec {
# It also seems not to mention libdl explicitly in some places.
NIX_LDFLAGS = "-lcups -ldl";
- # For some reason librdf_redland sometimes refers to rasqal.h instead
+ # For some reason librdf_redland sometimes refers to rasqal.h instead
# of rasqal/rasqal.h
NIX_CFLAGS_COMPILE="-I${librdf_rasqal}/include/rasqal";
diff --git a/pkgs/applications/office/marp/default.nix b/pkgs/applications/office/marp/default.nix
index 0e53d58a083b..c5dc9198740f 100644
--- a/pkgs/applications/office/marp/default.nix
+++ b/pkgs/applications/office/marp/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "marp-${version}";
- version = "0.0.10";
+ version = "0.0.11";
src = fetchurl {
url = "https://github.com/yhatt/marp/releases/download/v${version}/${version}-Marp-linux-x64.tar.gz";
- sha256 = "0x4qldbyvq88cs12znxv33bb0nxr3wxcwhyr97pkjrjc2cn7nphx";
+ sha256 = "06kka6kxrj35w23n34in6ks3vax9arl756jg720jhfy14vavyk0f";
};
sourceRoot = ".";
diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix
index c5ef0e8a277a..6ce003ff25d9 100644
--- a/pkgs/applications/office/mendeley/default.nix
+++ b/pkgs/applications/office/mendeley/default.nix
@@ -37,14 +37,14 @@ let
then "i386"
else "amd64";
- shortVersion = "1.17.10-stable";
+ shortVersion = "1.17.11-stable";
version = "${shortVersion}_${arch}";
url = "http://desktop-download.mendeley.com/download/apt/pool/main/m/mendeleydesktop/mendeleydesktop_${version}.deb";
sha256 = if stdenv.system == arch32
- then "0sc9fsprdpl39q8wqbjp59pnr10c1a8gss60b81h54agjni55yrg"
- else "02ncfdxcrdwghpch2nlfhc7d0vgjsfqn8sxjkb5yn4bf5wi8z9bq";
+ then "033855ix5qj1gwd3pa6qws5k94hgbp6rvibrrxl3rn5bvhrvvbkq"
+ else "09h6br8qhvphkvzy28y1pnh7dhyigb3w41w3kjwqj6027i46chi7";
deps = [
qt5.qtbase
diff --git a/pkgs/applications/office/paperwork/backend.nix b/pkgs/applications/office/paperwork/backend.nix
new file mode 100644
index 000000000000..557529964649
--- /dev/null
+++ b/pkgs/applications/office/paperwork/backend.nix
@@ -0,0 +1,39 @@
+{ buildPythonPackage, lib, fetchFromGitHub
+
+, isPy3k, isPyPy
+
+, pyenchant, simplebayes, pillow, pycountry, whoosh, termcolor
+, python-Levenshtein, pyinsane2, pygobject3, pyocr, natsort
+
+, pkgs
+}:
+
+buildPythonPackage rec {
+ name = "paperwork-backend-${version}";
+ version = "1.2.1";
+
+ src = fetchFromGitHub {
+ owner = "openpaperwork";
+ repo = "paperwork-backend";
+ rev = version;
+ sha256 = "1lrawibm6jnykj1bkrl8196kcxrhndzp7r0brdrb4hs54gql7j5x";
+ };
+
+ # Python 2.x is not supported.
+ disabled = !isPy3k && !isPyPy;
+
+ preCheck = "\"$out/bin/paperwork-shell\" chkdeps paperwork_backend";
+
+ propagatedBuildInputs = [
+ pyenchant simplebayes pillow pycountry whoosh termcolor
+ python-Levenshtein pyinsane2 pygobject3 pyocr natsort
+ pkgs.poppler_gi pkgs.gtk3
+ ];
+
+ meta = {
+ description = "Backend part of Paperwork (Python API, no UI)";
+ homepage = https://openpaper.work/;
+ license = lib.licenses.gpl3Plus;
+ maintainers = [ lib.maintainers.aszlig ];
+ };
+}
diff --git a/pkgs/applications/office/paperwork/default.nix b/pkgs/applications/office/paperwork/default.nix
index 07a09fbfc0ab..f0592aa0e687 100644
--- a/pkgs/applications/office/paperwork/default.nix
+++ b/pkgs/applications/office/paperwork/default.nix
@@ -1,19 +1,19 @@
{ lib, python3Packages, fetchFromGitHub, gtk3, cairo
, aspellDicts, buildEnv
-, gnome3, hicolor_icon_theme
+, gnome3, hicolor_icon_theme, librsvg
, xvfb_run, dbus, libnotify
}:
python3Packages.buildPythonApplication rec {
name = "paperwork-${version}";
# Don't forget to also update paperwork-backend when updating this!
- version = "1.2";
+ version = "1.2.1";
src = fetchFromGitHub {
repo = "paperwork";
- owner = "jflesch";
+ owner = "openpaperwork";
rev = version;
- sha256 = "1cb9wnhhpm3dyxjrkyl9bbva56xx85vlwlb7z07m1icflcln14x5";
+ sha256 = "0lqnq74hdjj778j2k0syibwy4i37l8w932gmibs8617s4yi34rxz";
};
# Patch out a few paths that assume that we're using the FHS:
@@ -47,7 +47,9 @@ python3Packages.buildPythonApplication rec {
}}/lib/aspell";
checkInputs = [ xvfb_run dbus.daemon ];
- buildInputs = [ gnome3.defaultIconTheme hicolor_icon_theme libnotify ];
+ buildInputs = [
+ gnome3.defaultIconTheme hicolor_icon_theme libnotify librsvg
+ ];
# A few parts of chkdeps need to have a display and a dbus session, so we not
# only need to run a virtual X server + dbus but also have a large enough
@@ -64,13 +66,14 @@ python3Packages.buildPythonApplication rec {
makeWrapperArgs = [
"--set GI_TYPELIB_PATH \"$GI_TYPELIB_PATH\""
+ "--set GDK_PIXBUF_MODULE_FILE \"$GDK_PIXBUF_MODULE_FILE\""
"--prefix XDG_DATA_DIRS : \"$out/share\""
"--suffix XDG_DATA_DIRS : \"$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\""
];
meta = {
description = "A personal document manager for scanned documents";
- homepage = https://github.com/jflesch/paperwork;
+ homepage = https://openpaper.work/;
license = lib.licenses.gpl3Plus;
maintainers = [ lib.maintainers.aszlig ];
platforms = lib.platforms.linux;
diff --git a/pkgs/applications/office/pinpoint/default.nix b/pkgs/applications/office/pinpoint/default.nix
index 28760602575f..b59d55d3ea08 100644
--- a/pkgs/applications/office/pinpoint/default.nix
+++ b/pkgs/applications/office/pinpoint/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
url = "http://ftp.gnome.org/pub/GNOME/sources/pinpoint/0.1/${name}.tar.xz";
sha256 = "1jp8chr9vjlpb5lybwp5cg6g90ak5jdzz9baiqkbg0anlg8ps82s";
};
- buildInputs = [ pkgconfig autoconf automake clutter clutter-gst gdk_pixbuf
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ autoconf automake clutter clutter-gst gdk_pixbuf
cairo clutter_gtk ];
meta = with stdenv.lib; {
diff --git a/pkgs/applications/office/wordgrinder/default.nix b/pkgs/applications/office/wordgrinder/default.nix
new file mode 100644
index 000000000000..67f7e2816a48
--- /dev/null
+++ b/pkgs/applications/office/wordgrinder/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchFromGitHub, pkgconfig, makeWrapper
+, lua52Packages, libXft, ncurses, readline, zlib }:
+
+stdenv.mkDerivation rec {
+ name = "wordgrinder-${version}";
+ version = "0.6-db14181";
+
+ src = fetchFromGitHub {
+ repo = "wordgrinder";
+ owner = "davidgiven";
+ rev = "db141815e8bd1da6e684a1142a59492e516f3041";
+ sha256 = "1l1jqzcqiwnc8r1igfi7ay4pzzhdhss81znnmfr4rc1ia8bpdjc2";
+ };
+
+ makeFlags = [
+ "PREFIX=$(out)"
+ "LUA_INCLUDE=${lua52Packages.lua}/include"
+ "LUA_LIB=${lua52Packages.lua}/lib/liblua.so"
+ ];
+
+ nativeBuildInputs = [ pkgconfig makeWrapper ];
+
+ buildInputs = [
+ libXft
+ lua52Packages.lua
+ ncurses
+ readline
+ zlib
+ ];
+
+ # To be able to find
+ NIX_CFLAGS_COMPILE = "-I${libXft.dev}/include/X11";
+
+ # Binaries look for LuaFileSystem library (lfs.so) at runtime
+ postInstall = ''
+ wrapProgram $out/bin/wordgrinder --set LUA_CPATH "${lua52Packages.luafilesystem}/lib/lua/5.2/lfs.so";
+ wrapProgram $out/bin/xwordgrinder --set LUA_CPATH "${lua52Packages.luafilesystem}/lib/lua/5.2/lfs.so";
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Text-based word processor";
+ homepage = https://cowlark.com/wordgrinder;
+ license = licenses.mit;
+ maintainers = with maintainers; [ matthiasbeyer ];
+ platforms = with stdenv.lib.platforms; linux;
+ };
+}
diff --git a/pkgs/applications/office/zanshin/default.nix b/pkgs/applications/office/zanshin/default.nix
index 021e7f87eee0..2130e64a2a3a 100644
--- a/pkgs/applications/office/zanshin/default.nix
+++ b/pkgs/applications/office/zanshin/default.nix
@@ -1,5 +1,5 @@
{
- stdenv,
+ mkDerivation, lib,
fetchurl, fetchpatch,
extra-cmake-modules,
qtbase, boost,
@@ -7,7 +7,7 @@
krunner, kwallet
}:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "zanshin";
version = "0.4.1";
name = "${pname}-${version}";
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
krunner kwallet
];
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "A powerful yet simple application to manage your day to day actions, getting your mind like water";
homepage = https://zanshin.kde.org/;
maintainers = with maintainers; [ zraexy ];
diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix
index 18c4514c4de1..48b278cc1dfb 100644
--- a/pkgs/applications/office/zim/default.nix
+++ b/pkgs/applications/office/zim/default.nix
@@ -9,11 +9,11 @@
python2Packages.buildPythonApplication rec {
name = "zim-${version}";
- version = "0.67-rc2";
+ version = "0.67";
src = fetchurl {
url = "http://zim-wiki.org/downloads/${name}.tar.gz";
- sha256 = "0l4q2dfnvyn0jr1lggf8g7515q4z7qr1lnmy0lsyhjf477ldszqf";
+ sha256 = "1gdbzy9qyzj3rn9fsl0ss7lbk9kyka99656bphx2dah694yyyz5k";
};
propagatedBuildInputs = with python2Packages; [ pyGtkGlade pyxdg pygobject2 ];
diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix
index 674aa666b7e6..fe6a3a41a236 100644
--- a/pkgs/applications/science/astronomy/celestia/default.nix
+++ b/pkgs/applications/science/astronomy/celestia/default.nix
@@ -44,7 +44,8 @@ stdenv.mkDerivation {
sha256 = "1i1lvhbgllsh2z8i6jj4mvrjak4a7r69psvk7syw03s4p7670mfk";
};
- buildInputs = [ freeglut gtk2 gtkglext libjpeg_turbo libtheora libXmu mesa pkgconfig lua
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ freeglut gtk2 gtkglext libjpeg_turbo libtheora libXmu mesa lua
perl autoreconfHook ];
patchPhase = ''
diff --git a/pkgs/applications/science/astronomy/xplanet/default.nix b/pkgs/applications/science/astronomy/xplanet/default.nix
index ca5bbd4882c1..7abd83b6dc12 100644
--- a/pkgs/applications/science/astronomy/xplanet/default.nix
+++ b/pkgs/applications/science/astronomy/xplanet/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0hml2v228wi2r61m1pgka7h96rl92b6apk0iigm62miyp4mp9ys4";
};
- buildInputs = [ pkgconfig freetype pango libpng libtiff giflib libjpeg netpbm ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ freetype pango libpng libtiff giflib libjpeg netpbm ];
patches = [
./giflib.patch
diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix
index cfd72601d1eb..db12fc00c87c 100644
--- a/pkgs/applications/science/biology/bcftools/default.nix
+++ b/pkgs/applications/science/biology/bcftools/default.nix
@@ -1,17 +1,18 @@
-{ stdenv, fetchurl, htslib, zlib, bzip2, lzma, perl }:
+{ stdenv, fetchurl, htslib, zlib, bzip2, lzma, curl, perl, bash }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "bcftools";
- major = "1.5";
- version = "${major}.0";
+ version = "1.6";
src = fetchurl {
- url = "https://github.com/samtools/bcftools/releases/download/${major}/bcftools-${major}.tar.bz2";
- sha256 = "0093hkkvxmbwfaa7905s6185jymynvg42kq6sxv7fili11l5mxwz";
+ url = "https://github.com/samtools/bcftools/releases/download/${version}/${name}.tar.bz2";
+ sha256 = "10prgmf09a13mk18840938ijqgfc9y92hfc7sa2gcv07ddri0c19";
};
- buildInputs = [ zlib bzip2 lzma perl ];
+ nativeBuildInputs = [ perl ];
+
+ buildInputs = [ htslib zlib bzip2 lzma curl ];
makeFlags = [
"HSTDIR=${htslib}"
@@ -19,6 +20,16 @@ stdenv.mkDerivation rec {
"CC=cc"
];
+ preCheck = ''
+ patchShebangs misc/
+ patchShebangs test/
+ sed -ie 's|/bin/bash|${bash}/bin/bash|' test/test.pl
+ '';
+
+ enableParallelBuilding = true;
+
+ doCheck = true;
+
meta = with stdenv.lib; {
description = "Tools for manipulating BCF2/VCF/gVCF format, SNP and short indel sequence variants";
license = licenses.mit;
diff --git a/pkgs/applications/science/biology/bowtie2/default.nix b/pkgs/applications/science/biology/bowtie2/default.nix
new file mode 100644
index 000000000000..05a85cafedf1
--- /dev/null
+++ b/pkgs/applications/science/biology/bowtie2/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, zlib, tbb }:
+
+stdenv.mkDerivation rec {
+ pname = "bowtie2";
+ version = "2.3.3.1";
+ name = "${pname}-${version}";
+
+ src = fetchFromGitHub {
+ owner = "BenLangmead";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1pcyks76bnnkq6h0gqjw4fkdddjjnw7k5ibim7ajkbvfw58a99y0";
+ };
+
+ buildInputs = [ zlib tbb ];
+
+ installFlags = [ "prefix=$(out)" ];
+
+ meta = with stdenv.lib; {
+ description = "An ultrafast and memory-efficient tool for aligning sequencing reads to long reference sequences";
+ license = licenses.gpl3;
+ homepage = http://bowtie-bio.sf.net/bowtie2;
+ maintainers = with maintainers; [ rybern ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/applications/science/biology/freebayes/builder.sh b/pkgs/applications/science/biology/freebayes/builder.sh
deleted file mode 100644
index a9f56e77d7e3..000000000000
--- a/pkgs/applications/science/biology/freebayes/builder.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-source $stdenv/setup
-
-unpackPhase
-
-cd freebayes-*
-
-make
-
-mkdir -p $out/bin
-cp bin/freebayes bin/bamleftalign $out/bin
-cp scripts/* $out/bin
diff --git a/pkgs/applications/science/biology/freebayes/default.nix b/pkgs/applications/science/biology/freebayes/default.nix
index ef0da619b25a..99d2dfa55ddd 100644
--- a/pkgs/applications/science/biology/freebayes/default.nix
+++ b/pkgs/applications/science/biology/freebayes/default.nix
@@ -1,21 +1,23 @@
-{ stdenv, fetchFromGitHub, cmake, gcc, zlib}:
+{ stdenv, fetchFromGitHub, cmake, gcc, zlib, bzip2, lzma }:
stdenv.mkDerivation rec {
name = "freebayes-${version}";
- version = "1.1.0";
+ version = "2017-08-23";
src = fetchFromGitHub {
name = "freebayes-${version}-src";
owner = "ekg";
repo = "freebayes";
- rev = "refs/tags/v${version}";
- sha256 = "0xb8aicb36w9mfs1gq1x7mcp3p82kl7i61d162hfncqzg2npg8rr";
+ rev = "8d2b3a060da473e1f4f89be04edfce5cba63f1d3";
+ sha256 = "0yyrgk2639lz1yvg4jf0ccahnkic31dy77q05pb3i28rjf37v45z";
fetchSubmodules = true;
};
- buildInputs = [ cmake gcc zlib ];
+ buildInputs = [ zlib bzip2 lzma ];
- builder = ./builder.sh;
+ installPhase = ''
+ install -vD bin/freebayes bin/bamleftalign scripts/* -t $out/bin
+ '';
meta = with stdenv.lib; {
description = "Bayesian haplotype-based polymorphism discovery and genotyping";
diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix
index f8391a2d6b3c..640f32671bbd 100644
--- a/pkgs/applications/science/biology/samtools/default.nix
+++ b/pkgs/applications/science/biology/samtools/default.nix
@@ -1,21 +1,30 @@
-{ stdenv, fetchurl, zlib, htslib, ncurses ? null }:
+{ stdenv, fetchurl, zlib, htslib, perl, ncurses ? null }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "samtools";
- major = "1.5";
- version = "${major}.0";
+ version = "1.6";
src = fetchurl {
- url = "https://github.com/samtools/samtools/releases/download/${major}/samtools-${major}.tar.bz2";
- sha256 = "1xidmv0jmfy7l0kb32hdnlshcxgzi1hmygvig0cqrq1fhckdlhl5";
+ url = "https://github.com/samtools/samtools/releases/download/${version}/${name}.tar.bz2";
+ sha256 = "17p4vdj2j2qr3b2c0v4100h6cg4jj3zrb4dmdnd9d9aqs74d4p7f";
};
- buildInputs = [ zlib ncurses ];
+ nativeBuildInputs = [ perl ];
+
+ buildInputs = [ zlib ncurses htslib ];
configureFlags = [ "--with-htslib=${htslib}" ]
++ stdenv.lib.optional (ncurses == null) "--without-curses";
+ preCheck = ''
+ patchShebangs test/
+ '';
+
+ enableParallelBuilding = true;
+
+ doCheck = true;
+
meta = with stdenv.lib; {
description = "Tools for manipulating SAM/BAM/CRAM format";
license = licenses.mit;
diff --git a/pkgs/applications/science/chemistry/gwyddion/default.nix b/pkgs/applications/science/chemistry/gwyddion/default.nix
index b98af36604a3..80115f4f0222 100644
--- a/pkgs/applications/science/chemistry/gwyddion/default.nix
+++ b/pkgs/applications/science/chemistry/gwyddion/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation {
url = "http://sourceforge.net/projects/gwyddion/files/gwyddion/2.48/gwyddion-2.48.tar.xz";
sha256 = "119iw58ac2wn4cas6js8m7r1n4gmmkga6b1y711xzcyjp9hshgwx";
};
- buildInputs = [ gtk2 pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk2 ];
meta = {
homepage = http://gwyddion.net/;
diff --git a/pkgs/applications/science/electronics/adms/default.nix b/pkgs/applications/science/electronics/adms/default.nix
index d4ec974007cf..99b7ef79594f 100644
--- a/pkgs/applications/science/electronics/adms/default.nix
+++ b/pkgs/applications/science/electronics/adms/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
sha256 = "1pcwq5khzdq4x33lid9hq967gv78dr5i4f2sk8m8rwkfqb9vdzrg";
};
- buildInputs = [ autoreconfHook flex bison gperf libxml2 perl gd perlPackages.XMLLibXML ];
+ nativeBuildInputs = [ autoreconfHook ];
+ buildInputs = [ flex bison gperf libxml2 perl gd perlPackages.XMLLibXML ];
configureFlags = [ "--enable-maintainer-mode" ];
meta = {
diff --git a/pkgs/applications/science/electronics/caneda/default.nix b/pkgs/applications/science/electronics/caneda/default.nix
index 2d6b12a5bb02..8f81a03044be 100644
--- a/pkgs/applications/science/electronics/caneda/default.nix
+++ b/pkgs/applications/science/electronics/caneda/default.nix
@@ -1,37 +1,20 @@
-{stdenv, fetchgit, qt4, cmake, libxml2, libxslt}:
-
-let
-
- srcComponents = fetchgit {
- url = git://caneda.git.sourceforge.net/gitroot/caneda/components;
- rev = "34cd36b620e0dfc57ba2d2b6168734ea9a2cfa9a";
- sha256 = "840f07921eecbf10e38e44e5c61c716295a16c98fbb75016d9a44e7dfee40e59";
- };
-
-in
+{stdenv, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qwt }:
stdenv.mkDerivation rec {
- name = "caneda-git-2012-02-16";
+ name = "caneda-${version}";
+ version = "0.3.1";
- src = fetchgit {
- url = git://caneda.git.sourceforge.net/gitroot/caneda/caneda;
- rev = "fff9e2f7988fe5d062548cafeda1e5cd660769d1";
- sha256 = "dfbcac97f5a1b41ad9a63392394f37fb294cbf78c576673c9bc4a5370957b2c8";
+ src = fetchFromGitHub {
+ owner = "Caneda";
+ repo = "Caneda";
+ rev = version;
+ sha256 = "0hx8qid50j9xvg2kpbpqmbdyakgyjn6m373m1cvhp70v2gp1v8l2";
};
- hardeningDisable = [ "format" ];
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ qtbase qttools qtsvg qwt ];
- buildInputs = [ cmake qt4 libxml2 libxslt ];
-
- patches = [
- ./gcc6.patch
- ];
-
- postInstall = ''
- mkdir $out/share/caneda/components
- cp -R ${srcComponents}/* $out/share/caneda/components
- chmod u+w -R $out/share/caneda/components
- '';
+ enableParallelBuilding = true;
meta = {
description = "Open source EDA software focused on easy of use and portability";
diff --git a/pkgs/applications/science/electronics/geda/default.nix b/pkgs/applications/science/electronics/geda/default.nix
index b8406c3255cc..e080569e56fb 100644
--- a/pkgs/applications/science/electronics/geda/default.nix
+++ b/pkgs/applications/science/electronics/geda/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
};
configureFlags = "--disable-update-xdg-database";
- buildInputs = [ pkgconfig guile gtk2 flex gawk perl ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ guile gtk2 flex gawk perl ];
meta = with stdenv.lib; {
description = "Full GPL'd suite of Electronic Design Automation tools";
diff --git a/pkgs/applications/science/electronics/gerbv/default.nix b/pkgs/applications/science/electronics/gerbv/default.nix
index 7cdcbb7fd197..c0821c8a9ab9 100644
--- a/pkgs/applications/science/electronics/gerbv/default.nix
+++ b/pkgs/applications/science/electronics/gerbv/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "00jn1xhf6kblxc5gac1wvk8zm12fy6sk81nj3jwdag0z6wk3z446";
};
- buildInputs = [ pkgconfig gettext libtool automake autoconf cairo gtk2 autoreconfHook ];
+ nativeBuildInputs = [ autoreconfHook pkgconfig ];
+ buildInputs = [ gettext libtool automake autoconf cairo gtk2 ];
configureFlags = ["--disable-update-desktop-database"];
diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix
index 657d20553b7f..e866b947fbc2 100644
--- a/pkgs/applications/science/electronics/gtkwave/default.nix
+++ b/pkgs/applications/science/electronics/gtkwave/default.nix
@@ -1,21 +1,24 @@
{stdenv, fetchurl, gtk2, gperf, pkgconfig, bzip2, tcl, tk, judy, xz}:
+
stdenv.mkDerivation rec {
- name = "gtkwave-3.3.70";
+ name = "gtkwave-${version}";
+ version = "3.3.86";
src = fetchurl {
- url = "mirror://sourceforge/gtkwave/${name}.tar.gz";
- sha256 = "1akzf1sq8mwarrbrbz5chrvgwlsp444h5za8rg1dfyqk733s7piz";
+ url = "mirror://sourceforge/gtkwave/${name}.tar.gz";
+ sha256 = "1l1hikhhk7drkbpdmj9qg7c3lj1b86z7f5rnwagrql8bss2j80fx";
};
- buildInputs = [ gtk2 gperf pkgconfig bzip2 tcl tk judy xz ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk2 gperf bzip2 tcl tk judy xz ];
configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--enable-judy" ];
meta = {
- description = "Wave viewer for Unix and Win32";
- homepage = http://gtkwave.sourceforge.net;
- license = stdenv.lib.licenses.gpl2Plus;
- maintainers = with stdenv.lib.maintainers; [viric];
- platforms = with stdenv.lib.platforms; linux;
+ description = "VCD/Waveform viewer for Unix and Win32";
+ homepage = http://gtkwave.sourceforge.net;
+ license = stdenv.lib.licenses.gpl2Plus;
+ maintainers = with stdenv.lib.maintainers; [ thoughtpolice viric ];
+ platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix
index 4ebc25fa4e8f..dc13f751b89f 100644
--- a/pkgs/applications/science/electronics/kicad/default.nix
+++ b/pkgs/applications/science/electronics/kicad/default.nix
@@ -32,7 +32,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; # often fails on Hydra: fatal error: pcb_plot_params_lexer.h: No such file or directory
- buildInputs = [ cmake mesa wxGTK zlib libX11 gettext glew cairo curl openssl boost pkgconfig doxygen ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ cmake mesa wxGTK zlib libX11 gettext glew cairo curl openssl boost doxygen ];
# They say they only support installs to /usr or /usr/local,
# so we have to handle this.
@@ -66,5 +67,6 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
+ hydraPlatforms = []; # 'output limit exceeded' error on hydra
};
}
diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix
index 2588ee39addc..ee7c0a5844d4 100644
--- a/pkgs/applications/science/electronics/ngspice/default.nix
+++ b/pkgs/applications/science/electronics/ngspice/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
buildInputs = [ readline libX11 flex bison libICE libXaw libXext ];
- configureFlags = [ "--enable-x" "--with-x" "--with-readline" "--enable-xspice" "--enable-cider" ];
+ configureFlags = [ "--enable-x" "--with-x" "--with-readline" "--enable-xspice" "--enable-cider" "--with-ngshared" ];
meta = with stdenv.lib; {
description = "The Next Generation Spice (Electronic Circuit Simulator)";
diff --git a/pkgs/applications/science/electronics/pcb/default.nix b/pkgs/applications/science/electronics/pcb/default.nix
index 1f5109434000..6b792310e8b4 100644
--- a/pkgs/applications/science/electronics/pcb/default.nix
+++ b/pkgs/applications/science/electronics/pcb/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0l6944hq79qsyp60i5ai02xwyp8l47q7xdm3js0jfkpf72ag7i42";
};
- buildInputs = [ pkgconfig gtk2 bison intltool flex netpbm imagemagick dbus xlibsWrapper mesa tcl shared_mime_info tk gnome2.gtkglext pangox_compat gd xorg.libXmu ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk2 bison intltool flex netpbm imagemagick dbus xlibsWrapper mesa tcl shared_mime_info tk gnome2.gtkglext pangox_compat gd xorg.libXmu ];
configureFlags = ["--disable-update-desktop-database"];
diff --git a/pkgs/applications/science/electronics/pulseview/default.nix b/pkgs/applications/science/electronics/pulseview/default.nix
index 1d61ee2dd162..f4d8d2bea5db 100644
--- a/pkgs/applications/science/electronics/pulseview/default.nix
+++ b/pkgs/applications/science/electronics/pulseview/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "1f8f2342d5yam98mmcb8f9g2vslcwv486bmi4x45pxn68l82ky3q";
};
- buildInputs = [ pkgconfig cmake glib qt5.full boost libsigrok
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ cmake glib qt5.full boost libsigrok
libsigrokdecode libserialport libzip udev libusb1 libftdi1 glibmm
];
diff --git a/pkgs/applications/science/electronics/qfsm/default.nix b/pkgs/applications/science/electronics/qfsm/default.nix
index 0e2295479af3..6ca3f80cefd3 100644
--- a/pkgs/applications/science/electronics/qfsm/default.nix
+++ b/pkgs/applications/science/electronics/qfsm/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "0rl7bc5cr29ng67yij4akciyid9z7npal812ys4c3m229vjvflrb";
};
- buildInputs = [ qt4 cmake graphviz pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ qt4 cmake graphviz ];
patches = [
./drop-hardcoded-prefix.patch
diff --git a/pkgs/applications/science/electronics/xoscope/default.nix b/pkgs/applications/science/electronics/xoscope/default.nix
index f26b13c5e32c..829caacb55cb 100644
--- a/pkgs/applications/science/electronics/xoscope/default.nix
+++ b/pkgs/applications/science/electronics/xoscope/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "00xlvvqyw6l1ljbsx1vgx2v1jfh0xacz1a0yhq1dj6yxf5wh58x8";
};
- buildInputs = [ gtk2 pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk2 ];
# from: https://aur.archlinux.org/packages.php?ID=12140&detail=1
patches = [ ./gtkdepre.diff ];
diff --git a/pkgs/applications/science/logic/abella/default.nix b/pkgs/applications/science/logic/abella/default.nix
index d9afc897cff6..968404362fcd 100644
--- a/pkgs/applications/science/logic/abella/default.nix
+++ b/pkgs/applications/science/logic/abella/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
name = "abella-${version}";
- version = "2.0.2";
+ version = "2.0.4";
src = fetchurl {
url = "http://abella-prover.org/distributions/${name}.tar.gz";
- sha256 = "b56d865ebdb198111f1dcd5b6fbcc0d7fc6dd1294f7601903ba4e3c3322c099c";
+ sha256 = "1hnccjlyzwgz7kqsr4xmx9y4wmalbxsj0g6fxdk6xrgpc84ihw2c";
};
- buildInputs = [ rsync ] ++ (with ocamlPackages; [ ocaml ocamlbuild ]);
+ buildInputs = [ rsync ] ++ (with ocamlPackages; [ ocaml ocamlbuild findlib ]);
installPhase = ''
mkdir -p $out/bin
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
'';
homepage = http://abella-prover.org/;
license = stdenv.lib.licenses.gpl3;
- maintainers = with stdenv.lib.maintainers; [ bcdarwin ];
+ maintainers = with stdenv.lib.maintainers; [ bcdarwin ciil ];
platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/applications/science/logic/aiger/default.nix b/pkgs/applications/science/logic/aiger/default.nix
new file mode 100644
index 000000000000..1a60c5e148cc
--- /dev/null
+++ b/pkgs/applications/science/logic/aiger/default.nix
@@ -0,0 +1,53 @@
+{ stdenv, fetchurl, picosat }:
+
+stdenv.mkDerivation rec {
+ name = "aiger-${version}";
+ version = "1.9.9";
+
+ src = fetchurl {
+ url = "http://fmv.jku.at/aiger/${name}.tar.gz";
+ sha256 = "1ish0dw0nf9gyghxsdhpy1jjiy5wp54c993swp85xp7m6vdx6l0y";
+ };
+
+ enableParallelBuilding = true;
+
+ configurePhase = ''
+ # Set up picosat, so we can build 'aigbmc'
+ echo $(pwd)
+ ls ..
+ mkdir ../picosat
+ ln -s ${picosat}/include/picosat/picosat.h ../picosat/picosat.h
+ ln -s ${picosat}/lib/picosat.o ../picosat/picosat.o
+ ln -s ${picosat}/share/picosat.version ../picosat/VERSION
+ ls ..
+ ./configure.sh
+ '';
+
+ installPhase = ''
+ mkdir -p $out/bin
+
+ # Do the installation manually, as the Makefile has odd
+ # cyrillic characters, and this is easier than adding
+ # a whole .patch file.
+ BINS=( \
+ aigand aigdd aigflip aigfuzz aiginfo aigjoin \
+ aigmiter aigmove aignm aigor aigreset aigsim \
+ aigsplit aigstrip aigtoaig aigtoblif aigtocnf \
+ aigtodot aigtosmv aigunconstraint aigunroll \
+ andtoaig bliftoaig smvtoaig soltostim wrapstim \
+ aigbmc aigdep
+ )
+
+ for x in ''${BINS[*]}; do
+ install -m 755 -s $x $out/bin/$x
+ done
+ '';
+
+ meta = {
+ description = "And-Inverter Graph (AIG) utilities";
+ homepage = http://fmv.jku.at/aiger/;
+ license = stdenv.lib.licenses.mit;
+ maintainers = with stdenv.lib.maintainers; [ thoughtpolice ];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/applications/science/logic/avy/0001-no-static-boost-libs.patch b/pkgs/applications/science/logic/avy/0001-no-static-boost-libs.patch
new file mode 100644
index 000000000000..a53142faba66
--- /dev/null
+++ b/pkgs/applications/science/logic/avy/0001-no-static-boost-libs.patch
@@ -0,0 +1,12 @@
+diff --git a/avy/CMakeLists.txt b/avy/CMakeLists.txt
+index 5913076..b0453b5 100644
+--- a/avy/CMakeLists.txt
++++ b/avy/CMakeLists.txt
+@@ -23,7 +23,6 @@ if (CUSTOM_BOOST_ROOT)
+ set (Boost_NO_SYSTEM_PATHS "ON")
+ endif()
+
+-set (Boost_USE_STATIC_LIBS ON)
+ find_package (Boost 1.46.1 REQUIRED program_options)
+ IF (Boost_FOUND)
+ include_directories (${Boost_INCLUDE_DIRS})
diff --git a/pkgs/applications/science/logic/avy/default.nix b/pkgs/applications/science/logic/avy/default.nix
new file mode 100644
index 000000000000..379224c73f89
--- /dev/null
+++ b/pkgs/applications/science/logic/avy/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchgit, cmake, zlib, boost }:
+
+stdenv.mkDerivation rec {
+ name = "avy-${version}";
+ version = "2017.10.16";
+
+ src = fetchgit {
+ url = "https://bitbucket.org/arieg/extavy";
+ rev = "c75c83379c38d6ea1046d0caee95aef77283ffe3";
+ sha256 = "0zcycnypg4q5g710bnkjpycaawmibc092vmyhgfbixkgq9fb5lfh";
+ fetchSubmodules = true;
+ };
+
+ buildInputs = [ cmake zlib boost.out boost.dev ];
+ NIX_CFLAGS_COMPILE = [ "-Wno-narrowing" ];
+ patches =
+ [ ./0001-no-static-boost-libs.patch
+ ];
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp avy/src/{avy,avybmc} $out/bin/
+ '';
+
+ meta = {
+ description = "AIGER model checking for Property Directed Reachability";
+ homepage = https://arieg.bitbucket.io/avy/;
+ license = stdenv.lib.licenses.mit;
+ maintainers = with stdenv.lib.maintainers; [ thoughtpolice ];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/applications/science/logic/coq/8.4.nix b/pkgs/applications/science/logic/coq/8.4.nix
index 34505192021c..1f7ef571eaf9 100644
--- a/pkgs/applications/science/logic/coq/8.4.nix
+++ b/pkgs/applications/science/logic/coq/8.4.nix
@@ -27,7 +27,8 @@ stdenv.mkDerivation {
sha256 = "1mpbj4yf36kpjg2v2sln12i8dzqn8rag6fd07hslj2lpm4qs4h55";
};
- buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ ocaml findlib camlp5 ncurses lablgtk ];
patches = [ ./configure.patch ];
diff --git a/pkgs/applications/science/logic/coq/HEAD.nix b/pkgs/applications/science/logic/coq/HEAD.nix
index 209cba07c438..968ea74e2960 100644
--- a/pkgs/applications/science/logic/coq/HEAD.nix
+++ b/pkgs/applications/science/logic/coq/HEAD.nix
@@ -31,7 +31,8 @@ stdenv.mkDerivation {
sha256 = "0sflrpp6x0ada0bjh67q1x65g88d179n3cawpwkp1pm4kw76g8x7";
};
- buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ ocaml findlib camlp5 ncurses lablgtk ];
postPatch = ''
UNAME=$(type -tp uname)
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index 7378aedc1be7..cdfd035c7139 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -19,7 +19,8 @@ let
"8.5pl3" = "15c3rdk59nifzihsp97z4vjxis5xmsnrvpb86qiazj143z2fmdgw";
"8.6" = "148mb48zpdax56c0blfi7v67lx014lnmrvxxasi28hsibyz2lvg4";
"8.6.1" = "0llrxcxwy5j87vbbjnisw42rfw1n1pm5602ssx64xaxx3k176g6l";
- "8.7+beta1" = "006rn5896pf39p4z9c6d4xj4zm80j4b67v5gwcixd63msrjqkmxp";
+ "8.7+beta2" = "1r274m44z774xigvj43g211ms9z9bwgyp1g43rvq4fswb3gzxc4b";
+ "8.7.0" = "1h18b7xpnx3ix9vsi5fx4zdcbxy7bhra7gd5c5yzxmk53cgf1p9m";
}."${version}";
coq-version = builtins.substring 0 3 version;
camlp5 = ocamlPackages.camlp5_strict;
@@ -89,7 +90,8 @@ self = stdenv.mkDerivation {
inherit sha256;
};
- buildInputs = [ pkgconfig ocamlPackages.ocaml ocamlPackages.findlib camlp5 ncurses ocamlPackages.lablgtk ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib camlp5 ncurses ocamlPackages.lablgtk ];
postPatch = ''
UNAME=$(type -tp uname)
diff --git a/pkgs/applications/science/logic/cubicle/default.nix b/pkgs/applications/science/logic/cubicle/default.nix
index 65a0f72da5eb..c7108d749061 100644
--- a/pkgs/applications/science/logic/cubicle/default.nix
+++ b/pkgs/applications/science/logic/cubicle/default.nix
@@ -1,20 +1,24 @@
-{ stdenv, fetchurl, ocaml, ocamlPackages }:
+{ stdenv, fetchurl, ocamlPackages }:
stdenv.mkDerivation rec {
name = "cubicle-${version}";
- version = "1.0.2";
+ version = "1.1.1";
src = fetchurl {
url = "http://cubicle.lri.fr/cubicle-${version}.tar.gz";
- sha256 = "1fg39vlr2d5067512df32hkw6g8vglxj1m47md5mw3pn3ij6dpsx";
+ sha256 = "1sny9c4fm14k014pk62ibpwbrjjirkx8xmhs9jg7q1hk7y7x3q2h";
};
- buildInputs = [ ocaml ocamlPackages.functory ];
+ postPatch = ''
+ substituteInPlace Makefile.in --replace "\\n" ""
+ '';
+
+ buildInputs = with ocamlPackages; [ ocaml findlib functory ];
meta = with stdenv.lib; {
description = "An open source model checker for verifying safety properties of array-based systems";
homepage = http://cubicle.lri.fr/;
license = licenses.asl20;
- platforms = platforms.linux;
+ platforms = platforms.unix;
maintainers = with maintainers; [ lucas8 ];
};
}
diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix
index acde7f6ae43b..6b213226635d 100644
--- a/pkgs/applications/science/logic/cvc4/default.nix
+++ b/pkgs/applications/science/logic/cvc4/default.nix
@@ -1,18 +1,19 @@
-{ stdenv, fetchFromGitHub, cln, gmp, swig, pkgconfig, readline, libantlr3c,
-boost, jdk, autoreconfHook, python2, antlr3_4 }:
+{ stdenv, fetchurl, cln, gmp, swig, pkgconfig
+, readline, libantlr3c, boost, jdk, autoreconfHook
+, python2, antlr3_4
+}:
stdenv.mkDerivation rec {
- name = "cvc4-unstable-${version}";
- version = "2017-05-18";
+ name = "cvc4-${version}";
+ version = "1.5";
- src = fetchFromGitHub {
- owner = "CVC4";
- repo = "CVC4";
- rev = "d77107cc56b0a089364c3d1512813701c155ea93";
- sha256 = "085bjrrm33rl5pwqx13af9sgni9cfbg70wag6lm08jj41ws411xs";
+ src = fetchurl {
+ url = "http://cvc4.cs.stanford.edu/downloads/builds/src/cvc4-${version}.tar.gz";
+ sha256 = "0yxxawgc9vd2cz883swjlm76rbdkj48n7a8dfppsami530y2rvhi";
};
- buildInputs = [ gmp cln pkgconfig readline swig libantlr3c antlr3_4 boost jdk autoreconfHook python2 ];
+ nativeBuildInputs = [ autoreconfHook pkgconfig ];
+ buildInputs = [ gmp cln readline swig libantlr3c antlr3_4 boost jdk python2 ];
configureFlags = [
"--enable-language-bindings=c,c++,java"
"--enable-gpl"
@@ -20,6 +21,7 @@ stdenv.mkDerivation rec {
"--with-readline"
"--with-boost=${boost.dev}"
];
+
preConfigure = ''
patchShebangs ./src/
'';
diff --git a/pkgs/applications/science/logic/glucose/default.nix b/pkgs/applications/science/logic/glucose/default.nix
index 5b318be16649..a0035f965392 100644
--- a/pkgs/applications/science/logic/glucose/default.nix
+++ b/pkgs/applications/science/logic/glucose/default.nix
@@ -1,19 +1,21 @@
{ stdenv, fetchurl, zlib }:
stdenv.mkDerivation rec {
name = "glucose-${version}";
- version = "4.0";
+ version = "4.1";
src = fetchurl {
- url = "http://www.labri.fr/perso/lsimon/downloads/softwares/glucose-syrup.tgz";
- sha256 = "0bq5l2jabhdfhng002qfk0mcj4pfi1v5853x3c7igwfrgx0jmfld";
+ url = "http://www.labri.fr/perso/lsimon/downloads/softwares/glucose-syrup-${version}.tgz";
+ sha256 = "0aahrkaq7n0z986fpqz66yz946nxardfi6dh8calzcfjpvqiraji";
};
buildInputs = [ zlib ];
- sourceRoot = "glucose-syrup/simp";
+ sourceRoot = "glucose-syrup-${version}/simp";
makeFlags = [ "r" ];
installPhase = ''
install -Dm0755 glucose_release $out/bin/glucose
+ mkdir -p "$out/share/doc/${name}/"
+ install -Dm0755 ../{LICEN?E,README*,Changelog*} "$out/share/doc/${name}/"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/science/logic/glucose/syrup.nix b/pkgs/applications/science/logic/glucose/syrup.nix
index 7604ebc1a3d9..fd59a53fd2ae 100644
--- a/pkgs/applications/science/logic/glucose/syrup.nix
+++ b/pkgs/applications/science/logic/glucose/syrup.nix
@@ -1,19 +1,18 @@
-{ stdenv, fetchurl, zlib }:
+{ stdenv, fetchurl, zlib, glucose }:
stdenv.mkDerivation rec {
name = "glucose-syrup-${version}";
- version = "4.0";
+ version = glucose.version;
- src = fetchurl {
- url = "http://www.labri.fr/perso/lsimon/downloads/softwares/glucose-syrup.tgz";
- sha256 = "0bq5l2jabhdfhng002qfk0mcj4pfi1v5853x3c7igwfrgx0jmfld";
- };
+ src = glucose.src;
buildInputs = [ zlib ];
- sourceRoot = "glucose-syrup/parallel";
+ sourceRoot = "glucose-syrup-${version}/parallel";
makeFlags = [ "r" ];
installPhase = ''
install -Dm0755 glucose-syrup_release $out/bin/glucose-syrup
+ mkdir -p "$out/share/doc/${name}/"
+ install -Dm0755 ../{LICEN?E,README*,Changelog*} "$out/share/doc/${name}/"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix
index 2409936ab694..af2bb3ed0c4e 100644
--- a/pkgs/applications/science/logic/isabelle/default.nix
+++ b/pkgs/applications/science/logic/isabelle/default.nix
@@ -2,21 +2,21 @@
# nettools needed for hostname
let
- dirname = "Isabelle2016-1";
+ dirname = "Isabelle2017";
in
stdenv.mkDerivation {
- name = "isabelle-2016-1";
+ name = "isabelle-2017";
inherit dirname;
src = if stdenv.isDarwin
then fetchurl {
url = "http://isabelle.in.tum.de/website-${dirname}/dist/${dirname}.dmg";
- sha256 = "0553l7m2z32ajmiv6sgg11rh16n490w8i4q9hr7vx4zzggr9nrlr";
+ sha256 = "1awgg39i72pivwfijdwffvil3glnpimjz2x04qbl5la2j6la48nb";
}
else fetchurl {
url = "http://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux.tar.gz";
- sha256 = "1w1cgfmmi1sr43z6hczyc29lxlnlz7dd8fa88ai44wkc13y05b5r";
+ sha256 = "01v1zrajyfamjq5b8v18qr3ffivjckifsvvx2vs13di6wsnmm9gw";
};
buildInputs = [ perl polyml z3 ]
@@ -43,6 +43,10 @@ stdenv.mkDerivation {
--replace '$ML_HOME/poly' ${polyml}/bin/poly
substituteInPlace contrib/z3*/etc/settings \
--replace '$Z3_HOME/z3' '${z3}/bin/z3'
+
+ for comp in contrib/jdk contrib/polyml*; do
+ rm -rf $comp/x86*
+ done
'' + (if ! stdenv.isLinux then "" else ''
arch=${if stdenv.system == "x86_64-linux" then "x86_64-linux" else "x86-linux"}
for f in contrib/*/$arch/{bash_process,epclextract,eprover,nunchaku,SPASS}; do
diff --git a/pkgs/applications/science/logic/ott/default.nix b/pkgs/applications/science/logic/ott/default.nix
index 293381d2888b..b10ec814ff55 100644
--- a/pkgs/applications/science/logic/ott/default.nix
+++ b/pkgs/applications/science/logic/ott/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "0i8ad1yrz9nrrgpi8db4z0aii5s0sy35mmzdfw5nq183mvbx8qqd";
};
- buildInputs = [ pkgconfig ocaml camlp5 ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ ocaml camlp5 ];
installPhase = ''
mkdir -p $out/bin
diff --git a/pkgs/applications/science/logic/picosat/default.nix b/pkgs/applications/science/logic/picosat/default.nix
index 070664980dcc..e026cfad218e 100644
--- a/pkgs/applications/science/logic/picosat/default.nix
+++ b/pkgs/applications/science/logic/picosat/default.nix
@@ -12,9 +12,11 @@ stdenv.mkDerivation rec {
configurePhase = "./configure.sh --shared --trace";
installPhase = ''
- mkdir -p $out/bin $out/lib $out/include/picosat
+ mkdir -p $out/bin $out/lib $out/share $out/include/picosat
cp picomus picomcs picosat picogcnf "$out"/bin
+ cp VERSION "$out"/share/picosat.version
+ cp picosat.o "$out"/lib
cp libpicosat.a "$out"/lib
cp libpicosat.so "$out"/lib
diff --git a/pkgs/applications/science/logic/potassco/clingo.nix b/pkgs/applications/science/logic/potassco/clingo.nix
new file mode 100644
index 000000000000..a73feba97b64
--- /dev/null
+++ b/pkgs/applications/science/logic/potassco/clingo.nix
@@ -0,0 +1,24 @@
+{stdenv, fetchurl, cmake}:
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "clingo";
+ version = "5.2.2";
+
+ src = fetchurl {
+ url = "https://github.com/potassco/clingo/releases/v${version}.tar.gz";
+ sha256 = "1kxzb385g8p9mqm1x9wvjrigifa09w6vj0wl7kradibm5qagh7ns";
+ };
+
+ buildInputs = [];
+ nativeBuildInputs = [cmake];
+
+ meta = {
+ inherit version;
+ description = "ASP system to ground and solve logic programs";
+ license = stdenv.lib.licenses.mit;
+ maintainers = [stdenv.lib.maintainers.raskin];
+ platforms = stdenv.lib.platforms.linux;
+ homepage = "https://potassco.org/";
+ downloadPage = "https://github.com/potassco/clingo/releases/";
+ };
+}
diff --git a/pkgs/applications/science/logic/potassco/clingo.upstream b/pkgs/applications/science/logic/potassco/clingo.upstream
new file mode 100644
index 000000000000..062577d1451b
--- /dev/null
+++ b/pkgs/applications/science/logic/potassco/clingo.upstream
@@ -0,0 +1,6 @@
+target clingo.nix
+attribute_name clingo
+url https://github.com/potassco/clingo/releases/
+ensure_choice
+version '.*/v([0-9.]+)[.]tar[.].*' '\1'
+minimize_overwrite
diff --git a/pkgs/applications/science/logic/prooftree/default.nix b/pkgs/applications/science/logic/prooftree/default.nix
index 94b1d5907620..b143fd982505 100644
--- a/pkgs/applications/science/logic/prooftree/default.nix
+++ b/pkgs/applications/science/logic/prooftree/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation (rec {
sha256 = "08yp66j05pdkdpv9xkfqymqy82mir5xbwfh9mkzhh219xkps4b4m";
};
- buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ ocaml findlib camlp5 ncurses lablgtk ];
dontAddPrefix = true;
configureFlags = [ "--prefix" "$(out)" ];
diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix
new file mode 100644
index 000000000000..53e1a90f5b6a
--- /dev/null
+++ b/pkgs/applications/science/logic/symbiyosys/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub, yosys, python3 }:
+
+stdenv.mkDerivation rec {
+ name = "symbiyosys-${version}";
+ version = "2017.11.05";
+
+ src = fetchFromGitHub {
+ owner = "cliffordwolf";
+ repo = "symbiyosys";
+ rev = "db9c7e97b8f84ef7e9b18ae630009897c7982a08";
+ sha256 = "0pyznkjm0vjmaf6mpwknmh052qrwy2fzi05h80ysx1bxc51ns0m0";
+ };
+
+ buildInputs = [ python3 yosys ];
+
+ buildPhase = "true";
+ installPhase = ''
+ mkdir -p $out/bin $out/share/yosys/python3
+
+ cp sbysrc/sby_*.py $out/share/yosys/python3/
+ cp sbysrc/sby.py $out/bin/sby
+ chmod +x $out/bin/sby
+
+ # Fix up shebang and Yosys imports
+ patchShebangs $out/bin/sby
+ substituteInPlace $out/bin/sby \
+ --replace "##yosys-sys-path##" \
+ "sys.path += [p + \"/share/yosys/python3/\" for p in [\"$out\", \"${yosys}\"]]"
+ '';
+ meta = {
+ description = "Yosys verification tools for Hardware Definition Languages";
+ homepage = https://symbiyosys.readthedocs.io/;
+ license = stdenv.lib.licenses.mit;
+ maintainers = with stdenv.lib.maintainers; [ thoughtpolice ];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/applications/science/logic/tptp/default.nix b/pkgs/applications/science/logic/tptp/default.nix
index db7e0c0c9382..16ef277e9300 100644
--- a/pkgs/applications/science/logic/tptp/default.nix
+++ b/pkgs/applications/science/logic/tptp/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
name = "TPTP-${version}";
- version = "6.4.0";
+ version = "7.0.0";
src = fetchurl {
url = [
"http://www.cs.miami.edu/~tptp/TPTP/Distribution/TPTP-v${version}.tgz"
- "http://www.cs.miami.edu/~tptp/TPTP/Archive/TPTP-v${version}/TPTP-v${version}.tgz"
+ "http://www.cs.miami.edu/~tptp/TPTP/Archive/TPTP-v${version}.tgz"
];
- sha256 = "17mnqxnyibmzf5vvbnyhsd010zykqw8ikx4pvyj0x9sfyhpvgfix";
+ sha256 = "13rm76lqlgbv15p8as0dpc74z2dfv5xydkhnd0hm3hhi3mn39dk9";
};
buildInputs = [ tcsh yap perl patchelf ];
diff --git a/pkgs/applications/science/logic/twelf/default.nix b/pkgs/applications/science/logic/twelf/default.nix
index ca2422558e9a..74f8875fcebe 100644
--- a/pkgs/applications/science/logic/twelf/default.nix
+++ b/pkgs/applications/science/logic/twelf/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0fi1kbs9hrdrm1x4k13angpjasxlyd1gc3ys8ah54i75qbcd9c4i";
};
- buildInputs = [ pkgconfig smlnj rsync ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ smlnj rsync ];
buildPhase = ''
export SMLNJ_HOME=${smlnj}
diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix
index 5e2bf8d26241..a607f1066395 100644
--- a/pkgs/applications/science/logic/yices/default.nix
+++ b/pkgs/applications/science/logic/yices/default.nix
@@ -2,37 +2,40 @@
stdenv.mkDerivation rec {
name = "yices-${version}";
- version = "2.5.3";
+ version = "2.5.4";
src = fetchurl {
url = "https://github.com/SRI-CSL/yices2/archive/Yices-${version}.tar.gz";
name = "${name}-src.tar.gz";
- sha256 = "0a3zzbvmgyiljzqn6xmc037gismm779p696jywk09j2pqbvp52ac";
+ sha256 = "1k8wmlddi3zv5kgg6xbch3a0s0xqsmsfc7y6z8zrgcyhswl36h7p";
};
- patchPhase = ''patchShebangs tests/regress/check.sh'';
-
- configureFlags = [ "--with-static-gmp=${gmp-static.out}/lib/libgmp.a"
- "--with-static-gmp-include-dir=${gmp-static.dev}/include"
- "--enable-mcsat"
- ];
- buildInputs = [ gmp-static gperf autoreconfHook libpoly ];
+ nativeBuildInputs = [ autoreconfHook ];
+ buildInputs = [ gmp-static gperf libpoly ];
+ configureFlags =
+ [ "--with-static-gmp=${gmp-static.out}/lib/libgmp.a"
+ "--with-static-gmp-include-dir=${gmp-static.dev}/include"
+ "--enable-mcsat"
+ ];
enableParallelBuilding = true;
doCheck = true;
+ # Usual shenanigans
+ patchPhase = ''patchShebangs tests/regress/check.sh'';
+
# Includes a fix for the embedded soname being libyices.so.2.5, but
- # only installing the libyices.so.2.5.1 file.
+ # only installing the libyices.so.2.5.x file.
installPhase = ''
make install LDCONFIG=true
- (cd $out/lib && ln -s -f libyices.so.2.5.3 libyices.so.2.5)
+ (cd $out/lib && ln -s -f libyices.so.${version} libyices.so.2.5)
'';
meta = with stdenv.lib; {
description = "A high-performance theorem prover and SMT solver";
homepage = "http://yices.csl.sri.com";
license = licenses.gpl3;
- platforms = platforms.linux ++ platforms.darwin;
+ platforms = with platforms; linux ++ darwin;
maintainers = [ maintainers.thoughtpolice ];
};
}
diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix
index a6b89f90ef67..be25738a6076 100644
--- a/pkgs/applications/science/logic/z3/default.nix
+++ b/pkgs/applications/science/logic/z3/default.nix
@@ -4,13 +4,13 @@ let
python = python2;
in stdenv.mkDerivation rec {
name = "z3-${version}";
- version = "4.5.0";
+ version = "4.5.0-2017-11-06";
src = fetchFromGitHub {
owner = "Z3Prover";
repo = "z3";
- rev = "z3-${version}";
- sha256 = "0ssp190ksak93hiz61z90x6hy9hcw1ywp8b2dzmbhn6fbd4bnxzp";
+ rev = "3350f32e1f2c01c9df63b7d71899796a18ce2272";
+ sha256 = "00jn0njn5h9v49pl67yxj6225m6334ndrx6mp37vcqac05pdbpw7";
};
buildInputs = [ python fixDarwinDylibNames ];
diff --git a/pkgs/applications/science/machine-learning/sc2-headless/default.nix b/pkgs/applications/science/machine-learning/sc2-headless/default.nix
new file mode 100644
index 000000000000..c06bfc04e07c
--- /dev/null
+++ b/pkgs/applications/science/machine-learning/sc2-headless/default.nix
@@ -0,0 +1,54 @@
+{ stdenv
+, lib
+, fetchurl
+, unzip
+, licenseAccepted ? false
+}:
+
+if !licenseAccepted then throw ''
+ You must accept the Blizzard® Starcraft® II AI and Machine Learning License at
+ https://blzdistsc2-a.akamaihd.net/AI_AND_MACHINE_LEARNING_LICENSE.html
+ by setting nixpkgs config option 'sc2-headless.accept_license = true;'
+ ''
+else assert licenseAccepted;
+stdenv.mkDerivation rec {
+ version = "3.17";
+ name = "sc2-headless-${version}";
+
+ src = fetchurl {
+ url = "https://blzdistsc2-a.akamaihd.net/Linux/SC2.${version}.zip";
+ sha256 = "1biyxpf7n95hali1pw30h91rhzrj6sbwrx6s52d00mlnwdhmf2v0";
+ };
+
+ unpackCmd = ''
+ unzip -P 'iagreetotheeula' $curSrc
+ '';
+
+ nativeBuildInputs = [ unzip ];
+
+ installPhase = ''
+ mkdir -p $out
+ cp -r . "$out"
+ rm -r $out/Libs
+ '';
+
+ preFixup = ''
+ find $out -type f -print0 | while IFS=''' read -d ''' -r file; do
+ isELF "$file" || continue
+ patchelf \
+ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+ --set-rpath ${lib.makeLibraryPath [stdenv.cc.cc stdenv.cc.libc]} \
+ "$file"
+ done
+ '';
+
+ meta = {
+ platforms = stdenv.lib.platforms.linux;
+ description = "Starcraft II headless linux client for machine learning research";
+ license = {
+ fullName = "BLIZZARD® STARCRAFT® II AI AND MACHINE LEARNING LICENSE";
+ url = "https://blzdistsc2-a.akamaihd.net/AI_AND_MACHINE_LEARNING_LICENSE.html";
+ free = false;
+ };
+ };
+}
diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix
new file mode 100644
index 000000000000..9d736694cbdc
--- /dev/null
+++ b/pkgs/applications/science/machine-learning/shogun/default.nix
@@ -0,0 +1,51 @@
+{ stdenv, lib, fetchFromGitHub, ccache, cmake, ctags, swig
+# data, compression
+, bzip2, curl, hdf5, json_c, lzma, lzo, protobuf, snappy
+# maths
+, blas, eigen, nlopt, lp_solve, colpack
+# libraries
+, libarchive, liblapack, libxml2
+# extra support
+, pythonSupport ? true, pythonPackages ? null
+, opencvSupport ? false, opencv ? null
+}:
+
+assert pythonSupport -> pythonPackages != null;
+assert opencvSupport -> opencv != null;
+
+stdenv.mkDerivation rec {
+
+ pname = "shogun";
+ version = "6.0.0";
+ name = pname + "-" + version;
+
+ src = fetchFromGitHub {
+ owner = pname + "-toolbox";
+ repo = pname;
+ rev = pname + "_" + version;
+ sha256 = "0f2zwzvn5apvwypkfkq371xp7c5bdb4g1fwqfh8c2d57ysjxhmgf";
+ fetchSubmodules = true;
+ };
+
+ CCACHE_DIR=".ccache";
+
+ buildInputs = with lib; [
+ blas bzip2 ccache cmake colpack curl ctags eigen hdf5 json_c lp_solve lzma lzo
+ protobuf nlopt snappy swig (libarchive.dev) liblapack libxml2
+ ]
+ ++ optionals (pythonSupport) (with pythonPackages; [ python ply numpy ])
+ ++ optional (opencvSupport) opencv;
+
+ cmakeFlags = with lib; []
+ ++ (optional (pythonSupport) "-DPythonModular=ON")
+ ++ (optional (opencvSupport) "-DOpenCV=ON")
+ ;
+
+ meta = with stdenv.lib; {
+ description = "A toolbox which offers a wide range of efficient and unified machine learning methods";
+ homepage = "http://shogun-toolbox.org/";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ edwtjo ];
+ };
+
+}
diff --git a/pkgs/applications/science/machine-learning/torch/torch-distro.nix b/pkgs/applications/science/machine-learning/torch/torch-distro.nix
index 5ff510a52ce8..91adb5283fdc 100644
--- a/pkgs/applications/science/machine-learning/torch/torch-distro.nix
+++ b/pkgs/applications/science/machine-learning/torch/torch-distro.nix
@@ -105,6 +105,7 @@ let
installPhase = ''
make install-extra $makeFlags
'';
+ meta.broken = true;
};
luafilesystem = buildLuaRocks {
@@ -123,6 +124,7 @@ let
luaffifb = buildLuaRocks {
name = "luaffifb";
src = "${distro_src}/extra/luaffifb";
+ meta.broken = true;
};
sundown = buildLuaRocks rec {
@@ -267,6 +269,7 @@ let
preBuild = ''
export Torch_DIR=${torch}/share/cmake/torch
'';
+ meta.broken = true;
};
trepl = buildLuaRocks rec {
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index 5adece31370e..fd0ff24d58b3 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -7,11 +7,11 @@
}:
stdenv.mkDerivation rec {
- name = "R-3.4.1";
+ name = "R-3.4.2";
src = fetchurl {
url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz";
- sha256 = "0y7wlfk3cn1dxn2mpnxwvsk31s0599crbsyah8srm5pa2mfi7c82";
+ sha256 = "0r0cv2kc3x5z9xycpnxx6fbvv22psw2m342jhpslbxkc8g1307lp";
};
buildInputs = [
diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix
index 5c6fe9c573d5..8dc3e3ce43dc 100644
--- a/pkgs/applications/science/math/caffe/default.nix
+++ b/pkgs/applications/science/math/caffe/default.nix
@@ -22,22 +22,23 @@ assert pythonSupport -> (python != null && numpy != null);
stdenv.mkDerivation rec {
name = "caffe-${version}";
- version = "1.0-rc5";
+ version = "1.0";
src = fetchFromGitHub {
owner = "BVLC";
repo = "caffe";
- rev = "rc5";
- sha256 = "0lfmmc0n6xvkpygvxclzrvd0zigb4yfc5612anv2ahlxpfi9031c";
+ rev = version;
+ sha256 = "104jp3cm823i3cdph7hgsnj6l77ygbwsy35mdmzhmsi4jxprd9j3";
};
enableParallelBuilding = true;
nativeBuildInputs = [ cmake doxygen ];
- cmakeFlags = [ "-DCUDA_ARCH_NAME=All" ]
- ++ lib.optional (!cudaSupport) "-DCPU_ONLY=ON"
- ++ lib.optional (!pythonSupport) "-DBUILD_python=OFF";
+ cmakeFlags = [
+ "-DCUDA_ARCH_NAME=All"
+ (if pythonSupport then "-Dpython_version=${python.version}" else "-DBUILD_python=OFF")
+ ] ++ lib.optional (!cudaSupport) "-DCPU_ONLY=ON";
buildInputs = [ boost google-gflags glog protobuf hdf5-cpp lmdb leveldb snappy opencv atlas ]
++ lib.optional cudaSupport cudatoolkit
@@ -46,9 +47,18 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = lib.optional pythonSupport python.pkgs.protobuf;
- outputs = [ "out" "bin" ];
- # Don't propagate bin.
- outputBin = "out";
+ outputs = [ "bin" "out"];
+ propagatedBuildOutputs = []; # otherwise propagates out -> bin cycle
+
+ preConfigure = lib.optionalString (cudaSupport && lib.versionAtLeast cudatoolkit.version "9.0") ''
+ # CUDA 9.0 doesn't support sm_20
+ sed -i 's,20 21(20) ,,' cmake/Cuda.cmake
+ '' + lib.optionalString (python.isPy3 or false) ''
+ sed -i \
+ -e 's,"python-py''${boost_py_version}",python3,g' \
+ -e 's,''${Boost_PYTHON-PY''${boost_py_version}_FOUND},''${Boost_PYTHON3_FOUND},g' \
+ cmake/Dependencies.cmake
+ '';
postInstall = ''
# Internal static library.
diff --git a/pkgs/applications/science/math/clp/default.nix b/pkgs/applications/science/math/clp/default.nix
new file mode 100644
index 000000000000..daa9a53c59a1
--- /dev/null
+++ b/pkgs/applications/science/math/clp/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, zlib }:
+
+stdenv.mkDerivation rec {
+ version = "1.16.11";
+ name = "clp-${version}";
+ src = fetchurl {
+ url = "https://www.coin-or.org/download/source/Clp/Clp-${version}.tgz";
+ sha256 = "0fazlqpp845186nmixa9f1xfxqqkdr1xj4va7q29m8594ca4a9dm";
+ };
+
+ propagatedBuildInputs = [ zlib ];
+
+ doCheck = true;
+
+ checkTarget = "test";
+
+ meta = {
+ license = stdenv.lib.licenses.epl10;
+ homepage = https://projects.coin-or.org/Clp;
+ description = "An open-source linear programming solver written in C++";
+ platforms = stdenv.lib.platforms.all;
+ maintainers = [ stdenv.lib.maintainers.vbgl ];
+ };
+}
diff --git a/pkgs/applications/science/math/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix
new file mode 100644
index 000000000000..89ed0582b37e
--- /dev/null
+++ b/pkgs/applications/science/math/cntk/default.nix
@@ -0,0 +1,99 @@
+{ lib, stdenv, fetchgit, fetchFromGitHub, fetchpatch, cmake
+, openblas, opencv3, libzip, boost, protobuf, openmpi
+, onebitSGDSupport ? false
+, cudaSupport ? false, cudatoolkit, nvidia_x11
+, cudnnSupport ? false, cudnn
+}:
+
+assert cudnnSupport -> cudaSupport;
+
+let
+ # Old specific version required for CNTK.
+ cub = fetchFromGitHub {
+ owner = "NVlabs";
+ repo = "cub";
+ rev = "1.4.1";
+ sha256 = "1lcdwblz03c0yq1lxndg566kg14b5qm14x5qixjbmz6wq85kgmqc";
+ };
+
+in stdenv.mkDerivation rec {
+ name = "CNTK-${version}";
+ version = "2.2";
+
+ # Submodules
+ src = fetchgit {
+ url = "https://github.com/Microsoft/CNTK";
+ rev = "v${version}";
+ sha256 = "0q4knrwiyphb2fbqf9jzqvkz2jzj6jmbmang3lavdvsh7z0n8zz9";
+ };
+
+ patches = [
+ # Fix "'exp' was not declared"
+ (fetchpatch {
+ url = "https://github.com/imriss/CNTK/commit/ef1cca6df95cc507deb8471df2c0dd8cbfeef23b.patch";
+ sha256 = "0z7xyrxwric0c4h7rfs05f544mcq6d10wgs0vvfcyd2pcf410hy7";
+ })
+ ];
+
+ nativeBuildInputs = [ cmake ];
+
+ buildInputs = [ openblas opencv3 libzip boost protobuf openmpi ]
+ ++ lib.optional cudaSupport cudatoolkit
+ ++ lib.optional cudnnSupport cudnn;
+
+ configureFlags = [
+ "--with-opencv=${opencv3}"
+ "--with-libzip=${libzip.dev}"
+ "--with-openblas=${openblas}"
+ "--with-boost=${boost.dev}"
+ "--with-protobuf=${protobuf}"
+ "--with-mpi=${openmpi}"
+ ] ++ lib.optionals cudaSupport [
+ "--cuda=yes"
+ "--with-cuda=${cudatoolkit}"
+ "--with-gdk-include=${cudatoolkit}/include"
+ "--with-gdk-nvml-lib=${nvidia_x11}/lib"
+ "--with-cub=${cub}"
+ ] ++ lib.optional onebitSGDSupport "--1bitsgd=yes";
+
+ configurePhase = ''
+ sed -i \
+ -e 's,^GIT_STATUS=.*,GIT_STATUS=,' \
+ -e 's,^GIT_COMMIT=.*,GIT_COMMIT=v${version},' \
+ -e 's,^GIT_BRANCH=.*,GIT_BRANCH=v${version},' \
+ -e 's,^BUILDER=.*,BUILDER=nixbld,' \
+ -e 's,^BUILDMACHINE=.*,BUILDMACHINE=machine,' \
+ -e 's,^BUILDPATH=.*,BUILDPATH=/homeless-shelter,' \
+ -e '/git does not exist/d' \
+ Tools/generate_build_info
+
+ patchShebangs .
+ mkdir build
+ cd build
+ ${lib.optionalString cudnnSupport ''
+ mkdir cuda
+ ln -s ${cudnn}/include cuda
+ export configureFlags="$configureFlags --with-cudnn=$PWD"
+ ''}
+ ../configure $configureFlags
+ '';
+
+ installPhase = ''
+ mkdir -p $out/bin
+ # Moving to make patchelf remove references later.
+ mv lib $out
+ cp bin/cntk $out/bin
+ '';
+
+ hardeningDisable = [ "format" ];
+
+ # on 2.2: fatal error: tensorboard/tensorboard.pb.h: No such file or directory
+ enableParallelBuilding = false;
+
+ meta = with lib; {
+ homepage = "https://github.com/Microsoft/CNTK";
+ description = "An open source deep-learning toolkit";
+ license = if onebitSGDSupport then licenses.unfreeRedistributable else licenses.mit;
+ maintainers = with maintainers; [ abbradar ];
+ };
+}
diff --git a/pkgs/applications/science/math/colpack/default.nix b/pkgs/applications/science/math/colpack/default.nix
new file mode 100644
index 000000000000..29785363b048
--- /dev/null
+++ b/pkgs/applications/science/math/colpack/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, gettext }:
+
+stdenv.mkDerivation rec {
+
+ pname = "ColPack";
+ version = "1.0.10";
+ name = pname + "-" + version;
+
+ src = fetchFromGitHub {
+ owner = "CSCsw";
+ repo = pname;
+ rev = "v" + version;
+ sha256 = "1p05vry940mrjp6236c0z83yizmw9pk6ly2lb7d8rpb7j9h03glr";
+ };
+
+ buildInputs = [ autoconf automake gettext libtool ];
+
+ configurePhase = ''
+ autoreconf -vif
+ ./configure --prefix=$out --enable-openmp
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A package comprising of implementations of algorithms for
+ vertex coloring and derivative computation";
+ homepage = "http://cscapes.cs.purdue.edu/coloringpage/software.htm#functionalities";
+ license = licenses.lgpl3;
+ maintainers = with maintainers; [ edwtjo ];
+ };
+
+}
diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix
new file mode 100644
index 000000000000..4ef00d56f182
--- /dev/null
+++ b/pkgs/applications/science/math/giac/default.nix
@@ -0,0 +1,68 @@
+{ stdenv, fetchurl, texlive, bison, flex
+, gmp, mpfr, pari, ntl, gsl, blas, mpfi, liblapackWithAtlas
+, readline, gettext, libpng, libao, gfortran, perl
+, enableGUI ? false, mesa ? null, xorg ? null, fltk ? null
+}:
+
+assert enableGUI -> mesa != null && xorg != null && fltk != null;
+
+stdenv.mkDerivation rec {
+ name = "${attr}-${version}";
+ attr = if enableGUI then "giac-with-xcas" else "giac";
+ version = "1.4.9";
+
+ src = fetchurl {
+ url = "https://www-fourier.ujf-grenoble.fr/~parisse/giac/giac-${version}.tar.bz2";
+ sha256 = "1n7xxgpqrsq7cv5wgcmgag6jvxw5wijkf1yv1r5aizlf1rc7dhai";
+ };
+
+ postPatch = ''
+ for i in doc/*/Makefile*; do
+ substituteInPlace "$i" --replace "/bin/cp" "cp";
+ done;
+ '';
+
+ nativeBuildInputs = [
+ texlive.combined.scheme-small bison flex
+ ];
+
+ # perl is only needed for patchShebangs fixup.
+ buildInputs = [
+ gmp mpfr pari ntl gsl blas mpfi liblapackWithAtlas
+ readline gettext libpng libao gfortran perl
+ ] ++ stdenv.lib.optionals enableGUI [
+ mesa fltk xorg.libX11
+ ];
+
+ outputs = [ "out" ];
+
+ enableParallelBuilding = true;
+ hardeningDisable = [ "format" "bindnow" "relro" ];
+
+ configureFlags = [
+ "--enable-gc" "--enable-png" "--enable-gsl" "--enable-lapack"
+ "--enable-pari" "--enable-ntl" "--enable-gmpxx" # "--enable-cocoa"
+ "--enable-ao"
+ ] ++ stdenv.lib.optionals enableGUI [
+ "--enable-gui" "--with-x"
+ ];
+
+ postInstall = ''
+ # example Makefiles contain the full path to some commands
+ # notably texlive, and we don't want texlive to become a runtime
+ # dependency
+ for file in $(find $out -name Makefile) ; do
+ sed -i "s@/nix/store/[^/]*/bin/@@" "$file" ;
+ done;
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A free computer algebra system (CAS)";
+ homepage = "https://www-fourier.ujf-grenoble.fr/~parisse/giac.html";
+ license = licenses.gpl3Plus;
+ ## xcas is buildable on darwin but there are specific instructions I could
+ ## not test
+ platforms = platforms.linux;
+ maintainers = [ maintainers.symphorien ];
+ };
+}
diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix
index b55961205922..bb24ac9bd499 100644
--- a/pkgs/applications/science/math/gmsh/default.nix
+++ b/pkgs/applications/science/math/gmsh/default.nix
@@ -1,25 +1,27 @@
-{ stdenv, fetchurl, cmake, blas, liblapack, gfortran, fltk, libjpeg
+{ stdenv, fetchurl, cmake, blas, liblapack, gfortran, gmm, fltk, libjpeg
, zlib, mesa, mesa_glu, xorg }:
-let version = "2.12.0"; in
+let version = "3.0.5"; in
stdenv.mkDerivation {
name = "gmsh-${version}";
src = fetchurl {
url = "http://gmsh.info/src/gmsh-${version}-source.tgz";
- sha256 = "02cx2mfbxx6m18s54z4yzbk4ybch3v9489z7cr974y8y0z42xgbz";
+ sha256 = "ae39ed81178d94b76990b8c89b69a5ded8910fd8f7426b800044d00373d12a93";
};
# The original CMakeLists tries to use some version of the Lapack lib
# that is supposed to work without Fortran but didn't for me.
patches = [ ./CMakeLists.txt.patch ];
- buildInputs = [ cmake blas liblapack gfortran fltk libjpeg zlib mesa
+ buildInputs = [ cmake blas liblapack gfortran gmm fltk libjpeg zlib mesa
mesa_glu xorg.libXrender xorg.libXcursor xorg.libXfixes xorg.libXext
xorg.libXft xorg.libXinerama xorg.libX11 xorg.libSM xorg.libICE
];
+ enableParallelBuilding = true;
+
meta = {
description = "A three-dimensional finite element mesh generator";
homepage = http://gmsh.info/;
diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix
index 1e23cfea27fc..1c86097f2ee4 100644
--- a/pkgs/applications/science/math/mathematica/default.nix
+++ b/pkgs/applications/science/math/mathematica/default.nix
@@ -3,6 +3,7 @@
, patchelf
, requireFile
, alsaLib
+, dbus
, fontconfig
, freetype
, gcc
@@ -12,6 +13,7 @@
, opencv
, openssl
, unixODBC
+, xkeyboard_config
, xorg
, zlib
, libxml2
@@ -26,7 +28,7 @@ let
throw "Mathematica requires i686-linux or x86_64 linux";
in
stdenv.mkDerivation rec {
- version = "11.0.1";
+ version = "11.2.0";
name = "mathematica-${version}";
@@ -37,7 +39,7 @@ stdenv.mkDerivation rec {
already part of the store. Find the file on your Mathematica CD
and add it to the nix store with nix-store --add-fixed sha256 .
'';
- sha256 = "1qqwz8gbw74rnnyirpbdanwx3d25s4x0i4zc7bs6kp959x66cdkw";
+ sha256 = "4a1293cc1c404303aa1cab1bd273c7be151d37ac5ed928fbbb18e9c5ab2d8df9";
};
buildInputs = [
@@ -45,6 +47,7 @@ stdenv.mkDerivation rec {
patchelf
alsaLib
coreutils
+ dbus
fontconfig
freetype
gcc.cc
@@ -54,6 +57,7 @@ stdenv.mkDerivation rec {
opencv
openssl
unixODBC
+ xkeyboard_config
libxml2
libuuid
zlib
@@ -100,6 +104,12 @@ stdenv.mkDerivation rec {
for path in mathematica MathKernel Mathematica WolframKernel wolfram math; do
sed -i -e 's#export LD_LIBRARY_PATH$#export LD_LIBRARY_PATH=${zlib}/lib:\''${LD_LIBRARY_PATH}#' $path
done
+
+ # Fix xkeyboard config path for Qt
+ for path in mathematica Mathematica; do
+ line=$(grep -n QT_PLUGIN_PATH $path | sed 's/:.*//')
+ sed -i -e "$line iexport QT_XKB_CONFIG_ROOT=\"${xkeyboard_config}/share/X11/xkb\"" $path
+ done
'';
preFixup = ''
diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix
index 67183c9dd551..d2f3d0c5f337 100644
--- a/pkgs/applications/science/math/mxnet/default.nix
+++ b/pkgs/applications/science/math/mxnet/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchgit, cmake
, opencv, gtest, openblas, liblapack
-, cudaSupport ? false, cudatoolkit
+, cudaSupport ? false, cudatoolkit, nvidia_x11
, cudnnSupport ? false, cudnn
}:
@@ -20,11 +20,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = [ opencv gtest openblas liblapack ]
- ++ lib.optional cudaSupport cudatoolkit
+ ++ lib.optionals cudaSupport [ cudatoolkit nvidia_x11 ]
++ lib.optional cudnnSupport cudnn;
- cmakeFlags = lib.optional (!cudaSupport) "-DUSE_CUDA=OFF"
- ++ lib.optional (!cudnnSupport) "-DUSE_CUDNN=OFF";
+ cmakeFlags = [
+ (if cudaSupport then "-DCUDA_ARCH_NAME=All" else "-DUSE_CUDA=OFF")
+ ] ++ lib.optional (!cudnnSupport) "-DUSE_CUDNN=OFF";
installPhase = ''
install -Dm755 libmxnet.so $out/lib/libmxnet.so
diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix
index 64784facfb96..86d4d289c2a6 100644
--- a/pkgs/applications/science/math/pari/default.nix
+++ b/pkgs/applications/science/math/pari/default.nix
@@ -14,12 +14,21 @@ stdenv.mkDerivation rec {
buildInputs = [ gmp readline libX11 libpthreadstubs tex perl ];
configureScript = "./Configure";
- configureFlags =
- "--mt=pthread" +
- "--with-gmp=${gmp.dev} " +
- "--with-readline=${readline.dev}";
+ configureFlags = [
+ "--mt=pthread"
+ "--with-gmp=${gmp.dev}"
+ "--with-readline=${readline.dev}"
+ ] ++ stdenv.lib.optional stdenv.isDarwin "--host=x86_64-darwin";
- makeFlags = "all";
+ preConfigure = ''
+ export LD=$CC
+ '';
+
+ postConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
+ echo 'echo x86_64-darwin' > config/arch-osname
+ '';
+
+ makeFlags = [ "all" ];
meta = with stdenv.lib; {
description = "Computer algebra system for high-performance number theory computations";
@@ -36,12 +45,12 @@ stdenv.mkDerivation rec {
Bordeaux I, France), PARI is now under the GPL and maintained by Karim
Belabas with the help of many volunteer contributors.
- - PARI is a C library, allowing fast computations.
+ - PARI is a C library, allowing fast computations.
- gp is an easy-to-use interactive shell giving access to the
PARI functions.
- GP is the name of gp's scripting language.
- - gp2c, the GP-to-C compiler, combines the best of both worlds
- by compiling GP scripts to the C language and transparently loading
+ - gp2c, the GP-to-C compiler, combines the best of both worlds
+ by compiling GP scripts to the C language and transparently loading
the resulting functions into gp. (gp2c-compiled scripts will typically
run 3 or 4 times faster.) gp2c currently only understands a subset
of the GP language.
@@ -50,7 +59,7 @@ stdenv.mkDerivation rec {
downloadPage = "http://pari.math.u-bordeaux.fr/download.html";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ ertes raskin AndersonTorres ];
- platforms = platforms.linux;
+ platforms = platforms.linux ++ platforms.darwin;
updateWalker = true;
};
}
diff --git a/pkgs/applications/science/math/pspp/default.nix b/pkgs/applications/science/math/pspp/default.nix
index e899548217f7..486a2e69d264 100644
--- a/pkgs/applications/science/math/pspp/default.nix
+++ b/pkgs/applications/science/math/pspp/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "1r8smr5057993h90nx0mdnff8nxw9x546zzh6qpy4h3xblp1la5s";
};
- buildInputs = [ libxml2 readline zlib perl cairo gtk3 gsl pkgconfig
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libxml2 readline zlib perl cairo gtk3 gsl
gtksourceview pango gettext ];
doCheck = false;
diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix
index 6b5cb452f591..278194d57fa4 100644
--- a/pkgs/applications/science/math/qalculate-gtk/default.nix
+++ b/pkgs/applications/science/math/qalculate-gtk/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "qalculate-gtk-${version}";
- version = "2.0.0a";
+ version = "2.1.0";
src = fetchurl {
url = "https://github.com/Qalculate/qalculate-gtk/archive/v${version}.tar.gz";
- sha256 = "0bif79wl2hi0sf4pk2b4s2xz33lj7401pygsdmxrnr5gqqq0s696";
+ sha256 = "14q89l6laa7v7d9qx7v71a0r2m65saxqgr9r871fasm400a9x8pw";
};
patchPhase = ''
diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix
index bf3c7fcea989..24dc4436b0fd 100644
--- a/pkgs/applications/science/math/sage/default.nix
+++ b/pkgs/applications/science/math/sage/default.nix
@@ -1,42 +1,183 @@
-{ stdenv, fetchurl, m4, perl, gfortran, texlive, ffmpeg, tk, gnused_422
-, imagemagick, liblapack, python, openssl, libpng
+# TODO
+# - consider writing a script to convert spkgs to nix packages, similar to vim
+# or cabal2nix. This would allow a more efficient and "cleaner" build, greater
+# flexibility and the possibility to select which dependencies to add and which
+# to remove. It would also allow to use system packages for some dependencies
+# and recompile others (optimized for the system) without recompiling everything.
+# - add optdeps:
+# - imagemagick
+# - texlive full for documentation
+# - ...
+# - further seperate build outputs. Also maybe run `make doc`.
+# Configure flags like --bindir and --libdir oculd also be used for that, see
+# ./configure --help`.
+
+# Other resources:
+# - https://wiki.debian.org/DebianScience/Sage
+# - https://github.com/cschwan/sage-on-gentoo
+# - https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/sagemath
+
+{ stdenv
+, fetchurl
+, perl
+, gfortran
+, python
+, autoreconfHook
+, gettext
, which
+, texlive
+, hevea
}:
stdenv.mkDerivation rec {
- name = "sage-6.8";
+ version = "8.0";
+ name = "sage-${version}";
src = fetchurl {
- url = "http://old.files.sagemath.org/src-old/${name}.tar.gz";
- sha256 = "102mrzzi215g1xn5zgcv501x9sghwg758jagx2jixvg1rj2jijj9";
-
+ # Note that the source is *not* fetched from github, since that doesn't
+ # the upstream folder with all the source tarballs of the spkgs.
+ # If those are not present they are fetched at build time, which breaks
+ # when building in a sandbox (and probably only works if you install the
+ # latest sage version).
+ urls = [
+ "http://mirrors.mit.edu/sage/src/sage-${version}.tar.gz"
+ "ftp://ftp.fu-berlin.de/unix/misc/sage/src/sage-${version}.tar.gz"
+ "http://sagemath.polytechnic.edu.na/src/sage-${version}.tar.gz"
+ "ftp://ftp.sun.ac.za/pub/mirrors/www.sagemath.org/src/sage-${version}.tar.gz"
+ "http://sagemath.mirror.ac.za/src/sage-${version}.tar.gz"
+ "http://ftp.leg.uct.ac.za/pub/packages/sage/src/sage-${version}.tar.gz"
+ "http://mirror.ufs.ac.za/sagemath/src/sage-${version}.tar.gz"
+ "http://mirrors-usa.go-parts.com/sage/sagemath/src/sage-${version}.tar.gz"
+ "http://www.cecm.sfu.ca/sage/src/sage-${version}.tar.gz"
+ "http://files.sagemath.org/src/sage-${version}.tar.gz"
+ "http://mirrors.xmission.com/sage/src/sage-${version}.tar.gz"
+ "http://sagemath.c3sl.ufpr.br/src/sage-${version}.tar.gz"
+ "http://linorg.usp.br/sage/src/sage-${version}.tar.gz"
+ "http://mirror.hust.edu.cn/sagemath/src/sage-${version}.tar.gz"
+ "http://ftp.iitm.ac.in/sage/src/sage-${version}.tar.gz"
+ "http://ftp.kaist.ac.kr/sage/src/sage-${version}.tar.gz"
+ "http://ftp.riken.jp/sagemath/src/sage-${version}.tar.gz"
+ "http://mirrors.tuna.tsinghua.edu.cn/sagemath/src/sage-${version}.tar.gz"
+ "http://mirrors.ustc.edu.cn/sagemath/src/sage-${version}.tar.gz"
+ "http://ftp.tsukuba.wide.ad.jp/software/sage/src/sage-${version}.tar.gz"
+ "http://ftp.yz.yamagata-u.ac.jp/pub/math/sage/src/sage-${version}.tar.gz"
+ "http://mirror.yandex.ru/mirrors/sage.math.washington.edu/src/sage-${version}.tar.gz"
+ "http://mirror.aarnet.edu.au/pub/sage/src/sage-${version}.tar.gz"
+ "http://sage.mirror.garr.it/mirrors/sage/src/sage-${version}.tar.gz"
+ "http://www.mirrorservice.org/sites/www.sagemath.org/src/sage-${version}.tar.gz"
+ "http://mirror.switch.ch/mirror/sagemath/src/sage-${version}.tar.gz"
+ "https://mirrors.up.pt/pub/sage/src/sage-${version}.tar.gz"
+ "http://www-ftp.lip6.fr/pub/math/sagemath/src/sage-${version}.tar.gz"
+ "http://ftp.ntua.gr/pub/sagemath/src/sage-${version}.tar.gz"
+ ];
+ sha256 = "1a9rhb8jby6fdqa2s7n2fl9jwqqlsl7qz7dbpbwvg6jwlrvni7fg";
};
- buildInputs = [ m4 perl gfortran texlive.combined.scheme-basic ffmpeg gnused_422 tk imagemagick liblapack
- python openssl libpng which ];
+ postPatch = ''
+ substituteAllInPlace src/bin/sage-env
+ '';
- patches = [ ./spkg-singular.patch ./spkg-python.patch ./spkg-git.patch ];
+ installPhase = ''
+ # Sage installs during first `make`, `make install` is no-op and just takes time.
+ '';
+
+ outputs = [ "out" "doc" ];
+
+ buildInputs = [
+ perl # needed for the build
+ python # needed for the build
+ gfortran # needed to build giac
+ autoreconfHook # needed to configure sage with prefix
+ gettext # needed to build the singular spkg
+ hevea # needed to build the docs of the giac spkg
+ which # needed in configure of mpir
+ # needed to build the docs of the giac spkg
+ (texlive.combine { inherit (texlive)
+ scheme-basic
+ collection-pstricks # needed by giac
+ times # font needed by giac
+ stmaryrd # needed by giac
+ babel-greek # optional for giac, otherwise throws a bunch of latex command not founds
+ ;
+ })
+ ];
+
+ patches = [
+ # fix usages of /bin/rm
+ ./spkg-singular.patch
+ # help python find the crypt library
+ ./spkg-python2.patch
+ ./spkg-python3.patch
+ # fix usages of /usr/bin/perl
+ ./spkg-git.patch
+ # fix usages of /bin/cp and add necessary argument to function call
+ ./spkg-giac.patch
+ # environment
+ ./env.patch
+ ];
enableParallelBuilding = true;
- hardeningDisable = [ "format" ];
+ hardeningDisable = [
+ "format" # needed to build palp, for lines like `printf(ctime(&_NFL->TIME))`
+ # TODO could be patched with `sed s|printf(ctime(\(.*\)))|%s... or fixed upstream
+ ];
preConfigure = ''
export SAGE_NUM_THREADS=$NIX_BUILD_CORES
export SAGE_ATLAS_ARCH=fast
- mkdir -p $out/sageHome
- export HOME=$out/sageHome
- export CPPFLAGS="-P"
+
+ export HOME=$out/sage-home
+ mkdir -p $out/sage-home
+
+ mkdir -p "$out"
+
+ # we need to keep the source around
+ dir="$PWD"
+ cd ..
+ mv "$dir" "$out/sage-root"
+
+ cd "$out/sage-root" # build in target dir, since `make` is also `make install`
'';
- preBuild = "patchShebangs build";
+ # for reference: http://doc.sagemath.org/html/en/installation/source.html
+ preBuild = ''
+ # TODO do this conditionally
+ export SAGE_SPKG_INSTALL_DOCS='no'
+ patchShebangs build
+ '';
- installPhase = ''DESTDIR=$out make install'';
+ postBuild = ''
+ rm -r "$out/sage-root/upstream" # don't keep the sources of all the spkgs
+ rm -r "$out/sage-root/src/build"
+ rm -rf "$out/sage-root/src/.git"
+ rm -r "$out/sage-root/logs"
+ # Fix dependency cycle between out and doc
+ rm -f "$out/sage-root/config.status"
+ rm -f "$out/sage-root/build/make/Makefile-auto"
+ rm -f "$out/sage-home/.sage/gap/libgap-workspace-"*
+ '';
+
+ # TODO there are some doctest failures, which seem harmless.
+ # We should figure out a way to fix the failures or ignore only those tests.
+ doCheck = false;
+
+ checkTarget = "ptestalllong"; # all long tests in parallell
+ preCheck = ''
+ export SAGE_TIMEOUT=0 # no timeout
+ export SAGE_TIMEOUT_LONG=0 # no timeout
+ '';
meta = {
homepage = http://www.sagemath.org;
description = "A free open source mathematics software system";
+ # taken from the homepage
+ longDescription = ''
+ SageMath is a free open-source mathematics software system licensed under the GPL. It builds on top of many existing open-source packages: NumPy, SciPy, matplotlib, Sympy, Maxima, GAP, FLINT, R and many more. Access their combined power through a common, Python-based language or directly via interfaces or wrappers.
+ Mission: Creating a viable free open source alternative to Magma, Maple, Mathematica and Matlab.
+ '';
license = stdenv.lib.licenses.gpl2Plus;
- broken = true;
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = with stdenv.lib.maintainers; [ timokau ];
};
}
diff --git a/pkgs/applications/science/math/sage/env.patch b/pkgs/applications/science/math/sage/env.patch
new file mode 100644
index 000000000000..a7f8538eac3d
--- /dev/null
+++ b/pkgs/applications/science/math/sage/env.patch
@@ -0,0 +1,22 @@
+diff --git a/src/bin/sage-env b/src/bin/sage-env
+index ead308f861..ed8db9f9b7 100644
+--- a/src/bin/sage-env
++++ b/src/bin/sage-env
+@@ -111,6 +111,8 @@ resolvelinks() {
+ }
+
+
++SAGE_ROOT="@out@/sage-root"
++
+ # New value for SAGE_ROOT: either SAGE_ROOT (if given)
+ # or a guessed value based on pwd.
+ if [ -n "$SAGE_ROOT" ]; then
+@@ -185,6 +187,8 @@ fi
+ export SAGE_ENV_SOURCED=$SAGE_ENV_VERSION
+
+ export SAGE_ROOT="$NEW_SAGE_ROOT"
++export SAGE_LOCAL='@out@/'
++export PYTHONPATH="@out@/lib/python2.7/site-packages:$PYTHONPATH"
+
+
+ # sage-env must know where the Sage's script files are.
diff --git a/pkgs/applications/science/math/sage/fetch-mirrors.sh b/pkgs/applications/science/math/sage/fetch-mirrors.sh
new file mode 100755
index 000000000000..a1103e86beb9
--- /dev/null
+++ b/pkgs/applications/science/math/sage/fetch-mirrors.sh
@@ -0,0 +1,11 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i bash -p curl go-pup
+
+# Fetches a list of all available source mirrors from the sage homepage.
+# Note that the list is sorted by country, but fetchurl doesn't offer an option
+# to customize mirror preference.
+
+curl -s http://www.sagemath.org/download-source.html \
+ | pup 'table#mirror' \
+ | pup 'a attr{href}' \
+ | sed -e 's/index\.html/sage-${version}.tar.gz/'
diff --git a/pkgs/applications/science/math/sage/spkg-giac.patch b/pkgs/applications/science/math/sage/spkg-giac.patch
new file mode 100644
index 000000000000..15b91433d254
--- /dev/null
+++ b/pkgs/applications/science/math/sage/spkg-giac.patch
@@ -0,0 +1,11 @@
+--- old/build/pkgs/giac/spkg-install 2017-07-21 14:10:00.000000000 -0500
++++ new/build/pkgs/giac/spkg-install 2017-10-15 15:55:55.321237645 -0500
+@@ -4,6 +4,8 @@
+ ## Giac
+ ###########################################
+
++find . -type f -exec sed -e 's@/bin/cp@cp@g' -i '{}' ';' && echo "Patching input parser" && find . -iname 'input_parser.cc'
++sed -e 's@yylex (&yylval)@yylex (\&yyval, scanner)@gp' -i 'src/src/input_parser.cc'
+
+ if [ "$SAGE_LOCAL" = "" ]; then
+ echo "SAGE_LOCAL undefined ... exiting";
diff --git a/pkgs/applications/science/math/sage/spkg-git.patch b/pkgs/applications/science/math/sage/spkg-git.patch
index a3e768a7c240..ff9a7b2e491a 100644
--- a/pkgs/applications/science/math/sage/spkg-git.patch
+++ b/pkgs/applications/science/math/sage/spkg-git.patch
@@ -1,10 +1,12 @@
---- old/build/pkgs/git/spkg-install 2015-07-26 15:34:43.000000000 +0200
-+++ new/build/pkgs/git/spkg-install 2015-09-17 08:28:03.586657451 +0200
-@@ -45,6 +45,8 @@
- fi
- done
+diff --git a/build/pkgs/git/spkg-install b/build/pkgs/git/spkg-install
+index 8469cb58c2..d0dc9a1db9 100755
+--- a/build/pkgs/git/spkg-install
++++ b/build/pkgs/git/spkg-install
+@@ -35,6 +35,8 @@ fi
-+find . -exec sed -e 's@/usr/bin/perl@perl@g' -i '{}' ';'
+ cd src
+
++find . -type f -exec sed -e 's@/usr/bin/perl@perl@g' -i '{}' ';'
+
# We don't want to think about Fink or Macports
export NO_FINK=1
diff --git a/pkgs/applications/science/math/sage/spkg-python.patch b/pkgs/applications/science/math/sage/spkg-python.patch
deleted file mode 100644
index 4db9427e3e02..000000000000
--- a/pkgs/applications/science/math/sage/spkg-python.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- old/build/pkgs/python2/spkg-install 2015-07-26 15:34:43.000000000 +0200
-+++ new/build/pkgs/python2/spkg-install 2015-09-16 20:48:51.904555797 +0200
-@@ -32,7 +32,7 @@
- done
-
- # We are setting LDFLAGS so that we pick up Sage's readline
--LDFLAGS="-L$SAGE_LOCAL/lib $LDFLAGS"
-+LDFLAGS="-L$SAGE_LOCAL/lib -lcrypt $LDFLAGS"
- export LDFLAGS
-
- if [ "$SAGE_DEBUG" = "yes" ]; then
diff --git a/pkgs/applications/science/math/sage/spkg-python2.patch b/pkgs/applications/science/math/sage/spkg-python2.patch
new file mode 100644
index 000000000000..5d92d3f8beaf
--- /dev/null
+++ b/pkgs/applications/science/math/sage/spkg-python2.patch
@@ -0,0 +1,12 @@
+--- old/build/pkgs/python2/spkg-install 2017-07-21 14:10:00.000000000 -0500
++++ new/build/pkgs/python2/spkg-install 2017-10-15 11:26:54.823134067 -0500
+@@ -22,6 +22,9 @@
+
+ cd src
+
++LDFLAGS="-lcrypt $LDFLAGS"
++export LDFLAGS
++
+ if [ "$SAGE_DEBUG" = "yes" ]; then
+ echo "Building Python with pydebug"
+ PYTHON_CONFIGURE="$PYTHON_CONFIGURE --with-pydebug"
diff --git a/pkgs/applications/science/math/sage/spkg-python3.patch b/pkgs/applications/science/math/sage/spkg-python3.patch
new file mode 100644
index 000000000000..51827fd11be0
--- /dev/null
+++ b/pkgs/applications/science/math/sage/spkg-python3.patch
@@ -0,0 +1,12 @@
+--- old/build/pkgs/python3/spkg-install 2017-07-21 14:10:00.000000000 -0500
++++ new/build/pkgs/python3/spkg-install 2017-10-15 13:11:17.769261404 -0500
+@@ -22,6 +22,9 @@
+
+ cd src
+
++LDFLAGS="-lcrypt $LDFLAGS"
++export LDFLAGS
++
+ if [ "$SAGE_DEBUG" = "yes" ]; then
+ echo "Building Python with pydebug"
+ PYTHON_CONFIGURE="$PYTHON_CONFIGURE --with-pydebug"
diff --git a/pkgs/applications/science/math/sage/spkg-singular.patch b/pkgs/applications/science/math/sage/spkg-singular.patch
index a4c29825a4c4..d561768600b4 100644
--- a/pkgs/applications/science/math/sage/spkg-singular.patch
+++ b/pkgs/applications/science/math/sage/spkg-singular.patch
@@ -1,28 +1,12 @@
---- old/build/pkgs/singular/spkg-install 2015-07-26 15:34:43.000000000 +0200
-+++ new/build/pkgs/singular/spkg-install 2015-09-15 20:42:51.716505855 +0200
-@@ -115,6 +115,11 @@
- done
- }
+--- old/build/pkgs/singular/spkg-install 2017-10-15 10:35:41.826540964 -0500
++++ new/build/pkgs/singular/spkg-install 2017-10-15 10:36:40.613743443 -0500
+@@ -4,6 +4,9 @@
+ ## Singular
+ ###########################################
-+nix_nuke_bin_rm()
-+{
-+ find . -exec sed -e 's@/bin/rm@rm@g' -i '{}' ';'
-+}
++find . -type f -exec sed -e 's@/bin/rm@rm@g' -i '{}' ';'
++#echo '#!/usr/bin/env bash\nIgnoring missing $1' > src/build-aux/missing
+
- remove_old_version()
- {
- rm -f "$SAGE_LOCAL"/bin/Singular*
-@@ -306,11 +311,11 @@
-
-
- # Actually run all the functions defined above
--for i in choose_patches apply_patches remove_old_version config \
-+for i in choose_patches apply_patches nix_nuke_bin_rm remove_old_version config \
- build_singular build_libsingular build_factory build_libfac \
- create_singular_script install_docs ; do
- echo "### Singular spkg-install: $i ###"
-- cd "$SRC" && $i
-+ cd "$SRC" && pwd && $i
- if [ $? -ne 0 ]; then
- echo >&2 "Error building Singular (error in $i)."
- exit 1
+ if [ -z "$SAGE_LOCAL" ]; then
+ echo >&2 "Error: SAGE_LOCAL undefined -- exiting..."
+ echo >&2 "Maybe run 'sage -sh'?"
diff --git a/pkgs/applications/science/misc/fityk/default.nix b/pkgs/applications/science/misc/fityk/default.nix
index 1c1cac203f8b..8d0336f58282 100644
--- a/pkgs/applications/science/misc/fityk/default.nix
+++ b/pkgs/applications/science/misc/fityk/default.nix
@@ -15,7 +15,8 @@ stdenv.mkDerivation {
sha256 = "0kmrjjjwrh6xgw590awcd52b86kksmv6rfgih75zvpiavr1ygwsi";
};
- buildInputs = [ autoreconfHook wxGTK30 boost lua zlib bzip2 xylib readline
+ nativeBuildInputs = [ autoreconfHook ];
+ buildInputs = [ wxGTK30 boost lua zlib bzip2 xylib readline
gnuplot swig3 ];
meta = {
diff --git a/pkgs/applications/science/misc/golly/default.nix b/pkgs/applications/science/misc/golly/default.nix
index 8902bacf11ca..94e7c0efaaee 100644
--- a/pkgs/applications/science/misc/golly/default.nix
+++ b/pkgs/applications/science/misc/golly/default.nix
@@ -20,7 +20,9 @@ stdenv.mkDerivation rec {
inherit (s) url sha256;
};
- sourceRoot="${name}-src/gui-wx/configure";
+ setSourceRoot = ''
+ sourceRoot=$(echo */gui-wx/configure)
+ '';
# Link against Python explicitly as it is needed for scripts
makeFlags=[
diff --git a/pkgs/applications/science/misc/gplates/default.nix b/pkgs/applications/science/misc/gplates/default.nix
index 05e0091108aa..c8f89c398b12 100644
--- a/pkgs/applications/science/misc/gplates/default.nix
+++ b/pkgs/applications/science/misc/gplates/default.nix
@@ -24,5 +24,6 @@ stdenv.mkDerivation rec {
homepage = https://www.gplates.org;
license = licenses.gpl2;
platforms = platforms.all;
+ broken = true;
};
}
diff --git a/pkgs/applications/science/misc/openmodelica/default.nix b/pkgs/applications/science/misc/openmodelica/default.nix
index 8d673a15fa8e..9e9a10a011ec 100644
--- a/pkgs/applications/science/misc/openmodelica/default.nix
+++ b/pkgs/applications/science/misc/openmodelica/default.nix
@@ -50,6 +50,7 @@ stdenv.mkDerivation {
license = licenses.gpl3;
maintainers = with maintainers; [ smironov ];
platforms = platforms.linux;
+ broken = true;
};
}
diff --git a/pkgs/applications/science/misc/root/ROOT-8728-extra.patch b/pkgs/applications/science/misc/root/ROOT-8728-extra.patch
deleted file mode 100644
index a396a848f142..000000000000
--- a/pkgs/applications/science/misc/root/ROOT-8728-extra.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-diff --git a/core/metacling/src/TCling.cxx b/core/metacling/src/TCling.cxx
-index d71cb74..076facb 100644
---- a/core/metacling/src/TCling.cxx
-+++ b/core/metacling/src/TCling.cxx
-@@ -756,7 +756,7 @@ int TCling_GenerateDictionary(const std::vector &classes,
- gSystem->PrependPathName(dirbase, header);
- dir = gSystem->DirName(dir);
- }
-- fileContent += TString("#include \"") + header + "\"\n";
-+ fileContent += (TString("#include \"") + header + "\"\n").Data();
- }
- }
- for (it = fwdDecls.begin(); it != fwdDecls.end(); ++it) {
-@@ -1061,7 +1061,7 @@ TCling::TCling(const char *name, const char *title)
- ROOT::TMetaUtils::SetPathsForRelocatability(clingArgsStorage);
-
- // Add -I early so ASTReader can find the headers.
-- std::string interpInclude(TROOT::GetEtcDir());
-+ std::string interpInclude(TROOT::GetEtcDir().Data());
- clingArgsStorage.push_back("-I" + interpInclude);
-
- // Add include path to etc/cling. FIXME: This is a short term solution. The
-@@ -1070,7 +1070,7 @@ TCling::TCling(const char *name, const char *title)
- clingArgsStorage.push_back("-I" + interpInclude + "/cling");
-
- // Add the root include directory and etc/ to list searched by default.
-- clingArgsStorage.push_back(std::string("-I" + TROOT::GetIncludeDir()));
-+ clingArgsStorage.push_back(std::string(("-I" + TROOT::GetIncludeDir()).Data()));
-
- // Add the current path to the include path
- // TCling::AddIncludePath(".");
-diff --git a/hist/hist/src/TFormula.cxx b/hist/hist/src/TFormula.cxx
-index abf3929..e7dad98 100644
---- a/hist/hist/src/TFormula.cxx
-+++ b/hist/hist/src/TFormula.cxx
-@@ -1677,7 +1677,7 @@ void TFormula::ProcessFormula(TString &formula)
- if(fun.fName.Contains("::")) // add support for nested namespaces
- {
- // look for last occurence of "::"
-- std::string name(fun.fName);
-+ std::string name(fun.fName.Data());
- size_t index = name.rfind("::");
- assert(index != std::string::npos);
- TString className = fun.fName(0,fun.fName(0,index).Length());
-@@ -1869,7 +1869,7 @@ void TFormula::ProcessFormula(TString &formula)
-
- // save copy of inputFormula in a std::strig for the unordered map
- // and also formula is same as FClingInput typically and it will be modified
-- std::string inputFormula = std::string(formula);
-+ std::string inputFormula = std::string(formula.Data());
-
-
- // valid input formula - try to put into Cling
-diff --git a/main/src/nbmain.cxx b/main/src/nbmain.cxx
-index 55d4f2f..8490149 100644
---- a/main/src/nbmain.cxx
-+++ b/main/src/nbmain.cxx
-@@ -173,9 +173,9 @@ static bool CreateStamp(string dest)
-
- int main()
- {
-- string rootbin(TROOT::GetBinDir());
-- string rootlib(TROOT::GetLibDir());
-- string rootetc(TROOT::GetEtcDir());
-+ string rootbin(TROOT::GetBinDir().Data());
-+ string rootlib(TROOT::GetLibDir().Data());
-+ string rootetc(TROOT::GetEtcDir().Data());
-
- // If needed, install ROOT notebook files in the user's home directory
- #ifdef WIN32
-diff --git a/math/minuit/src/TMinuitMinimizer.cxx b/math/minuit/src/TMinuitMinimizer.cxx
-index 4e2082a..18215c0 100644
---- a/math/minuit/src/TMinuitMinimizer.cxx
-+++ b/math/minuit/src/TMinuitMinimizer.cxx
-@@ -454,7 +454,7 @@ std::string TMinuitMinimizer::VariableName(unsigned int ivar) const {
- // return the variable name
- if (!CheckMinuitInstance()) return std::string();
- if (!CheckVarIndex(ivar)) return std::string();
-- return std::string(fMinuit->fCpnam[ivar]);
-+ return std::string(fMinuit->fCpnam[ivar].Data());
- }
-
- int TMinuitMinimizer::VariableIndex(const std::string & ) const {
-diff --git a/tmva/tmva/src/Factory.cxx b/tmva/tmva/src/Factory.cxx
-index 36060ef..a1bbe34 100644
---- a/tmva/tmva/src/Factory.cxx
-+++ b/tmva/tmva/src/Factory.cxx
-@@ -390,7 +390,7 @@ TMVA::MethodBase* TMVA::Factory::BookMethod( TMVA::DataLoader *loader, TString t
- // initialize methods
- IMethod* im;
- if (!boostNum) {
-- im = ClassifierFactory::Instance().Create( std::string(theMethodName),
-+ im = ClassifierFactory::Instance().Create( std::string(theMethodName.Data()),
- fJobName,
- methodTitle,
- loader->DefaultDataSetInfo(),
-@@ -933,7 +933,7 @@ void TMVA::Factory::TrainAllMethods()
-
- // recreate
- m = dynamic_cast( ClassifierFactory::Instance()
-- .Create( std::string(Types::Instance().GetMethodName(methodType)),
-+ .Create( std::string(Types::Instance().GetMethodName(methodType).Data()),
- dataSetInfo, weightfile ) );
- if( m->GetMethodType() == Types::kCategory ){
- MethodCategory *methCat = (dynamic_cast(m));
-diff --git a/tmva/tmva/src/MethodBoost.cxx b/tmva/tmva/src/MethodBoost.cxx
-index 1349e5d..2125ab3 100644
---- a/tmva/tmva/src/MethodBoost.cxx
-+++ b/tmva/tmva/src/MethodBoost.cxx
-@@ -389,7 +389,7 @@ void TMVA::MethodBoost::Train()
- // the first classifier shows the option string output, the rest not
- if (fCurrentMethodIdx>0) TMVA::MsgLogger::InhibitOutput();
-
-- IMethod* method = ClassifierFactory::Instance().Create(std::string(fBoostedMethodName),
-+ IMethod* method = ClassifierFactory::Instance().Create(std::string(fBoostedMethodName.Data()),
- GetJobName(),
- Form("%s_B%04i", fBoostedMethodTitle.Data(),fCurrentMethodIdx),
- DataInfo(),
-diff --git a/tmva/tmva/src/MethodCategory.cxx b/tmva/tmva/src/MethodCategory.cxx
-index c2cbe80..d278cca 100644
---- a/tmva/tmva/src/MethodCategory.cxx
-+++ b/tmva/tmva/src/MethodCategory.cxx
-@@ -147,7 +147,7 @@ TMVA::IMethod* TMVA::MethodCategory::AddMethod( const TCut& theCut,
- const TString& theTitle,
- const TString& theOptions )
- {
-- std::string addedMethodName = std::string(Types::Instance().GetMethodName(theMethod));
-+ std::string addedMethodName = std::string(Types::Instance().GetMethodName(theMethod).Data());
-
- Log() << kINFO << "Adding sub-classifier: " << addedMethodName << "::" << theTitle << Endl;
-
-diff --git a/tmva/tmva/src/MethodCompositeBase.cxx b/tmva/tmva/src/MethodCompositeBase.cxx
-index 98fa5da..96bd9a3 100644
---- a/tmva/tmva/src/MethodCompositeBase.cxx
-+++ b/tmva/tmva/src/MethodCompositeBase.cxx
-@@ -194,7 +194,7 @@ void TMVA::MethodCompositeBase::ReadWeightsFromXML( void* wghtnode )
- ((TMVA::MethodBoost*)this)->BookMethod( Types::Instance().GetMethodType( methodTypeName), methodName, optionString );
- }
- fMethods.push_back(ClassifierFactory::Instance().Create(
-- std::string(methodTypeName),jobName, methodName,DataInfo(),optionString));
-+ std::string(methodTypeName.Data()),jobName, methodName,DataInfo(),optionString));
-
- fMethodWeight.push_back(methodWeight);
- MethodBase* meth = dynamic_cast(fMethods.back());
-@@ -259,7 +259,7 @@ void TMVA::MethodCompositeBase::ReadWeightsFromStream( std::istream& istr )
- ((TMVA::MethodBoost*)this)->BookMethod( Types::Instance().GetMethodType( methodName), methodTitle, optionString );
- }
- else methodTitle=Form("%s (%04i)",GetMethodName().Data(),fCurrentMethodIdx);
-- fMethods.push_back(ClassifierFactory::Instance().Create( std::string(methodName), jobName,
-+ fMethods.push_back(ClassifierFactory::Instance().Create( std::string(methodName.Data()), jobName,
- methodTitle,DataInfo(), optionString) );
- fMethodWeight.push_back( methodWeight );
- if(MethodBase* m = dynamic_cast(fMethods.back()) )
-diff --git a/tmva/tmva/src/Reader.cxx b/tmva/tmva/src/Reader.cxx
-index 94a8b28..0b67867 100644
---- a/tmva/tmva/src/Reader.cxx
-+++ b/tmva/tmva/src/Reader.cxx
-@@ -401,7 +401,7 @@ TMVA::IMethod* TMVA::Reader::BookMVA( const TString& methodTag, const TString& w
-
- TMVA::IMethod* TMVA::Reader::BookMVA( TMVA::Types::EMVA methodType, const TString& weightfile )
- {
-- IMethod* im = ClassifierFactory::Instance().Create(std::string(Types::Instance().GetMethodName( methodType )),
-+ IMethod* im = ClassifierFactory::Instance().Create(std::string(Types::Instance().GetMethodName( methodType ).Data()),
- DataInfo(), weightfile );
-
- MethodBase *method = (dynamic_cast(im));
-@@ -440,7 +440,7 @@ TMVA::IMethod* TMVA::Reader::BookMVA( TMVA::Types::EMVA methodType, const char*
- #if ROOT_VERSION_CODE >= ROOT_VERSION(5,26,00)
-
- // books MVA method from weightfile
-- IMethod* im = ClassifierFactory::Instance().Create(std::string(Types::Instance().GetMethodName( methodType )),
-+ IMethod* im = ClassifierFactory::Instance().Create(std::string(Types::Instance().GetMethodName( methodType ).Data()),
- DataInfo(), "" );
-
- MethodBase *method = (dynamic_cast(im));
diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix
index b220bb8a80ce..676395d03d53 100644
--- a/pkgs/applications/science/misc/root/default.nix
+++ b/pkgs/applications/science/misc/root/default.nix
@@ -1,29 +1,24 @@
{ stdenv, fetchurl, fetchpatch, cmake, pcre, pkgconfig, python2
-, libX11, libXpm, libXft, libXext, mesa, zlib, libxml2, lzma, gsl
+, libX11, libXpm, libXft, libXext, mesa, zlib, libxml2, lz4, lzma, gsl, xxHash
, Cocoa, OpenGL, noSplash ? false }:
stdenv.mkDerivation rec {
name = "root-${version}";
- version = "6.10.04";
+ version = "6.10.08";
src = fetchurl {
url = "https://root.cern.ch/download/root_v${version}.source.tar.gz";
- sha256 = "0nwg4bw02v6vahm2rwfaj7fzp3ffhjg5jk7h20il4246swhxw6s6";
+ sha256 = "12mddl6pqwwc9nr4jqzp6h1jm4zycazd3v88dz306m1nmk97dlic";
};
- buildInputs = [ cmake pcre pkgconfig python2 zlib libxml2 lzma gsl ]
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ cmake pcre python2 zlib libxml2 lz4 lzma gsl xxHash ]
++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext mesa ]
++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ]
;
patches = [
./sw_vers.patch
-
- # this prevents thisroot.sh from setting $p, which interferes with stdenv setup
- ./thisroot.patch
-
- # https://sft.its.cern.ch/jira/browse/ROOT-8728
- ./ROOT-8728-extra.patch
];
preConfigure = ''
diff --git a/pkgs/applications/science/misc/root/thisroot.patch b/pkgs/applications/science/misc/root/thisroot.patch
deleted file mode 100644
index 57cd5838e64a..000000000000
--- a/pkgs/applications/science/misc/root/thisroot.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/config/thisroot.sh b/config/thisroot.sh
-index 85dee20..532cb28 100644
---- a/config/thisroot.sh
-+++ b/config/thisroot.sh
-@@ -15,8 +15,8 @@ drop_from_path()
- return 1
- fi
-
-- p=$1
-- drop=$2
-+ local p=$1
-+ local drop=$2
-
- newpath=`echo $p | sed -e "s;:${drop}:;:;g" \
- -e "s;:${drop};;g" \
diff --git a/pkgs/applications/science/robotics/gazebo/default.nix b/pkgs/applications/science/robotics/gazebo/default.nix
index 6cefb156d1df..3edf75a4bffe 100644
--- a/pkgs/applications/science/robotics/gazebo/default.nix
+++ b/pkgs/applications/science/robotics/gazebo/default.nix
@@ -38,8 +38,12 @@ stdenv.mkDerivation rec {
++ optional withLowMemorySupport [ "-DUSE_LOW_MEMORY_TESTS=True" ]
++ optional withHeadless [ "-DENABLE_SCREEN_TESTS=False" ];
+ nativeBuildInputs = [ cmake pkgconfig ];
+
+ propagatedNativeBuildInputs = [ boost boost-build boost_process protobuf ];
+
buildInputs = [
- #cmake pkgconfig boost protobuf
+ #cmake boost protobuf
freeimage
xorg_sys_opengl
tbb
@@ -69,10 +73,6 @@ stdenv.mkDerivation rec {
++ optional withConstructiveSolidGeometrySupport gts
++ optional withHdf5Support hdf5;
- nativeBuildInputs = [ cmake pkgconfig ];
-
- propagatedNativeBuildInputs = [ boost boost-build boost_process protobuf ];
-
meta = with stdenv.lib; {
homepage = http://gazebosim.org/;
description = "Multi-robot simulator for outdoor environments";
diff --git a/pkgs/applications/version-management/bitkeeper/default.nix b/pkgs/applications/version-management/bitkeeper/default.nix
index d8597913c24b..06cfc90e65f1 100644
--- a/pkgs/applications/version-management/bitkeeper/default.nix
+++ b/pkgs/applications/version-management/bitkeeper/default.nix
@@ -15,8 +15,9 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- perl gperf bison groff libXft pkgconfig
+ perl gperf bison groff libXft
pcre libtomcrypt libtommath lz4
];
diff --git a/pkgs/applications/version-management/cvs/CVE-2017-12836.patch b/pkgs/applications/version-management/cvs/CVE-2017-12836.patch
new file mode 100644
index 000000000000..950079423685
--- /dev/null
+++ b/pkgs/applications/version-management/cvs/CVE-2017-12836.patch
@@ -0,0 +1,29 @@
+--- a/src/rsh-client.c.orig 2005-10-02 17:17:21.000000000 +0200
++++ b/src/rsh-client.c 2017-11-07 16:56:06.957370469 +0100
+@@ -53,7 +53,7 @@
+ char *cvs_server = (root->cvs_server != NULL
+ ? root->cvs_server : getenv ("CVS_SERVER"));
+ int i = 0;
+- /* This needs to fit "rsh", "-b", "-l", "USER", "host",
++ /* This needs to fit "rsh", "-b", "-l", "USER", "--", "host",
+ "cmd (w/ args)", and NULL. We leave some room to grow. */
+ char *rsh_argv[10];
+
+@@ -97,6 +97,9 @@
+ rsh_argv[i++] = root->username;
+ }
+
++ /* Only non-option arguments from here. (CVE-2017-12836) */
++ rsh_argv[i++] = "--";
++
+ rsh_argv[i++] = root->hostname;
+ rsh_argv[i++] = cvs_server;
+ rsh_argv[i++] = "server";
+@@ -171,6 +174,7 @@
+ *p++ = root->username;
+ }
+
++ *p++ = "--";
+ *p++ = root->hostname;
+ *p++ = command;
+ *p++ = NULL;
diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/applications/version-management/cvs/default.nix
index 8c69517a7506..a330db6a8d67 100644
--- a/pkgs/applications/version-management/cvs/default.nix
+++ b/pkgs/applications/version-management/cvs/default.nix
@@ -11,6 +11,7 @@ stdenv.mkDerivation {
patches = [
./getcwd-chroot.patch
./CVE-2012-0804.patch
+ ./CVE-2017-12836.patch
];
hardeningDisable = [ "fortify" "format" ];
diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix
index cefdc1108bfc..80c4401f1708 100644
--- a/pkgs/applications/version-management/fossil/default.nix
+++ b/pkgs/applications/version-management/fossil/default.nix
@@ -2,15 +2,16 @@
, tcllib, withJson ? true}:
stdenv.mkDerivation rec {
- name = "fossil-2.2";
+ name = "fossil-${version}";
+ version = "2.3";
src = fetchurl {
- urls =
+ urls =
[
- https://www.fossil-scm.org/index.html/uv/fossil-src-2.2.tar.gz
+ "https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz"
];
name = "${name}.tar.gz";
- sha256 = "0wfgacfg29dkl0c3l1rp5ji0kraa64gcbg5lh8p4m7mqdqcq53wv";
+ sha256 = "0paalvb4rdyr79v6rwspaha5n4dqb92df9irijha13m3apsanwzh";
};
buildInputs = [ zlib openssl readline sqlite which ed ]
diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
index 518db7708b7f..3c7d0a86be04 100644
--- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
@@ -20,8 +20,9 @@ stdenv.mkDerivation rec {
sha256 = "0wc64dzcxrzgi6kwcljz6y3cwm3ajdgf6aws7g58azbhvl1jk04l";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- openssl zlib asciidoc libxml2 libxslt docbook_xml_xslt pkgconfig luajit
+ openssl zlib asciidoc libxml2 libxslt docbook_xml_xslt luajit
];
postPatch = ''
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 82846a564cd9..75b53d2cfe09 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -58,6 +58,8 @@ rec {
# support for bugzilla
git-bz = callPackage ./git-bz { };
+ git-codeowners = callPackage ./git-codeowners { };
+
git-cola = callPackage ./git-cola { };
git-crypt = callPackage ./git-crypt { };
@@ -82,6 +84,8 @@ rec {
git-remote-hg = callPackage ./git-remote-hg { };
+ git-secret = callPackage ./git-secret { };
+
git-stree = callPackage ./git-stree { };
git2cl = callPackage ./git2cl { };
diff --git a/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/pkgs/applications/version-management/git-and-tools/ghq/default.nix
index 4ba86a2a0866..84a441641dfa 100644
--- a/pkgs/applications/version-management/git-and-tools/ghq/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/ghq/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "ghq-${version}";
- version = "0.7.4";
+ version = "0.8.0";
goPackagePath = "github.com/motemen/ghq";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "motemen";
repo = "ghq";
rev = "v${version}";
- sha256 = "0x2agr7why8mcjhq2j8kh8d0gbwx2333zgf1ribc9fn14ryas1j2";
+ sha256 = "1gdi0sbmq9kfi8hzd0dpgmhbmcf8q93jy3x08dd8smayrhbbwmld";
};
goDeps = ./deps.nix;
diff --git a/pkgs/applications/version-management/git-and-tools/ghq/deps.nix b/pkgs/applications/version-management/git-and-tools/ghq/deps.nix
index ec54803a6e76..1df37aa0f21f 100644
--- a/pkgs/applications/version-management/git-and-tools/ghq/deps.nix
+++ b/pkgs/applications/version-management/git-and-tools/ghq/deps.nix
@@ -1,11 +1,11 @@
[
{
- goPackagePath = "github.com/codegangsta/cli";
+ goPackagePath = "github.com/daviddengcn/go-colortext";
fetch = {
type = "git";
- url = "https://github.com/codegangsta/cli";
- rev = "0bdeddeeb0f650497d603c4ad7b20cfe685682f6";
- sha256 = "1ny63c7bfwfrsp7vfkvb4i0xhq4v7yxqnwxa52y4xlfxs4r6v6fg";
+ url = "https://github.com/daviddengcn/go-colortext";
+ rev = "805cee6e0d43c72ba1d4e3275965ff41e0da068a";
+ sha256 = "0z0ggqnprqchnd8zyrz99w53kr4sgv372lyx12z5nsh9q342pmyf";
};
}
{
@@ -27,12 +27,12 @@
};
}
{
- goPackagePath = "github.com/daviddengcn/go-colortext";
+ goPackagePath = "github.com/urfave/cli";
fetch = {
type = "git";
- url = "https://github.com/daviddengcn/go-colortext";
- rev = "805cee6e0d43c72ba1d4e3275965ff41e0da068a";
- sha256 = "0z0ggqnprqchnd8zyrz99w53kr4sgv372lyx12z5nsh9q342pmyf";
+ url = "https://github.com/urfave/cli";
+ rev = "f017f86fccc5a039a98f23311f34fdf78b014f78";
+ sha256 = "1biq4wl4z8l0ycinb39mfavnk13d0qnqqdplqybl7klxmk67cvhv";
};
}
]
diff --git a/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix b/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix
new file mode 100644
index 000000000000..07e0ce80c5d6
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix
@@ -0,0 +1,21 @@
+{ lib, rustPlatform, fetchFromGitHub }:
+rustPlatform.buildRustPackage rec {
+ name = "git-codeowners-${version}";
+ version = "0.1.1";
+
+ src = fetchFromGitHub {
+ owner = "softprops";
+ repo = "git-codeowners";
+ rev = "v${version}";
+ sha256 = "0imxbi6y1165bi2rik0n98v79fkgp8alb615qh41idg1p2krzyy5";
+ };
+
+ cargoSha256 = "0h831rf5vlvpzfm4sr3fvwlc0ys776fqis90y414mczphkxvz437";
+
+ meta = with lib; {
+ homepage = "https://github.com/softprops/git-codeowners";
+ description = "a git extension to work with CODEOWNERS files";
+ license = licenses.mit;
+ maintainers = with maintainers; [ zimbatm ];
+ };
+}
diff --git a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
index e5e676059706..0d6b206cb4a4 100644
--- a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, openssl, gnupg1compat, makeWrapper }:
+{ fetchFromGitHub, git, gnupg1compat, makeWrapper, openssl, stdenv }:
stdenv.mkDerivation rec {
@@ -14,9 +14,14 @@ stdenv.mkDerivation rec {
buildInputs = [ openssl makeWrapper ];
+ patchPhase = ''
+ substituteInPlace commands.cpp \
+ --replace '(escape_shell_arg(our_exe_path()))' '= "git-crypt"'
+ '';
+
installPhase = ''
make install PREFIX=$out
- wrapProgram $out/bin/* --prefix PATH : ${gnupg1compat}/bin
+ wrapProgram $out/bin/* --prefix PATH : $out/bin:${git}/bin:${gnupg1compat}/bin
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
index a4b552bcca37..6fb9f5e36f1a 100644
--- a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
@@ -1,39 +1,41 @@
-{ stdenv, fetchFromGitHub, pandoc }:
+{ stdenv
+, fetchFromGitHub
+, openssl
+, gcc
+, zlib
+, libssh
+, cmake
+, perl
+, pkgconfig
+, rustPlatform
+}:
-stdenv.mkDerivation rec {
+with rustPlatform;
+
+buildRustPackage rec {
name = "git-dit-${version}";
- version = "0.1.0";
-
- buildInputs = [ pandoc ];
+ version = "0.4.0";
src = fetchFromGitHub {
owner = "neithernut";
repo = "git-dit";
rev = "v${version}";
- sha256 = "1rvp2dhnb8yqrracvfpvf8z1vz4fs0rii18hhrskr6n1sfd7x9kd";
+ sha256 = "1sx6sc2dj3l61gbiqz8vfyhw5w4xjdyfzn1ixz0y8ipm579yc7a2";
};
- # the Makefile doesn’t work, we emulate it below
- dontBuild = true;
+ cargoSha256 = "08zbvjwjdpv2sbj6mh73py82inhs18jvmh8m9k4l94fcz6ykgqwr";
- postPatch = ''
- # resolve binaries to the right path
- sed -e "s|exec git-dit-|exec $out/bin/git-dit-|" -i git-dit
+ nativeBuildInputs = [
+ cmake
+ pkgconfig
+ perl
+ ];
- # we change every git dit command to the local subcommand path
- # (git dit foo -> /nix/store/…-git-dit/bin/git-dit-foo)
- for script in git-dit-*; do
- sed -e "s|git dit |$out/bin/git-dit-|g" -i "$script"
- done
- '';
-
- installPhase = ''
- mkdir -p $out/{bin,share/man/man1}
- # from the Makefile
- ${stdenv.lib.getBin pandoc}/bin/pandoc -s -t man git-dit.1.md \
- -o $out/share/man/man1/git-dit.1
- cp git-dit* $out/bin
- '';
+ buildInputs = [
+ openssl
+ libssh
+ zlib
+ ];
meta = with stdenv.lib; {
inherit (src.meta) homepage;
@@ -41,6 +43,4 @@ stdenv.mkDerivation rec {
license = licenses.gpl2;
maintainers = with maintainers; [ profpatsch matthiasbeyer ];
};
-
-
}
diff --git a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix
index f8ac8c385e60..abd9013b6b03 100644
--- a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix
@@ -2,16 +2,16 @@
stdenv.mkDerivation rec {
name = "git-extras-${version}";
- version = "4.2.0";
+ version = "4.4.0";
src = fetchurl {
url = "https://github.com/tj/git-extras/archive/${version}.tar.gz";
- sha256 = "0pr2vf5rajkwjm45zvnwkc13kvk3kyr18axxvmm8drsqdkr8lrjk";
+ sha256 = "0vb8syyr5nbvmkj5g4rb1p8rqxb2hyl25gbyf4rd0b972d7iihhn";
};
- phases = [ "unpackPhase" "installPhase" ];
+ dontBuild = true;
- makeFlags = "DESTDIR=$(out) PREFIX=";
+ installFlags = [ "DESTDIR=$(out) PREFIX=" ];
meta = with stdenv.lib; {
homepage = https://github.com/tj/git-extras;
diff --git a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
index 9ddcaea497de..4ec83af91607 100644
--- a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
@@ -1,18 +1,21 @@
-{ stdenv, fetchFromGitHub, docutils, python2Packages }:
+{ stdenv, fetchFromGitHub, docutils, gitMinimal, python2Packages }:
stdenv.mkDerivation rec {
name = "git-hub-${version}";
- version = "0.11.1";
+ version = "1.0.0";
src = fetchFromGitHub {
- sha256 = "15449bqk7nyvbpin5j2hg862cqa7hb4zxkmr8mkqm5hz2jxmxspa";
+ sha256 = "07756pidrm4cph3nm90z16imvnylvz3fw4369wrglbdr27filf3x";
rev = "v${version}";
repo = "git-hub";
owner = "sociomantic-tsunami";
};
buildInputs = [ python2Packages.python ];
- nativeBuildInputs = [ python2Packages.docutils ];
+ nativeBuildInputs = [
+ gitMinimal # Used during build to generate Bash completion.
+ python2Packages.docutils
+ ];
postPatch = ''
substituteInPlace Makefile --replace rst2man rst2man.py
@@ -21,7 +24,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- installFlags = [ "prefix=$(out)" ];
+ installFlags = [ "prefix=$(out)" "sysconfdir=$(out)/etc" ];
postInstall = ''
# Remove inert ftdetect vim plugin and a README that's a man page subset:
diff --git a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix
new file mode 100644
index 000000000000..3f64d9d86bb6
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, lib, fetchFromGitHub, makeWrapper, git, gnupg }:
+
+let
+ version = "0.2.2";
+ repo = "git-secret";
+
+in stdenv.mkDerivation {
+ name = "${repo}-${version}";
+
+ src = fetchFromGitHub {
+ inherit repo;
+ owner = "sobolevn";
+ rev = "v${version}";
+ sha256 = "0vn9jibp97z7kc828wka1k0d7a9wx4skd6cnqy60kagfc00l0bzh";
+ };
+
+ buildInputs = [ makeWrapper ];
+
+ installPhase = ''
+ install -D git-secret $out/bin/git-secret
+
+ wrapProgram $out/bin/git-secret \
+ --prefix PATH : "${lib.makeBinPath [ git gnupg ]}"
+
+ mkdir $out/share
+ cp -r man $out/share
+ '';
+
+ meta = {
+ description = "A bash-tool to store your private data inside a git repository";
+ homepage = http://git-secret.io;
+ license = stdenv.lib.licenses.mit;
+ maintainers = [ stdenv.lib.maintainers.lo1tuma ];
+ platforms = stdenv.lib.platforms.all;
+ };
+}
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 46c48fd1579f..5e42992cbe22 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -13,7 +13,7 @@
}:
let
- version = "2.14.1";
+ version = "2.15.0";
svn = subversionClient.override { perlBindings = true; };
in
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
- sha256 = "1iic3wiihxp3l3k6d4z886v3869c3dzgddjxnd5124wy1rnlqwkg";
+ sha256 = "0siyxg1ppg6szjp8xp37zfq1fj97kbdxpigi3asmidqhkx41cw8h";
};
hardeningDisable = [ "format" ];
@@ -53,9 +53,6 @@ stdenv.mkDerivation {
NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.cc.isClang) "-lgcc_s"
+ stdenv.lib.optionalString (stdenv.isFreeBSD) "-lthr";
- # without this, git fails when trying to check for /etc/gitconfig existence
- propagatedSandboxProfile = stdenv.lib.sandbox.allowDirectoryList "/etc";
-
makeFlags = "prefix=\${out} PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell} "
+ (if pythonSupport then "PYTHON_PATH=${python}/bin/python" else "NO_PYTHON=1")
+ (if stdenv.isSunOS then " INSTALL=install NO_INET_NTOP= NO_INET_PTON=" else "")
@@ -145,6 +142,22 @@ stdenv.mkDerivation {
# Also put git-http-backend into $PATH, so that we can use smart
# HTTP(s) transports for pushing
ln -s $out/libexec/git-core/git-http-backend $out/bin/git-http-backend
+
+ # wrap perl commands
+ gitperllib=$out/lib/perl5/site_perl
+ for i in ${builtins.toString perlLibs}; do
+ gitperllib=$gitperllib:$i/lib/perl5/site_perl
+ done
+ wrapProgram $out/libexec/git-core/git-cvsimport \
+ --set GITPERLLIB "$gitperllib"
+ wrapProgram $out/libexec/git-core/git-add--interactive \
+ --set GITPERLLIB "$gitperllib"
+ wrapProgram $out/libexec/git-core/git-archimport \
+ --set GITPERLLIB "$gitperllib"
+ wrapProgram $out/libexec/git-core/git-instaweb \
+ --set GITPERLLIB "$gitperllib"
+ wrapProgram $out/libexec/git-core/git-cvsexportcommit \
+ --set GITPERLLIB "$gitperllib"
''
+ (if svnSupport then
diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix
index f5e5fddd3b72..bed0ef358271 100644
--- a/pkgs/applications/version-management/git-and-tools/tig/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix
@@ -4,14 +4,14 @@
stdenv.mkDerivation rec {
pname = "tig";
- version = "2.2.2";
+ version = "2.3.0";
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "jonas";
repo = pname;
rev = name;
- sha256 = "1zbj4pfcnj1d0zfhx5jw9x7f2hz99mry20bgyyvrij2vj8gf5vk4";
+ sha256 = "04qw3fyamm1lka9vh7adrkr2mcnwcch9ya5sph51jx6d4jz1lih5";
};
nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkgconfig ];
diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix
index bf089a03fa0f..5c2e99d8e3fe 100644
--- a/pkgs/applications/version-management/git-lfs/default.nix
+++ b/pkgs/applications/version-management/git-lfs/default.nix
@@ -2,16 +2,15 @@
buildGoPackage rec {
name = "git-lfs-${version}";
- version = "2.2.1";
- rev = "621d1f821f73efcedc829dda43fd9c1fcf07c6ab";
+ version = "2.3.4";
goPackagePath = "github.com/git-lfs/git-lfs";
src = fetchFromGitHub {
- inherit rev;
+ rev = "v${version}";
owner = "git-lfs";
repo = "git-lfs";
- sha256 = "00wc4gjs4yy2qld1m4yar37jkw9fdi2h8xp25hy2y80cnyiafn7s";
+ sha256 = "0fv1ly9577jrjwx91jqfql740rwp06chl4y37pcpl72nc08jvcw7";
};
preBuild = ''
diff --git a/pkgs/applications/version-management/gitaly/Gemfile b/pkgs/applications/version-management/gitaly/Gemfile
index a12e23a57b51..7e8f9f2b2557 100644
--- a/pkgs/applications/version-management/gitaly/Gemfile
+++ b/pkgs/applications/version-management/gitaly/Gemfile
@@ -1,5 +1,9 @@
source 'https://rubygems.org'
gem 'github-linguist', '~> 4.7.0', require: 'linguist'
-gem 'gitaly-proto', '~> 0.31.0', require: 'gitaly'
+gem 'gitaly-proto', '~> 0.37.0', require: 'gitaly'
gem 'activesupport'
+
+group :development, :test do
+ gem 'gitlab-styles', '~> 2.0.0', require: false
+end
diff --git a/pkgs/applications/version-management/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitaly/Gemfile.lock
index 9d2f03b531e5..5ea14855b97f 100644
--- a/pkgs/applications/version-management/gitaly/Gemfile.lock
+++ b/pkgs/applications/version-management/gitaly/Gemfile.lock
@@ -8,12 +8,13 @@ GEM
tzinfo (~> 1.1)
addressable (2.5.1)
public_suffix (~> 2.0, >= 2.0.2)
+ ast (2.3.0)
charlock_holmes (0.7.5)
concurrent-ruby (1.0.5)
escape_utils (1.1.1)
faraday (0.12.2)
multipart-post (>= 1.2, < 3)
- gitaly-proto (0.31.0)
+ gitaly-proto (0.37.0)
google-protobuf (~> 3.1)
grpc (~> 1.0)
github-linguist (4.7.6)
@@ -21,7 +22,11 @@ GEM
escape_utils (~> 1.1.0)
mime-types (>= 1.19)
rugged (>= 0.23.0b)
- google-protobuf (3.3.0)
+ gitlab-styles (2.0.0)
+ rubocop (~> 0.49)
+ rubocop-gitlab-security (~> 0.1.0)
+ rubocop-rspec (~> 1.15)
+ google-protobuf (3.4.0.2)
googleauth (0.5.3)
faraday (~> 0.12)
jwt (~> 1.4)
@@ -30,7 +35,7 @@ GEM
multi_json (~> 1.11)
os (~> 0.9)
signet (~> 0.7)
- grpc (1.4.5)
+ grpc (1.6.0)
google-protobuf (~> 3.1)
googleauth (~> 0.5.1)
i18n (0.8.1)
@@ -47,7 +52,26 @@ GEM
multi_json (1.12.1)
multipart-post (2.0.0)
os (0.9.6)
+ parallel (1.12.0)
+ parser (2.4.0.0)
+ ast (~> 2.2)
+ powerpack (0.1.1)
public_suffix (2.0.5)
+ rainbow (2.2.2)
+ rake
+ rake (12.1.0)
+ rubocop (0.50.0)
+ parallel (~> 1.10)
+ parser (>= 2.3.3.1, < 3.0)
+ powerpack (~> 0.1)
+ rainbow (>= 2.2.2, < 3.0)
+ ruby-progressbar (~> 1.7)
+ unicode-display_width (~> 1.0, >= 1.0.1)
+ rubocop-gitlab-security (0.1.0)
+ rubocop (>= 0.47.1)
+ rubocop-rspec (1.17.0)
+ rubocop (>= 0.50.0)
+ ruby-progressbar (1.8.3)
rugged (0.26.0)
signet (0.7.3)
addressable (~> 2.3)
@@ -57,14 +81,16 @@ GEM
thread_safe (0.3.6)
tzinfo (1.2.2)
thread_safe (~> 0.1)
+ unicode-display_width (1.3.0)
PLATFORMS
ruby
DEPENDENCIES
activesupport
- gitaly-proto (~> 0.31.0)
+ gitaly-proto (~> 0.37.0)
github-linguist (~> 4.7.0)
+ gitlab-styles (~> 2.0.0)
BUNDLED WITH
- 1.15.3
+ 1.15.4
diff --git a/pkgs/applications/version-management/gitaly/default.nix b/pkgs/applications/version-management/gitaly/default.nix
index ff6555ad8f05..63e5758107f7 100644
--- a/pkgs/applications/version-management/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitaly/default.nix
@@ -7,14 +7,14 @@ let
gemdir = ./.;
};
in buildGoPackage rec {
- version = "0.35.0";
+ version = "0.43.1";
name = "gitaly-${version}";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
- sha256 = "0h3gh4y571wrnnsg5wpi67psih8yssaw24v3vrcpqpkz5linj7pl";
+ sha256 = "19ggfc5nwv8q1wq739ab8qdfdngpi33431dgfa9593p6ad7v6hyq";
};
goPackagePath = "gitlab.com/gitlab-org/gitaly";
diff --git a/pkgs/applications/version-management/gitaly/gemset.nix b/pkgs/applications/version-management/gitaly/gemset.nix
index 06ba56e6b9a9..57480f3f337e 100644
--- a/pkgs/applications/version-management/gitaly/gemset.nix
+++ b/pkgs/applications/version-management/gitaly/gemset.nix
@@ -17,6 +17,14 @@
};
version = "2.5.1";
};
+ ast = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0pp82blr5fakdk27d1d21xq9zchzb6vmyb1zcsl520s3ygvprn8m";
+ type = "gem";
+ };
+ version = "2.3.0";
+ };
charlock_holmes = {
source = {
remotes = ["https://rubygems.org"];
@@ -54,10 +62,10 @@
dependencies = ["google-protobuf" "grpc"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1n5bpclizxc42m5kbrhdgsb0ddkl47d0rgmcya5b6sv8qbclkkds";
+ sha256 = "1nqp9ib00q55ig8zf1r6ldf3xkqw0874ra1mbcsm8sl46l84lx11";
type = "gem";
};
- version = "0.31.0";
+ version = "0.37.0";
};
github-linguist = {
dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"];
@@ -68,13 +76,22 @@
};
version = "4.7.6";
};
+ gitlab-styles = {
+ dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-rspec"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1k8xrkjx8rcny8p0gsp18wskvn1qbw4rfgdp1f6x0p4xp6dlhjf4";
+ type = "gem";
+ };
+ version = "2.0.0";
+ };
google-protobuf = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1q0ka7x53b9vx4wdb2jdvwxxpb5i5ns7fhqb9zgbrp8yy1bg9m9p";
+ sha256 = "1jh8axm5m75rvdf2i3s24pmi7p613armh9vk3p1d0ryfx159mqkl";
type = "gem";
};
- version = "3.3.0";
+ version = "3.4.0.2";
};
googleauth = {
dependencies = ["faraday" "jwt" "logging" "memoist" "multi_json" "os" "signet"];
@@ -89,10 +106,10 @@
dependencies = ["google-protobuf" "googleauth"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1zhci260088zlghpaz6ania1blz1dd7lgklsjnqk1vcymhpr6b38";
+ sha256 = "056ipqai887x5jpbgcc215kdi0lfqjzcjbx3hx11cjrfww01zc52";
type = "gem";
};
- version = "1.4.5";
+ version = "1.6.0";
};
i18n = {
source = {
@@ -184,6 +201,31 @@
};
version = "0.9.6";
};
+ parallel = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0qv2yj4sxr36ga6xdxvbq9h05hn10bwcbkqv6j6q1fiixhsdnnzd";
+ type = "gem";
+ };
+ version = "1.12.0";
+ };
+ parser = {
+ dependencies = ["ast"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "130rfk8a2ws2fyq52hmi1n0xakylw39wv4x1qhai4z17x2b0k9cq";
+ type = "gem";
+ };
+ version = "2.4.0.0";
+ };
+ powerpack = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1fnn3fli5wkzyjl4ryh0k90316shqjfnhydmc7f8lqpi0q21va43";
+ type = "gem";
+ };
+ version = "0.1.1";
+ };
public_suffix = {
source = {
remotes = ["https://rubygems.org"];
@@ -192,6 +234,58 @@
};
version = "2.0.5";
};
+ rainbow = {
+ dependencies = ["rake"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "08w2ghc5nv0kcq5b257h7dwjzjz1pqcavajfdx2xjyxqsvh2y34w";
+ type = "gem";
+ };
+ version = "2.2.2";
+ };
+ rake = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0mfqgpp3m69s5v1rd51lfh5qpjwyia5p4rg337pw8c8wzm6pgfsw";
+ type = "gem";
+ };
+ version = "12.1.0";
+ };
+ rubocop = {
+ dependencies = ["parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1hpd7zcv4y9y750wj630abvmcjwv39dsrj1fjff60ik7gfri0xlz";
+ type = "gem";
+ };
+ version = "0.50.0";
+ };
+ rubocop-gitlab-security = {
+ dependencies = ["rubocop"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0aw9qmyc6xj6fi0jxp8m4apk358rd91z492ragn6jp4rghkqj5cy";
+ type = "gem";
+ };
+ version = "0.1.0";
+ };
+ rubocop-rspec = {
+ dependencies = ["rubocop"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1hf48ng67yswvshmv4cyysj1rs1z3fnvlycr50jdcgwlynpyxkhs";
+ type = "gem";
+ };
+ version = "1.17.0";
+ };
+ ruby-progressbar = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "029kv0q3kfq53rjyak4ypn7196l8z4hflfmv4p5787n78z7baiqf";
+ type = "gem";
+ };
+ version = "1.8.3";
+ };
rugged = {
source = {
remotes = ["https://rubygems.org"];
@@ -226,4 +320,12 @@
};
version = "1.2.2";
};
+ unicode-display_width = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "12pi0gwqdnbx1lv5136v3vyr0img9wr0kxcn4wn54ipq4y41zxq8";
+ type = "gem";
+ };
+ version = "1.3.0";
+ };
}
\ No newline at end of file
diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix
new file mode 100644
index 000000000000..d4afdd7b3cd4
--- /dev/null
+++ b/pkgs/applications/version-management/gitea/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper
+, git, coreutils, bash, gzip, openssh
+, sqliteSupport ? true
+}:
+
+with stdenv.lib;
+
+buildGoPackage rec {
+ name = "gitea-${version}";
+ version = "1.2.3";
+
+ src = fetchFromGitHub {
+ owner = "go-gitea";
+ repo = "gitea";
+ rev = "v${version}";
+ sha256 = "0v24q14xzmqgwk10m7rqyn6pahd630v3bnc646ij4w8fbgr8hzja";
+ };
+
+ patches = [ ./static-root-path.patch ];
+
+ postPatch = ''
+ patchShebangs .
+ substituteInPlace modules/setting/setting.go --subst-var data
+ '';
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ buildFlags = optionalString sqliteSupport "-tags sqlite";
+
+ outputs = [ "bin" "out" "data" ];
+
+ postInstall = ''
+ mkdir $data
+ cp -R $src/{public,templates} $data
+ mkdir -p $out
+ cp -R $src/options/locale $out/locale
+
+ wrapProgram $bin/bin/gitea \
+ --prefix PATH : ${makeBinPath [ bash git gzip openssh ]}
+ '';
+
+ goPackagePath = "code.gitea.io/gitea";
+
+ meta = {
+ description = "Git with a cup of tea";
+ homepage = http://gitea.io;
+ license = licenses.mit;
+ maintainers = [ maintainers.disassembler ];
+ };
+}
diff --git a/pkgs/applications/version-management/gitea/static-root-path.patch b/pkgs/applications/version-management/gitea/static-root-path.patch
new file mode 100644
index 000000000000..06ce521e9e8d
--- /dev/null
+++ b/pkgs/applications/version-management/gitea/static-root-path.patch
@@ -0,0 +1,13 @@
+diff --git i/modules/setting/setting.go w/modules/setting/setting.go
+index aafe2d1b..1e4a8064 100644
+--- i/modules/setting/setting.go
++++ w/modules/setting/setting.go
+@@ -683,7 +683,7 @@ func NewContext() {
+ LocalURL = sec.Key("LOCAL_ROOT_URL").MustString(defaultLocalURL)
+ OfflineMode = sec.Key("OFFLINE_MODE").MustBool()
+ DisableRouterLog = sec.Key("DISABLE_ROUTER_LOG").MustBool()
+- StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString(workDir)
++ StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString("@data@")
+ AppDataPath = sec.Key("APP_DATA_PATH").MustString("data")
+ EnableGzip = sec.Key("ENABLE_GZIP").MustBool()
+ EnablePprof = sec.Key("ENABLE_PPROF").MustBool(false)
diff --git a/pkgs/applications/version-management/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab-shell/default.nix
index 590070f04a2e..ac05ca4c4847 100644
--- a/pkgs/applications/version-management/gitlab-shell/default.nix
+++ b/pkgs/applications/version-management/gitlab-shell/default.nix
@@ -1,14 +1,14 @@
{ stdenv, ruby, bundler, fetchFromGitLab, go }:
stdenv.mkDerivation rec {
- version = "5.8.0";
+ version = "5.9.3";
name = "gitlab-shell-${version}";
srcs = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-shell";
rev = "v${version}";
- sha256 = "1zqd7lys309ylbg45vm1apyx9r82kq1drwinr3di2ybb64v3z2q8";
+ sha256 = "12iil8ap9lbd7skj7xr2v6lsyjdd97svbmyj0n2j8m819fv0x27p";
};
buildInputs = [
diff --git a/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch
index e88dbad071f5..dd1ecafb8bf8 100644
--- a/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch
+++ b/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch
@@ -3,7 +3,7 @@ index 0b11ce3..ffc3faf 100644
--- a/lib/gitlab_projects.rb
+++ b/lib/gitlab_projects.rb
@@ -8,7 +8,7 @@ require_relative 'gitlab_metrics'
- require_relative 'gitlab_reference_counter'
+ require_relative 'gitlab_metrics'
class GitlabProjects
- GLOBAL_HOOKS_DIRECTORY = File.join(ROOT_PATH, 'hooks')
@@ -15,7 +15,7 @@ diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb
index e7d0254..181ec8a 100644
--- a/lib/gitlab_shell.rb
+++ b/lib/gitlab_shell.rb
-@@ -163,7 +163,8 @@ class GitlabShell
+@@ -188,7 +188,8 @@ class GitlabShell
end
# We use 'chdir: ROOT_PATH' to let the next executable know where config.yml is.
diff --git a/pkgs/applications/version-management/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab-workhorse/default.nix
index a91a15e66b85..1f3407eddcf5 100644
--- a/pkgs/applications/version-management/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab-workhorse/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitLab, git, go }:
stdenv.mkDerivation rec {
- version = "3.0.0";
+ version = "3.2.0";
name = "gitlab-workhorse-${version}";
srcs = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-workhorse";
rev = "v${version}";
- sha256 = "0lz3bgwww640c7gh97vf40a8h6cz4znscl0r00z6iiwkc0xxzp7j";
+ sha256 = "1ivqlhvmxhdb8359yh469zl45j00n94b53naqi8jx06kijfsdz4r";
};
buildInputs = [ git go ];
diff --git a/pkgs/applications/version-management/gitlab-workhorse/remove-hardcoded-paths.patch b/pkgs/applications/version-management/gitlab-workhorse/remove-hardcoded-paths.patch
index 37f3d2deef54..d8313ecb433a 100644
--- a/pkgs/applications/version-management/gitlab-workhorse/remove-hardcoded-paths.patch
+++ b/pkgs/applications/version-management/gitlab-workhorse/remove-hardcoded-paths.patch
@@ -2,11 +2,11 @@ diff --git a/internal/git/command.go b/internal/git/command.go
index 0e5496c..5778294 100644
--- a/internal/git/command.go
+++ b/internal/git/command.go
-@@ -16,6 +16,7 @@ func gitCommand(gl_id string, name string, args ...string) *exec.Cmd {
+@@ -19,6 +19,7 @@ func gitCommand(gl_id string, name string, args ...string) *exec.Cmd {
cmd.Env = []string{
fmt.Sprintf("HOME=%s", os.Getenv("HOME")),
fmt.Sprintf("PATH=%s", os.Getenv("PATH")),
+ fmt.Sprintf("GITLAB_SHELL_CONFIG_PATH=%s", os.Getenv("GITLAB_SHELL_CONFIG_PATH")),
fmt.Sprintf("LD_LIBRARY_PATH=%s", os.Getenv("LD_LIBRARY_PATH")),
- fmt.Sprintf("GL_ID=%s", gl_id),
+ fmt.Sprintf("GL_PROTOCOL=http"),
}
diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile
index 5a38c956be10..b4a457bff6e5 100644
--- a/pkgs/applications/version-management/gitlab/Gemfile
+++ b/pkgs/applications/version-management/gitlab/Gemfile
@@ -16,22 +16,22 @@ gem 'mysql2', '~> 0.4.5', group: :mysql
gem 'pg', '~> 0.18.2', group: :postgres
gem 'rugged', '~> 0.26.0'
-gem 'grape-route-helpers', '~> 2.0.0'
+gem 'grape-route-helpers', '~> 2.1.0'
gem 'faraday', '~> 0.12'
# Authentication libraries
gem 'devise', '~> 4.2'
gem 'doorkeeper', '~> 4.2.0'
-gem 'doorkeeper-openid_connect', '~> 1.1.0'
+gem 'doorkeeper-openid_connect', '~> 1.2.0'
gem 'omniauth', '~> 1.4.2'
gem 'omniauth-auth0', '~> 1.4.1'
-gem 'omniauth-azure-oauth2', '~> 0.0.6'
+gem 'omniauth-azure-oauth2', '~> 0.0.9'
gem 'omniauth-cas3', '~> 1.1.4'
gem 'omniauth-facebook', '~> 4.0.0'
gem 'omniauth-github', '~> 1.1.1'
gem 'omniauth-gitlab', '~> 1.0.2'
-gem 'omniauth-google-oauth2', '~> 0.4.1'
+gem 'omniauth-google-oauth2', '~> 0.5.2'
gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos
gem 'omniauth-oauth2-generic', '~> 0.2.2'
gem 'omniauth-saml', '~> 1.7.0'
@@ -64,7 +64,7 @@ gem 'gpgme'
# LDAP Auth
# GitLab fork with several improvements to original library. For full list of changes
# see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
-gem 'gitlab_omniauth-ldap', '~> 2.0.3', require: 'omniauth-ldap'
+gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap'
gem 'net-ldap'
# Git Wiki
@@ -76,7 +76,7 @@ gem 'gollum-rugged_adapter', '~> 0.4.4', require: false
gem 'github-linguist', '~> 4.7.0', require: 'linguist'
# API
-gem 'grape', '~> 0.19.2'
+gem 'grape', '~> 1.0'
gem 'grape-entity', '~> 0.6.0'
gem 'rack-cors', '~> 0.4.0', require: 'rack/cors'
@@ -105,7 +105,7 @@ gem 'fog-rackspace', '~> 0.1.1'
gem 'fog-aliyun', '~> 0.1.0'
# for Google storage
-gem 'google-api-client', '~> 0.8.6'
+gem 'google-api-client', '~> 0.13.6'
# for aws storage
gem 'unf', '~> 0.1.4'
@@ -116,7 +116,7 @@ gem 'seed-fu', '~> 2.3.5'
# Markdown and HTML processing
gem 'html-pipeline', '~> 1.11.0'
gem 'deckar01-task_list', '2.0.0'
-gem 'gitlab-markup', '~> 1.5.1'
+gem 'gitlab-markup', '~> 1.6.2'
gem 'redcarpet', '~> 3.4'
gem 'RedCloth', '~> 4.3.2'
gem 'rdoc', '~> 4.2'
@@ -128,7 +128,7 @@ gem 'asciidoctor-plantuml', '0.0.7'
gem 'rouge', '~> 2.0'
gem 'truncato', '~> 0.7.9'
gem 'bootstrap_form', '~> 2.7.0'
-gem 'nokogiri', '~> 1.8.0'
+gem 'nokogiri', '~> 1.8.1'
# Diffs
gem 'diffy', '~> 3.1.0'
@@ -141,8 +141,6 @@ end
# State machine
gem 'state_machines-activerecord', '~> 0.4.0'
-# Run events after state machine commits
-gem 'after_commit_queue', '~> 1.3.0'
# Issue tags
gem 'acts-as-taggable-on', '~> 4.0'
@@ -183,7 +181,7 @@ gem 'connection_pool', '~> 2.0'
gem 'hipchat', '~> 1.5.0'
# JIRA integration
-gem 'jira-ruby', '~> 1.1.2'
+gem 'jira-ruby', '~> 1.4'
# Flowdock integration
gem 'gitlab-flowdock-git-hook', '~> 1.0.1'
@@ -206,9 +204,6 @@ gem 'kubeclient', '~> 2.2.0'
# d3
gem 'd3_rails', '~> 3.5.0'
-# underscore-rails
-gem 'underscore-rails', '~> 1.8.0'
-
# Sanitize user input
gem 'sanitize', '~> 2.0'
gem 'babosa', '~> 1.0.2'
@@ -229,7 +224,7 @@ gem 'ace-rails-ap', '~> 4.1.0'
gem 'mousetrap-rails', '~> 1.4.6'
# Detect and convert string character encoding
-gem 'charlock_holmes', '~> 0.7.3'
+gem 'charlock_holmes', '~> 0.7.5'
# Faster JSON
gem 'oj', '~> 2.17.4'
@@ -244,7 +239,7 @@ gem 'rack-proxy', '~> 0.6.0'
gem 'sass-rails', '~> 5.0.6'
gem 'uglifier', '~> 2.7.2'
-gem 'addressable', '~> 2.3.8'
+gem 'addressable', '~> 2.5.2'
gem 'bootstrap-sass', '~> 3.3.0'
gem 'font-awesome-rails', '~> 4.7'
gem 'gemojione', '~> 3.3'
@@ -286,7 +281,7 @@ group :metrics do
gem 'influxdb', '~> 0.2', require: false
# Prometheus
- gem 'prometheus-client-mmap', '~>0.7.0.beta14'
+ gem 'prometheus-client-mmap', '~>0.7.0.beta18'
gem 'raindrops', '~> 0.18'
end
@@ -329,7 +324,7 @@ group :development, :test do
# Generate Fake data
gem 'ffaker', '~> 2.4'
- gem 'capybara', '~> 2.6.2'
+ gem 'capybara', '~> 2.15.0'
gem 'capybara-screenshot', '~> 1.0.0'
gem 'poltergeist', '~> 1.9.0'
@@ -339,6 +334,7 @@ group :development, :test do
gem 'rubocop', '~> 0.49.1', require: false
gem 'rubocop-rspec', '~> 1.15.1', require: false
+ gem 'rubocop-gitlab-security', '~> 0.1.0', require: false
gem 'scss_lint', '~> 0.54.0', require: false
gem 'haml_lint', '~> 0.26.0', require: false
gem 'simplecov', '~> 0.14.0', require: false
@@ -352,18 +348,21 @@ group :development, :test do
gem 'activerecord_sane_schema_dumper', '0.2'
- gem 'stackprof', '~> 0.2.10'
+ gem 'stackprof', '~> 0.2.10', require: false
+
+ gem 'simple_po_parser', '~> 1.1.2', require: false
end
group :test do
gem 'shoulda-matchers', '~> 3.1.2', require: false
gem 'email_spec', '~> 1.6.0'
- gem 'json-schema', '~> 2.6.2'
+ gem 'json-schema', '~> 2.8.0'
gem 'webmock', '~> 2.3.2'
gem 'test_after_commit', '~> 1.1'
gem 'sham_rack', '~> 1.3.6'
gem 'timecop', '~> 0.8.0'
gem 'concurrent-ruby', '~> 1.0.5'
+ gem 'test-prof', '~> 0.2.5'
end
gem 'octokit', '~> 4.6.2'
@@ -394,12 +393,12 @@ gem 'net-ssh', '~> 4.1.0'
# Required for ED25519 SSH host key support
group :ed25519 do
gem 'rbnacl-libsodium'
- gem 'rbnacl', '~> 3.2'
+ gem 'rbnacl', '~> 4.0'
gem 'bcrypt_pbkdf', '~> 1.0'
end
# Gitaly GRPC client
-gem 'gitaly', '~> 0.26.0'
+gem 'gitaly-proto', '~> 0.39.0', require: 'gitaly'
gem 'toml-rb', '~> 0.3.15', require: false
@@ -409,5 +408,6 @@ gem 'flipper-active_record', '~> 0.10.2'
# Structured logging
gem 'lograge', '~> 0.5'
+gem 'grape_logging', '~> 1.7'
gem 'activerecord-nulldb-adapter'
diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock
index d729b62d8f9a..fd3aab2d54ad 100644
--- a/pkgs/applications/version-management/gitlab/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/Gemfile.lock
@@ -47,9 +47,8 @@ GEM
adamantium (0.2.0)
ice_nine (~> 0.11.0)
memoizable (~> 0.4.0)
- addressable (2.3.8)
- after_commit_queue (1.3.0)
- activerecord (>= 3.0)
+ addressable (2.5.2)
+ public_suffix (>= 2.0.2, < 4.0)
akismet (2.0.0)
allocations (1.0.5)
arel (6.0.4)
@@ -66,10 +65,6 @@ GEM
attr_encrypted (3.0.3)
encryptor (~> 3.0.0)
attr_required (1.0.0)
- autoparse (0.3.3)
- addressable (>= 2.3.1)
- extlib (>= 0.9.15)
- multi_json (>= 1.0.0)
autoprefixer-rails (6.2.3)
execjs
json
@@ -87,7 +82,7 @@ GEM
coderay (>= 1.0.0)
erubis (>= 2.6.6)
rack (>= 0.9.0)
- bindata (2.3.5)
+ bindata (2.4.1)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
bootstrap-sass (3.3.6)
@@ -104,9 +99,9 @@ GEM
bundler (~> 1.2)
thor (~> 0.18)
byebug (9.0.6)
- capybara (2.6.2)
+ capybara (2.15.1)
addressable
- mime-types (>= 1.16)
+ mini_mime (>= 0.1.3)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
@@ -119,7 +114,7 @@ GEM
activesupport (>= 4.0.0)
mime-types (>= 1.16)
cause (0.1)
- charlock_holmes (0.7.3)
+ charlock_holmes (0.7.5)
chronic (0.10.2)
chronic_duration (0.10.6)
numerizer (~> 0.1.1)
@@ -150,6 +145,8 @@ GEM
debugger-ruby_core_source (1.3.8)
deckar01-task_list (2.0.0)
html-pipeline
+ declarative (0.0.10)
+ declarative-option (0.1.0)
default_value_for (3.0.2)
activerecord (>= 3.2.0, < 5.1)
descendants_tracker (0.0.4)
@@ -171,9 +168,9 @@ GEM
docile (1.1.5)
domain_name (0.5.20161021)
unf (>= 0.0.5, < 1.0.0)
- doorkeeper (4.2.0)
+ doorkeeper (4.2.6)
railties (>= 4.2)
- doorkeeper-openid_connect (1.1.2)
+ doorkeeper-openid_connect (1.2.0)
doorkeeper (~> 4.0)
json-jwt (~> 1.6)
dropzonejs-rails (0.7.2)
@@ -192,13 +189,12 @@ GEM
excon (0.57.1)
execjs (2.6.0)
expression_parser (0.9.0)
- extlib (0.9.16)
factory_girl (4.7.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.7.0)
factory_girl (~> 4.7.0)
railties (>= 3.0.0)
- faraday (0.12.1)
+ faraday (0.12.2)
multipart-post (>= 1.2, < 3)
faraday_middleware (0.11.0.1)
faraday (>= 0.7.4, < 1.0)
@@ -207,7 +203,7 @@ GEM
multi_json
fast_gettext (1.4.0)
ffaker (2.4.0)
- ffi (1.9.10)
+ ffi (1.9.18)
flay (2.8.1)
erubis (~> 2.7.0)
path_expander (~> 1.0)
@@ -279,7 +275,7 @@ GEM
po_to_json (>= 1.0.0)
rails (>= 3.2.0)
gherkin-ruby (0.3.2)
- gitaly (0.26.0)
+ gitaly-proto (0.39.0)
google-protobuf (~> 3.1)
grpc (~> 1.0)
github-linguist (4.7.6)
@@ -292,13 +288,13 @@ GEM
flowdock (~> 0.7)
gitlab-grit (>= 2.4.1)
multi_json
- gitlab-grit (2.8.1)
+ gitlab-grit (2.8.2)
charlock_holmes (~> 0.6)
diff-lcs (~> 1.1)
- mime-types (>= 1.16, < 3)
+ mime-types (>= 1.16)
posix-spawn (~> 0.3)
- gitlab-markup (1.5.1)
- gitlab_omniauth-ldap (2.0.3)
+ gitlab-markup (1.6.2)
+ gitlab_omniauth-ldap (2.0.4)
net-ldap (~> 0.16)
omniauth (~> 1.3)
pyu-ruby-sasl (>= 0.0.3.3, < 0.1)
@@ -323,20 +319,16 @@ GEM
json
multi_json
request_store (>= 1.0)
- google-api-client (0.8.7)
- activesupport (>= 3.2, < 5.0)
- addressable (~> 2.3)
- autoparse (~> 0.3)
- extlib (~> 0.9)
- faraday (~> 0.9)
- googleauth (~> 0.3)
- launchy (~> 2.4)
- multi_json (~> 1.10)
- retriable (~> 1.4)
- signet (~> 0.6)
- google-protobuf (3.3.0)
- googleauth (0.5.1)
- faraday (~> 0.9)
+ google-api-client (0.13.6)
+ addressable (~> 2.5, >= 2.5.1)
+ googleauth (~> 0.5)
+ httpclient (>= 2.8.1, < 3.0)
+ mime-types (~> 3.0)
+ representable (~> 3.0)
+ retriable (>= 2.0, < 4.0)
+ google-protobuf (3.4.0.2)
+ googleauth (0.5.3)
+ faraday (~> 0.12)
jwt (~> 1.4)
logging (~> 2.0)
memoist (~> 0.12)
@@ -345,12 +337,9 @@ GEM
signet (~> 0.7)
gpgme (2.0.13)
mini_portile2 (~> 2.1)
- grape (0.19.2)
+ grape (1.0.0)
activesupport
builder
- hashie (>= 2.1.0)
- multi_json (>= 1.3.2)
- multi_xml (>= 0.5.2)
mustermann-grape (~> 1.0.0)
rack (>= 1.3.0)
rack-accept
@@ -358,11 +347,13 @@ GEM
grape-entity (0.6.0)
activesupport
multi_json (>= 1.3.2)
- grape-route-helpers (2.0.0)
+ grape-route-helpers (2.1.0)
activesupport
- grape (~> 0.16, >= 0.16.0)
+ grape (>= 0.16.0)
rake
- grpc (1.4.0)
+ grape_logging (1.7.0)
+ grape
+ grpc (1.6.0)
google-protobuf (~> 3.1)
googleauth (~> 0.5.1)
haml (4.0.7)
@@ -378,7 +369,7 @@ GEM
thor
tilt
hashdiff (0.3.4)
- hashie (3.5.5)
+ hashie (3.5.6)
hashie-forbidden_attributes (0.1.1)
hashie (>= 3.0)
health_check (2.6.0)
@@ -411,8 +402,9 @@ GEM
cause
json
ipaddress (0.8.3)
- jira-ruby (1.1.2)
+ jira-ruby (1.4.1)
activesupport
+ multipart-post
oauth (~> 0.5, >= 0.5.0)
jquery-atwho-rails (1.3.2)
jquery-rails (4.1.1)
@@ -420,14 +412,14 @@ GEM
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (1.8.6)
- json-jwt (1.7.1)
+ json-jwt (1.7.2)
activesupport
bindata
multi_json (>= 1.3)
securecompare
url_safe_base64
- json-schema (2.6.2)
- addressable (~> 2.3.8)
+ json-schema (2.8.0)
+ addressable (>= 2.4)
jwt (1.5.6)
kaminari (1.0.1)
activesupport (>= 4.1.0)
@@ -479,17 +471,20 @@ GEM
mail (2.6.6)
mime-types (>= 1.16, < 4)
mail_room (0.9.1)
- memoist (0.15.0)
+ memoist (0.16.0)
memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1)
method_source (0.8.2)
- mime-types (2.99.3)
+ mime-types (3.1)
+ mime-types-data (~> 3.2015)
+ mime-types-data (3.2016.0521)
mimemagic (0.3.0)
- mini_portile2 (2.2.0)
+ mini_mime (0.1.4)
+ mini_portile2 (2.3.0)
minitest (5.7.0)
mmap2 (2.2.7)
mousetrap-rails (1.4.6)
- multi_json (1.12.1)
+ multi_json (1.12.2)
multi_xml (0.6.0)
multipart-post (2.0.0)
mustermann (1.0.0)
@@ -499,8 +494,8 @@ GEM
net-ldap (0.16.0)
net-ssh (4.1.0)
netrc (0.11.0)
- nokogiri (1.8.0)
- mini_portile2 (~> 2.2.0)
+ nokogiri (1.8.1)
+ mini_portile2 (~> 2.3.0)
numerizer (0.1.1)
oauth (0.5.1)
oauth2 (1.4.0)
@@ -519,10 +514,10 @@ GEM
omniauth-oauth2 (~> 1.1)
omniauth-authentiq (0.3.1)
omniauth-oauth2 (~> 1.3, >= 1.3.1)
- omniauth-azure-oauth2 (0.0.6)
+ omniauth-azure-oauth2 (0.0.9)
jwt (~> 1.0)
omniauth (~> 1.0)
- omniauth-oauth2 (~> 1.1)
+ omniauth-oauth2 (~> 1.4)
omniauth-cas3 (1.1.4)
addressable (~> 2.3)
nokogiri (~> 1.7, >= 1.7.1)
@@ -535,8 +530,8 @@ GEM
omniauth-gitlab (1.0.2)
omniauth (~> 1.0)
omniauth-oauth2 (~> 1.0)
- omniauth-google-oauth2 (0.4.1)
- jwt (~> 1.5.2)
+ omniauth-google-oauth2 (0.5.2)
+ jwt (~> 1.5)
multi_json (~> 1.3)
omniauth (>= 1.1.1)
omniauth-oauth2 (>= 1.3.1)
@@ -548,7 +543,7 @@ GEM
omniauth-oauth (1.1.0)
oauth
omniauth (~> 1.0)
- omniauth-oauth2 (1.3.1)
+ omniauth-oauth2 (1.4.0)
oauth2 (~> 1.0)
omniauth (~> 1.2)
omniauth-oauth2-generic (0.2.2)
@@ -569,7 +564,7 @@ GEM
rubypants (~> 0.2)
orm_adapter (0.5.0)
os (0.9.6)
- parallel (1.11.2)
+ parallel (1.12.0)
paranoia (2.3.1)
activerecord (>= 4.0, < 5.2)
parser (2.4.0.0)
@@ -627,7 +622,7 @@ GEM
parser
unparser
procto (0.0.3)
- prometheus-client-mmap (0.7.0.beta14)
+ prometheus-client-mmap (0.7.0.beta18)
mmap2 (~> 2.2, >= 2.2.7)
pry (0.10.4)
coderay (~> 1.1.0)
@@ -638,6 +633,7 @@ GEM
pry (~> 0.10)
pry-rails (0.3.5)
pry (>= 0.9.10)
+ public_suffix (3.0.0)
pyu-ruby-sasl (0.0.3.3)
rack (1.6.8)
rack-accept (0.4.5)
@@ -687,10 +683,10 @@ GEM
rainbow (2.2.2)
rake
raindrops (0.18.0)
- rake (12.0.0)
+ rake (12.1.0)
rblineprof (0.3.6)
debugger-ruby_core_source (~> 1.3)
- rbnacl (3.4.0)
+ rbnacl (4.0.2)
ffi
rbnacl-libsodium (1.0.11)
rbnacl (>= 3.0.1)
@@ -720,6 +716,10 @@ GEM
redis-store (~> 1.2.0)
redis-store (1.2.0)
redis (>= 2.2)
+ representable (3.0.4)
+ declarative (< 0.1.0)
+ declarative-option (< 0.2.0)
+ uber (< 0.2.0)
request_store (1.3.1)
responders (2.3.0)
railties (>= 4.2.0, < 5.1)
@@ -727,10 +727,10 @@ GEM
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
- retriable (1.4.1)
+ retriable (3.1.1)
rinku (2.0.0)
rotp (2.1.2)
- rouge (2.1.0)
+ rouge (2.2.1)
rqrcode (0.7.0)
chunky_png
rqrcode-rails3 (0.1.7)
@@ -777,6 +777,8 @@ GEM
rainbow (>= 1.99.1, < 3.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
+ rubocop-gitlab-security (0.1.0)
+ rubocop (>= 0.47.1)
rubocop-rspec (1.15.1)
rubocop (>= 0.42.0)
ruby-fogbugz (0.2.1)
@@ -838,6 +840,7 @@ GEM
faraday (~> 0.9)
jwt (~> 1.5)
multi_json (~> 1.10)
+ simple_po_parser (1.1.2)
simplecov (0.14.1)
docile (~> 1.1.0)
json (>= 1.8, < 3)
@@ -882,6 +885,7 @@ GEM
ffi
sysexits (1.2.0)
temple (0.7.7)
+ test-prof (0.2.5)
test_after_commit (1.1.0)
activerecord (>= 3.2)
text (1.3.1)
@@ -902,13 +906,13 @@ GEM
tzinfo (1.2.3)
thread_safe (~> 0.1)
u2f (0.2.1)
+ uber (0.1.0)
uglifier (2.7.2)
execjs (>= 0.3.0)
json (>= 1.8.0)
- underscore-rails (1.8.3)
unf (0.1.4)
unf_ext
- unf_ext (0.0.7.2)
+ unf_ext (0.0.7.4)
unicode-display_width (1.3.0)
unicorn (5.1.0)
kgio (~> 2.6)
@@ -952,7 +956,7 @@ GEM
expression_parser
rinku
xml-simple (1.1.5)
- xpath (2.0.0)
+ xpath (2.1.0)
nokogiri (~> 1.3)
PLATFORMS
@@ -964,8 +968,7 @@ DEPENDENCIES
activerecord-nulldb-adapter
activerecord_sane_schema_dumper (= 0.2)
acts-as-taggable-on (~> 4.0)
- addressable (~> 2.3.8)
- after_commit_queue (~> 1.3.0)
+ addressable (~> 2.5.2)
akismet (~> 2.0)
allocations (~> 1.0)
asana (~> 0.6.0)
@@ -985,10 +988,10 @@ DEPENDENCIES
browser (~> 2.2)
bullet (~> 5.5.0)
bundler-audit (~> 0.5.0)
- capybara (~> 2.6.2)
+ capybara (~> 2.15.0)
capybara-screenshot (~> 1.0.0)
carrierwave (~> 1.1)
- charlock_holmes (~> 0.7.3)
+ charlock_holmes (~> 0.7.5)
chronic (~> 0.10.2)
chronic_duration (~> 0.10.6)
concurrent-ruby (~> 1.0.5)
@@ -1002,7 +1005,7 @@ DEPENDENCIES
devise-two-factor (~> 3.0.0)
diffy (~> 3.1.0)
doorkeeper (~> 4.2.0)
- doorkeeper-openid_connect (~> 1.1.0)
+ doorkeeper-openid_connect (~> 1.2.0)
dropzonejs-rails (~> 0.7.1)
email_reply_trimmer (~> 0.1)
email_spec (~> 1.6.0)
@@ -1027,19 +1030,20 @@ DEPENDENCIES
gettext (~> 3.2.2)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.2.0)
- gitaly (~> 0.26.0)
+ gitaly-proto (~> 0.39.0)
github-linguist (~> 4.7.0)
gitlab-flowdock-git-hook (~> 1.0.1)
- gitlab-markup (~> 1.5.1)
- gitlab_omniauth-ldap (~> 2.0.3)
+ gitlab-markup (~> 1.6.2)
+ gitlab_omniauth-ldap (~> 2.0.4)
gollum-lib (~> 4.2)
gollum-rugged_adapter (~> 0.4.4)
gon (~> 6.1.0)
- google-api-client (~> 0.8.6)
+ google-api-client (~> 0.13.6)
gpgme
- grape (~> 0.19.2)
+ grape (~> 1.0)
grape-entity (~> 0.6.0)
- grape-route-helpers (~> 2.0.0)
+ grape-route-helpers (~> 2.1.0)
+ grape_logging (~> 1.7)
haml_lint (~> 0.26.0)
hamlit (~> 2.6.1)
hashie-forbidden_attributes
@@ -1049,10 +1053,10 @@ DEPENDENCIES
html2text
httparty (~> 0.13.3)
influxdb (~> 0.2)
- jira-ruby (~> 1.1.2)
+ jira-ruby (~> 1.4)
jquery-atwho-rails (~> 1.3.2)
jquery-rails (~> 4.1.0)
- json-schema (~> 2.6.2)
+ json-schema (~> 2.8.0)
jwt (~> 1.5.6)
kaminari (~> 1.0)
knapsack (~> 1.11.0)
@@ -1069,19 +1073,19 @@ DEPENDENCIES
mysql2 (~> 0.4.5)
net-ldap
net-ssh (~> 4.1.0)
- nokogiri (~> 1.8.0)
+ nokogiri (~> 1.8.1)
oauth2 (~> 1.4)
octokit (~> 4.6.2)
oj (~> 2.17.4)
omniauth (~> 1.4.2)
omniauth-auth0 (~> 1.4.1)
omniauth-authentiq (~> 0.3.1)
- omniauth-azure-oauth2 (~> 0.0.6)
+ omniauth-azure-oauth2 (~> 0.0.9)
omniauth-cas3 (~> 1.1.4)
omniauth-facebook (~> 4.0.0)
omniauth-github (~> 1.1.1)
omniauth-gitlab (~> 1.0.2)
- omniauth-google-oauth2 (~> 0.4.1)
+ omniauth-google-oauth2 (~> 0.5.2)
omniauth-kerberos (~> 0.3.0)
omniauth-oauth2-generic (~> 0.2.2)
omniauth-saml (~> 1.7.0)
@@ -1102,7 +1106,7 @@ DEPENDENCIES
pg (~> 0.18.2)
poltergeist (~> 1.9.0)
premailer-rails (~> 1.9.7)
- prometheus-client-mmap (~> 0.7.0.beta14)
+ prometheus-client-mmap (~> 0.7.0.beta18)
pry-byebug (~> 3.4.1)
pry-rails (~> 0.3.4)
rack-attack (~> 4.4.1)
@@ -1115,7 +1119,7 @@ DEPENDENCIES
rainbow (~> 2.2)
raindrops (~> 0.18)
rblineprof (~> 0.3.6)
- rbnacl (~> 3.2)
+ rbnacl (~> 4.0)
rbnacl-libsodium
rdoc (~> 4.2)
re2 (~> 1.1.1)
@@ -1134,6 +1138,7 @@ DEPENDENCIES
rspec-set (~> 0.1.3)
rspec_profiling (~> 0.0.5)
rubocop (~> 0.49.1)
+ rubocop-gitlab-security (~> 0.1.0)
rubocop-rspec (~> 1.15.1)
ruby-fogbugz (~> 0.2.1)
ruby-prof (~> 0.16.2)
@@ -1152,6 +1157,7 @@ DEPENDENCIES
sidekiq (~> 5.0)
sidekiq-cron (~> 0.6.0)
sidekiq-limit_fetch (~> 3.4)
+ simple_po_parser (~> 1.1.2)
simplecov (~> 0.14.0)
slack-notifier (~> 1.5.1)
spinach-rails (~> 0.2.1)
@@ -1163,6 +1169,7 @@ DEPENDENCIES
stackprof (~> 0.2.10)
state_machines-activerecord (~> 0.4.0)
sys-filesystem (~> 1.1.6)
+ test-prof (~> 0.2.5)
test_after_commit (~> 1.1)
thin (~> 1.7.0)
timecop (~> 0.8.0)
@@ -1170,7 +1177,6 @@ DEPENDENCIES
truncato (~> 0.7.9)
u2f (~> 0.2.1)
uglifier (~> 2.7.2)
- underscore-rails (~> 1.8.0)
unf (~> 0.1.4)
unicorn (~> 5.1.0)
unicorn-worker-killer (~> 0.4.4)
@@ -1183,4 +1189,4 @@ DEPENDENCIES
wikicloth (= 0.8.1)
BUNDLED WITH
- 1.15.3
+ 1.15.4
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index 9087ff6fdc02..bc3ca9192bcb 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -18,11 +18,11 @@ let
};
};
- version = "9.5.5";
+ version = "10.1.1";
gitlabDeb = fetchurl {
url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/jessie/gitlab-ce_${version}-ce.0_amd64.deb/download";
- sha256 = "1wrwxksfqkha7qm2hbgs0z7lmgisdvdqa4wcll0qfzq1c3d286zz";
+ sha256 = "0xvzxcygy6ffqm24rk6v9gs6g9r744vpwwvk9d00wjla7hwmq3w2";
};
in
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
owner = "gitlabhq";
repo = "gitlabhq";
rev = "v${version}";
- sha256 = "0qi21lkq69ah977vssbkllb7q5jwb0vf2ws5s3bzpvp2mj3iab5m";
+ sha256 = "0p118msad6l12pd4q3vkvjggiiasbkh6pnl94riqyb5zkb7yrb1a";
};
patches = [
@@ -84,12 +84,14 @@ stdenv.mkDerivation rec {
'';
installPhase = ''
+ rm -r tmp
mkdir -p $out/share
cp -r . $out/share/gitlab
rm -rf $out/share/gitlab/log
ln -sf /run/gitlab/log $out/share/gitlab/log
ln -sf /run/gitlab/uploads $out/share/gitlab/public/uploads
ln -sf /run/gitlab/config $out/share/gitlab/config
+ ln -sf /run/gitlab/tmp $out/share/gitlab/tmp
# rake tasks to mitigate CVE-2017-0882
# see https://about.gitlab.com/2017/03/20/gitlab-8-dot-17-dot-4-security-release/
diff --git a/pkgs/applications/version-management/gitlab/gemset.nix b/pkgs/applications/version-management/gitlab/gemset.nix
index fd27c6435974..4fb4c48b0dee 100644
--- a/pkgs/applications/version-management/gitlab/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/gemset.nix
@@ -115,21 +115,13 @@
version = "0.2.0";
};
addressable = {
+ dependencies = ["public_suffix"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1533axm85gpz267km9gnfarf9c78g2scrysd6b8yw33vmhkz2km6";
+ sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk";
type = "gem";
};
- version = "2.3.8";
- };
- after_commit_queue = {
- dependencies = ["activerecord"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1jrhvj4335dsrj0xndbf7a7m2inbwbx1knc0bwgvmkk1w47l43s0";
- type = "gem";
- };
- version = "1.3.0";
+ version = "2.5.2";
};
akismet = {
source = {
@@ -214,15 +206,6 @@
};
version = "1.0.0";
};
- autoparse = {
- dependencies = ["addressable" "extlib" "multi_json"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1q5wkd8gc2ckmgry9fba4b8vxb5kr8k8gqq2wycbirgq06mbllb6";
- type = "gem";
- };
- version = "0.3.3";
- };
autoprefixer-rails = {
dependencies = ["execjs" "json"];
source = {
@@ -301,10 +284,10 @@
bindata = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "07i51jzq9iamw40xmmcgkrdq4m8f0vb5gp53p6q1vggj7z53q3v7";
+ sha256 = "0anbg203zjr4crql20ss5b9xg2c6a7j8nm6hs8w3ll1h1akkpp2z";
type = "gem";
};
- version = "2.3.5";
+ version = "2.4.1";
};
binding_of_caller = {
dependencies = ["debug_inspector"];
@@ -383,13 +366,13 @@
version = "9.0.6";
};
capybara = {
- dependencies = ["addressable" "mime-types" "nokogiri" "rack" "rack-test" "xpath"];
+ dependencies = ["addressable" "mini_mime" "nokogiri" "rack" "rack-test" "xpath"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ln77a5wwhd5sbxsh3v26xrwjnza0rgx2hn23yjggdlha03b00yw";
+ sha256 = "0bahhwrd1rpfhci1x57yz0df9plziipljbw3p4k6mlash4wq6w92";
type = "gem";
};
- version = "2.6.2";
+ version = "2.15.1";
};
capybara-screenshot = {
dependencies = ["capybara" "launchy"];
@@ -420,10 +403,10 @@
charlock_holmes = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0jsl6k27wjmssxbwv9wpf7hgp9r0nvizcf6qpjnr7qs2nia53lf7";
+ sha256 = "09dn56sx0kcw0k8ypiynhnhhiq7ff9m7b57l8wvnxj82wxsjb54y";
type = "gem";
};
- version = "0.7.3";
+ version = "0.7.5";
};
chronic = {
source = {
@@ -601,6 +584,22 @@
};
version = "2.0.0";
};
+ declarative = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0642xvwzzbgi3kp1bg467wma4g3xqrrn0sk369hjam7w579gnv5j";
+ type = "gem";
+ };
+ version = "0.0.10";
+ };
+ declarative-option = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1g4ibxq566f1frnhdymzi9hxxcm4g2gw4n21mpjk2mhwym4q6l0p";
+ type = "gem";
+ };
+ version = "0.1.0";
+ };
default_value_for = {
dependencies = ["activerecord"];
source = {
@@ -674,19 +673,19 @@
dependencies = ["railties"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0hs8r280k7a1kibzxrhifjps880n43jfrybf4mqpffw669jrwk3v";
+ sha256 = "0r5rfvjjnlf9cn97cdrfw260zkg785k4197xqidgb35445k62mah";
type = "gem";
};
- version = "4.2.0";
+ version = "4.2.6";
};
doorkeeper-openid_connect = {
dependencies = ["doorkeeper" "json-jwt"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1pla85j5wxra0k9rhj04g2ai5d5jg97fiavi0s9v2hjba2l54cni";
+ sha256 = "13k0xlr1grjj8ri26qy2zwbgi3fqxinvnygh53bnyi9qcynx5827";
type = "gem";
};
- version = "1.1.2";
+ version = "1.2.0";
};
dropzonejs-rails = {
dependencies = ["rails"];
@@ -787,14 +786,6 @@
};
version = "0.9.0";
};
- extlib = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1cbw3vgb189z3vfc1arijmsd604m3w5y5xvdfkrblc9qh7sbk2rh";
- type = "gem";
- };
- version = "0.9.16";
- };
factory_girl = {
dependencies = ["activesupport"];
source = {
@@ -817,10 +808,10 @@
dependencies = ["multipart-post"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1wkx9844vacsk2229xbc27djf6zw15kqd60ifr78whf9mp9v6l03";
+ sha256 = "157c4cmb5g1b3ny6k9qf9z57rfijl54fcq3hnqqf6g31g1m096b2";
type = "gem";
};
- version = "0.12.1";
+ version = "0.12.2";
};
faraday_middleware = {
dependencies = ["faraday"];
@@ -859,10 +850,10 @@
ffi = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1m5mprppw0xcrv2mkim5zsk70v089ajzqiq5hpyb0xg96fcyzyxj";
+ sha256 = "034f52xf7zcqgbvwbl20jwdyjwznvqnwpbaps9nk18v9lgb1dpx0";
type = "gem";
};
- version = "1.9.10";
+ version = "1.9.18";
};
flay = {
dependencies = ["erubis" "path_expander" "ruby_parser" "sexp_processor"];
@@ -1076,14 +1067,14 @@
};
version = "0.3.2";
};
- gitaly = {
+ gitaly-proto = {
dependencies = ["google-protobuf" "grpc"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1vm3kp2qrlkrdd1r386fg97av73y2k3xxw4xl9wfjdqqhisyi6hw";
+ sha256 = "0irc3yfyr5li2ki6w03znsklnk0qx3srk4wrb7jav042c4kw325k";
type = "gem";
};
- version = "0.26.0";
+ version = "0.39.0";
};
github-linguist = {
dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"];
@@ -1115,27 +1106,27 @@
dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0lf1cr6pzqrbnxiiwym6q74b1a2ihdi91dynajk8hi1p093hl66n";
+ sha256 = "0xgs3l81ghlc5nm75n0pz7b2cj3hpscfq5iy27c483nnjn2v5mc4";
type = "gem";
};
- version = "2.8.1";
+ version = "2.8.2";
};
gitlab-markup = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1aam7zvvbai5nv7vf0c0640pvik6s71f276lip4yb4slbg0pfpn2";
+ sha256 = "114jfbyyfwad609k1l1fcmbzszb3frdchh83gdwndkglllvprhjz";
type = "gem";
};
- version = "1.5.1";
+ version = "1.6.2";
};
gitlab_omniauth-ldap = {
dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1lx5ayb8m2avw6iy9fq0d847z78npg2aax4pbcbprwwmpbnvzz4b";
+ sha256 = "1cpjadx852vw1gv5cm1qiqq6mclglzqajw7q572zncw4q3ji2fkv";
type = "gem";
};
- version = "2.0.3";
+ version = "2.0.4";
};
globalid = {
dependencies = ["activesupport"];
@@ -1183,30 +1174,30 @@
version = "6.1.0";
};
google-api-client = {
- dependencies = ["activesupport" "addressable" "autoparse" "extlib" "faraday" "googleauth" "launchy" "multi_json" "retriable" "signet"];
+ dependencies = ["addressable" "googleauth" "httpclient" "mime-types" "representable" "retriable"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "11wr57j9fp6x6fym4k1a7jqp72qgc8l24mfwb4y55bbvdmkv1b2d";
+ sha256 = "0ac9qa0kwnirkvwz2w9zf07lqcgbmnvgd1wg8xxyjbadwsbpyf1y";
type = "gem";
};
- version = "0.8.7";
+ version = "0.13.6";
};
google-protobuf = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1q0ka7x53b9vx4wdb2jdvwxxpb5i5ns7fhqb9zgbrp8yy1bg9m9p";
+ sha256 = "1jh8axm5m75rvdf2i3s24pmi7p613armh9vk3p1d0ryfx159mqkl";
type = "gem";
};
- version = "3.3.0";
+ version = "3.4.0.2";
};
googleauth = {
dependencies = ["faraday" "jwt" "logging" "memoist" "multi_json" "os" "signet"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1nzkg63s161c6jsia92c1jfwpayzbpwn588smd286idn07y0az2m";
+ sha256 = "1xpmvrzhczak25nm0k3r9aa083lmfnzi94mir3g1xyrgzz66vxli";
type = "gem";
};
- version = "0.5.1";
+ version = "0.5.3";
};
gpgme = {
dependencies = ["mini_portile2"];
@@ -1218,13 +1209,13 @@
version = "2.0.13";
};
grape = {
- dependencies = ["activesupport" "builder" "hashie" "multi_json" "multi_xml" "mustermann-grape" "rack" "rack-accept" "virtus"];
+ dependencies = ["activesupport" "builder" "mustermann-grape" "rack" "rack-accept" "virtus"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ida2agz4f6hfxc4nvmls15f9cl1xg2pra04d388x40r5dmjp04x";
+ sha256 = "1vz5lx56z9hwx6ifyc7qpdwd020xb3ynv3vahvlcgm01qi7ykdhv";
type = "gem";
};
- version = "0.19.2";
+ version = "1.0.0";
};
grape-entity = {
dependencies = ["activesupport" "multi_json"];
@@ -1239,19 +1230,28 @@
dependencies = ["activesupport" "grape" "rake"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1qkaf2l56rxhacviqpzgqiwiv1fpbpxg5xgyp18x66mgxp9bpram";
+ sha256 = "0ja4dlakk6r8p2cx113kymz9sbhdybjsiynnqpfs71lv0r6mmghj";
type = "gem";
};
- version = "2.0.0";
+ version = "2.1.0";
+ };
+ grape_logging = {
+ dependencies = ["grape"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0lg2vhk0dlnyqs2rz8wilfm039q5mbsp5nvf51asir48a1rf9yza";
+ type = "gem";
+ };
+ version = "1.7.0";
};
grpc = {
dependencies = ["google-protobuf" "googleauth"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1siq5v4bmqlsb6122394dpk35fd2lxvjp4xnrabsb3vd90xqszcj";
+ sha256 = "056ipqai887x5jpbgcc215kdi0lfqjzcjbx3hx11cjrfww01zc52";
type = "gem";
};
- version = "1.4.0";
+ version = "1.6.0";
};
haml = {
dependencies = ["tilt"];
@@ -1291,10 +1291,10 @@
hashie = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0lfmbh98ng141m7yc8s4v56v49ppam416pzvd2d7pg85wmm44ljw";
+ sha256 = "120mkd2hkwhcfj7avi1dphb0lm7wx364d1cjm9yr4fibqpvsgqi7";
type = "gem";
};
- version = "3.5.5";
+ version = "3.5.6";
};
hashie-forbidden_attributes = {
dependencies = ["hashie"];
@@ -1434,13 +1434,13 @@
version = "0.8.3";
};
jira-ruby = {
- dependencies = ["activesupport" "oauth"];
+ dependencies = ["activesupport" "multipart-post" "oauth"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "03n76a8m2d352q29j3yna1f9g3xg9dc9p3fvvx77w67h19ks7zrf";
+ sha256 = "14019mliqwcppj6qp2wdhh5gbvs2yh2idibag13m9a18ag965bhw";
type = "gem";
};
- version = "1.1.2";
+ version = "1.4.1";
};
jquery-atwho-rails = {
source = {
@@ -1471,19 +1471,19 @@
dependencies = ["activesupport" "bindata" "multi_json" "securecompare" "url_safe_base64"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1ylvlnb6assan9qkhz1vq1gbfwxg35q9a8f8qhlyx0fak5fyks23";
+ sha256 = "15a3v498lvsshzgjnk2dmyvjv87y3lffq71axj5xq3iz4mp1r4b2";
type = "gem";
};
- version = "1.7.1";
+ version = "1.7.2";
};
json-schema = {
dependencies = ["addressable"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "15bva4w940ckan3q89in5f98s8zz77nxglylgm98697wa4fbfqp9";
+ sha256 = "11di8qyam6bmqn0fvvvf3crgaqy4sil0d406ymx0jacn3ff98ymz";
type = "gem";
};
- version = "2.6.2";
+ version = "2.8.0";
};
jwt = {
source = {
@@ -1662,10 +1662,10 @@
memoist = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0yd3rd7bnbhn9n47qlhcii5z89liabdjhy3is3h6gq77gyfk4f5q";
+ sha256 = "0pq8fhqh8w25qcw9v3vzfb0i6jp0k3949ahxc3wrwz2791dpbgbh";
type = "gem";
};
- version = "0.15.0";
+ version = "0.16.0";
};
memoizable = {
dependencies = ["thread_safe"];
@@ -1685,12 +1685,21 @@
version = "0.8.2";
};
mime-types = {
+ dependencies = ["mime-types-data"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "03j98xr0qw2p2jkclpmk7pm29yvmmh0073d8d43ajmr0h3w7i5l9";
+ sha256 = "0087z9kbnlqhci7fxh9f6il63hj1k02icq2rs0c6cppmqchr753m";
type = "gem";
};
- version = "2.99.3";
+ version = "3.1";
+ };
+ mime-types-data = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "04my3746hwa4yvbx1ranhfaqkgf6vavi1kyijjnw8w3dy37vqhkm";
+ type = "gem";
+ };
+ version = "3.2016.0521";
};
mimemagic = {
source = {
@@ -1700,13 +1709,21 @@
};
version = "0.3.0";
};
+ mini_mime = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0kzf2zx1arhjhw9c6mns0jqbmzdkd1vw25v940lvw63fzkbfv6dg";
+ type = "gem";
+ };
+ version = "0.1.4";
+ };
mini_portile2 = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0g5bpgy08q0nc0anisg3yvwc1gc3inl854fcrg48wvg7glqd6dpm";
+ sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11";
type = "gem";
};
- version = "2.2.0";
+ version = "2.3.0";
};
minitest = {
source = {
@@ -1735,10 +1752,10 @@
multi_json = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1wpc23ls6v2xbk3l1qncsbz16npvmw8p0b38l8czdzri18mp51xk";
+ sha256 = "1raim9ddjh672m32psaa9niw67ywzjbxbdb8iijx3wv9k5b0pk2x";
type = "gem";
};
- version = "1.12.1";
+ version = "1.12.2";
};
multi_xml = {
source = {
@@ -1809,10 +1826,10 @@
dependencies = ["mini_portile2"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1nffsyx1xjg6v5n9rrbi8y1arrcx2i5f21cp6clgh9iwiqkr7rnn";
+ sha256 = "105xh2zkr8nsyfaj2izaisarpnkrrl9000y3nyflg9cbzrfxv021";
type = "gem";
};
- version = "1.8.0";
+ version = "1.8.1";
};
numerizer = {
source = {
@@ -1887,10 +1904,10 @@
dependencies = ["jwt" "omniauth" "omniauth-oauth2"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0qay454zvyas8xfnfkycqpjkafaq5pw4gaji176cdfw0blhviz0s";
+ sha256 = "0ck5616fjik0dw89xvak1mi8ijcv10lsh6n9h4107l5dys2g3jfx";
type = "gem";
};
- version = "0.0.6";
+ version = "0.0.9";
};
omniauth-cas3 = {
dependencies = ["addressable" "nokogiri" "omniauth"];
@@ -1932,10 +1949,10 @@
dependencies = ["jwt" "multi_json" "omniauth" "omniauth-oauth2"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1m6v2vm3h21ychd10wzkdhyhnrk9zhc1bgi4ahp5gwy00pggrppw";
+ sha256 = "1sri7pn9pm7nr93zj7j1g4gqd3rpibqw7v09s1c6fihh5cmjz3fz";
type = "gem";
};
- version = "0.4.1";
+ version = "0.5.2";
};
omniauth-kerberos = {
dependencies = ["omniauth-multipassword" "timfel-krb5-auth"];
@@ -1968,10 +1985,10 @@
dependencies = ["oauth2" "omniauth"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0mskwlw5ibx9mz7ywqji6mm56ikf7mglbnfc02qhg6ry527jsxdm";
+ sha256 = "0aykbg5qfm37ywrq34dydrhxa5jwpski71dpspgp2fi6dinx09f5";
type = "gem";
};
- version = "1.3.1";
+ version = "1.4.0";
};
omniauth-oauth2-generic = {
dependencies = ["omniauth-oauth2"];
@@ -2046,10 +2063,10 @@
parallel = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1yxhk64sfkm84v509m3mzmp0b7ra9lc7s8k6113yk9faih3g7w7v";
+ sha256 = "0qv2yj4sxr36ga6xdxvbq9h05hn10bwcbkqv6j6q1fiixhsdnnzd";
type = "gem";
};
- version = "1.11.2";
+ version = "1.12.0";
};
paranoia = {
dependencies = ["activerecord"];
@@ -2239,10 +2256,10 @@
dependencies = ["mmap2"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1r9s30hypcpw4abxlzcjlkcwkckqvr5sbph3blbl0rq2r8c8h25p";
+ sha256 = "1fgkilpiha338mvfkj5rwhny3vld0nb3v1vgbrlxbhnvch26wakh";
type = "gem";
};
- version = "0.7.0.beta14";
+ version = "0.7.0.beta18";
};
pry = {
dependencies = ["coderay" "method_source" "slop"];
@@ -2271,6 +2288,14 @@
};
version = "0.3.5";
};
+ public_suffix = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0snaj1gxfib4ja1mvy3dzmi7am73i0mkqr0zkz045qv6509dhj5f";
+ type = "gem";
+ };
+ version = "3.0.0";
+ };
pyu-ruby-sasl = {
source = {
remotes = ["https://rubygems.org"];
@@ -2423,10 +2448,10 @@
rake = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "01j8fc9bqjnrsxbppncai05h43315vmz9fwg28qdsgcjw9ck1d7n";
+ sha256 = "0mfqgpp3m69s5v1rd51lfh5qpjwyia5p4rg337pw8c8wzm6pgfsw";
type = "gem";
};
- version = "12.0.0";
+ version = "12.1.0";
};
rblineprof = {
dependencies = ["debugger-ruby_core_source"];
@@ -2441,10 +2466,10 @@
dependencies = ["ffi"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "06xb4khgjblrmp1xgkjbmca0wl97i0nazf9pgx69vwr1ac03j920";
+ sha256 = "08dkigw8wdx53hviw1zqrs7rcrzqcwh9jd3dvwr72013z9fmyp48";
type = "gem";
};
- version = "3.4.0";
+ version = "4.0.2";
};
rbnacl-libsodium = {
dependencies = ["rbnacl"];
@@ -2567,6 +2592,15 @@
};
version = "1.2.0";
};
+ representable = {
+ dependencies = ["declarative" "declarative-option" "uber"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0qm9rgi1j5a6nv726ka4mmixivlxfsg91h8rpp72wwd4vqbkkm07";
+ type = "gem";
+ };
+ version = "3.0.4";
+ };
request_store = {
source = {
remotes = ["https://rubygems.org"];
@@ -2596,10 +2630,10 @@
retriable = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1cmhwgv5r4vn7iqy4bfbnbb73pzl8ik69zrwq9vdim45v8b13gsj";
+ sha256 = "0pnriyn9zh120hxm92vb12hfsf7c98nawyims1shxj3ldpl0l3ar";
type = "gem";
};
- version = "1.4.1";
+ version = "3.1.1";
};
rinku = {
source = {
@@ -2620,10 +2654,10 @@
rouge = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1932gvvzfdky2z01sjri354ak7wq3nk9jmh7fiydfgjchfwk7sr4";
+ sha256 = "02kpahk5nkc33yxnn75649kzxaz073wvazr2zyg491nndykgnvcs";
type = "gem";
};
- version = "2.1.0";
+ version = "2.2.1";
};
rqrcode = {
dependencies = ["chunky_png"];
@@ -2740,6 +2774,15 @@
};
version = "0.49.1";
};
+ rubocop-gitlab-security = {
+ dependencies = ["rubocop"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0aw9qmyc6xj6fi0jxp8m4apk358rd91z492ragn6jp4rghkqj5cy";
+ type = "gem";
+ };
+ version = "0.1.0";
+ };
rubocop-rspec = {
dependencies = ["rubocop"];
source = {
@@ -2990,6 +3033,14 @@
};
version = "0.7.3";
};
+ simple_po_parser = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "08wkp4gcrd89k5yari9j94if9ffkj3rka4llcwrhdgsi3l15p5f3";
+ type = "gem";
+ };
+ version = "1.1.2";
+ };
simplecov = {
dependencies = ["docile" "json" "simplecov-html"];
source = {
@@ -3170,6 +3221,14 @@
};
version = "0.7.7";
};
+ test-prof = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "08nvn3c1mzgcjgk9lr3py0zjd8fjjrm3ncn9rpqkfbx429mgw2l3";
+ type = "gem";
+ };
+ version = "0.2.5";
+ };
test_after_commit = {
dependencies = ["activerecord"];
source = {
@@ -3271,6 +3330,14 @@
};
version = "0.2.1";
};
+ uber = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1p1mm7mngg40x05z52md3mbamkng0zpajbzqjjwmsyw0zw3v9vjv";
+ type = "gem";
+ };
+ version = "0.1.0";
+ };
uglifier = {
dependencies = ["execjs" "json"];
source = {
@@ -3280,14 +3347,6 @@
};
version = "2.7.2";
};
- underscore-rails = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0iyspb7s49wpi9cc314gvlkyn45iyfivzxhdw0kql1zrgllhlzfk";
- type = "gem";
- };
- version = "1.8.3";
- };
unf = {
dependencies = ["unf_ext"];
source = {
@@ -3300,10 +3359,10 @@
unf_ext = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "04d13bp6lyg695x94whjwsmzc2ms72d94vx861nx1y40k3817yp8";
+ sha256 = "14hr2dzqh33kqc0xchs8l05pf3kjcayvad4z1ip5rdjxrkfk8glb";
type = "gem";
};
- version = "0.0.7.2";
+ version = "0.0.7.4";
};
unicode-display_width = {
source = {
@@ -3455,9 +3514,9 @@
dependencies = ["nokogiri"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "04kcr127l34p7221z13blyl0dvh0bmxwx326j72idayri36a394w";
+ sha256 = "1ha626m6fh50fpilb9pdnmq9xl586w7c0zyidg895c3iq13rqgyw";
type = "gem";
};
- version = "2.0.0";
+ version = "2.1.0";
};
}
\ No newline at end of file
diff --git a/pkgs/applications/version-management/gitlab/nulladapter.patch b/pkgs/applications/version-management/gitlab/nulladapter.patch
index 70195fe821a0..3b30ff03346b 100644
--- a/pkgs/applications/version-management/gitlab/nulladapter.patch
+++ b/pkgs/applications/version-management/gitlab/nulladapter.patch
@@ -14,7 +14,7 @@ diff --git a/Gemfile.lock b/Gemfile.lock
index 38944248f9..08ce4486ba 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
-@@ -32,6 +32,8 @@ GEM
+@@ -33,6 +33,8 @@ GEM
activemodel (= 4.2.8)
activesupport (= 4.2.8)
arel (~> 6.0)
@@ -23,11 +23,11 @@ index 38944248f9..08ce4486ba 100644
activerecord_sane_schema_dumper (0.2)
rails (>= 4, < 5)
activesupport (4.2.8)
-@@ -926,6 +928,7 @@ PLATFORMS
+@@ -963,6 +965,7 @@ PLATFORMS
DEPENDENCIES
RedCloth (~> 4.3.2)
ace-rails-ap (~> 4.1.0)
+ activerecord-nulldb-adapter
activerecord_sane_schema_dumper (= 0.2)
acts-as-taggable-on (~> 4.0)
- addressable (~> 2.3.8)
+ addressable (~> 2.5.2)
diff --git a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
index 0c56140b9f07..39c7c28847c4 100644
--- a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
+++ b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
@@ -27,20 +27,20 @@ diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 0b33783869..cd4e41d9bd 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
-@@ -521,7 +521,7 @@ production: &base
+@@ -574,7 +574,7 @@ production: &base
# CAUTION!
# Use the default values unless you really know what you are doing
git:
- bin_path: /usr/bin/git
+ bin_path: git
- # The next value is the maximum memory size grit can use
- # Given in number of bytes per git object (e.g. a commit)
- # This value can be increased if you have very large commits
+
+ ## Webpack settings
+ # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 8ddf8e4d2e..559cf9adf7 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
-@@ -219,7 +219,7 @@ Settings.gitlab['user'] ||= 'git'
+@@ -252,7 +252,7 @@ Settings.gitlab['user'] ||= 'git'
Settings.gitlab['user_home'] ||= begin
Etc.getpwnam(Settings.gitlab['user']).dir
rescue ArgumentError # no user configured
@@ -49,35 +49,29 @@ index 8ddf8e4d2e..559cf9adf7 100644
end
Settings.gitlab['time_zone'] ||= nil
Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].nil?
-@@ -454,7 +454,7 @@ Settings.backup['upload']['storage_class'] ||= nil
+@@ -491,7 +491,7 @@ Settings.backup['upload']['storage_class'] ||= nil
+ # Git
#
Settings['git'] ||= Settingslogic.new({})
- Settings.git['max_size'] ||= 20971520 # 20.megabytes
--Settings.git['bin_path'] ||= '/usr/bin/git'
-+Settings.git['bin_path'] ||= 'git'
- Settings.git['timeout'] ||= 10
+-Settings.git['bin_path'] ||= '/usr/bin/git'
++Settings.git['bin_path'] ||= 'git'
# Important: keep the satellites.path setting until GitLab 9.0 at
+ # least. This setting is fed to 'rm -rf' in
diff --git a/lib/gitlab/logger.rb b/lib/gitlab/logger.rb
index 59b21149a9..4f4a39a06c 100644
--- a/lib/gitlab/logger.rb
+++ b/lib/gitlab/logger.rb
-@@ -13,20 +13,20 @@ module Gitlab
+@@ -13,7 +13,7 @@
end
def self.read_latest
- path = Rails.root.join("log", file_name)
+ path = File.join(ENV["GITLAB_LOG_PATH"], file_name)
- self.build unless File.exist?(path)
- tail_output, _ = Gitlab::Popen.popen(%W(tail -n 2000 #{path}))
- tail_output.split("\n")
- end
- def self.read_latest_for(filename)
-- path = Rails.root.join("log", filename)
-+ path = File.join(ENV["GITLAB_LOG_PATH"], filename)
- tail_output, _ = Gitlab::Popen.popen(%W(tail -n 2000 #{path}))
- tail_output.split("\n")
+ return [] unless File.readable?(path)
+
+@@ -22,7 +22,7 @@
end
def self.build
@@ -158,3 +152,14 @@ index b276a81eac..070e3ebd81 100644
end
end
end
+--- a/lib/api/api.rb 1970-01-01 01:00:01.000000000 +0100
++++ b/lib/api/api.rb 2017-09-28 19:37:24.953605705 +0200
+@@ -2,7 +2,7 @@
+ class API < Grape::API
+ include APIGuard
+
+- LOG_FILENAME = Rails.root.join("log", "api_json.log")
++ LOG_FILENAME = File.join(ENV["GITLAB_LOG_PATH"], "api_json.log")
+
+ use GrapeLogging::Middleware::RequestLogger,
+ logger: Logger.new(LOG_FILENAME),
diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix
index 49243a823ede..a86a7f96e097 100644
--- a/pkgs/applications/version-management/gogs/default.nix
+++ b/pkgs/applications/version-management/gogs/default.nix
@@ -7,18 +7,21 @@ with stdenv.lib;
buildGoPackage rec {
name = "gogs-${version}";
- version = "0.11.19";
+ version = "0.11.29";
src = fetchFromGitHub {
owner = "gogits";
repo = "gogs";
rev = "v${version}";
- sha256 = "0smzklhpfv3smqgzd0cnjdif3zi5q7b02grrnb5zssmdi1b2dlsd";
+ sha256 = "1xn1b4dxf7r8kagps3yvp31zskfxn50k1gfic9abl4kjwpwk78c0";
};
- patchPhase = ''
+ patches = [ ./static-root-path.patch ];
+
+ postPatch = ''
patchShebangs .
- '';
+ substituteInPlace pkg/setting/setting.go --subst-var data
+ '';
nativeBuildInputs = [ makeWrapper ];
@@ -26,17 +29,12 @@ buildGoPackage rec {
outputs = [ "bin" "out" "data" ];
- postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
- install_name_tool -delete_rpath $out/lib $bin/bin/gogs
- '' + ''
+ postInstall = ''
mkdir $data
cp -R $src/{public,templates} $data
wrapProgram $bin/bin/gogs \
- --prefix PATH : ${makeBinPath [ bash git gzip openssh ]} \
- --run 'export GOGS_WORK_DIR=''${GOGS_WORK_DIR:-$PWD}' \
- --run 'mkdir -p "$GOGS_WORK_DIR" && cd "$GOGS_WORK_DIR"' \
- --run "ln -fs $data/{public,templates} ."
+ --prefix PATH : ${makeBinPath [ bash git gzip openssh ]}
'';
goPackagePath = "github.com/gogits/gogs";
diff --git a/pkgs/applications/version-management/gogs/static-root-path.patch b/pkgs/applications/version-management/gogs/static-root-path.patch
new file mode 100644
index 000000000000..9eaa72a0c85d
--- /dev/null
+++ b/pkgs/applications/version-management/gogs/static-root-path.patch
@@ -0,0 +1,13 @@
+diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
+index f206592d..796da6ef 100644
+--- a/pkg/setting/setting.go
++++ b/pkg/setting/setting.go
+@@ -474,7 +474,7 @@ func NewContext() {
+ LocalURL = sec.Key("LOCAL_ROOT_URL").MustString(string(Protocol) + "://localhost:" + HTTPPort + "/")
+ OfflineMode = sec.Key("OFFLINE_MODE").MustBool()
+ DisableRouterLog = sec.Key("DISABLE_ROUTER_LOG").MustBool()
+- StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString(workDir)
++ StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString("@data@")
+ AppDataPath = sec.Key("APP_DATA_PATH").MustString("data")
+ EnableGzip = sec.Key("ENABLE_GZIP").MustBool()
+
diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix
index 03997047d3a9..25a85f4b92d7 100644
--- a/pkgs/applications/version-management/gource/default.nix
+++ b/pkgs/applications/version-management/gource/default.nix
@@ -11,8 +11,9 @@ stdenv.mkDerivation rec {
sha256 = "1llqwdnfa1pff8bxk27qsqff1fcg0a9kfdib0rn7p28vl21n1cgj";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- glew SDL2 ftgl pkgconfig libpng libjpeg pcre SDL2_image mesa
+ glew SDL2 ftgl libpng libjpeg pcre SDL2_image mesa
boost glm freetype
];
@@ -22,7 +23,7 @@ stdenv.mkDerivation rec {
"-std=c++11"; # fix build with glm >= 0.9.6.0
meta = with stdenv.lib; {
- homepage = http://code.google.com/p/gource/;
+ homepage = http://gource.io/;
description = "A Software version control visualization tool";
license = licenses.gpl3Plus;
longDescription = ''
diff --git a/pkgs/applications/version-management/guitone/default.nix b/pkgs/applications/version-management/guitone/default.nix
index 8f8750b98c22..bfaa62ebb66d 100644
--- a/pkgs/applications/version-management/guitone/default.nix
+++ b/pkgs/applications/version-management/guitone/default.nix
@@ -16,7 +16,8 @@ stdenv.mkDerivation rec {
branch = "net.venge.monotone.guitone";
};
- buildInputs = [ qt4 qmake4Hook pkgconfig graphviz ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ qt4 qmake4Hook graphviz ];
qmakeFlags = [ "guitone.pro" ];
diff --git a/pkgs/applications/version-management/monotone-viz/default.nix b/pkgs/applications/version-management/monotone-viz/default.nix
index 7b8b0598925e..c2006e9dd6bf 100644
--- a/pkgs/applications/version-management/monotone-viz/default.nix
+++ b/pkgs/applications/version-management/monotone-viz/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
version = "1.0.2";
name = "monotone-viz-${version}";
- buildInputs = [ocaml lablgtk libgnomecanvas glib pkgconfig graphviz_2_0 makeWrapper camlp4];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ocaml lablgtk libgnomecanvas glib graphviz_2_0 makeWrapper camlp4];
src = fetchurl {
url = "http://oandrieu.nerim.net/monotone-viz/${name}-nolablgtk.tar.gz";
sha256 = "1l5x4xqz5g1aaqbc1x80mg0yzkiah9ma9k9mivmn08alkjlakkdk";
diff --git a/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix b/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix
index 32cc283bc3c9..73acc3a6b36f 100644
--- a/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix
+++ b/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix
@@ -12,8 +12,9 @@ stdenv.mkDerivation rec {
sha256 = "39b8e1f2ba4cc1f5bdc8e39c7be35e5f831253008e4ee2c176984f080416676c";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig xlibsWrapper libpng libjpeg expat libXaw yacc
+ xlibsWrapper libpng libjpeg expat libXaw yacc
libtool fontconfig pango gd libwebp
];
diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix
index 6be36533ce6b..8f8930424a94 100644
--- a/pkgs/applications/version-management/monotone/default.nix
+++ b/pkgs/applications/version-management/monotone/default.nix
@@ -20,7 +20,8 @@ stdenv.mkDerivation rec {
patches = [ ];
- buildInputs = [ boost zlib botan libidn lua pcre sqlite pkgconfig expect
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ boost zlib botan libidn lua pcre sqlite expect
openssl gmp bzip2 ];
postInstall = ''
diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix
index a5479a6c6a87..36c7c3c58851 100644
--- a/pkgs/applications/version-management/pijul/default.nix
+++ b/pkgs/applications/version-management/pijul/default.nix
@@ -18,7 +18,7 @@ buildRustPackage rec {
doCheck = false;
- depsSha256 = "1qzzpnkyw1bn5fnj06c80f7985v1q0rqcphrrrkpbi33lg5mzgbv";
+ cargoSha256 = "0r69vghjd6b30v0qjsipyv56n92iwvyxmllrnwjzjf5pzhhjl7sy";
meta = with stdenv.lib; {
description = "A distributed version control system";
diff --git a/pkgs/applications/version-management/redmine/bootstrap.nix b/pkgs/applications/version-management/redmine/bootstrap.nix
index 82643f18a554..53757c37ed82 100644
--- a/pkgs/applications/version-management/redmine/bootstrap.nix
+++ b/pkgs/applications/version-management/redmine/bootstrap.nix
@@ -13,8 +13,10 @@ in stdenv.mkDerivation rec {
url = "http://www.redmine.org/releases/${name}.tar.gz";
sha256 = "0x0zwxyj4dwbk7l64s3lgny10mjf0ba8jwrbafsm4d72sncmacv0";
};
+
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- ruby bundler libiconv libxslt libxml2 pkgconfig
+ ruby bundler libiconv libxslt libxml2
libffi imagemagickBig postgresql which stdenv
];
installPhase = ''
diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index 0a5a3fbd0c64..e069c39f059f 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -104,8 +104,8 @@ let
in {
subversion18 = common {
- version = "1.8.18";
- sha256 = "19lpqdrl86mjfdpayhn3f9rkmpb6zs2iny38cnxq6wcj7snh0sz5";
+ version = "1.8.19";
+ sha256 = "1gp6426gkdza6ni2whgifjcmjb4nq34ljy07yxkrhlarvfq6ks2n";
};
subversion19 = common {
diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix
index 1a0c506a19d4..6466e5ab0ae5 100644
--- a/pkgs/applications/version-management/tortoisehg/default.nix
+++ b/pkgs/applications/version-management/tortoisehg/default.nix
@@ -2,11 +2,11 @@
python2Packages.buildPythonApplication rec {
name = "tortoisehg-${version}";
- version = "4.1.1";
+ version = "4.3.1";
src = fetchurl {
url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz";
- sha256 = "14fy5p5hx4iij5kyma9679nrprd9lsjr6j047bfyfrwa3l4knj2g";
+ sha256 = "0lxppjdqjmwl5y8fmp2am0my7a3mks811yg4fff7cx0569hdp62n";
};
pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ];
diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix
index 39a85a03199d..ebc1249dc11d 100644
--- a/pkgs/applications/video/aegisub/default.nix
+++ b/pkgs/applications/video/aegisub/default.nix
@@ -29,6 +29,9 @@ stdenv.mkDerivation rec {
sha256 = "11b83qazc8h0iidyj1rprnnjdivj1lpphvpa08y53n42bfa36pn5";
};
+ # Fixup build with icu-59
+ postPatch = "sed '1i#include ' -i src/utils.cpp";
+
buildInputs = with stdenv.lib;
[ pkgconfig intltool libX11 wxGTK fontconfig freetype mesa
libass fftw ffms ffmpeg zlib icu boost boost.out libiconv
diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix
index ca9620a0eb0e..b00aae61d36d 100644
--- a/pkgs/applications/video/byzanz/default.nix
+++ b/pkgs/applications/video/byzanz/default.nix
@@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
- buildInputs = [ which gnome3.gnome_common glib intltool pkgconfig libtool cairo gtk3 xorg.xwininfo ]
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ which gnome3.gnome_common glib intltool libtool cairo gtk3 xorg.xwininfo ]
++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-bad gst-plugins-good gst-plugins-ugly gst-libav wrapGAppsHook ]);
meta = with stdenv.lib; {
diff --git a/pkgs/applications/video/coriander/default.nix b/pkgs/applications/video/coriander/default.nix
index 60c31cf07f92..10a8f4019fca 100644
--- a/pkgs/applications/video/coriander/default.nix
+++ b/pkgs/applications/video/coriander/default.nix
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
cp ${automake}/share/automake-*/mkinstalldirs .
'';
- buildInputs = [ pkgconfig glib gtk2 libgnomeui libXv libraw1394 libdc1394 SDL GConf ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ glib gtk2 libgnomeui libXv libraw1394 libdc1394 SDL GConf ];
meta = {
homepage = https://damien.douxchamps.net/ieee1394/coriander/;
diff --git a/pkgs/applications/video/gnome-mplayer/default.nix b/pkgs/applications/video/gnome-mplayer/default.nix
index e2980c7108f4..ba72e085bf7c 100644
--- a/pkgs/applications/video/gnome-mplayer/default.nix
+++ b/pkgs/applications/video/gnome-mplayer/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "1k5yplsvddcm7xza5h4nfb6vibzjcqsk8gzis890alizk07f5xp2";
};
- buildInputs = [pkgconfig glib gtk2 dbus dbus_glib GConf];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ glib gtk2 dbus dbus_glib GConf];
hardeningDisable = [ "format" ];
diff --git a/pkgs/applications/video/gpac/default.nix b/pkgs/applications/video/gpac/default.nix
index 927842916a15..7a8b66d2d28e 100644
--- a/pkgs/applications/video/gpac/default.nix
+++ b/pkgs/applications/video/gpac/default.nix
@@ -1,19 +1,25 @@
-{ stdenv, fetchsvn, pkgconfig, zlib }:
+{ stdenv, fetchFromGitHub, pkgconfig, zlib }:
stdenv.mkDerivation rec {
- name = "gpac-0.5.0-svn";
+ version = "0.7.1";
+ name = "gpac-${version}";
- src = fetchsvn {
- url = "http://svn.code.sf.net/p/gpac/code/trunk/gpac";
- rev = "4749";
- sha256 = "0y38pmp64a2l70y1yby90qzxfzx8y7r0cdmgjxzw86jh6si5ndhp";
+ src = fetchFromGitHub {
+ owner = "gpac";
+ repo = "gpac";
+ rev = "v${version}";
+ sha256 = "197c5968p5bzvk0ga347fwgkqh4j1v3z65wlx65c5m9gwfxz2k2q";
};
# this is the bare minimum configuration, as I'm only interested in MP4Box
# For most other functionality, this should probably be extended
- nativeBuildInputs = [ pkgconfig zlib ];
+ nativeBuildInputs = [ pkgconfig ];
- meta = {
+ buildInputs = [ zlib ];
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
description = "Open Source multimedia framework for research and academic purposes";
longDescription = ''
GPAC is an Open Source multimedia framework for research and academic purposes.
@@ -27,10 +33,9 @@ stdenv.mkDerivation rec {
A multimedia packager, called MP4Box,
And some server tools included in MP4Box and MP42TS applications.
'';
- homepage = http://gpac.wp.mines-telecom.fr;
- license = stdenv.lib.licenses.lgpl21;
-
- maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
- platforms = stdenv.lib.platforms.linux;
+ homepage = https://gpac.wp.imt.fr;
+ license = licenses.lgpl21;
+ maintainers = with maintainers; [ bluescreen303 mgdelacroix ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/video/kmplayer/default.nix b/pkgs/applications/video/kmplayer/default.nix
index 59b9893ded14..44313f9499f5 100644
--- a/pkgs/applications/video/kmplayer/default.nix
+++ b/pkgs/applications/video/kmplayer/default.nix
@@ -1,30 +1,48 @@
-{ stdenv, fetchurl
-, automoc4, cmake, gettext, makeWrapper, perl, pkgconfig
-, kdelibs4, cairo, dbus_glib, mplayer
+{
+ mkDerivation, lib, fetchurl,
+ extra-cmake-modules, makeWrapper,
+ libpthreadstubs, libXdmcp,
+ qtsvg, qtx11extras, ki18n, kdelibs4support, kio, kmediaplayer, kwidgetsaddons,
+ phonon, cairo, mplayer
}:
-stdenv.mkDerivation {
- name = "kmplayer-0.11.3d";
+mkDerivation rec {
+ majorMinorVersion = "0.12";
+ patchVersion = "0b";
+ version = "${majorMinorVersion}.${patchVersion}";
+ name = "kmplayer-${version}";
src = fetchurl {
- #url = http://kmplayer.kde.org/pkgs/kmplayer-0.11.3d.tar.bz2;
- url = "mirror://gentoo/distfiles/kmplayer-0.11.3d.tar.bz2";
- sha256 = "1yvbkb1hh5y7fqfvixjf2rryzm0fm0fpkx4lmvhi7k7d0v4wpgky";
+ url = "mirror://kde/stable/kmplayer/${majorMinorVersion}/kmplayer-${version}.tar.bz2";
+ sha256 = "0wzdxym4fc83wvqyhcwid65yv59a2wvp1lq303cn124mpnlwx62y";
};
- buildInputs = [ kdelibs4 cairo dbus_glib ];
+ patches = [
+ ./kmplayer_part-plugin_metadata.patch # Qt 5.9 doesn't like an empty string for the optional "FILE" argument of "Q_PLUGIN_METADATA"
+ ./no-docs.patch # Don't build docs due to errors (kdelibs4support propagates kdoctools)
+ ];
- nativeBuildInputs = [ automoc4 cmake gettext makeWrapper perl pkgconfig ];
+ postPatch = ''
+ sed -i src/kmplayer.desktop \
+ -e "s,^Exec.*,Exec=$out/bin/kmplayer -qwindowtitle %c %i %U,"
+ '';
+
+ nativeBuildInputs = [ extra-cmake-modules makeWrapper ];
+
+ buildInputs = [
+ libpthreadstubs libXdmcp
+ qtsvg qtx11extras ki18n kdelibs4support kio kmediaplayer kwidgetsaddons
+ phonon cairo
+ ];
postInstall = ''
wrapProgram $out/bin/kmplayer --suffix PATH : ${mplayer}/bin
'';
- meta = {
+ meta = with lib; {
description = "MPlayer front-end for KDE";
- license = "GPL";
- homepage = http://kmplayer.kde.org;
- broken = true; # Also unavailable on this mirror
- maintainers = [ stdenv.lib.maintainers.sander ];
+ license = with licenses; [ gpl2 lgpl2 fdl12 ];
+ homepage = https://kmplayer.kde.org/;
+ maintainers = with maintainers; [ sander zraexy ];
};
}
diff --git a/pkgs/applications/video/kmplayer/kmplayer_part-plugin_metadata.patch b/pkgs/applications/video/kmplayer/kmplayer_part-plugin_metadata.patch
new file mode 100644
index 000000000000..9b6652b0be58
--- /dev/null
+++ b/pkgs/applications/video/kmplayer/kmplayer_part-plugin_metadata.patch
@@ -0,0 +1,11 @@
+--- a/src/kmplayer_part.h
++++ b/src/kmplayer_part.h
+@@ -36,7 +36,7 @@
+
+ class KMPlayerFactory : public KPluginFactory {
+ Q_OBJECT
+- Q_PLUGIN_METADATA(IID "org.kde.KPluginFactory" FILE "")
++ Q_PLUGIN_METADATA(IID "org.kde.KPluginFactory")
+ Q_INTERFACES(KPluginFactory)
+ public:
+ KMPlayerFactory();
diff --git a/pkgs/applications/video/kmplayer/no-docs.patch b/pkgs/applications/video/kmplayer/no-docs.patch
new file mode 100644
index 000000000000..c93453f908c9
--- /dev/null
+++ b/pkgs/applications/video/kmplayer/no-docs.patch
@@ -0,0 +1,12 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -79,9 +79,6 @@
+
+ add_subdirectory(src)
+ add_subdirectory(icons)
+-if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/doc" AND KF5DocTools_VERSION)
+- add_subdirectory(doc)
+-endif(KF5DocTools_VERSION)
+ add_subdirectory(data)
+
+ if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix
new file mode 100644
index 000000000000..9c6a49c55136
--- /dev/null
+++ b/pkgs/applications/video/lightworks/default.nix
@@ -0,0 +1,87 @@
+{ stdenv, fetchurl, dpkg, makeWrapper, patchelf, buildFHSUserEnv
+, gtk3, gnome3, gdk_pixbuf, cairo, libjpeg_original, glib, gnome2, mesa_glu
+, nvidia_cg_toolkit, zlib, openssl, portaudio
+}:
+let
+ fullPath = stdenv.lib.makeLibraryPath [
+ stdenv.cc.cc
+ gnome3.gtk
+ gdk_pixbuf
+ cairo
+ libjpeg_original
+ glib
+ gnome2.pango
+ mesa_glu
+ nvidia_cg_toolkit
+ zlib
+ openssl
+ portaudio
+ ];
+
+ lightworks = stdenv.mkDerivation rec {
+ version = "14.0.0";
+ name = "lightworks-${version}";
+
+ src =
+ if stdenv.system == "x86_64-linux" then
+ fetchurl {
+ url = "http://downloads.lwks.com/v14/lwks-14.0.0-amd64.deb";
+ sha256 = "66eb9f9678d979db76199f1c99a71df0ddc017bb47dfda976b508849ab305033";
+ }
+ else throw "${name} is not supported on ${stdenv.system}";
+
+ buildInputs = [ dpkg makeWrapper ];
+
+ phases = [ "unpackPhase" "installPhase" ];
+ unpackPhase = "dpkg-deb -x ${src} ./";
+
+ installPhase = ''
+ mkdir -p $out/bin
+ substitute usr/bin/lightworks $out/bin/lightworks \
+ --replace "/usr/lib/lightworks" "$out/lib/lightworks"
+ chmod +x $out/bin/lightworks
+
+ cp -r usr/lib $out
+
+ # /usr/share/fonts is not normally searched
+ # This adds it to lightworks' search path while keeping the default
+ # using the FONTCONFIG_FILE env variable
+ echo "
+
+
+ /usr/share/fonts/truetype
+ /etc/fonts/fonts.conf
+ " > $out/lib/lightworks/fonts.conf
+
+ patchelf \
+ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+ $out/lib/lightworks/ntcardvt
+
+ wrapProgram $out/lib/lightworks/ntcardvt \
+ --prefix LD_LIBRARY_PATH : ${fullPath}:$out/lib/lightworks \
+ --set FONTCONFIG_FILE $out/lib/lightworks/fonts.conf
+
+ cp -r usr/share $out/share
+ '';
+
+ dontPatchELF = true;
+
+ meta = {
+ description = "Professional Non-Linear Video Editor";
+ homepage = "https://www.lwks.com/";
+ license = stdenv.lib.licenses.unfree;
+ maintainers = [ stdenv.lib.maintainers.antonxy ];
+ platforms = [ "x86_64-linux" ];
+ };
+ };
+
+# Lightworks expects some files in /usr/share/lightworks
+in buildFHSUserEnv rec {
+ name = "lightworks";
+
+ targetPkgs = pkgs: [
+ lightworks
+ ];
+
+ runScript = "lightworks";
+}
diff --git a/pkgs/applications/video/linuxstopmotion/default.nix b/pkgs/applications/video/linuxstopmotion/default.nix
index fef2c1357747..717853af745c 100644
--- a/pkgs/applications/video/linuxstopmotion/default.nix
+++ b/pkgs/applications/video/linuxstopmotion/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
sha256 = "19v9d0v3laiwi0f1n92lvj2s5s1mxsrfygna0xyw9pkcnk3b26q6";
};
- buildInputs = [ pkgconfig qt4 SDL SDL_image libvorbis libtar libxml2 gamin qmake4Hook ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ qt4 SDL SDL_image libvorbis libtar libxml2 gamin qmake4Hook ];
patches = [ ./linuxstopmotion-fix-wrong-isProcess-logic.patch ];
diff --git a/pkgs/applications/video/lxdvdrip/default.nix b/pkgs/applications/video/lxdvdrip/default.nix
index a56eba3bf5a6..8287a176ce63 100644
--- a/pkgs/applications/video/lxdvdrip/default.nix
+++ b/pkgs/applications/video/lxdvdrip/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Command line tool to make a copy from a video DVD for private use";
- homepage = http://sourceforge.net/projects/lxdvdrip;
+ homepage = https://sourceforge.net/projects/lxdvdrip;
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
};
diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix
index 1559535f342b..ae7625d1972a 100644
--- a/pkgs/applications/video/makemkv/default.nix
+++ b/pkgs/applications/video/makemkv/default.nix
@@ -4,20 +4,21 @@
stdenv.mkDerivation rec {
name = "makemkv-${ver}";
- ver = "1.10.6";
+ ver = "1.10.7";
builder = ./builder.sh;
src_bin = fetchurl {
url = "http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz";
- sha256 = "99d68e4e0166c9a4e2dce6638e19cbe312b5981f6e1811ed0987578ceefac3e3";
+ sha256 = "2b9a9e6fb779bc876371b2f88b23fddad3e92d6449fe5d1541dcd9ad04e01eac";
};
src_oss = fetchurl {
url = "http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz";
- sha256 = "ab028ba05364f2d899b76e6a7392c9ef555379de2ef4732e1de27c23fd78d235";
+ sha256 = "be61fcee31dc52944ec7ef440ff8fffbc140d24877e6afb19149c541564eb654";
};
- buildInputs = [openssl qt4 mesa zlib pkgconfig libav];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [openssl qt4 mesa zlib libav];
libPath = stdenv.lib.makeLibraryPath [stdenv.cc.cc openssl mesa qt4 zlib ]
+ ":" + stdenv.cc.cc + "/lib64";
diff --git a/pkgs/applications/video/mjpg-streamer/default.nix b/pkgs/applications/video/mjpg-streamer/default.nix
index 5fd0664d15b4..f9d4d4698faf 100644
--- a/pkgs/applications/video/mjpg-streamer/default.nix
+++ b/pkgs/applications/video/mjpg-streamer/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- homepage = http://sourceforge.net/projects/mjpg-streamer/;
+ homepage = https://sourceforge.net/projects/mjpg-streamer/;
description = "MJPG-streamer takes JPGs from Linux-UVC compatible webcams, filesystem or other input plugins and streams them as M-JPEG via HTTP to webbrowsers, VLC and other software";
platforms = platforms.linux;
license = licenses.gpl2;
diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index 442e9d8eeb34..183722beed81 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -10,13 +10,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "mkvtoolnix-${version}";
- version = "15.0.0";
+ version = "17.0.0";
src = fetchFromGitHub {
owner = "mbunkus";
repo = "mkvtoolnix";
rev = "release-${version}";
- sha256 = "06n0hbp484zpsjvnzp6p0nzzssym3illxdicn3y1jf8gy971rxi0";
+ sha256 = "1v74rxf9wm0sn2illy0hp36hpwz7q04y0k32wq6wn7qrnzkzcc88";
};
nativeBuildInputs = [ pkgconfig autoconf automake gettext drake ruby docbook_xsl libxslt ];
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index aacfa9d8874a..680cad1ec252 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -108,6 +108,7 @@ in stdenv.mkDerivation rec {
(enableFeature dvdnavSupport "dvdnav")
(enableFeature vaapiSupport "vaapi")
(enableFeature waylandSupport "wayland")
+ (enableFeature stdenv.isLinux "dvbin")
];
configurePhase = ''
diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix
index 75dccbafd3f4..518cd3d94bac 100644
--- a/pkgs/applications/video/natron/default.nix
+++ b/pkgs/applications/video/natron/default.nix
@@ -20,14 +20,14 @@ let
nativeBuildInputs = [ cmake ];
buildInputs = [ libpng flex bison ];
};
- buildPlugin = { pluginName, sha256, buildInputs, preConfigure ? "" }:
+ buildPlugin = { pluginName, sha256, nativeBuildInputs ? [], buildInputs ? [], preConfigure ? "" }:
stdenv.mkDerivation {
name = "openfx-${pluginName}-${version}";
src = fetchurl {
url = "https://github.com/MrKepzie/Natron/releases/download/${version}/openfx-${pluginName}-${version}.tar.xz";
inherit sha256;
};
- inherit buildInputs;
+ inherit nativeBuildInputs buildInputs;
preConfigure = ''
makeFlagsArray+=("CONFIG=release")
makeFlagsArray+=("PLUGINPATH=$out/Plugins/OFX/Natron")
@@ -50,8 +50,9 @@ let
({
pluginName = "arena";
sha256 = "0qba13vn9qdfax7nqlz1ps27zspr5kh795jp1xvbmwjzjzjpkqkf";
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig pango librsvg librevenge libcdr opencolorio libxml2 libzip
+ pango librsvg librevenge libcdr opencolorio libxml2 libzip
poppler imagemagick
];
preConfigure = ''
@@ -65,8 +66,9 @@ let
({
pluginName = "io";
sha256 = "0s196i9fkgr9iw92c94mxgs1lkxbhynkf83vmsgrldflmf0xjky7";
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig libpng ffmpeg openexr opencolorio openimageio boost mesa_noglu
+ libpng ffmpeg openexr opencolorio openimageio boost mesa_noglu
seexpr
];
})
@@ -91,11 +93,11 @@ stdenv.mkDerivation {
sha256 = "1wdc0zqriw2jhlrhzs6af3kagrv22cm086ffnbr1x43mgc9hfhjp";
};
- buildInputs = [
- pkgconfig qt4 boost expat cairo python2Packages.pyside python2Packages.pysideShiboken
- ];
+ nativeBuildInputs = [ qmake4Hook pkgconfig python2Packages.wrapPython ];
- nativeBuildInputs = [ qmake4Hook python2Packages.wrapPython ];
+ buildInputs = [
+ qt4 boost expat cairo python2Packages.pyside python2Packages.pysideShiboken
+ ];
preConfigure = ''
export MAKEFLAGS=-j$NIX_BUILD_CORES
@@ -122,5 +124,6 @@ stdenv.mkDerivation {
license = stdenv.lib.licenses.gpl2;
maintainers = [ maintainers.puffnfresh ];
platforms = platforms.linux;
+ broken = true;
};
}
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 3707f32c9d3c..5d82a8c5d096 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -4,17 +4,20 @@
, fdk_aac
, ffmpeg
, jansson
+, libjack2
, libxkbcommon
, libpthreadstubs
, libXdmcp
, qtbase
, qtx11extras
+, speex
, libv4l
, x264
, curl
, xorg
, makeWrapper
, pkgconfig
+, vlc
, alsaSupport ? false
, alsaLib
@@ -26,13 +29,13 @@ let
optional = stdenv.lib.optional;
in stdenv.mkDerivation rec {
name = "obs-studio-${version}";
- version = "20.0.1";
+ version = "20.1.0";
src = fetchFromGitHub {
owner = "jp9000";
repo = "obs-studio";
rev = "${version}";
- sha256 = "1f701rh4w88ba48b50y16fvmzzsyv4y5nv30mrx3pb2ni7wyanld";
+ sha256 = "1366nl301rhz8cfbq89ixiq1hdxdn8iimz9xyln274anghz02sbr";
};
patches = [ ./find-xcb.patch ];
@@ -45,13 +48,16 @@ in stdenv.mkDerivation rec {
fdk_aac
ffmpeg
jansson
+ libjack2
libv4l
libxkbcommon
libpthreadstubs
libXdmcp
qtbase
qtx11extras
+ speex
x264
+ vlc
makeWrapper
]
++ optional alsaSupport alsaLib
diff --git a/pkgs/applications/video/p2pvc/default.nix b/pkgs/applications/video/p2pvc/default.nix
index 1244421210e5..d9eef7f4cd85 100644
--- a/pkgs/applications/video/p2pvc/default.nix
+++ b/pkgs/applications/video/p2pvc/default.nix
@@ -3,7 +3,8 @@
stdenv.mkDerivation {
name = "p2pvc";
- buildInputs = [ pkgconfig opencv ncurses portaudio ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ opencv ncurses portaudio ];
enableParallelBuilding = true;
diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix
index c2c64bfa4966..c4d80344080d 100644
--- a/pkgs/applications/video/pitivi/default.nix
+++ b/pkgs/applications/video/pitivi/default.nix
@@ -18,7 +18,8 @@ let
url = "https://github.com/pitivi/gst-transcoder/archive/1.8.0.tar.gz";
sha256 = "0iggr6idmp7cmfsf6pkhfl3jq1bkga37jl5prbcl1zapkzi26fg6";
};
- buildInputs = [ which meson ninja pkgconfig gobjectIntrospection ]
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ which meson ninja gobjectIntrospection ]
++ (with gst; [ gstreamer gst-plugins-base ]);
};
diff --git a/pkgs/applications/video/quvi/library.nix b/pkgs/applications/video/quvi/library.nix
index 26e0d9479541..8b2a69acfcc8 100644
--- a/pkgs/applications/video/quvi/library.nix
+++ b/pkgs/applications/video/quvi/library.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1cl1kbgxl1jnx2nwx4z90l0lap09lnnj1fg7hxsxk3m6aj4y4grd";
};
- buildInputs = [ pkgconfig lua5 curl quvi_scripts libproxy libgcrypt glib ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ lua5 curl quvi_scripts libproxy libgcrypt glib ];
meta = {
description = "Web video downloader";
diff --git a/pkgs/applications/video/quvi/scripts.nix b/pkgs/applications/video/quvi/scripts.nix
index cdc53367d114..6f4e60913390 100644
--- a/pkgs/applications/video/quvi/scripts.nix
+++ b/pkgs/applications/video/quvi/scripts.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1qvp6z5k1qgcys7vf7jd6fm0g07xixmciwj14ypn1kqhmjgizwhp";
};
- buildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
meta = {
description = "Web video downloader";
diff --git a/pkgs/applications/video/quvi/tool.nix b/pkgs/applications/video/quvi/tool.nix
index 29bb439dcf66..3f99258737c2 100644
--- a/pkgs/applications/video/quvi/tool.nix
+++ b/pkgs/applications/video/quvi/tool.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1h52s265rp3af16dvq1xlscp2926jqap2l4ah94vrfchv6m1hffb";
};
- buildInputs = [ pkgconfig lua5 curl quvi_scripts libquvi glib makeWrapper ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ lua5 curl quvi_scripts libquvi glib makeWrapper ];
postInstall = ''
wrapProgram $out/bin/quvi --set LUA_PATH "${lua5_sockets}/share/lua/${lua5.luaversion}/?.lua"
'';
diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix
index 72dbf87fdefe..2fd0d57b4e2a 100644
--- a/pkgs/applications/video/shotcut/default.nix
+++ b/pkgs/applications/video/shotcut/default.nix
@@ -1,26 +1,29 @@
-{ stdenv, fetchurl, SDL, frei0r, gettext, mlt, jack1, pkgconfig, qtbase,
-qtmultimedia, qtwebkit, qtx11extras, qtwebsockets, qtquickcontrols,
-qtgraphicaleffects,
-qmake, makeWrapper }:
+{ stdenv, fetchFromGitHub, SDL2, frei0r, gettext, mlt, jack1, pkgconfig, qtbase
+, qtmultimedia, qtwebkit, qtx11extras, qtwebsockets, qtquickcontrols
+, qtgraphicaleffects, libmlt
+, qmake, makeWrapper }:
stdenv.mkDerivation rec {
name = "shotcut-${version}";
- version = "17.02";
+ version = "17.09";
- src = fetchurl {
- url = "https://github.com/mltframework/shotcut/archive/v${version}.tar.gz";
- sha256 = "09nygz1x9fvqf33gqpc6jnr1j7ny0yny3w2ngwqqfkf3f8n83qhr";
+ src = fetchFromGitHub {
+ owner = "mltframework";
+ repo = "shotcut";
+ rev = "v${version}";
+ sha256 = "061jmk1g2h7p82kyk2zgk19g0y3dgx3lppfnm6cdmi550b51qllb";
};
-
enableParallelBuilding = true;
nativeBuildInputs = [ makeWrapper pkgconfig qmake ];
buildInputs = [
- SDL frei0r gettext mlt
+ SDL2 frei0r gettext mlt libmlt
qtbase qtmultimedia qtwebkit qtx11extras qtwebsockets qtquickcontrols
qtgraphicaleffects
];
+ NIX_CFLAGS_COMPILE = "-I${libmlt}/include/mlt++ -I${libmlt}/include/mlt";
+
prePatch = ''
sed 's_shotcutPath, "qmelt"_"${mlt}/bin/melt"_' -i src/jobs/meltjob.cpp
sed 's_shotcutPath, "ffmpeg"_"${mlt.ffmpeg}/bin/ffmpeg"_' -i src/jobs/ffmpegjob.cpp
@@ -31,7 +34,7 @@ stdenv.mkDerivation rec {
postInstall = ''
mkdir -p $out/share/shotcut
cp -r src/qml $out/share/shotcut/
- wrapProgram $out/bin/shotcut --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ jack1 SDL ]} --prefix PATH : ${mlt}/bin
+ wrapProgram $out/bin/shotcut --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ jack1 SDL2 ]} --prefix PATH : ${mlt}/bin
'';
meta = with stdenv.lib; {
@@ -49,9 +52,5 @@ stdenv.mkDerivation rec {
license = licenses.gpl3;
maintainers = [ maintainers.goibhniu ];
platforms = platforms.linux;
-
- # after qt5 bump it probably needs to be updated,
- # but newer versions seem to need newer than the latest stable mlt
- # broken = true;
};
}
diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix
index 571f46de3854..447518d008b4 100644
--- a/pkgs/applications/video/simplescreenrecorder/default.nix
+++ b/pkgs/applications/video/simplescreenrecorder/default.nix
@@ -24,8 +24,9 @@ stdenv.mkDerivation rec {
done
'';
- buildInputs = [
- alsaLib ffmpeg libjack2 libX11 libXext libXfixes mesa pkgconfig
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [
+ alsaLib ffmpeg libjack2 libX11 libXext libXfixes mesa
libpulseaudio qt4
];
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index b806ff65ddb2..b465379c50ed 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -11,6 +11,7 @@
, qt4 ? null
, withQt5 ? false, qtbase ? null, qtx11extras ? null
, jackSupport ? false
+, fetchpatch
}:
with stdenv.lib;
@@ -27,6 +28,14 @@ stdenv.mkDerivation rec {
sha256 = "1a22b913p2227ljz89c4fgjlyln5gcz8z58w32r0wh4srnnd60y4";
};
+ patches = [
+ (fetchpatch {
+ name = "CVE-2017-9300.patch";
+ url = "https://git.videolan.org/?p=vlc/vlc-2.2.git;a=patch;h=55a82442cfea9dab8b853f3a4610f2880c5fadf3;hp=dbe888f9ca9c3b102478b4a16a3d1d985c267899";
+ sha256 = "0l0fwqkn31lggwc5dkhb58gkv8pc6ng51y0izjigqvfqvhwdnzxn";
+ })
+ ];
+
# Comment-out the Qt 5.5 version check, as we do apply the relevant patch.
# https://trac.videolan.org/vlc/ticket/16497
postPatch = if (!withQt5) then null else
diff --git a/pkgs/applications/video/vlc/plugin.nix b/pkgs/applications/video/vlc/plugin.nix
index bba4cdb6e363..583d978a5514 100644
--- a/pkgs/applications/video/vlc/plugin.nix
+++ b/pkgs/applications/video/vlc/plugin.nix
@@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
preConfigure = "sh autogen.sh";
- buildInputs = [ vlc autoconf automake libtool pkgconfig npapi_sdk libxcb
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ vlc autoconf automake libtool npapi_sdk libxcb
xlibsWrapper gtk ];
enableParallelBuilding = true;
diff --git a/pkgs/applications/video/xvidcap/default.nix b/pkgs/applications/video/xvidcap/default.nix
index c8414bbb83a0..663f89b325a2 100644
--- a/pkgs/applications/video/xvidcap/default.nix
+++ b/pkgs/applications/video/xvidcap/default.nix
@@ -11,8 +11,10 @@ stdenv.mkDerivation {
};
patches = [ ./xlib.patch ];
+
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- perl perlXMLParser pkgconfig gtk2 scrollkeeper
+ perl perlXMLParser gtk2 scrollkeeper
libglade libXmu gettext lame libXdamage libXfixes libXext libX11
];
diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix
index 2852eeef2ed7..fcf569a762a7 100644
--- a/pkgs/applications/virtualization/OVMF/default.nix
+++ b/pkgs/applications/virtualization/OVMF/default.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" {
meta = {
description = "Sample UEFI firmware for QEMU and KVM";
- homepage = http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=OVMF;
+ homepage = https://sourceforge.net/apps/mediawiki/tianocore/index.php?title=OVMF;
license = stdenv.lib.licenses.bsd2;
platforms = ["x86_64-linux" "i686-linux"];
};
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 043f27e13d24..48bb512e1341 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -44,6 +44,12 @@ rec {
rev = containerdRev;
sha256 = containerdSha256;
};
+
+ # This should go into the containerd derivation once 1.0.0 is out
+ preBuild = ''
+ mkdir $(pwd)/vendor/src
+ mv $(pwd)/vendor/{github.com,golang.org,google.golang.org} $(pwd)/vendor/src/
+ '' + oldAttrs.preBuild;
});
docker-tini = tini.overrideAttrs (oldAttrs: rec {
name = "docker-init";
@@ -66,8 +72,9 @@ rec {
# Optimizations break compilation of libseccomp c bindings
hardeningDisable = [ "fortify" ];
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- makeWrapper removeReferencesTo pkgconfig go-md2man go
+ makeWrapper removeReferencesTo go-md2man go
sqlite devicemapper btrfs-progs systemd libtool libseccomp
];
@@ -115,7 +122,13 @@ rec {
installPhase = ''
install -Dm755 ./components/cli/docker $out/libexec/docker/docker
- install -Dm755 ./components/engine/bundles/${version}/dynbinary-daemon/dockerd-${version} $out/libexec/docker/dockerd
+
+ if [ -d "./components/engine/bundles/${version}" ]; then
+ install -Dm755 ./components/engine/bundles/${version}/dynbinary-daemon/dockerd-${version} $out/libexec/docker/dockerd
+ else
+ install -Dm755 ./components/engine/bundles/dynbinary-daemon/dockerd-${version} $out/libexec/docker/dockerd
+ fi
+
makeWrapper $out/libexec/docker/docker $out/bin/docker \
--prefix PATH : "$out/libexec/docker:$extraPath"
makeWrapper $out/libexec/docker/dockerd $out/bin/dockerd \
@@ -168,7 +181,7 @@ rec {
homepage = https://www.docker.com/;
description = "An open source project to pack, ship and run any application as a lightweight container";
license = licenses.asl20;
- maintainers = with maintainers; [ offline tailhook vdemeester ];
+ maintainers = with maintainers; [ nequissimus offline tailhook vdemeester ];
platforms = platforms.linux;
};
};
@@ -176,26 +189,26 @@ rec {
# Get revisions from
# https://github.com/docker/docker-ce/blob/v${version}/components/engine/hack/dockerfile/binaries-commits
- docker_17_06 = dockerGen rec {
- version = "17.06.2-ce";
- rev = "cec0b72a9940e047e945a09e1febd781e88366d6"; # git commit
- sha256 = "1scqx28vzh72ziq00lbx92vsb896mj974j8f0zg11y6qc5n5jx3l";
- runcRev = "810190ceaa507aa2727d7ae6f4790c76ec150bd2";
- runcSha256 = "0f1x1z262qg579qb1w21axj3mibq4fbff3gamliw49sdqqnb7vk3";
- containerdRev = "6e23458c129b551d5c9871e5174f6b1b7f6d1170";
- containerdSha256 = "12kzc5z1nhxdbizzr494ywilbs6rdv39v5ql7lmfzwh350gwlg93";
+ docker_17_09 = dockerGen rec {
+ version = "17.09.0-ce";
+ rev = "afdb6d44a80f777069885a9ee0e0f86cf841b1bb"; # git commit
+ sha256 = "03g0imdcxqx9y4hhyymxqzvm8bqg4cqrmb7sjbxfdgrhzh9kcn1p";
+ runcRev = "3f2f8b84a77f73d38244dd690525642a72156c64";
+ runcSha256 = "0vaagmav8443kmyxac2y1y5l2ipcs1c7gdmsnvj48y9bafqx72rq";
+ containerdRev = "06b9cb35161009dcb7123345749fef02f7cea8e0";
+ containerdSha256 = "10hms8a2nn69nfnwly6923jzx40c3slpsdhjhff4bxh36flpf9gd";
tiniRev = "949e6facb77383876aeff8a6944dde66b3089574";
tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
};
- docker_17_07 = dockerGen rec {
- version = "17.07.0-ce";
- rev = "87847530f7176a48348d196f7c23bbd058052af1"; # git commit
- sha256 = "0zw9zlzbd7il33ch17ypwpa73gsb930sf2njnphg7ylvnqp8qzsp";
- runcRev = "2d41c047c83e09a6d61d464906feb2a2f3c52aa4";
- runcSha256 = "0v5iv29ck6lkxvxh7a56gfrlgfs0bjvjhrq3p6qqv9qjzv825byq";
- containerdRev = "3addd840653146c90a254301d6c3a663c7fd6429";
- containerdSha256 = "0as4s5wd57pdh1cyavkccpgs46kvlhr41v07qrv0phzffdhq3d5j";
+ docker_17_10 = dockerGen rec {
+ version = "17.10.0-ce";
+ rev = "f4ffd2511ce93aa9e5eefdf0e912f77543080b0b"; # git commit
+ sha256 = "07x47cfdaz4lhlga1pchcbqqy0nd2q6zch0ycag18vzi99w4gmh2";
+ runcRev = "0351df1c5a66838d0c392b4ac4cf9450de844e2d";
+ runcSha256 = "1cmkdv6rli7v0y0fddqxvrvzd486fg9ssp3kgkya3szkljzz4xj0";
+ containerdRev = "06b9cb35161009dcb7123345749fef02f7cea8e0";
+ containerdSha256 = "10hms8a2nn69nfnwly6923jzx40c3slpsdhjhff4bxh36flpf9gd";
tiniRev = "949e6facb77383876aeff8a6944dde66b3089574";
tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
};
diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix
index b790a15e607f..c62fa63ea594 100644
--- a/pkgs/applications/virtualization/lkl/default.nix
+++ b/pkgs/applications/virtualization/lkl/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, bc, python, fuse, libarchive }:
stdenv.mkDerivation rec {
- name = "lkl-2017-08-09";
- rev = "083cdeece0577635d523244dcf0da86074e23e4e";
+ name = "lkl-2017-10-18";
+ rev = "bfb315c4612c38427e3239d0a427a125d9ba0ede";
outputs = [ "dev" "lib" "out" ];
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
inherit rev;
owner = "lkl";
repo = "linux";
- sha256 = "1fyh0p54jgsqywswj40zbw64jbqx2w10wax1k3j2szzlhjrv9x1a";
+ sha256 = "172ccn2gsybnji7giiqq63bvp9nsw8kri88pjlvinwpwsv7x81aa";
};
# Fix a /usr/bin/env reference in here that breaks sandboxed builds
diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix
index bc280823a3ce..c7f8ea696b57 100644
--- a/pkgs/applications/virtualization/open-vm-tools/default.nix
+++ b/pkgs/applications/virtualization/open-vm-tools/default.nix
@@ -36,6 +36,9 @@ stdenv.mkDerivation rec {
# Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror.
sed 1i'#include ' -i lib/wiper/wiperPosix.c
+
+ # Make reboot work, shutdown is not in /sbin on NixOS
+ sed -i 's,/sbin/shutdown,shutdown,' lib/system/systemLinux.c
'';
configureFlags = [ "--without-kernel-modules" "--without-xmlsecurity" ]
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 5da9db918557..cb0f772ada3a 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -18,7 +18,8 @@
with stdenv.lib;
let
- version = "2.9.0";
+ version = "2.10.1";
+ sha256 = "1a3bjr0ygx4r2qd4nx5jf77jhh4xis3zga27lfryn0b4ap3hn14f";
audio = optionalString (hasSuffix "linux" stdenv.system) "alsa,"
+ optionalString pulseSupport "pa,"
+ optionalString sdlSupport "sdl,";
@@ -33,7 +34,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://wiki.qemu.org/download/qemu-${version}.tar.bz2";
- sha256 = "053c7ivp3li7cdagzkp2wdc5myybzjf826r6qfkcf0xvn4bv5gq0";
+ inherit sha256;
};
buildInputs =
diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix
index a23537847a19..452f082e20e7 100644
--- a/pkgs/applications/virtualization/rkt/default.nix
+++ b/pkgs/applications/virtualization/rkt/default.nix
@@ -4,15 +4,15 @@
let
# Always get the information from
# https://github.com/coreos/rkt/blob/v${VERSION}/stage1/usr_from_coreos/coreos-common.mk
- coreosImageRelease = "1235.0.0";
- coreosImageSystemdVersion = "231";
+ coreosImageRelease = "1478.0.0";
+ coreosImageSystemdVersion = "233";
# TODO: track https://github.com/coreos/rkt/issues/1758 to allow "host" flavor.
stage1Flavours = [ "coreos" "fly" ];
stage1Dir = "lib/rkt/stage1-images";
in stdenv.mkDerivation rec {
- version = "1.28.1";
+ version = "1.29.0";
name = "rkt-${version}";
BUILDDIR="build-${name}";
@@ -20,12 +20,12 @@ in stdenv.mkDerivation rec {
owner = "coreos";
repo = "rkt";
rev = "v${version}";
- sha256 = "1xn2cz30gq0500gmp5aml03hmk066fq9i04jizb5sc0j41fmsgja";
+ sha256 = "0wnhii15pr4z190iladfcl4jzj9sgyl1bn5v63a3yy6nkmz9cfda";
};
stage1BaseImage = fetchurl {
url = "http://alpha.release.core-os.net/amd64-usr/${coreosImageRelease}/coreos_production_pxe_image.cpio.gz";
- sha256 = "05gk28a7zzp3j0d1y96cr1xwy9gdl4s0lpnbakzqppa4w3c4m3lq";
+ sha256 = "0s4qdkkfp0iirfnm5ds3b3hxq0249kvpygyhflma8z90ivkzk5wq";
};
buildInputs = [
diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix
index f1d850cd62cd..4fdb7421c3cb 100644
--- a/pkgs/applications/virtualization/runc/default.nix
+++ b/pkgs/applications/virtualization/runc/default.nix
@@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
hardeningDisable = ["fortify"];
- buildInputs = [ removeReferencesTo go-md2man go pkgconfig libseccomp libapparmor apparmor-parser ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ removeReferencesTo go-md2man go libseccomp libapparmor apparmor-parser ];
makeFlags = ''BUILDTAGS+=seccomp BUILDTAGS+=apparmor'';
diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix
index e318a0b64d7b..ddd8cf72b93d 100644
--- a/pkgs/applications/virtualization/singularity/default.nix
+++ b/pkgs/applications/virtualization/singularity/default.nix
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
sha256 = "19g43gfdy5s8y4252474cp39d6ypn5dd37wp0s21fgd13vqy26px";
};
- buildInputs = [ autoreconfHook ];
+ nativeBuildInputs = [ autoreconfHook ];
+ buildInputs = [ ];
meta = with stdenv.lib; {
homepage = http://singularity.lbl.gov/;
diff --git a/pkgs/applications/virtualization/spice-vdagent/default.nix b/pkgs/applications/virtualization/spice-vdagent/default.nix
index 5608f4ed3599..74da6c4ab167 100644
--- a/pkgs/applications/virtualization/spice-vdagent/default.nix
+++ b/pkgs/applications/virtualization/spice-vdagent/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace data/spice-vdagent.desktop --replace /usr $out
'';
- buildInputs = [ pkgconfig alsaLib spice_protocol glib
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ alsaLib spice_protocol glib
libpciaccess libxcb libXrandr libXinerama libXfixes
dbus systemd ] ;
meta = {
diff --git a/pkgs/applications/virtualization/tini/default.nix b/pkgs/applications/virtualization/tini/default.nix
index 2a7b4810a24f..0d4aa4783c6b 100644
--- a/pkgs/applications/virtualization/tini/default.nix
+++ b/pkgs/applications/virtualization/tini/default.nix
@@ -1,20 +1,25 @@
{ stdenv, fetchFromGitHub, cmake, glibc }:
stdenv.mkDerivation rec {
- version = "0.13.1";
+ version = "0.16.1";
name = "tini-${version}";
+
src = fetchFromGitHub {
owner = "krallin";
repo = "tini";
rev = "v${version}";
- sha256 ="1g4n8v5d197zcb41fcpbhip2x342383zw1d2zkv57w73vkqgv6z6";
+ sha256 ="1abvjwjk7xhsbx60niy4ykcj3xvrxcl6zx8z1v827jsn47wzpikp";
};
+
patchPhase = "sed -i /tini-static/d CMakeLists.txt";
+
NIX_CFLAGS_COMPILE = [
"-DPR_SET_CHILD_SUBREAPER=36"
"-DPR_GET_CHILD_SUBREAPER=37"
];
+
buildInputs = [ cmake glibc glibc.static ];
+
meta = with stdenv.lib; {
description = "A tiny but valid init for containers";
homepage = https://github.com/krallin/tini;
diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix
index fe885d86456b..f386b457fc50 100644
--- a/pkgs/applications/virtualization/virt-manager/qt.nix
+++ b/pkgs/applications/virtualization/virt-manager/qt.nix
@@ -1,17 +1,17 @@
{ mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig
, qtbase, qtmultimedia, qtsvg
-, lxqt, libvncserver, libvirt, pixman, spice_gtk, spice_protocol
+, lxqt, libvncserver, libvirt, pcre, pixman, spice_gtk, spice_protocol
}:
mkDerivation rec {
name = "virt-manager-qt-${version}";
- version = "0.43.72";
+ version = "0.45.75";
src = fetchFromGitHub {
owner = "F1ash";
repo = "qt-virt-manager";
rev = "${version}";
- sha256 = "0m8aqs58wnk404z2hav5j4yjsy8f0vfsm771pm0gprsfbx4sm3qg";
+ sha256 = "1s59g7kkz8481y8yyf89f549xwbg1978zj9ds61iy94mwz80b38n";
};
cmakeFlags = [
@@ -19,21 +19,24 @@ mkDerivation rec {
];
buildInputs = [
- qtbase qtmultimedia qtsvg lxqt.qtermwidget
+ # virt-manager-qt currently does not compile with qtermwidget-0.8.0
+ qtbase qtmultimedia qtsvg lxqt.qtermwidget_0_7_1
libvirt libvncserver pixman spice_gtk spice_protocol
];
nativeBuildInputs = [ cmake pkgconfig ];
+ enableParallelBuilding = true;
+
meta = with lib; {
- homepage = http://f1ash.github.io/qt-virt-manager;
+ homepage = https://f1ash.github.io/qt-virt-manager;
description = "Desktop user interface for managing virtual machines (QT)";
longDescription = ''
The virt-manager application is a desktop user interface for managing
virtual machines through libvirt. It primarily targets KVM VMs, but also
manages Xen and LXC (linux containers).
'';
- license = licenses.gpl2;
+ license = licenses.gpl2;
maintainers = with maintainers; [ peterhoeg ];
};
}
diff --git a/pkgs/applications/virtualization/virt-what/default.nix b/pkgs/applications/virtualization/virt-what/default.nix
new file mode 100644
index 000000000000..0236a34bb124
--- /dev/null
+++ b/pkgs/applications/virtualization/virt-what/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, lib, fetchurl }:
+
+stdenv.mkDerivation rec {
+ name = "virt-what-${version}";
+ version = "1.18";
+
+ src = fetchurl {
+ url = "https://people.redhat.com/~rjones/virt-what/files/${name}.tar.gz";
+ sha256 = "1x32h7i6lh823wj97r5rr2hg1v215kqzly14dwg0mwx62j1dshmw";
+ };
+
+ meta = with lib; {
+ description = "Detect if running in a virtual machine and prints its type";
+ homepage = "https://people.redhat.com/~rjones/virt-what/";
+ maintainers = with maintainers; [ fpletz ];
+ license = licenses.gpl2Plus;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index fbc0cc5ded0f..6649b027c316 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -94,6 +94,14 @@ in stdenv.mkDerivation {
postPatch = ''
sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \
src/VBox/HostDrivers/adpctl/VBoxNetAdpCtl.cpp
+ patch -p0 < ${
+ fetchurl { # for glibc-2.26
+ name = "conflicting-types-for-greg_t.patch";
+ url = "http://www.linuxquestions.org/questions/"
+ + "attachment.php?attachmentid=25801&d=1504099531";
+ sha256 = "1bcyf9qrqxizyjp1s662k6n1cfyfjbl7256r4n20kbr65yxcydps";
+ }
+ }
'';
# first line: ugly hack, and it isn't yet clear why it's a problem
@@ -190,7 +198,10 @@ in stdenv.mkDerivation {
cp -rv out/linux.*/${buildType}/bin/src "$modsrc"
'';
- passthru = { inherit version; /* for guest additions */ };
+ passthru = {
+ inherit version; # for guest additions
+ inherit extensionPack; # for inclusion in profile to prevent gc
+ };
meta = {
description = "PC emulator";
diff --git a/pkgs/applications/virtualization/xen/4.5.nix b/pkgs/applications/virtualization/xen/4.5.nix
index 5fe4fa823fea..308913adf89c 100644
--- a/pkgs/applications/virtualization/xen/4.5.nix
+++ b/pkgs/applications/virtualization/xen/4.5.nix
@@ -1,4 +1,5 @@
{ stdenv, callPackage, fetchurl, fetchpatch, fetchgit
+, ocamlPackages_4_02
, withInternalQemu ? true
, withInternalTraditionalQemu ? true
, withInternalSeabios ? true
@@ -31,13 +32,15 @@ let
udev pciutils xorg.libX11 SDL pixman acl glusterfs spice_protocol usbredir
alsaLib
];
+
+ xsa = import ./xsa-patches.nix { inherit fetchpatch; };
in
callPackage (import ./generic.nix (rec {
version = "4.5.5";
src = fetchurl {
- url = "http://bits.xensource.com/oss-xen/release/${version}/xen-${version}.tar.gz";
+ url = "https://downloads.xenproject.org/release/xen/${version}/xen-${version}.tar.gz";
sha256 = "1y74ms4yc3znf8jc3fgyq94va2y0pf7jh8m9pfqnpgklywqnw8g2";
};
@@ -182,227 +185,52 @@ callPackage (import ./generic.nix (rec {
++ optional (withOVMF) "--with-system-ovmf=${OVMF.fd}/FV/OVMF.fd"
++ optional (withInternalOVMF) "--enable-ovmf";
- patches =
- [ ./0001-libxl-Spice-image-compression-setting-support-for-up.patch
- ./0002-libxl-Spice-streaming-video-setting-support-for-upst.patch
- ./0003-Add-qxl-vga-interface-support-for-upstream-qem.patch
- (xsaPatch {
- name = "190-4.5";
- sha256 = "0f8pw38kkxky89ny3ic5h26v9zsjj9id89lygx896zc3w1klafqm";
- })
- (xsaPatch {
- name = "191-4.6";
- sha256 = "1wl1ndli8rflmc44pkp8cw4642gi8z7j7gipac8mmlavmn3wdqhg";
- })
- (xsaPatch {
- name = "192-4.5";
- sha256 = "0m8cv0xqvx5pdk7fcmaw2vv43xhl62plyx33xqj48y66x5z9lxpm";
- })
- (xsaPatch {
- name = "193-4.5";
- sha256 = "0k9mykhrpm4rbjkhv067f6s05lqmgnldcyb3vi8cl0ndlyh66lvr";
- })
- (xsaPatch {
- name = "195";
- sha256 = "0m0g953qnjy2knd9qnkdagpvkkgjbk3ydgajia6kzs499dyqpdl7";
- })
- (xsaPatch {
- name = "196-0001-x86-emul-Correct-the-IDT-entry-calculation-in-inject";
- sha256 = "0z53nzrjvc745y26z1qc8jlg3blxp7brawvji1hx3s74n346ssl6";
- })
- (xsaPatch {
- name = "196-0002-x86-svm-Fix-injection-of-software-interrupts";
- sha256 = "11cqvr5jn2s92wsshpilx9qnfczrd9hnyb5aim6qwmz3fq3hrrkz";
- })
- (xsaPatch {
- name = "198";
- sha256 = "0d1nndn4p520c9xa87ixnyks3mrvzcri7c702d6mm22m8ansx6d9";
- })
- (xsaPatch {
- name = "200-4.6";
- sha256 = "0k918ja83470iz5k4vqi15293zjvz2dipdhgc9sy9rrhg4mqncl7";
- })
- (xsaPatch {
- name = "202-4.6";
- sha256 = "0nnznkrvfbbc8z64dr9wvbdijd4qbpc0wz2j5vpmx6b32sm7932f";
- })
- (xsaPatch {
- name = "204-4.5";
- sha256 = "083z9pbdz3f532fnzg7n2d5wzv6rmqc0f4mvc3mnmkd0rzqw8vcp";
- })
- (xsaPatch {
- name = "206-4.5/0001-xenstored-apply-a-write-transaction-rate-limit";
- sha256 = "07vsm8mlbxh2s01ny2xywnm1bqhhxas1az31fzwb6f1g14vkzwm4";
- })
- (xsaPatch {
- name = "206-4.5/0002-xenstored-Log-when-the-write-transaction-rate-limit-";
- sha256 = "17pnvxjmhny22abwwivacfig4vfsy5bqlki07z236whc2y7yzbsx";
- })
- (xsaPatch {
- name = "206-4.5/0003-oxenstored-refactor-putting-response-on-wire";
- sha256 = "0xf566yicnisliy82cydb2s9k27l3bxc43qgmv6yr2ir3ixxlw5s";
- })
- (xsaPatch {
- name = "206-4.5/0004-oxenstored-remove-some-unused-parameters";
- sha256 = "16cqx9i0w4w3x06qqdk9rbw4z96yhm0kbc32j40spfgxl82d1zlk";
- })
- (xsaPatch {
- name = "206-4.5/0005-oxenstored-refactor-request-processing";
- sha256 = "1g2hzlv7w03sqnifbzda85mwlz3bw37rk80l248180sv3k7k6bgv";
- })
- (xsaPatch {
- name = "206-4.5/0006-oxenstored-keep-track-of-each-transaction-s-operatio";
- sha256 = "0n65yfxvpfd4cz95dpbwqj3nablyzq5g7a0klvi2y9zybhch9cmg";
- })
- (xsaPatch {
- name = "206-4.5/0007-oxenstored-move-functions-that-process-simple-operat";
- sha256 = "0qllvbc9rnj7jhhlslxxs35gvphvih0ywz52jszj4irm23ka5vnz";
- })
- (xsaPatch {
- name = "206-4.5/0008-oxenstored-replay-transaction-upon-conflict";
- sha256 = "0lixkxjfzciy9l0f980cmkr8mcsx14c289kg0mn5w1cscg0hb46g";
- })
- (xsaPatch {
- name = "206-4.5/0009-oxenstored-log-request-and-response-during-transacti";
- sha256 = "09ph8ddcx0k7rndd6hx6kszxh3fhxnvdjsq13p97n996xrpl1x7b";
- })
- (xsaPatch {
- name = "206-4.5/0010-oxenstored-allow-compilation-prior-to-OCaml-3.12.0";
- sha256 = "1y0m7sqdz89z2vs4dfr45cyvxxas323rxar0xdvvvivgkgxawvxj";
- })
- (xsaPatch {
- name = "206-4.5/0011-oxenstored-comments-explaining-some-variables";
- sha256 = "1d3n0y9syya4kaavrvqn01d3wsn85gmw7qrbylkclznqgkwdsr2p";
- })
- (xsaPatch {
- name = "206-4.5/0012-oxenstored-handling-of-domain-conflict-credit";
- sha256 = "12zgid5y9vrhhpk2syxp0x01lzzr6447fa76n6rjmzi1xgdzpaf8";
- })
- (xsaPatch {
- name = "206-4.5/0013-oxenstored-ignore-domains-with-no-conflict-credit";
- sha256 = "0v3g9pm60w6qi360hdqjcw838s0qcyywz9qpl8gzmhrg7a35avxl";
- })
- (xsaPatch {
- name = "206-4.5/0014-oxenstored-add-transaction-info-relevant-to-history-";
- sha256 = "0vv3w0h5xh554i9v2vbc8gzm8wabjf2vzya3dyv5yzvly6ygv0sb";
- })
- (xsaPatch {
- name = "206-4.5/0015-oxenstored-support-commit-history-tracking";
- sha256 = "1iv2vy29g437vj73x9p33rdcr5ln2q0kx1b3pgxq202ghbc1x1zj";
- })
- (xsaPatch {
- name = "206-4.5/0016-oxenstored-only-record-operations-with-side-effects-";
- sha256 = "1cjkw5ganbg6lq78qsg0igjqvbgph3j349faxgk1p5d6nr492zzy";
- })
- (xsaPatch {
- name = "206-4.5/0017-oxenstored-discard-old-commit-history-on-txn-end";
- sha256 = "0lm15lq77403qqwpwcqvxlzgirp6ffh301any9g401hs98f9y4ps";
- })
- (xsaPatch {
- name = "206-4.5/0018-oxenstored-track-commit-history";
- sha256 = "1jh92p6vjhkm3bn5vz260npvsjji63g2imsxflxs4f3r69sz1nkd";
- })
- (xsaPatch {
- name = "206-4.5/0019-oxenstored-blame-the-connection-that-caused-a-transa";
- sha256 = "17k264pk0fvsamj85578msgpx97mw63nmj0j9v5hbj4bgfazvj4h";
- })
- (xsaPatch {
- name = "206-4.5/0020-oxenstored-allow-self-conflicts";
- sha256 = "15z3rd49q0pa72si0s8wjsy2zvbm613d0hjswp4ikc6nzsnsh4qy";
- })
- (xsaPatch {
- name = "206-4.5/0021-oxenstored-do-not-commit-read-only-transactions";
- sha256 = "04wpzazhv90lg3228z5i6vnh1z4lzd08z0d0fvc4br6pkd0w4va8";
- })
- (xsaPatch {
- name = "206-4.5/0022-oxenstored-don-t-wake-to-issue-no-conflict-credit";
- sha256 = "1shbrn0w68rlywcc633zcgykfccck1a77igmg8ydzwjsbwxsmsjy";
- })
- (xsaPatch {
- name = "206-4.5/0023-oxenstored-transaction-conflicts-improve-logging";
- sha256 = "1086y268yh8047k1vxnxs2nhp6izp7lfmq01f1gq5n7jiy1sxcq7";
- })
- (xsaPatch {
- name = "206-4.5/0024-oxenstored-trim-history-in-the-frequent_ops-function";
- sha256 = "014zs6i4gzrimn814k5i7gz66vbb0adkzr2qyai7i4fxc9h9r7w8";
- })
- (xsaPatch {
- name = "207";
- sha256 = "0wdlhijmw9mdj6a82pyw1rwwiz605dwzjc392zr3fpb2jklrvibc";
- })
- (xsaPatch {
- name = "212";
- sha256 = "1ggjbbym5irq534a3zc86md9jg8imlpc9wx8xsadb9akgjrr1r8d";
- })
- (xsaPatch {
- name = "213-4.5";
- sha256 = "1vnqf89ydacr5bq3d6z2r33xb2sn5vsd934rncyc28ybc9rvj6wm";
- })
- (xsaPatch {
- name = "214";
- sha256 = "0qapzx63z0yl84phnpnglpkxp6b9sy1y7cilhwjhxyigpfnm2rrk";
- })
- (xsaPatch {
- name = "215";
- sha256 = "0sv8ccc5xp09f1w1gj5a9n3mlsdsh96sdb1n560vh31f4kkd61xs";
- })
- (xsaPatch {
- name = "217-4.5";
- sha256 = "067pgsfrb9py2dhm1pk9g8f6fs40vyfrcxhj8c12vzamb6svzmn4";
- })
- (xsaPatch {
- name = "218-4.5/0001-IOMMU-handle-IOMMU-mapping-and-unmapping-failures";
- sha256 = "00y6j3yjxw0igpldsavikmhlxw711k2jsj1qx0s05w2k608gadkq";
- })
- (xsaPatch {
- name = "218-4.5/0002-gnttab-fix-unmap-pin-accounting-race";
- sha256 = "0qbbfnnjlpdcd29mzmacfmi859k92c213l91q7w1rg2k6pzx928k";
- })
- (xsaPatch {
- name = "218-4.5/0003-gnttab-Avoid-potential-double-put-of-maptrack-entry";
- sha256 = "1cndzvyhf41mk4my6vh3bk9jvh2y4gpmqdhvl9zhxhmppszslqkc";
- })
- (xsaPatch {
- name = "218-4.5/0004-gnttab-correct-maptrack-table-accesses";
- sha256 = "02zpb0ffigijacqvyyjylwx3qpgibwslrka7mbxwnclf4s9c03a2";
- })
- (xsaPatch {
- name = "219-4.5";
- sha256 = "003msr5vhsc66scmdpgn0lp3p01g4zfw5vj86y5lw9ajkbaywdsm";
- })
- (xsaPatch {
- name = "220-4.5";
- sha256 = "1dj9nn6lzxlipjb3nb7b9m4337fl6yn2bd7ap1lqrjn8h9zkk1pp";
- })
- (xsaPatch {
- name = "221";
- sha256 = "1mcr1nqgxyjrkywdg7qhlfwgz7vj2if1dhic425vgd41p9cdgl26";
- })
- (xsaPatch {
- name = "222-1-4.6";
- sha256 = "1g4dqm5qx4wqlv1520jpfiscph95vllcp4gqp1rdfailk8xi0mcf";
- })
- (xsaPatch {
- name = "222-2-4.5";
- sha256 = "1hw8rhc7q4v309f4w11gxfsn5x1pirvxkg7s4kr711fnmvp9hkzd";
- })
- (xsaPatch {
- name = "224-4.5/0001-gnttab-Fix-handling-of-dev_bus_addr-during-unmap";
- sha256 = "1aislj66ss4cb3v2bh12mrqsyrf288d4h54rj94jjq7h1hnycw7h";
- })
- (xsaPatch {
- name = "224-4.5/0002-gnttab-never-create-host-mapping-unless-asked-to";
- sha256 = "1j6fgm1ccb07gg0mi5qmdr0vqwwc3n12z433g1jrija2gbk1x8aq";
- })
- (xsaPatch {
- name = "224-4.5/0003-gnttab-correct-logic-to-get-page-references-during-m";
- sha256 = "166kmicwx280fjqjvgigbmhabjksa0hhvqx5h4v6kjlcjpmxqy08";
- })
- (xsaPatch {
- name = "224-4.5/0004-gnttab-__gnttab_unmap_common_complete-is-all-or-noth";
- sha256 = "1skc0yj1zsn8xgyq1y57bdc0scvvlmd0ynrjwwf1zkias1wlilav";
- })
- ];
+ patches = with xsa; flatten [
+ ./0001-libxl-Spice-image-compression-setting-support-for-up.patch
+ ./0002-libxl-Spice-streaming-video-setting-support-for-upst.patch
+ ./0003-Add-qxl-vga-interface-support-for-upstream-qem.patch
+ XSA_190
+ XSA_191
+ XSA_192
+ XSA_193
+ XSA_195
+ XSA_196
+ XSA_198
+ XSA_200
+ XSA_202_45
+ XSA_204_45
+ XSA_206_45
+ XSA_207
+ XSA_212
+ XSA_213_45
+ XSA_214
+ XSA_215
+ XSA_217_45
+ XSA_218_45
+ XSA_219_45
+ XSA_220_45
+ XSA_221
+ XSA_222_45
+ XSA_223
+ XSA_224_45
+ XSA_227_45
+ XSA_230
+ XSA_231_45
+ XSA_232
+ XSA_233
+ XSA_234_45
+ XSA_235_45
+ XSA_236_45
+ XSA_237_45
+ XSA_238_45
+ XSA_239_45
+ XSA_240_45
+ XSA_241
+ XSA_242
+ XSA_243_45
+ XSA_244_45
+ XSA_245
+ ];
# Fix build on Glibc 2.24.
NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
@@ -414,4 +242,4 @@ callPackage (import ./generic.nix (rec {
-i tools/libxl/libxl_device.c
'';
-})) args
+})) ({ ocamlPackages = ocamlPackages_4_02; } // args)
diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix
index 3429545557ad..259dd72a960c 100644
--- a/pkgs/applications/virtualization/xen/4.8.nix
+++ b/pkgs/applications/virtualization/xen/4.8.nix
@@ -27,6 +27,8 @@ let
inherit sha256;
});
+ xsa = import ./xsa-patches.nix { inherit fetchpatch; };
+
qemuDeps = [
udev pciutils xorg.libX11 SDL pixman acl glusterfs spice_protocol usbredir
alsaLib
@@ -34,11 +36,11 @@ let
in
callPackage (import ./generic.nix (rec {
- version = "4.8.1";
+ version = "4.8.2";
src = fetchurl {
- url = "http://bits.xensource.com/oss-xen/release/${version}/xen-${version}.tar.gz";
- sha256 = "158kb1w61jmwxi3fc560s4269hhpxrin9xhm60ljj52njhxias8x";
+ url = "https://downloads.xenproject.org/release/xen/${version}/xen-${version}.tar.gz";
+ sha256 = "1ydgwbn8ab0s16jrbi3wzaa6j0y3zk0j8pay458qcgayk3qc476b";
};
# Sources needed to build tools and firmwares.
@@ -141,68 +143,22 @@ callPackage (import ./generic.nix (rec {
++ optional (withOVMF) "--with-system-ovmf=${OVMF.fd}/FV/OVMF.fd"
++ optional (withInternalOVMF) "--enable-ovmf";
- patches =
- [ (xsaPatch {
- name = "213-4.8";
- sha256 = "0ia3zr6r3bqy2h48fdy7p0iz423lniy3i0qkdvzgv5a8m80darr2";
- })
- (xsaPatch {
- name = "214";
- sha256 = "0qapzx63z0yl84phnpnglpkxp6b9sy1y7cilhwjhxyigpfnm2rrk";
- })
- (xsaPatch {
- name = "217";
- sha256 = "1khs5ilif14dzcm7lmikjzkwsrfzlmir1rgrgzkc411gf18ylzmj";
- })
- (xsaPatch {
- name = "218-4.8/0001-gnttab-fix-unmap-pin-accounting-race";
- sha256 = "0r363frai239r2wmwxi48kcr50gbk5l64nja0h9lppi3z2y3dkdd";
- })
- (xsaPatch {
- name = "218-4.8/0002-gnttab-Avoid-potential-double-put-of-maptrack-entry";
- sha256 = "07wm06i7frv7bsaykakx3g9h0hfqv96zcadvwf6wv194dggq1plc";
- })
- (xsaPatch {
- name = "218-4.8/0003-gnttab-correct-maptrack-table-accesses";
- sha256 = "0ad0irc3p4dmla8sp3frxbh2qciji1dipkslh0xqvy2hyf9p80y9";
- })
- (xsaPatch {
- name = "219-4.8";
- sha256 = "16q7kiamy86x8qdvls74wmq5j72kgzgdilryig4q1b21mp0ij1jq";
- })
- (xsaPatch {
- name = "220-4.8";
- sha256 = "0214qyqx7qap5y1pdi9fm0vz4y2fbyg71gaq36fisknj35dv2mh5";
- })
- (xsaPatch {
- name = "221";
- sha256 = "1mcr1nqgxyjrkywdg7qhlfwgz7vj2if1dhic425vgd41p9cdgl26";
- })
- (xsaPatch {
- name = "222-1";
- sha256 = "0x02x4kqwfw255638fh2zcxwig1dy6kadlmqim1jgnjgmrvvqas2";
- })
- (xsaPatch {
- name = "222-2-4.8";
- sha256 = "1xhyp6q3c5l8djh965g1i8201m2wvhms8k886h4sn30hks38giin";
- })
- (xsaPatch {
- name = "224-4.8/0001-gnttab-Fix-handling-of-dev_bus_addr-during-unmap";
- sha256 = "1k326yan5811qzyvpdfkv801a19nyd09nsqayi8gyh58xx9c21m4";
- })
- (xsaPatch {
- name = "224-4.8/0002-gnttab-never-create-host-mapping-unless-asked-to";
- sha256 = "06nj1x59bbx9hrj26xmvbw8z805lfqhld9hm0ld0fs6dmcpqzcck";
- })
- (xsaPatch {
- name = "224-4.8/0003-gnttab-correct-logic-to-get-page-references-during-m";
- sha256 = "0kmag6fdsskgplcvzqp341yfi6pgc14wvjj58bp7ydb9hdk53qx2";
- })
- (xsaPatch {
- name = "224-4.8/0004-gnttab-__gnttab_unmap_common_complete-is-all-or-noth";
- sha256 = "1ww80pi7jr4gjpymkcw8qxmr5as18b2asdqv35527nqprylsff9f";
- })
- ];
+ patches = with xsa; flatten [
+ XSA_231
+ XSA_232
+ XSA_233
+ XSA_234_48
+ XSA_236
+ XSA_237_48
+ XSA_238
+ XSA_239
+ XSA_240_48
+ XSA_241
+ XSA_242
+ XSA_243_48
+ XSA_244
+ XSA_245
+ ];
# Fix build on Glibc 2.24.
NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix
index 434853b7cc12..9efcc45be359 100644
--- a/pkgs/applications/virtualization/xen/generic.nix
+++ b/pkgs/applications/virtualization/xen/generic.nix
@@ -53,8 +53,9 @@ stdenv.mkDerivation (rec {
hardeningDisable = [ "stackprotector" "fortify" "pic" ];
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- cmake pkgconfig which
+ cmake which
# Xen
bison bzip2 checkpolicy dev86 figlet flex gettext glib iasl libaio
diff --git a/pkgs/applications/virtualization/xen/xsa-patches.nix b/pkgs/applications/virtualization/xen/xsa-patches.nix
new file mode 100644
index 000000000000..fd85c85f22bb
--- /dev/null
+++ b/pkgs/applications/virtualization/xen/xsa-patches.nix
@@ -0,0 +1,774 @@
+{ fetchpatch }:
+
+let
+ xsaPatch = { name , sha256 }: (fetchpatch {
+ url = "https://xenbits.xen.org/xsa/xsa${name}.patch";
+ inherit sha256;
+ });
+in rec {
+ # 4.5
+ XSA_190 = (xsaPatch {
+ name = "190-4.5";
+ sha256 = "0f8pw38kkxky89ny3ic5h26v9zsjj9id89lygx896zc3w1klafqm";
+ });
+
+ # 4.5
+ XSA_191 = (xsaPatch {
+ name = "191-4.6";
+ sha256 = "1wl1ndli8rflmc44pkp8cw4642gi8z7j7gipac8mmlavmn3wdqhg";
+ });
+
+ # 4.5
+ XSA_192 = (xsaPatch {
+ name = "192-4.5";
+ sha256 = "0m8cv0xqvx5pdk7fcmaw2vv43xhl62plyx33xqj48y66x5z9lxpm";
+ });
+
+ # 4.5
+ XSA_193 = (xsaPatch {
+ name = "193-4.5";
+ sha256 = "0k9mykhrpm4rbjkhv067f6s05lqmgnldcyb3vi8cl0ndlyh66lvr";
+ });
+
+ # 4.5
+ XSA_195 = (xsaPatch {
+ name = "195";
+ sha256 = "0m0g953qnjy2knd9qnkdagpvkkgjbk3ydgajia6kzs499dyqpdl7";
+ });
+
+ # 4.5
+ XSA_196 = [
+ (xsaPatch {
+ name = "196-0001-x86-emul-Correct-the-IDT-entry-calculation-in-inject";
+ sha256 = "0z53nzrjvc745y26z1qc8jlg3blxp7brawvji1hx3s74n346ssl6";
+ })
+ (xsaPatch {
+ name = "196-0002-x86-svm-Fix-injection-of-software-interrupts";
+ sha256 = "11cqvr5jn2s92wsshpilx9qnfczrd9hnyb5aim6qwmz3fq3hrrkz";
+ })
+ ];
+
+ # 4.5
+ XSA_198 = (xsaPatch {
+ name = "198";
+ sha256 = "0d1nndn4p520c9xa87ixnyks3mrvzcri7c702d6mm22m8ansx6d9";
+ });
+
+ # 4.5
+ XSA_200 = (xsaPatch {
+ name = "200-4.6";
+ sha256 = "0k918ja83470iz5k4vqi15293zjvz2dipdhgc9sy9rrhg4mqncl7";
+ });
+
+ # 4.5
+ XSA_202_45 = (xsaPatch {
+ name = "202-4.6";
+ sha256 = "0nnznkrvfbbc8z64dr9wvbdijd4qbpc0wz2j5vpmx6b32sm7932f";
+ });
+
+ # 4.8
+ XSA_202 = (xsaPatch {
+ name = "202";
+ sha256 = "0j1d5akcjgx8w2c6w6p9znv77fkmps0880m2xgpbgs1ra9grshm1";
+ });
+
+ # 4.8
+ XSA_203 = (xsaPatch {
+ name = "203";
+ sha256 = "1s1q7xskvpg87ivwfaiqr0cj3ajdkhkhpmpikfkvq127h8hhmd8j";
+ });
+
+ # 4.5
+ XSA_204_45 = (xsaPatch {
+ name = "204-4.5";
+ sha256 = "083z9pbdz3f532fnzg7n2d5wzv6rmqc0f4mvc3mnmkd0rzqw8vcp";
+ });
+
+ # 4.8
+ XSA_204 = (xsaPatch {
+ name = "204-4.8";
+ sha256 = "0rs498s4w2alz3h6jhlr2y0ni630vhggmxbrd1p1p3gcv8p6zzrr";
+ });
+
+ # 4.5
+ XSA_206_45 = [
+ (xsaPatch {
+ name = "206-4.5/0001-xenstored-apply-a-write-transaction-rate-limit";
+ sha256 = "07vsm8mlbxh2s01ny2xywnm1bqhhxas1az31fzwb6f1g14vkzwm4";
+ })
+ (xsaPatch {
+ name = "206-4.5/0002-xenstored-Log-when-the-write-transaction-rate-limit-";
+ sha256 = "17pnvxjmhny22abwwivacfig4vfsy5bqlki07z236whc2y7yzbsx";
+ })
+ (xsaPatch {
+ name = "206-4.5/0003-oxenstored-refactor-putting-response-on-wire";
+ sha256 = "0xf566yicnisliy82cydb2s9k27l3bxc43qgmv6yr2ir3ixxlw5s";
+ })
+ (xsaPatch {
+ name = "206-4.5/0004-oxenstored-remove-some-unused-parameters";
+ sha256 = "16cqx9i0w4w3x06qqdk9rbw4z96yhm0kbc32j40spfgxl82d1zlk";
+ })
+ (xsaPatch {
+ name = "206-4.5/0005-oxenstored-refactor-request-processing";
+ sha256 = "1g2hzlv7w03sqnifbzda85mwlz3bw37rk80l248180sv3k7k6bgv";
+ })
+ (xsaPatch {
+ name = "206-4.5/0006-oxenstored-keep-track-of-each-transaction-s-operatio";
+ sha256 = "0n65yfxvpfd4cz95dpbwqj3nablyzq5g7a0klvi2y9zybhch9cmg";
+ })
+ (xsaPatch {
+ name = "206-4.5/0007-oxenstored-move-functions-that-process-simple-operat";
+ sha256 = "0qllvbc9rnj7jhhlslxxs35gvphvih0ywz52jszj4irm23ka5vnz";
+ })
+ (xsaPatch {
+ name = "206-4.5/0008-oxenstored-replay-transaction-upon-conflict";
+ sha256 = "0lixkxjfzciy9l0f980cmkr8mcsx14c289kg0mn5w1cscg0hb46g";
+ })
+ (xsaPatch {
+ name = "206-4.5/0009-oxenstored-log-request-and-response-during-transacti";
+ sha256 = "09ph8ddcx0k7rndd6hx6kszxh3fhxnvdjsq13p97n996xrpl1x7b";
+ })
+ (xsaPatch {
+ name = "206-4.5/0010-oxenstored-allow-compilation-prior-to-OCaml-3.12.0";
+ sha256 = "1y0m7sqdz89z2vs4dfr45cyvxxas323rxar0xdvvvivgkgxawvxj";
+ })
+ (xsaPatch {
+ name = "206-4.5/0011-oxenstored-comments-explaining-some-variables";
+ sha256 = "1d3n0y9syya4kaavrvqn01d3wsn85gmw7qrbylkclznqgkwdsr2p";
+ })
+ (xsaPatch {
+ name = "206-4.5/0012-oxenstored-handling-of-domain-conflict-credit";
+ sha256 = "12zgid5y9vrhhpk2syxp0x01lzzr6447fa76n6rjmzi1xgdzpaf8";
+ })
+ (xsaPatch {
+ name = "206-4.5/0013-oxenstored-ignore-domains-with-no-conflict-credit";
+ sha256 = "0v3g9pm60w6qi360hdqjcw838s0qcyywz9qpl8gzmhrg7a35avxl";
+ })
+ (xsaPatch {
+ name = "206-4.5/0014-oxenstored-add-transaction-info-relevant-to-history-";
+ sha256 = "0vv3w0h5xh554i9v2vbc8gzm8wabjf2vzya3dyv5yzvly6ygv0sb";
+ })
+ (xsaPatch {
+ name = "206-4.5/0015-oxenstored-support-commit-history-tracking";
+ sha256 = "1iv2vy29g437vj73x9p33rdcr5ln2q0kx1b3pgxq202ghbc1x1zj";
+ })
+ (xsaPatch {
+ name = "206-4.5/0016-oxenstored-only-record-operations-with-side-effects-";
+ sha256 = "1cjkw5ganbg6lq78qsg0igjqvbgph3j349faxgk1p5d6nr492zzy";
+ })
+ (xsaPatch {
+ name = "206-4.5/0017-oxenstored-discard-old-commit-history-on-txn-end";
+ sha256 = "0lm15lq77403qqwpwcqvxlzgirp6ffh301any9g401hs98f9y4ps";
+ })
+ (xsaPatch {
+ name = "206-4.5/0018-oxenstored-track-commit-history";
+ sha256 = "1jh92p6vjhkm3bn5vz260npvsjji63g2imsxflxs4f3r69sz1nkd";
+ })
+ (xsaPatch {
+ name = "206-4.5/0019-oxenstored-blame-the-connection-that-caused-a-transa";
+ sha256 = "17k264pk0fvsamj85578msgpx97mw63nmj0j9v5hbj4bgfazvj4h";
+ })
+ (xsaPatch {
+ name = "206-4.5/0020-oxenstored-allow-self-conflicts";
+ sha256 = "15z3rd49q0pa72si0s8wjsy2zvbm613d0hjswp4ikc6nzsnsh4qy";
+ })
+ (xsaPatch {
+ name = "206-4.5/0021-oxenstored-do-not-commit-read-only-transactions";
+ sha256 = "04wpzazhv90lg3228z5i6vnh1z4lzd08z0d0fvc4br6pkd0w4va8";
+ })
+ (xsaPatch {
+ name = "206-4.5/0022-oxenstored-don-t-wake-to-issue-no-conflict-credit";
+ sha256 = "1shbrn0w68rlywcc633zcgykfccck1a77igmg8ydzwjsbwxsmsjy";
+ })
+ (xsaPatch {
+ name = "206-4.5/0023-oxenstored-transaction-conflicts-improve-logging";
+ sha256 = "1086y268yh8047k1vxnxs2nhp6izp7lfmq01f1gq5n7jiy1sxcq7";
+ })
+ (xsaPatch {
+ name = "206-4.5/0024-oxenstored-trim-history-in-the-frequent_ops-function";
+ sha256 = "014zs6i4gzrimn814k5i7gz66vbb0adkzr2qyai7i4fxc9h9r7w8";
+ })
+ ];
+
+ # 4.8
+ XSA_206 = [
+ (xsaPatch {
+ name = "206-4.8/0001-xenstored-apply-a-write-transaction-rate-limit";
+ sha256 = "1c81d93i3qx7l38f9af0sd84w5x51zvn262mzl25ilcklql4kzl6";
+ })
+ (xsaPatch {
+ name = "206-4.8/0002-xenstored-Log-when-the-write-transaction-rate-limit-";
+ sha256 = "0b8iw409wi1x6p0swpnr51lcdlla1lgxjv5f910sj4wl96bca84q";
+ })
+ (xsaPatch {
+ name = "206-4.8/0003-oxenstored-comments-explaining-some-variables";
+ sha256 = "1d3n0y9syya4kaavrvqn01d3wsn85gmw7qrbylkclznqgkwdsr2p";
+ })
+ (xsaPatch {
+ name = "206-4.8/0004-oxenstored-handling-of-domain-conflict-credit";
+ sha256 = "020rw7hgc0dmhr4admz91kd99b4z1bdpji47nsy1255bjgvwc01k";
+ })
+ (xsaPatch {
+ name = "206-4.8/0005-oxenstored-ignore-domains-with-no-conflict-credit";
+ sha256 = "1ilhcgyn803bxvfbqv0ihfrh9jfpp0lidkv7i4613f9v9vjm8q0h";
+ })
+ (xsaPatch {
+ name = "206-4.8/0006-oxenstored-add-transaction-info-relevant-to-history-";
+ sha256 = "1dbd9pzda6hn9wj9pck44dlgz9nxvch3bzgrpaivanww8llxdfzz";
+ })
+ (xsaPatch {
+ name = "206-4.8/0007-oxenstored-support-commit-history-tracking";
+ sha256 = "1jfr56c22fqkhj6fnv1ha7zsid86zm9l0nihpb8m932xgc4a6h9h";
+ })
+ (xsaPatch {
+ name = "206-4.8/0008-oxenstored-only-record-operations-with-side-effects-";
+ sha256 = "1y845hj8krjdrirbd2jx4jqgnylwjv7bxnk7474lkld5kdnlbjyf";
+ })
+ (xsaPatch {
+ name = "206-4.8/0009-oxenstored-discard-old-commit-history-on-txn-end";
+ sha256 = "1lcr9gz2b77x74sr1flfymyyz4xzs04iv88rc1633ibyqxmvk0lx";
+ })
+ (xsaPatch {
+ name = "206-4.8/0010-oxenstored-track-commit-history";
+ sha256 = "1qwnivak4y038mpby75aaz0y70r0l3yc3hsz6wl5x0b74q6yy0ja";
+ })
+ (xsaPatch {
+ name = "206-4.8/0011-oxenstored-blame-the-connection-that-caused-a-transa";
+ sha256 = "0p2w5ddyhc6d95dnlxzc5k77j063p02d53ab7m7ijfm7m6gknq8y";
+ })
+ (xsaPatch {
+ name = "206-4.8/0012-oxenstored-allow-self-conflicts";
+ sha256 = "1571l81m30cbmqm4pk33q33p3dy58sfy2lnkl2wbgl2b3mkk657l";
+ })
+ (xsaPatch {
+ name = "206-4.8/0013-oxenstored-do-not-commit-read-only-transactions";
+ sha256 = "15985wl635w22dddjyx5l97b5p6m55mzv5ygk7xr0jx7mi192f9x";
+ })
+ (xsaPatch {
+ name = "206-4.8/0014-oxenstored-don-t-wake-to-issue-no-conflict-credit";
+ sha256 = "08672w4gaf2n3r8xy09h874gh5lg2vnrkjzq6xzvzdhdl092mipw";
+ })
+ (xsaPatch {
+ name = "206-4.8/0015-oxenstored-transaction-conflicts-improve-logging";
+ sha256 = "0ck98ms0py8wjsc38pbx6222x7n6l90zckfa7m7nnszsyc0sxxad";
+ })
+ (xsaPatch {
+ name = "206-4.8/0016-oxenstored-trim-history-in-the-frequent_ops-function";
+ sha256 = "014zs6i4gzrimn814k5i7gz66vbb0adkzr2qyai7i4fxc9h9r7w8";
+ })
+ ];
+
+ # 4.5 - 4.8
+ XSA_207 = (xsaPatch {
+ name = "207";
+ sha256 = "0wdlhijmw9mdj6a82pyw1rwwiz605dwzjc392zr3fpb2jklrvibc";
+ });
+
+ # 4.8
+ XSA_210 = (xsaPatch {
+ name = "210";
+ sha256 = "02mykxqxnsrd0sr4ij022j8y7618wzi2a6j6j761vx8qgmh11xai";
+ });
+
+ # 4.5 - 4.8
+ XSA_212 = (xsaPatch {
+ name = "212";
+ sha256 = "1ggjbbym5irq534a3zc86md9jg8imlpc9wx8xsadb9akgjrr1r8d";
+ });
+
+ # 4.5
+ XSA_213_45 = (xsaPatch {
+ name = "213-4.5";
+ sha256 = "1vnqf89ydacr5bq3d6z2r33xb2sn5vsd934rncyc28ybc9rvj6wm";
+ });
+
+ # 4.8
+ XSA_213 = (xsaPatch {
+ name = "213-4.8";
+ sha256 = "0ia3zr6r3bqy2h48fdy7p0iz423lniy3i0qkdvzgv5a8m80darr2";
+ });
+
+ # 4.5 - 4.8
+ XSA_214 = (xsaPatch {
+ name = "214";
+ sha256 = "0qapzx63z0yl84phnpnglpkxp6b9sy1y7cilhwjhxyigpfnm2rrk";
+ });
+
+ # 4.5
+ XSA_215 = (xsaPatch {
+ name = "215";
+ sha256 = "0sv8ccc5xp09f1w1gj5a9n3mlsdsh96sdb1n560vh31f4kkd61xs";
+ });
+
+ # 4.5
+ XSA_217_45 = (xsaPatch {
+ name = "217-4.5";
+ sha256 = "067pgsfrb9py2dhm1pk9g8f6fs40vyfrcxhj8c12vzamb6svzmn4";
+ });
+
+ # 4.6 - 4.8
+ XSA_217 = (xsaPatch {
+ name = "217";
+ sha256 = "1khs5ilif14dzcm7lmikjzkwsrfzlmir1rgrgzkc411gf18ylzmj";
+ });
+
+ # 4.5
+ XSA_218_45 = [
+ (xsaPatch {
+ name = "218-4.5/0001-IOMMU-handle-IOMMU-mapping-and-unmapping-failures";
+ sha256 = "00y6j3yjxw0igpldsavikmhlxw711k2jsj1qx0s05w2k608gadkq";
+ })
+ (xsaPatch {
+ name = "218-4.5/0002-gnttab-fix-unmap-pin-accounting-race";
+ sha256 = "0qbbfnnjlpdcd29mzmacfmi859k92c213l91q7w1rg2k6pzx928k";
+ })
+ (xsaPatch {
+ name = "218-4.5/0003-gnttab-Avoid-potential-double-put-of-maptrack-entry";
+ sha256 = "1cndzvyhf41mk4my6vh3bk9jvh2y4gpmqdhvl9zhxhmppszslqkc";
+ })
+ (xsaPatch {
+ name = "218-4.5/0004-gnttab-correct-maptrack-table-accesses";
+ sha256 = "02zpb0ffigijacqvyyjylwx3qpgibwslrka7mbxwnclf4s9c03a2";
+ })
+ ];
+
+ # 4.8
+ XSA_218 = [
+ (xsaPatch {
+ name = "218-4.8/0001-gnttab-fix-unmap-pin-accounting-race";
+ sha256 = "0r363frai239r2wmwxi48kcr50gbk5l64nja0h9lppi3z2y3dkdd";
+ })
+ (xsaPatch {
+ name = "218-4.8/0002-gnttab-Avoid-potential-double-put-of-maptrack-entry";
+ sha256 = "07wm06i7frv7bsaykakx3g9h0hfqv96zcadvwf6wv194dggq1plc";
+ })
+ (xsaPatch {
+ name = "218-4.8/0003-gnttab-correct-maptrack-table-accesses";
+ sha256 = "0ad0irc3p4dmla8sp3frxbh2qciji1dipkslh0xqvy2hyf9p80y9";
+ })
+ ];
+
+ # 4.5
+ XSA_219_45 = (xsaPatch {
+ name = "219-4.5";
+ sha256 = "003msr5vhsc66scmdpgn0lp3p01g4zfw5vj86y5lw9ajkbaywdsm";
+ });
+
+ # 4.8
+ XSA_219 = (xsaPatch {
+ name = "219-4.8";
+ sha256 = "16q7kiamy86x8qdvls74wmq5j72kgzgdilryig4q1b21mp0ij1jq";
+ });
+
+ # 4.5
+ XSA_220_45 = (xsaPatch {
+ name = "220-4.5";
+ sha256 = "1dj9nn6lzxlipjb3nb7b9m4337fl6yn2bd7ap1lqrjn8h9zkk1pp";
+ });
+
+ # 4.8
+ XSA_220 = (xsaPatch {
+ name = "220-4.8";
+ sha256 = "0214qyqx7qap5y1pdi9fm0vz4y2fbyg71gaq36fisknj35dv2mh5";
+ });
+
+ # 4.5 - 4.8
+ XSA_221 = (xsaPatch {
+ name = "221";
+ sha256 = "1mcr1nqgxyjrkywdg7qhlfwgz7vj2if1dhic425vgd41p9cdgl26";
+ });
+
+ # 4.5
+ XSA_222_45 = [
+ (xsaPatch {
+ name = "222-1-4.6";
+ sha256 = "1g4dqm5qx4wqlv1520jpfiscph95vllcp4gqp1rdfailk8xi0mcf";
+ })
+ (xsaPatch {
+ name = "222-2-4.5";
+ sha256 = "1hw8rhc7q4v309f4w11gxfsn5x1pirvxkg7s4kr711fnmvp9hkzd";
+ })
+ ];
+
+ # 4.8
+ XSA_222 = [
+ (xsaPatch {
+ name = "222-1";
+ sha256 = "0x02x4kqwfw255638fh2zcxwig1dy6kadlmqim1jgnjgmrvvqas2";
+ })
+ (xsaPatch {
+ name = "222-2-4.8";
+ sha256 = "1xhyp6q3c5l8djh965g1i8201m2wvhms8k886h4sn30hks38giin";
+ })
+ ];
+
+ # 4.5 - 4.8
+ XSA_223 = (xsaPatch {
+ name = "223";
+ sha256 = "0803gjgcbq9vaz2mq0v5finf1fq8iik1g4hqsjqhjxvspn8l70c5";
+ });
+
+ # 4.5
+ XSA_224_45 = [
+ (xsaPatch {
+ name = "224-4.5/0001-gnttab-Fix-handling-of-dev_bus_addr-during-unmap";
+ sha256 = "1aislj66ss4cb3v2bh12mrqsyrf288d4h54rj94jjq7h1hnycw7h";
+ })
+ (xsaPatch {
+ name = "224-4.5/0002-gnttab-never-create-host-mapping-unless-asked-to";
+ sha256 = "1j6fgm1ccb07gg0mi5qmdr0vqwwc3n12z433g1jrija2gbk1x8aq";
+ })
+ (xsaPatch {
+ name = "224-4.5/0003-gnttab-correct-logic-to-get-page-references-during-m";
+ sha256 = "166kmicwx280fjqjvgigbmhabjksa0hhvqx5h4v6kjlcjpmxqy08";
+ })
+ (xsaPatch {
+ name = "224-4.5/0004-gnttab-__gnttab_unmap_common_complete-is-all-or-noth";
+ sha256 = "1skc0yj1zsn8xgyq1y57bdc0scvvlmd0ynrjwwf1zkias1wlilav";
+ })
+ ];
+
+ # 4.8
+ XSA_224 = [
+ (xsaPatch {
+ name = "224-4.8/0001-gnttab-Fix-handling-of-dev_bus_addr-during-unmap";
+ sha256 = "1k326yan5811qzyvpdfkv801a19nyd09nsqayi8gyh58xx9c21m4";
+ })
+ (xsaPatch {
+ name = "224-4.8/0002-gnttab-never-create-host-mapping-unless-asked-to";
+ sha256 = "06nj1x59bbx9hrj26xmvbw8z805lfqhld9hm0ld0fs6dmcpqzcck";
+ })
+ (xsaPatch {
+ name = "224-4.8/0003-gnttab-correct-logic-to-get-page-references-during-m";
+ sha256 = "0kmag6fdsskgplcvzqp341yfi6pgc14wvjj58bp7ydb9hdk53qx2";
+ })
+ (xsaPatch {
+ name = "224-4.8/0004-gnttab-__gnttab_unmap_common_complete-is-all-or-noth";
+ sha256 = "1ww80pi7jr4gjpymkcw8qxmr5as18b2asdqv35527nqprylsff9f";
+ })
+ ];
+
+ # 4.6 - 4.8
+ XSA_225 = (xsaPatch {
+ name = "225";
+ sha256 = "0lcp2bs0r849xnvhrdf8s821v36cqdbzk8lwz6chrjhjalk6ha2g";
+ });
+
+ # 4.5
+ XSA_226_45 = [
+ (xsaPatch {
+ name = "226-4.5/0001-gnttab-dont-use-possibly-unbounded-tail-calls";
+ sha256 = "1hx47ppv5q33cw4dwp82lgvv4fp28gx7rxijw0iaczsv8bvb8vcg";
+ })
+ (xsaPatch {
+ name = "226-4.5/0002-gnttab-fix-transitive-grant-handling";
+ sha256 = "1gzp8m2zfihwlk71c3lqyd0ajh9h11pvkhzhw0mawckxy0qksvlc";
+ })
+ ];
+
+ # 4.8 - 4.9
+ XSA_226 = [
+ (xsaPatch {
+ name = "226-4.9/0001-gnttab-dont-use-possibly-unbounded-tail-calls";
+ sha256 = "1hx47ppv5q33cw4dwp82lgvv4fp28gx7rxijw0iaczsv8bvb8vcg";
+ })
+ (xsaPatch {
+ name = "226-4.9/0002-gnttab-fix-transitive-grant-handling";
+ sha256 = "1gzp8m2zfihwlk71c3lqyd0ajh9h11pvkhzhw0mawckxy0qksvlc";
+ })
+ ];
+
+ # 4.5
+ XSA_227_45 = (xsaPatch {
+ name = "227-4.5";
+ sha256 = "1qfjfisgqm4x98qw54x2qrvgjnvvzizx9p1pjhcnsps9q6g1y3x8";
+ });
+
+ # 4.8 - 4.9
+ XSA_227 = (xsaPatch {
+ name = "227";
+ sha256 = "0zdcm43i5n08rh7rrnb0fcssvd4fgawwmizsa16w2ak7pzvgmg94";
+ });
+
+ # 4.8
+ XSA_228_48 = (xsaPatch {
+ name = "228-4.8";
+ sha256 = "085pnzwyv0rdb51hv5vhbhwfyxl0wg8sxcm912gjq8z7da5cv10n";
+ });
+
+ # 4.9
+ XSA_228 = (xsaPatch {
+ name = "228";
+ sha256 = "0c9nvfpnr5ira7ha3fszhvvh71nsxrvmzrab56xwjhl2dbw2yy23";
+ });
+
+ # 4.5 - 4.9
+ XSA_230 = (xsaPatch {
+ name = "230";
+ sha256 = "10x0j7wmzkrwycs1ng89fgjzvzh8vsdd4c5nb68b3j1azdx4ld83";
+ });
+
+ # 4.5
+ XSA_231_45 = (xsaPatch {
+ name = "231-4.5";
+ sha256 = "06gwx2f1lg51dfk2b4zxp7wv9c4pxdi87pg2asvmxqc78ir7l5s6";
+ });
+
+ # 4.8 - 4.9
+ XSA_231 = (xsaPatch {
+ name = "231-4.9";
+ sha256 = "09r8xxq2fd52wrk6i0y0sk3nbidfg6pzzrkx327hfmdjj76iyz3b";
+ });
+
+ # 4.5 - 4.9
+ XSA_232 = (xsaPatch {
+ name = "232";
+ sha256 = "0n6irjpmraa3hbxxm64a1cplc6y6g07x7v2fmlpvn70ql3fs0220";
+ });
+
+ # 4.5 - 4.9
+ XSA_233 = (xsaPatch {
+ name = "233";
+ sha256 = "1w3m8349cqav56av63w6jzvlsv4jw5rimwvskr9pq2rcbk2dx8kf";
+ });
+
+ # 4.5
+ XSA_234_45 = (xsaPatch {
+ name = "234-4.5";
+ sha256 = "1ji6hbgybb4gbgz5l5fis9midnvjbddzam8d63377rkzdyb3yz9f";
+ });
+
+ # 4.8
+ XSA_234_48 = (xsaPatch {
+ name = "234-4.8";
+ sha256 = "08n1pf7z5y67dmay1ap39bi81clgkx82fpmfn7jsh8k4aw94jrsa";
+ });
+
+ # 4.9
+ XSA_234 = (xsaPatch {
+ name = "234-4.9";
+ sha256 = "1znmxg432is0virw8321gax8zqq2zcmi2pc5p2j31sixylixsvzx";
+ });
+
+ # 4.5
+ XSA_235_45 = (xsaPatch {
+ name = "235-4.5";
+ sha256 = "0hhgnql2gji111020z4wiyzg23wqs6ymanb67rg11p4qad1fp3ff";
+ });
+
+ # 4.8 - 4.9
+ XSA_235 = (xsaPatch {
+ name = "235-4.9";
+ sha256 = "1rj4jkmh79wm30jq9f8x65qv3al8l91zc3m5s23q0x6abn3pfb9z";
+ });
+
+ # 4.5
+ XSA_236_45 = (xsaPatch {
+ name = "236-4.5";
+ sha256 = "0hcla86x81wykssd2967gblp7fzx61290p4ls4v0hcyxdg2bs2yz";
+ });
+
+ # 4.8 - 4.9
+ XSA_236 = (xsaPatch {
+ name = "236-4.9";
+ sha256 = "0vqxy7mgflga05l33j3488fwxmdw3p9yxj4ylhk9n3nw8id72ghq";
+ });
+
+ # 4.5
+ XSA_237_45 = [
+ (xsaPatch {
+ name = "237-4.5/0001-x86-dont-allow-MSI-pIRQ-mapping-on-unowned-device";
+ sha256 = "0hjxs20jhls4i0iph45a0qpw4znkm04gv74jmwhw84gy4hrhzq3b";
+ })
+ (xsaPatch {
+ name = "237-4.5/0002-x86-enforce-proper-privilege-when-mapping-pIRQ-s";
+ sha256 = "0ki8nmbc2g1l9wnqsph45a2k4c6dk5s7jvdlxg3zznyiyxjcv8yn";
+ })
+ (xsaPatch {
+ name = "237-4.5/0003-x86-MSI-disallow-redundant-enabling";
+ sha256 = "1hdz83qrjaqnihz8ji186dypxiblbfpgyb01j9m5alhk4whjqvp1";
+ })
+ (xsaPatch {
+ name = "237-4.5/0004-x86-IRQ-conditionally-preserve-irq-pirq-mapping-on-error";
+ sha256 = "0csdfn9kzn1k94pg3fcwsgqw14wcd4myi1jkcq5alj1fmkhw4wmk";
+ })
+ (xsaPatch {
+ name = "237-4.5/0005-x86-FLASK-fix-unmap-domain-IRQ-XSM-hook";
+ sha256 = "14b73rkvbkd1a2gh9kp0zrvv2d3kfwkiv24fg9agh4hrf2w3nx7y";
+ })
+ ];
+
+ # 4.8
+ XSA_237_48 = [
+ (xsaPatch {
+ name = "237-4.8/0001-x86-dont-allow-MSI-pIRQ-mapping-on-unowned-device";
+ sha256 = "0qjisp37lwi2611mp7fbbm1s7m0bx726rrg79dnxs2mj0skw59iv";
+ })
+ (xsaPatch {
+ name = "237-4.8/0002-x86-enforce-proper-privilege-when-mapping-pIRQ-s";
+ sha256 = "05q1dny13jrqhjfwak7r635mqp9chpibjvn8b7d90japc1nzpq62";
+ })
+ (xsaPatch {
+ name = "237-4.8/0003-x86-MSI-disallow-redundant-enabling";
+ sha256 = "1907lv8nb2zhpb6k6jlw4m0hm0n0lyd69vfr3wpzbc56dn0w7jqd";
+ })
+ (xsaPatch {
+ name = "237-4.8/0004-x86-IRQ-conditionally-preserve-irq-pirq-mapping-on-error";
+ sha256 = "06nrq0bx3p9ipab2r1why6qm4g32dj0x5q24hfkwc6ih0l9xwf8h";
+ })
+ (xsaPatch {
+ name = "237-4.8/0005-x86-FLASK-fix-unmap-domain-IRQ-XSM-hook";
+ sha256 = "1nbg7bjw2hv55gnkhf6chkh35va6brs08acq1d5jxncl6kv0amc1";
+ })
+ ];
+
+ # 4.9
+ XSA_237 = [
+ (xsaPatch {
+ name = "237-4.9/0001-x86-dont-allow-MSI-pIRQ-mapping-on-unowned-device";
+ sha256 = "1cbl24mqxa62h0wgsnrpcs6y6vs53znzj7g8dfsbmf74xwrd4px6";
+ })
+ (xsaPatch {
+ name = "237-4.9/0002-x86-enforce-proper-privilege-when-mapping-pIRQ-s";
+ sha256 = "0p60148j18b78pxz0dx5ymh1gyrhg2cgmxq0jxmbk090bc4jql35";
+ })
+ (xsaPatch {
+ name = "237-4.9/0003-x86-MSI-disallow-redundant-enabling";
+ sha256 = "1907lv8nb2zhpb6k6jlw4m0hm0n0lyd69vfr3wpzbc56dn0w7jqd";
+ })
+ (xsaPatch {
+ name = "237-4.9/0004-x86-IRQ-conditionally-preserve-irq-pirq-mapping-on-error";
+ sha256 = "0q95z5641amni53agimnzbspva53p0hz5wl16zaz2yhnjasj5pzr";
+ })
+ (xsaPatch {
+ name = "237-4.9/0005-x86-FLASK-fix-unmap-domain-IRQ-XSM-hook";
+ sha256 = "0bnqx9w7ppgx8wxj2zw09z0rkv1jzn3r0bd76cz0r22wz29fsdp2";
+ })
+ ];
+
+ # 4.5
+ XSA_238_45 = (xsaPatch {
+ name = "238-4.5";
+ sha256 = "1x2fg5vfv5jc084h5gjm6fq0nxjpzvi96px3sqzz4pvsvy4y4i1z";
+ });
+
+ # 4.8 - 4.9
+ XSA_238 = (xsaPatch {
+ name = "238";
+ sha256 = "1cbmg1bi5ajh7qbwsl92ynaxw2c3p7i24p3wds81r4n93r0y5dxk";
+ });
+
+ # 4.5
+ XSA_239_45 = (xsaPatch {
+ name = "239-4.5";
+ sha256 = "06bi8q3973yajxsdj7pcqarvb56q2gisxdiy0cpbyffbmpkfv3h6";
+ });
+
+ # 4.8 - 4.9
+ XSA_239 = (xsaPatch {
+ name = "239";
+ sha256 = "1a9r8j7167s43ds5i7v7mm4y970vjnbhhkrjzpmzlcx8kcz96vh3";
+ });
+
+ # 4.5
+ XSA_240_45 = [
+ (xsaPatch {
+ name = "240-4.5/0001-x86-limit-linear-page-table-use-to-a-single-level";
+ sha256 = "0pmf10mbnmb88y7mly8s2l0j88cg0ayhkcnmj1zbjrkjmpccv395";
+ })
+ (xsaPatch {
+ name = "240-4.5/0002-x86-mm-Disable-PV-linear-pagetables-by-default";
+ sha256 = "19f096ra3xndvzkjjasx73p2g25hfkm905px0p3yakwll0qzd029";
+ })
+ ];
+
+ # 4.8
+ XSA_240_48 = [
+ (xsaPatch {
+ name = "240-4.8/0001-x86-limit-linear-page-table-use-to-a-single-level";
+ sha256 = "0m44qhhqk2pdwqg8g28pypqrylq6iw00k9qrzf6qd0iza2y42kgj";
+ })
+ (xsaPatch {
+ name = "240-4.8/0002-x86-mm-Disable-PV-linear-pagetables-by-default";
+ sha256 = "1jd720wvngj9wq3fprdhakxvqlff0jd8zcx2pd3vsn2qvjbvr2gf";
+ })
+ ];
+
+ # 4.9
+ XSA_240 = [
+ (xsaPatch {
+ name = "240-4.9/0001-x86-limit-linear-page-table-use-to-a-single-level";
+ sha256 = "1759ni80aifakm44g4cc6pnmbcn1xjic8j66fvj0vibm0wqk6xck";
+ })
+ (xsaPatch {
+ name = "240-4.9/0002-x86-mm-Disable-PV-linear-pagetables-by-default";
+ sha256 = "0g6dpi006p5cjxw5d8h33p0429fdmdm6nqzj0m63ralpqvns3ib5";
+ })
+ ];
+
+ # 4.5 - 4.8
+ XSA_241 = (xsaPatch {
+ name = "241-4.8";
+ sha256 = "16zb75kzs98f4mdxhbyczk5mbh9dvn6j3yhfafki34x1dfdnq4pj";
+ });
+
+ # 4.9
+ XSA_241_49 = (xsaPatch {
+ name = "241-4.9";
+ sha256 = "0xlhin7wkhmlnbp9mqcbq3q4drdwb5la482ja9nwkhi8i867p6wc";
+ });
+
+ # 4.5 - 4.9
+ XSA_242 = (xsaPatch {
+ name = "242-4.9";
+ sha256 = "0yx3x0i2wybsm7lzdffxa2mm866bjl4ipbb9vipnw77dyg705zpr";
+ });
+
+ # 4.5
+ XSA_243_45 = [
+ (xsaPatch {
+ name = "243-4.6-1";
+ sha256 = "1cqanpyysa7px0j645z4jw9yqsvv6cbh7yq1b86ap134axfifcan";
+ })
+ (xsaPatch {
+ name = "243-4.5-2";
+ sha256 = "0wbcgw4m0nzm2902jnda2020l7bd5adkq8j5myi1zmsfzbq03hwn";
+ })
+ ];
+
+ # 4.8
+ XSA_243_48 = (xsaPatch {
+ name = "243-4.8";
+ sha256 = "1q60zn55l9wpq45nrxh0av59sjz0jg8pkjm1gkyywkdsgg4fg5z4";
+ });
+
+ # 4.9
+ XSA_243 = (xsaPatch {
+ name = "243";
+ sha256 = "06fnbnh9zlsbkqih9ipnb7a8gly54m7lp17d854j1r370ad3c4yg";
+ });
+
+ # 4.5
+ XSA_244_45 = (xsaPatch {
+ name = "244-4.5";
+ sha256 = "05ci3vdl1ywfjpzcvsy1k52whxjk8pxzj7dh3r94yqasr56i5v2l";
+ });
+
+ # 4.8 - 4.9
+ XSA_244 = (xsaPatch {
+ name = "244";
+ sha256 = "10308xsgmhb0vg6fk0ql8v94zifv6dcv6vkaicryfp405yj2rzkm";
+ });
+
+ # 4.5 - 4.9
+ XSA_245 = [
+ (xsaPatch {
+ name = "245/0001-xen-page_alloc-Cover-memory-unreserved-after-boot-in";
+ sha256 = "12brsgbn7xwakalsn10afykgqmx119mqg6vjj3v2b1pnmf4ss0w8";
+ })
+ (xsaPatch {
+ name = "245/0002-xen-arm-Correctly-report-the-memory-region-in-the-du";
+ sha256 = "1k6z5r7wnrswsczn2j3a1mc4nvxqm4ydj6n6rvgqizk2pszdkqg8";
+ })
+ ];
+}
diff --git a/pkgs/applications/window-managers/afterstep/default.nix b/pkgs/applications/window-managers/afterstep/default.nix
index 962942905db0..20deb2c24048 100644
--- a/pkgs/applications/window-managers/afterstep/default.nix
+++ b/pkgs/applications/window-managers/afterstep/default.nix
@@ -16,7 +16,8 @@ stdenv.mkDerivation rec {
sha256 = "1j7vkx1ig4kzwffdxnkqv3kld9qi3sam4w2nhq18waqjsi8xl5gz";
};
- buildInputs = [ pkgconfig libjpeg libtiff libpng freetype fltk gtk libX11 libXext libICE dbus dbus_libs ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libjpeg libtiff libpng freetype fltk gtk libX11 libXext libICE dbus dbus_libs ];
# A strange type of bug: dbus is not immediately found by pkgconfig
preConfigure = ''
diff --git a/pkgs/applications/window-managers/cwm/default.nix b/pkgs/applications/window-managers/cwm/default.nix
index b2aa4de40c02..0b611906a466 100644
--- a/pkgs/applications/window-managers/cwm/default.nix
+++ b/pkgs/applications/window-managers/cwm/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "0a0x8rgqif4kxy7hj70hck7jma6c8jy4428ybl8fz9qxgxh014ml";
};
- buildInputs = [ libX11 libXinerama libXrandr libXft yacc pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libX11 libXinerama libXrandr libXft yacc ];
prePatch = ''sed -i "s@/usr/local@$out@" Makefile'';
diff --git a/pkgs/applications/window-managers/dzen2/default.nix b/pkgs/applications/window-managers/dzen2/default.nix
index b3e970e90be0..7bc76d5c2bfb 100644
--- a/pkgs/applications/window-managers/dzen2/default.nix
+++ b/pkgs/applications/window-managers/dzen2/default.nix
@@ -3,7 +3,8 @@
stdenv.mkDerivation rec {
name = "dzen2-0.9.5";
- buildInputs = [ pkgconfig libX11 libXft libXinerama libXpm ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libX11 libXft libXinerama libXpm ];
src = fetchurl {
url = "https://github.com/robm/dzen/tarball/master/dzen2-0.9.5git.tar.gz";
diff --git a/pkgs/applications/window-managers/fvwm/default.nix b/pkgs/applications/window-managers/fvwm/default.nix
index 7587dcb490ae..0b9c286aa9de 100644
--- a/pkgs/applications/window-managers/fvwm/default.nix
+++ b/pkgs/applications/window-managers/fvwm/default.nix
@@ -17,8 +17,9 @@ stdenv.mkDerivation rec {
sha256 = "01654d5abdcde6dac131cae9befe5cf6f01f9f7524d097c3b0f316e39f84ef73";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig cairo fontconfig freetype
+ cairo fontconfig freetype
libXft libXcursor libXinerama libXpm libXt
librsvg libpng fribidi perl
] ++ stdenv.lib.optional gestures libstroke;
diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix
index 3bf089f83545..b2e34a016adc 100644
--- a/pkgs/applications/window-managers/herbstluftwm/default.nix
+++ b/pkgs/applications/window-managers/herbstluftwm/default.nix
@@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
--replace "/zsh/functions/Completion/X" "/zsh/site-functions"
'';
- buildInputs = [ pkgconfig glib libX11 libXext libXinerama ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ glib libX11 libXext libXinerama ];
meta = {
description = "A manual tiling window manager for X";
diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index 54dfc08e3b59..19aa89a7f7e7 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "i3-${version}";
- version = "4.14";
+ version = "4.14.1";
src = fetchurl {
url = "http://i3wm.org/downloads/${name}.tar.bz2";
- sha256 = "1mm5jazwv4dz3k8vl1lfrcw86agpws5k9lmav1ly51qvmzivsfmf";
+ sha256 = "1cazmfbbx6n8c81h6x6pdayq3mxs2ml3adz165z8vapkc72kl1nh";
};
nativeBuildInputs = [ which pkgconfig makeWrapper ];
diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix
index 58ab5b1d676b..b322c7da193a 100644
--- a/pkgs/applications/window-managers/i3/gaps.nix
+++ b/pkgs/applications/window-managers/i3/gaps.nix
@@ -3,12 +3,12 @@
i3.overrideDerivation (super : rec {
name = "i3-gaps-${version}";
- version = "4.14";
- releaseDate = "2017-09-04";
+ version = "4.14.1";
+ releaseDate = "2017-09-24";
src = fetchurl {
url = "https://github.com/Airblader/i3/archive/${version}.tar.gz";
- sha256 = "08y2m0afcm8mbzb92qz286fd1hnqfya2pvhpxbgv83sgjcsg6hlr";
+ sha256 = "11fnkg4halplcnannfw3ishzwwbxbnjafmkxsim199jhlyjjd8j7";
};
nativeBuildInputs = super.nativeBuildInputs ++ [ autoreconfHook ];
diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix
index fd47a104326e..a589e21be98b 100644
--- a/pkgs/applications/window-managers/i3/lock-color.nix
+++ b/pkgs/applications/window-managers/i3/lock-color.nix
@@ -28,6 +28,9 @@ stdenv.mkDerivation rec {
homepage = https://i3wm.org/i3lock/;
maintainers = with maintainers; [ garbas malyn ];
license = licenses.bsd3;
- platforms = platforms.all;
+
+ # Needs the SSE2 instruction set. See upstream issue
+ # https://github.com/chrjguill/i3lock-color/issues/44
+ platforms = platforms.i686 ++ platforms.x86_64;
};
}
diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix
index a979797d0801..20df6566b23f 100644
--- a/pkgs/applications/window-managers/i3/lock.nix
+++ b/pkgs/applications/window-managers/i3/lock.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "1467ha4ssbfjk1jh0ya2i5ljzm554ln18nyrppvsipg8shb1cshh";
};
- buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutilimage pam libX11
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ which libxcb xcbutilkeysyms xcbutilimage pam libX11
libev cairo libxkbcommon libxkbfile ];
makeFlags = "all";
diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix
index bd79f6b8ff0a..19c9f8c98351 100644
--- a/pkgs/applications/window-managers/i3/status.nix
+++ b/pkgs/applications/window-managers/i3/status.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0pwcy599fw8by1a1sf91crkqba7679qhvhbacpmhis8c1xrpxnwq";
};
- buildInputs = [ confuse yajl alsaLib libpulseaudio libnl pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ confuse yajl alsaLib libpulseaudio libnl ];
makeFlags = [ "all" "PREFIX=$(out)" ];
diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix
index 83c4e6828e1d..fbea1d4e9a41 100644
--- a/pkgs/applications/window-managers/jwm/default.nix
+++ b/pkgs/applications/window-managers/jwm/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
name = "jwm-${version}";
- version = "1621";
+ version = "1651";
src = fetchFromGitHub {
owner = "joewing";
repo = "jwm";
rev = "s${version}";
- sha256 = "1cxi9yd3wwzhh06f6myk15cav7ayvzxdaxhvqb3570nwj21zlnsm";
+ sha256 = "097wqipg1h7h19a5bqdx7iq60fkjrx2niwsgg1f8cfz106yhbp6q";
};
nativeBuildInputs = [ pkgconfig automake autoconf libtool gettext which ];
diff --git a/pkgs/applications/window-managers/kbdd/default.nix b/pkgs/applications/window-managers/kbdd/default.nix
index 9bbb8f161328..1c6b8a84c952 100644
--- a/pkgs/applications/window-managers/kbdd/default.nix
+++ b/pkgs/applications/window-managers/kbdd/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1ys9w1lncsfg266g9sfnm95an2add3g51mryg0hnrzcqa4knz809";
};
- buildInputs = [ pkgconfig xorg.libX11 dbus_glib autoreconfHook ];
+ nativeBuildInputs = [ autoreconfHook pkgconfig ];
+ buildInputs = [ xorg.libX11 dbus_glib ];
meta = {
description = "Simple daemon and library to make per window layout using XKB";
diff --git a/pkgs/applications/window-managers/matchbox/default.nix b/pkgs/applications/window-managers/matchbox/default.nix
index dc624f449865..17084d6a6a70 100644
--- a/pkgs/applications/window-managers/matchbox/default.nix
+++ b/pkgs/applications/window-managers/matchbox/default.nix
@@ -4,7 +4,8 @@ stdenv.mkDerivation rec {
name = "matchbox-${version}";
version = "1.2";
- buildInputs = [ libmatchbox pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libmatchbox ];
src = fetchurl {
url = "http://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/${version}/matchbox-window-manager-${version}.tar.bz2";
diff --git a/pkgs/applications/window-managers/notion/default.nix b/pkgs/applications/window-managers/notion/default.nix
index 72947906d6f0..ebe58e921ddd 100644
--- a/pkgs/applications/window-managers/notion/default.nix
+++ b/pkgs/applications/window-managers/notion/default.nix
@@ -32,7 +32,8 @@ stdenv.mkDerivation {
substituteInPlace man/Makefile --replace "nroff -man -Tlatin1" "${mandoc}/bin/mandoc -T man"
'';
- buildInputs = [makeWrapper xlibsWrapper lua gettext mandoc pkgconfig which libXinerama libXrandr libX11 ] ++ stdenv.lib.optional enableXft libXft;
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [makeWrapper xlibsWrapper lua gettext mandoc which libXinerama libXrandr libX11 ] ++ stdenv.lib.optional enableXft libXft;
buildFlags = "LUA_DIR=${lua} X11_PREFIX=/no-such-path PREFIX=\${out}";
installFlags = "PREFIX=\${out}";
diff --git a/pkgs/applications/window-managers/openbox/default.nix b/pkgs/applications/window-managers/openbox/default.nix
index 7b60d573d1e5..ead78bf4efd9 100644
--- a/pkgs/applications/window-managers/openbox/default.nix
+++ b/pkgs/applications/window-managers/openbox/default.nix
@@ -6,8 +6,9 @@ stdenv.mkDerivation rec {
name = "openbox-${version}";
version = "3.6.1";
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig libxml2
+ libxml2
libXinerama libXcursor libXau libXrandr libICE libSM
libstartup_notification makeWrapper
python2.pkgs.wrapPython
diff --git a/pkgs/applications/window-managers/oroborus/default.nix b/pkgs/applications/window-managers/oroborus/default.nix
index 226b33be0603..d2bf1e5a96de 100644
--- a/pkgs/applications/window-managers/oroborus/default.nix
+++ b/pkgs/applications/window-managers/oroborus/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
name = "oroborus-${version}";
version = "2.0.20";
- buildInputs = [ pkgconfig freetype fribidi libSM libICE libXt libXaw libXmu libXext libXft libXpm libXrandr libXrender xextproto libXinerama ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ freetype fribidi libSM libICE libXt libXaw libXmu libXext libXft libXpm libXrandr libXrender xextproto libXinerama ];
src = fetchurl {
url = "http://ftp.debian.org/debian/pool/main/o/oroborus/oroborus_${version}.tar.gz";
diff --git a/pkgs/applications/window-managers/pekwm/default.nix b/pkgs/applications/window-managers/pekwm/default.nix
index 60753e468408..bdf914fbd751 100644
--- a/pkgs/applications/window-managers/pekwm/default.nix
+++ b/pkgs/applications/window-managers/pekwm/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
sha256 = "003x6bxj1lb2ljxz3v414bn0rdl6z68c0r185fxwgs1qkyzx67wa";
};
- buildInputs = [ pkgconfig libpng libjpeg
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libpng libjpeg
libXext libXft libXpm libXrandr libXinerama ];
meta = with stdenv.lib; {
diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix
index 4b9da41b028c..8f4d4858ca11 100644
--- a/pkgs/applications/window-managers/qtile/default.nix
+++ b/pkgs/applications/window-managers/qtile/default.nix
@@ -29,7 +29,8 @@ python27Packages.buildPythonApplication rec {
substituteInPlace libqtile/xcursors.py --subst-var-by xcb-cursor ${xcbutilcursor.out}
'';
- buildInputs = [ pkgconfig glib libxcb cairo pango python27Packages.xcffib ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ glib libxcb cairo pango python27Packages.xcffib ];
pythonPath = with python27Packages; [ xcffib cairocffi-xcffib trollius ];
diff --git a/pkgs/applications/window-managers/sawfish/default.nix b/pkgs/applications/window-managers/sawfish/default.nix
index 37596f5f212b..d18ffb507956 100644
--- a/pkgs/applications/window-managers/sawfish/default.nix
+++ b/pkgs/applications/window-managers/sawfish/default.nix
@@ -19,7 +19,8 @@ stdenv.mkDerivation rec {
sha256 = "1z7awzgw8d15aw17kpbj460pcxq8l2rhkaxk47w7yg9qrmg0xja4";
};
- buildInputs = [ pkgconfig which autoreconfHook
+ nativeBuildInputs = [ autoreconfHook pkgconfig ];
+ buildInputs = [ which
rep-gtk pango gdk_pixbuf imlib gettext texinfo
libXinerama libXrandr libXtst libICE libSM
makeWrapper ];
diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix
index 6d5e53b70880..215b8c38ece4 100644
--- a/pkgs/applications/window-managers/stumpwm/default.nix
+++ b/pkgs/applications/window-managers/stumpwm/default.nix
@@ -23,9 +23,9 @@ let
patches = [ ./fix-module-path.patch ];
};
"git" = {
- name = "git-20160617";
- rev = "7d5b5eb76aa656baf5a8713f514937765f66b10a";
- sha256 = "1jpj978r54086hypjxqxi0r3zacqpkr61dp6dbi0lykgx7m5bjfb";
+ name = "git-20170203";
+ rev = "d20f24e58ab62afceae2afb6262ffef3cc318b97";
+ sha256 = "1gi29ds1x6dq7lz8lamnhcvcrr3cvvrg5yappfkggyhyvib1ii70";
patches = [];
};
}.${version};
@@ -48,6 +48,7 @@ stdenv.mkDerivation rec {
sbcl
lispPackages.clx
lispPackages.cl-ppcre
+ lispPackages.alexandria
xdpyinfo
];
diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix
index ac725733d647..1e1072e49604 100644
--- a/pkgs/applications/window-managers/sway/default.nix
+++ b/pkgs/applications/window-managers/sway/default.nix
@@ -1,45 +1,40 @@
-{ stdenv, fetchFromGitHub, pango, libinput
-, makeWrapper, cmake, pkgconfig, asciidoc, libxslt, docbook_xsl, cairo
-, wayland, wlc, libxkbcommon, pixman, fontconfig, pcre, json_c, dbus_libs, libcap
-, xwayland, pam, gdk_pixbuf
+{ stdenv, fetchFromGitHub
+, cmake, pkgconfig, asciidoc, libxslt, docbook_xsl
+, wayland, wlc, libxkbcommon, pcre, json_c, dbus_libs
+, pango, cairo, libinput, libcap, pam, gdk_pixbuf, libpthreadstubs
+, libXdmcp
+, buildDocs ? true
}:
-let
- version = "0.13.0";
-in
- stdenv.mkDerivation rec {
- name = "sway-${version}";
+stdenv.mkDerivation rec {
+ name = "sway-${version}";
+ version = "0.15.0";
- src = fetchFromGitHub {
- owner = "Sircmpwn";
- repo = "sway";
- rev = "${version}";
- sha256 = "1vgk4rl51nx66yzpwg4yhnbj7wc30k5q0hh5lf8y0i1nvpal0p3q";
- };
+ src = fetchFromGitHub {
+ owner = "swaywm";
+ repo = "sway";
+ rev = version;
+ sha256 = "0rz5rgap2ah7hkk4glvlmjq0c8i2f47qzkwjx7gm4wmb8gymikmh";
+ };
- nativeBuildInputs = [ makeWrapper cmake pkgconfig asciidoc libxslt docbook_xsl ];
+ nativeBuildInputs = [
+ cmake pkgconfig
+ ] ++ stdenv.lib.optional buildDocs [ asciidoc libxslt docbook_xsl ];
+ buildInputs = [
+ wayland wlc libxkbcommon pcre json_c dbus_libs
+ pango cairo libinput libcap pam gdk_pixbuf libpthreadstubs
+ libXdmcp
+ ];
- buildInputs = [ wayland wlc libxkbcommon pixman fontconfig pcre json_c dbus_libs pango cairo libinput libcap xwayland pam gdk_pixbuf ];
+ enableParallelBuilding = true;
- patchPhase = ''
- sed -i s@/etc/sway@$out/etc/sway@g CMakeLists.txt;
- '';
+ cmakeFlags = "-DVERSION=${version}";
- makeFlags = "PREFIX=$(out)";
- cmakeFlags = "-DVERSION=${version}";
- installPhase = "PREFIX=$out make install";
-
- LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ wlc dbus_libs ];
- preFixup = ''
- wrapProgram $out/bin/sway \
- --prefix LD_LIBRARY_PATH : "${LD_LIBRARY_PATH}";
- '';
-
- meta = with stdenv.lib; {
- description = "i3-compatible window manager for Wayland";
- homepage = "http://swaywm.org";
- license = licenses.mit;
- platforms = platforms.linux;
- maintainers = with maintainers; [ ];
- };
- }
+ meta = with stdenv.lib; {
+ description = "i3-compatible window manager for Wayland";
+ homepage = http://swaywm.org;
+ license = licenses.mit;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ primeos ]; # Trying to keep it up-to-date.
+ };
+}
diff --git a/pkgs/applications/window-managers/sxhkd/default.nix b/pkgs/applications/window-managers/sxhkd/default.nix
index 41a50668f19b..cca9f1c6ac58 100644
--- a/pkgs/applications/window-managers/sxhkd/default.nix
+++ b/pkgs/applications/window-managers/sxhkd/default.nix
@@ -1,22 +1,27 @@
-{ stdenv, fetchurl, asciidoc, libxcb, xcbutil, xcbutilkeysyms, xcbutilwm }:
+{ stdenv, fetchFromGitHub, asciidoc, libxcb, xcbutil, xcbutilkeysyms
+, xcbutilwm
+}:
stdenv.mkDerivation rec {
name = "sxhkd-${version}";
- version = "0.5.6";
+ version = "0.5.8";
- src = fetchurl {
- url = "https://github.com/baskerville/sxhkd/archive/${version}.tar.gz";
- sha256 = "15grmzpxz5fqlbfg2slj7gb7r6nzkvjmflmbkqx7mlby9pm6wdkj";
+ src = fetchFromGitHub {
+ owner = "baskerville";
+ repo = "sxhkd";
+ rev = version;
+ sha256 = "0vnm0d2ckijsp8kc2v8jz4raamb487vg62v58v01a3rb9gzzgl06";
};
buildInputs = [ asciidoc libxcb xcbutil xcbutilkeysyms xcbutilwm ];
- makeFlags = ''PREFIX=$(out)'';
+ makeFlags = [ "PREFIX=$(out)" ];
- meta = {
+ meta = with stdenv.lib; {
description = "Simple X hotkey daemon";
- homepage = https://github.com/baskerville/sxhkd/;
- license = stdenv.lib.licenses.bsd2;
- platforms = stdenv.lib.platforms.linux;
+ homepage = "https://github.com/baskerville/sxhkd";
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ vyp ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/window-managers/trayer/default.nix b/pkgs/applications/window-managers/trayer/default.nix
index 79c73d80789f..020a7bbb3577 100644
--- a/pkgs/applications/window-managers/trayer/default.nix
+++ b/pkgs/applications/window-managers/trayer/default.nix
@@ -3,7 +3,8 @@
stdenv.mkDerivation rec {
name = "trayer-1.1.7";
- buildInputs = [ pkgconfig gdk_pixbuf gtk2 ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gdk_pixbuf gtk2 ];
src = fetchFromGitHub {
owner = "sargon";
diff --git a/pkgs/applications/window-managers/vwm/default.nix b/pkgs/applications/window-managers/vwm/default.nix
index b5d4733bae54..8ed144a32ea4 100644
--- a/pkgs/applications/window-managers/vwm/default.nix
+++ b/pkgs/applications/window-managers/vwm/default.nix
@@ -20,7 +20,8 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin $out/include
'';
- buildInputs = [ ncurses pkgconfig glib libviper libpseudo gpm libvterm ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ ncurses glib libviper libpseudo gpm libvterm ];
meta = with stdenv.lib; {
homepage = http://vwm.sourceforge.net/;
diff --git a/pkgs/applications/window-managers/way-cooler/default.nix b/pkgs/applications/window-managers/way-cooler/default.nix
index d9d84e834304..75c9e6ecf8c8 100755
--- a/pkgs/applications/window-managers/way-cooler/default.nix
+++ b/pkgs/applications/window-managers/way-cooler/default.nix
@@ -14,13 +14,14 @@ buildRustPackage rec {
sha256 = "10s01x54kwjm2c85v57i6g3pvj5w3wpkjblj036mmd865fla1brb";
};
- depsSha256 = "1k5xbw2zhm5z650mxdbxixr90im53wlpjdvq2pbnx2snqm84idlc";
+ cargoSha256 = "06qivlybmmc49ksv4232sm1r4hp923xsq4c2ksa4i2azdzc1csdc";
buildInputs = [ wlc dbus_libs dbus_glib cairo libxkbcommon ];
nativeBuildInputs = [ pkgconfig ];
meta = with stdenv.lib; {
+ broken = true;
description = "Customizable Wayland compositor (window manager)";
longDescription = ''
Way Cooler is a customizable tiling window manager written in Rust
diff --git a/pkgs/applications/window-managers/windowlab/default.nix b/pkgs/applications/window-managers/windowlab/default.nix
index 39865c4b3e7d..caf97c6510de 100644
--- a/pkgs/applications/window-managers/windowlab/default.nix
+++ b/pkgs/applications/window-managers/windowlab/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation {
sha256 = "1fx4jwq4s98p2wpvawsiww7d6568bpjgcjpks61dzfj8p2j32s4d";
};
- buildInputs = [ pkgconfig libX11 libXext libXft ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libX11 libXext libXft ];
postPatch =
''
diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix b/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix
index 0102fb05d8ee..e708682e3036 100644
--- a/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix
+++ b/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation {
sha256 = "0g9cwhlqg065fbhav4g4n16a4cqkk9jykl3y0zwbn5whhacfqyhl";
};
- buildInputs = [ pkgconfig libX11 libXpm libXext alsaLib ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libX11 libXpm libXext alsaLib ];
postUnpack = "sourceRoot=\${sourceRoot}/AlsaMixer.app";
diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix
index 40e41407f7bf..e2f17d11f64d 100644
--- a/pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix
+++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix
@@ -7,7 +7,8 @@ stdenv.mkDerivation {
sha256 = "4b42b55bb7c1d7c58b5ee1f0058c683d3e4f3e3380d3a69c54a50b983c7c1b3f";
};
- buildInputs = [ pkgconfig libX11 libXpm libXext ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libX11 libXpm libXext ];
postUnpack = "sourceRoot=\${sourceRoot}/Src";
diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix
index e211abe0ea54..3e8b3f7f1584 100644
--- a/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix
+++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix
@@ -7,10 +7,13 @@ stdenv.mkDerivation {
sha256 = "369a8f2e5673c6b7ab0cf85166f38fbf553dd966c3c1cfeec0e32837defd32c7";
};
- buildInputs = [ pkgconfig libX11 libXpm libXext ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libX11 libXpm libXext ];
postUnpack = "sourceRoot=\${sourceRoot}/wmsm";
+ NIX_CFLAGS_COMPILE = "-std=gnu89";
+
installPhase = ''
substituteInPlace Makefile --replace "PREFIX = /usr/X11R6/bin" "" --replace "/usr/bin/install" "install"
mkdir -pv $out/bin;
diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix
index 80a24635f67c..e5eb2fc559da 100644
--- a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix
+++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix
@@ -7,7 +7,8 @@ stdenv.mkDerivation {
sha256 = "8edef43691e9fff071000e29166c7c1ad420c0956e9068151061e881c8ac97e9";
};
- buildInputs = [ pkgconfig libX11 libXpm libXext libXfixes libXmu ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libX11 libXpm libXext libXfixes libXmu ];
meta = {
description = "Systemtray for Windowmaker";
diff --git a/pkgs/applications/window-managers/wmii-hg/default.nix b/pkgs/applications/window-managers/wmii-hg/default.nix
index bea7c99a5112..5a8b68df364a 100644
--- a/pkgs/applications/window-managers/wmii-hg/default.nix
+++ b/pkgs/applications/window-managers/wmii-hg/default.nix
@@ -29,14 +29,15 @@ stdenv.mkDerivation rec {
EOF
'';
- buildInputs = [ unzip pkgconfig libixp_hg txt2tags dash python which
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ unzip libixp_hg txt2tags dash python which
libX11 libXrender libXext libXinerama libXrandr libXft ];
# For some reason including mercurial in buildInputs did not help
makeFlags = "WMII_HGVERSION=hg${rev}";
meta = {
- homepage = https://code.google.com/archive/p/wmii/;
+ homepage = https://suckless.org/; # https://wmii.suckless.org/ does not exist anymore
description = "A small window manager controlled by a 9P filesystem";
maintainers = with stdenv.lib.maintainers; [ kovirobi ];
license = stdenv.lib.licenses.mit;
diff --git a/pkgs/applications/window-managers/wtftw/default.nix b/pkgs/applications/window-managers/wtftw/default.nix
index 0ff3367e3aee..a4eff26d88cf 100644
--- a/pkgs/applications/window-managers/wtftw/default.nix
+++ b/pkgs/applications/window-managers/wtftw/default.nix
@@ -1,17 +1,18 @@
{ stdenv, fetchFromGitHub, rustPlatform, cargo, libXinerama, libX11, xlibs, pkgconfig }:
rustPlatform.buildRustPackage rec {
- name = "wtftw-0.0pre20161001";
+ name = "wtftw-0.0pre20170921";
src = fetchFromGitHub {
owner = "kintaro";
repo = "wtftw";
- rev = "b72a1bd24430a614d953d6ecf61732805277cc0c";
- sha256 = "1ajxkncqh4azyhmsdyk07r1kbhwv81vl1ix3w4iaz8cyln4gs0kp";
+ rev = "13712d4c051938520b90b6639d4ff813f6fe5f48";
+ sha256 = "1r74nhcwiy2rmifzjhdal3jcqz4jz48nfvhdyw4gasa6nxp3msdl";
};
- depsSha256 = "0z7h8ybh2db3xl8qxbzby5lncdaijixzmbn1j8a45lbky1xiix71";
+ cargoSha256 = "0z92ml84b5652zgwzn08a8vvxksaa54jql66sfpdz1mvjwhgdmvn";
- buildInputs = [ libXinerama libX11 pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libXinerama libX11 ];
libPath = stdenv.lib.makeLibraryPath [ libXinerama libX11 ];
preInstall = ''
@@ -24,12 +25,13 @@ rustPlatform.buildRustPackage rec {
cp -p target/release/wtftw $out/bin/
echo "[Desktop Entry]
Name=wtftw
- Exec=/bin/wtftw
+ Exec=$out/bin/wtftw
Type=XSession
DesktopName=wtftw" > $out/share/xsessions/wtftw.desktop
'';
meta = with stdenv.lib; {
+ broken = true;
description = "A tiling window manager in Rust";
homepage = https://github.com/Kintaro/wtftw;
license = stdenv.lib.licenses.bsd3;
diff --git a/pkgs/applications/window-managers/yabar/build.nix b/pkgs/applications/window-managers/yabar/build.nix
index a5d02093e3f6..5e92c52e521b 100644
--- a/pkgs/applications/window-managers/yabar/build.nix
+++ b/pkgs/applications/window-managers/yabar/build.nix
@@ -2,6 +2,7 @@
, xcbutilwm, alsaLib, wirelesstools, asciidoc, libxslt, makeWrapper, docbook_xsl
, configFile ? null, lib
, rev, sha256, version
+, playerctl
}:
stdenv.mkDerivation {
@@ -20,6 +21,7 @@ stdenv.mkDerivation {
buildInputs = [
cairo gdk_pixbuf libconfig pango xcbutilwm docbook_xsl
alsaLib wirelesstools asciidoc libxslt makeWrapper
+ playerctl
];
postPatch = ''
@@ -28,7 +30,7 @@ stdenv.mkDerivation {
--replace "a2x" "${asciidoc}/bin/a2x --no-xmllint"
'';
- makeFlags = [ "DESTDIR=$(out)" "PREFIX=/" ];
+ makeFlags = [ "DESTDIR=$(out)" "PREFIX=/" "PLAYERCTL=1" ];
postInstall = ''
mkdir -p $out/share/yabar/examples
diff --git a/pkgs/applications/window-managers/yabar/unstable.nix b/pkgs/applications/window-managers/yabar/unstable.nix
index 6baa7ae5c036..b704c480d668 100644
--- a/pkgs/applications/window-managers/yabar/unstable.nix
+++ b/pkgs/applications/window-managers/yabar/unstable.nix
@@ -2,9 +2,9 @@
let
overrides = {
- version = "unstable-2017-09-09";
+ version = "unstable-2017-10-12";
- rev = "d3934344ba27f5bdf122bf74daacee6d49284dab";
- sha256 = "14zrlzva8i83ffg426mrf6yli8afwq6chvc7yi78ngixyik5gzhx";
+ rev = "cbecc7766e37f29d50705da0a82dc76ce7c3b86e";
+ sha256 = "1wprjas3k14rxfl06mgr0xq2ra735w1c7dq4xrdvii887wnl37xb";
} // attrs;
in callPackage ./build.nix overrides
diff --git a/pkgs/build-support/build-dotnet-package/default.nix b/pkgs/build-support/build-dotnet-package/default.nix
index 2b1b34429c57..f36c69e43392 100644
--- a/pkgs/build-support/build-dotnet-package/default.nix
+++ b/pkgs/build-support/build-dotnet-package/default.nix
@@ -19,8 +19,8 @@ attrsOrig @
attrs = {
name = "${baseName}-${version}";
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig
mono
dotnetbuildhelpers
makeWrapper
diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix
index 9c228b391147..da8a86b68f5d 100644
--- a/pkgs/build-support/build-fhs-userenv/env.nix
+++ b/pkgs/build-support/build-fhs-userenv/env.nix
@@ -54,6 +54,7 @@ let
export PATH='/run/wrappers/bin:/usr/bin:/usr/sbin'
# Force compilers and other tools to look in default search paths
+ export NIX_CC_WRAPPER_${stdenv.cc.infixSalt}_TARGET_HOST=1
export NIX_CFLAGS_COMPILE='-idirafter /usr/include'
export NIX_LDFLAGS_BEFORE='-L/usr/lib -L/usr/lib32'
export PKG_CONFIG_PATH=/usr/lib/pkgconfig
diff --git a/pkgs/build-support/build-pecl.nix b/pkgs/build-support/build-pecl.nix
index 5837d413abc9..ce948739c320 100644
--- a/pkgs/build-support/build-pecl.nix
+++ b/pkgs/build-support/build-pecl.nix
@@ -2,6 +2,7 @@
{ name
, buildInputs ? []
+, nativeBuildInputs ? []
, makeFlags ? []
, src ? fetchurl {
url = "http://pecl.php.net/get/${name}.tgz";
@@ -15,7 +16,8 @@ stdenv.mkDerivation (args // {
inherit src;
- buildInputs = [ php autoreconfHook ] ++ buildInputs;
+ nativeBuildInputs = [ autoreconfHook ] ++ nativeBuildInputs;
+ buildInputs = [ php ] ++ buildInputs;
makeFlags = [ "EXTENSION_DIR=$(out)/lib/php/extensions" ] ++ makeFlags;
diff --git a/pkgs/build-support/cc-wrapper/add-hardening.sh b/pkgs/build-support/cc-wrapper/add-hardening.sh
index 34358e04194a..b0e39e455ffc 100644
--- a/pkgs/build-support/cc-wrapper/add-hardening.sh
+++ b/pkgs/build-support/cc-wrapper/add-hardening.sh
@@ -16,14 +16,14 @@ do
hardeningDisableMap[$flag]=1
done
-if [[ -n "${NIX_DEBUG:-}" ]]; then
+if (( "${NIX_DEBUG:-0}" >= 1 )); then
printf 'HARDENING: disabled flags:' >&2
(( "${#hardeningDisableMap[@]}" )) && printf ' %q' "${!hardeningDisableMap[@]}" >&2
echo >&2
fi
if [[ -z "${hardeningDisableMap[all]:-}" ]]; then
- if [[ -n "${NIX_DEBUG:-}" ]]; then
+ if (( "${NIX_DEBUG:-0}" >= 1 )); then
echo 'HARDENING: Is active (not completely disabled with "all" flag)' >&2;
fi
for flag in "${hardeningFlags[@]}"
@@ -31,40 +31,40 @@ if [[ -z "${hardeningDisableMap[all]:-}" ]]; then
if [[ -z "${hardeningDisableMap[$flag]:-}" ]]; then
case $flag in
fortify)
- if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling fortify >&2; fi
+ if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling fortify >&2; fi
hardeningCFlags+=('-O2' '-D_FORTIFY_SOURCE=2')
;;
stackprotector)
- if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling stackprotector >&2; fi
+ if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling stackprotector >&2; fi
hardeningCFlags+=('-fstack-protector-strong' '--param' 'ssp-buffer-size=4')
;;
pie)
- if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling CFlags -fPIE >&2; fi
+ if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling CFlags -fPIE >&2; fi
hardeningCFlags+=('-fPIE')
if [[ ! ("$*" =~ " -shared " || "$*" =~ " -static ") ]]; then
- if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling LDFlags -pie >&2; fi
+ if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling LDFlags -pie >&2; fi
hardeningCFlags+=('-pie')
hardeningLDFlags+=('-pie')
fi
;;
pic)
- if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling pic >&2; fi
+ if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling pic >&2; fi
hardeningCFlags+=('-fPIC')
;;
strictoverflow)
- if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling strictoverflow >&2; fi
+ if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling strictoverflow >&2; fi
hardeningCFlags+=('-fno-strict-overflow')
;;
format)
- if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling format >&2; fi
+ if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling format >&2; fi
hardeningCFlags+=('-Wformat' '-Wformat-security' '-Werror=format-security')
;;
relro)
- if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling relro >&2; fi
+ if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling relro >&2; fi
hardeningLDFlags+=('-z' 'relro')
;;
bindnow)
- if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling bindnow >&2; fi
+ if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling bindnow >&2; fi
hardeningLDFlags+=('-z' 'now')
;;
*)
diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh
index aacaf196f313..d2cdbf6ce0cc 100644
--- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh
@@ -1,7 +1,11 @@
#! @shell@
-set -eu -o pipefail
+set -eu -o pipefail +o posix
shopt -s nullglob
+if (( "${NIX_DEBUG:-0}" >= 7 )); then
+ set -x
+fi
+
path_backup="$PATH"
# That @-vars are substituted separately from bash evaluation makes
@@ -57,10 +61,6 @@ while (( "$n" < "$nParams" )); do
cppInclude=0
elif [ "${p:0:1}" != - ]; then
nonFlagArgs=1
- elif [ "$p" = -m32 ]; then
- if [ -e @out@/nix-support/dynamic-linker-m32 ]; then
- NIX_@infixSalt@_LDFLAGS+=" -dynamic-linker $(< @out@/nix-support/dynamic-linker-m32)"
- fi
fi
n+=1
done
@@ -161,7 +161,7 @@ if [ "$*" = -v ]; then
fi
# Optionally print debug info.
-if [ -n "${NIX_DEBUG:-}" ]; then
+if (( "${NIX_DEBUG:-0}" >= 1 )); then
# Old bash workaround, see ld-wrapper for explanation.
echo "extra flags before to @prog@:" >&2
printf " %q\n" ${extraBefore+"${extraBefore[@]}"} >&2
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 866be9cded9e..8d8b8a42fe9f 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -5,15 +5,15 @@
# script that sets up the right environment variables so that the
# compiler and the linker just "work".
-{ name ? "", stdenv, nativeTools, noLibc ? false, nativeLibc, nativePrefix ? ""
-, cc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? stdenv.shell
+{ name ? "", stdenvNoCC, nativeTools, noLibc ? false, nativeLibc, nativePrefix ? ""
+, cc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? stdenvNoCC.shell
, zlib ? null, extraPackages ? [], extraBuildCommands ? ""
, isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null
, buildPackages ? {}
, useMacosReexportHack ? false
}:
-with stdenv.lib;
+with stdenvNoCC.lib;
assert nativeTools -> nativePrefix != "";
assert !nativeTools ->
@@ -25,6 +25,7 @@ assert (noLibc || nativeLibc) == (libc == null);
assert cc.langVhdl or false -> zlib != null;
let
+ stdenv = stdenvNoCC;
inherit (stdenv) hostPlatform targetPlatform;
# Prefix for binaries. Customarily ends with a dash separator.
@@ -96,6 +97,11 @@ stdenv.mkDerivation {
outputs = [ "out" "man" ];
passthru = {
+ # "cc" is the generic name for a C compiler, but there is no one for package
+ # providing the linker and related tools. The two we use now are GNU
+ # Binutils, and Apple's "cctools"; "binutils" as an attempt to find an
+ # unused middle-ground name that evokes both.
+ bintools = binutils_bin;
inherit libc nativeTools nativeLibc nativePrefix isGNU isClang default_cxx_stdlib_compile
prefix;
@@ -285,7 +291,7 @@ stdenv.mkDerivation {
*) echo "Multiple dynamic linkers found for platform '${targetPlatform.config}'." >&2;;
esac
- if [ -n "$dynamicLinker" ]; then
+ if [ -n "''${dynamicLinker:-}" ]; then
echo $dynamicLinker > $out/nix-support/dynamic-linker
'' + (if targetPlatform.isDarwin then ''
diff --git a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh
index f0c922a3d5b4..7a0eb28be636 100644
--- a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh
@@ -1,7 +1,11 @@
#! @shell@
-set -eu -o pipefail
+set -eu -o pipefail +o posix
shopt -s nullglob
+if (( "${NIX_DEBUG:-0}" >= 7 )); then
+ set -x
+fi
+
# N.B. Gnat is not used during bootstrapping, so we don't need to
# worry about the old bash empty array `set -u` workarounds.
@@ -109,7 +113,7 @@ fi
#fi
# Optionally print debug info.
-if [ -n "${NIX_DEBUG:-}" ]; then
+if (( "${NIX_DEBUG:-0}" >= 1 )); then
echo "extra flags before to @prog@:" >&2
printf " %q\n" "${extraBefore[@]}" >&2
echo "original flags to @prog@:" >&2
diff --git a/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh b/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh
index 2de748b5f31e..0944d74e431b 100644
--- a/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh
@@ -1,7 +1,11 @@
#! @shell@
-set -eu -o pipefail
+set -eu -o pipefail +o posix
shopt -s nullglob
+if (( "${NIX_DEBUG:-0}" >= 7 )); then
+ set -x
+fi
+
# N.B. Gnat is not used during bootstrapping, so we don't need to
# worry about the old bash empty array `set -u` workarounds.
@@ -24,7 +28,7 @@ extraBefore=()
#export NIX_@infixSalt@_LDFLAGS_SET=1
# Optionally print debug info.
-if [ -n "${NIX_DEBUG:-}" ]; then
+if (( "${NIX_DEBUG:-0}" >= 1 )); then
echo "extra flags before to @prog@:" >&2
printf " %q\n" "${extraBefore[@]}" >&2
echo "original flags to @prog@:" >&2
diff --git a/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh
index 72c999ff8bc8..5d81e34a047f 100755
--- a/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh
@@ -2,6 +2,10 @@
set -eu -o pipefail
shopt -s nullglob
+if (( "${NIX_DEBUG:-0}" >= 7 )); then
+ set -x
+fi
+
declare -a args=("$@")
# I've also tried adding -z direct and -z lazyload, but it gave too many problems with C++ exceptions :'(
# Also made sure libgcc would not be lazy-loaded, as suggested here: https://www.illumos.org/issues/2534#note-3
diff --git a/pkgs/build-support/cc-wrapper/ld-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-wrapper.sh
index a9cc1e3f9e6f..ef618f9a86d4 100644
--- a/pkgs/build-support/cc-wrapper/ld-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/ld-wrapper.sh
@@ -1,7 +1,11 @@
#! @shell@
-set -eu -o pipefail
+set -eu -o pipefail +o posix
shopt -s nullglob
+if (( "${NIX_DEBUG:-0}" >= 7 )); then
+ set -x
+fi
+
path_backup="$PATH"
# phase separation makes this look useless
@@ -63,12 +67,22 @@ fi
extraAfter+=($NIX_@infixSalt@_LDFLAGS_AFTER)
+# Three tasks:
+#
+# 1. Find all -L... switches for rpath
+#
+# 2. Find relocatable flag for build id.
+#
+# 3. Choose 32-bit dynamic linker if needed
declare -a libDirs
declare -A libs
-relocatable=
+declare -i relocatable=0 link32=0
-# Find all -L... switches for rpath, and relocatable flags for build id.
-if [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ] || [ "$NIX_@infixSalt@_SET_BUILD_ID" = 1 ]; then
+if
+ [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ] \
+ || [ "$NIX_@infixSalt@_SET_BUILD_ID" = 1 ] \
+ || [ -e @out@/nix-support/dynamic-linker-m32 ]
+then
prev=
# Old bash thinks empty arrays are undefined, ugh.
for p in \
@@ -83,6 +97,13 @@ if [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ] || [ "$NIX_@infixSalt@_SET_BUILD_I
-l)
libs["lib${p}.so"]=1
;;
+ -m)
+ # Presumably only the last `-m` flag has any effect.
+ case "$p" in
+ elf_i386) link32=1;;
+ *) link32=0;;
+ esac
+ ;;
-dynamic-linker | -plugin)
# Ignore this argument, or it will match *.so and be added to rpath.
;;
@@ -108,6 +129,14 @@ if [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ] || [ "$NIX_@infixSalt@_SET_BUILD_I
done
fi
+if [ -e "@out@/nix-support/dynamic-linker-m32" ] && (( "$link32" )); then
+ # We have an alternate 32-bit linker and we're producing a 32-bit ELF, let's
+ # use it.
+ extraAfter+=(
+ '-dynamic-linker'
+ "$(< @out@/nix-support/dynamic-linker-m32)"
+ )
+fi
# Add all used dynamic libraries to the rpath.
if [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ]; then
@@ -142,21 +171,23 @@ if [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ]; then
done
done
- if [ -n "${NIX_COREFOUNDATION_RPATH:-}" ]; then
- extraAfter+=(-rpath $NIX_COREFOUNDATION_RPATH)
- fi
fi
+# This is outside the DONT_SET_RPATH branch because it's more targeted and we
+# usually want it (on Darwin) even if DONT_SET_RPATH is set.
+if [ -n "${NIX_COREFOUNDATION_RPATH:-}" ]; then
+ extraAfter+=(-rpath $NIX_COREFOUNDATION_RPATH)
+fi
# Only add --build-id if this is a final link. FIXME: should build gcc
# with --enable-linker-build-id instead?
-if [ "$NIX_@infixSalt@_SET_BUILD_ID" = 1 ] && [ ! "$relocatable" ]; then
+if [ "$NIX_@infixSalt@_SET_BUILD_ID" = 1 ] && ! (( "$relocatable" )); then
extraAfter+=(--build-id)
fi
# Optionally print debug info.
-if [ -n "${NIX_DEBUG:-}" ]; then
+if (( "${NIX_DEBUG:-0}" >= 1 )); then
# Old bash workaround, see above.
echo "extra flags before to @prog@:" >&2
printf " %q\n" ${extraBefore+"${extraBefore[@]}"} >&2
diff --git a/pkgs/build-support/cc-wrapper/utils.sh b/pkgs/build-support/cc-wrapper/utils.sh
index c84a094e26b0..c43c2e12d74a 100644
--- a/pkgs/build-support/cc-wrapper/utils.sh
+++ b/pkgs/build-support/cc-wrapper/utils.sh
@@ -1,5 +1,5 @@
skip () {
- if [ -n "${NIX_DEBUG:-}" ]; then
+ if (( "${NIX_DEBUG:-0}" >= 1 )); then
echo "skipping impure path $1" >&2
fi
}
diff --git a/pkgs/build-support/closure-info.nix b/pkgs/build-support/closure-info.nix
new file mode 100644
index 000000000000..4d178ac96c5d
--- /dev/null
+++ b/pkgs/build-support/closure-info.nix
@@ -0,0 +1,58 @@
+# This derivation builds two files containing information about the
+# closure of 'rootPaths': $out/store-paths contains the paths in the
+# closure, and $out/registration contains a file suitable for use with
+# "nix-store --load-db" and "nix-store --register-validity
+# --hash-given".
+
+{ stdenv, coreutils, jq, perl, pathsFromGraph }:
+
+{ rootPaths }:
+
+#if builtins.langVersion >= 5 then
+# FIXME: it doesn't work on Hydra, failing to find mkdir;
+# perhaps .attrs.sh clobbers PATH with new nix?
+if false then
+
+ # Nix >= 1.12: Include NAR hash / size info.
+
+ stdenv.mkDerivation {
+ name = "closure-info";
+
+ __structuredAttrs = true;
+
+ exportReferencesGraph.closure = rootPaths;
+
+ PATH = "${coreutils}/bin:${jq}/bin";
+
+ builder = builtins.toFile "builder"
+ ''
+ if [ -e .attrs.sh ]; then . .attrs.sh; fi
+
+ out=''${outputs[out]}
+
+ mkdir $out
+
+ jq -r '.closure | map([.path, .narHash, .narSize, "", (.references | length)] + .references) | add | map("\(.)\n") | add' < .attrs.json | head -n -1 > $out/registration
+ jq -r .closure[].path < .attrs.json > $out/store-paths
+ '';
+ }
+
+else
+
+ # Nix < 1.12
+
+ stdenv.mkDerivation {
+ name = "closure-info";
+
+ exportReferencesGraph =
+ map (x: [("closure-" + baseNameOf x) x]) rootPaths;
+
+ buildInputs = [ perl ];
+
+ buildCommand =
+ ''
+ mkdir $out
+ printRegistration=1 perl ${pathsFromGraph} closure-* > $out/registration
+ perl ${pathsFromGraph} closure-* > $out/store-paths
+ '';
+ }
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 843d6d6b5ddb..68b803f6e3cc 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -32,20 +32,7 @@ rec {
inherit pkgs buildImage pullImage shadowSetup buildImageWithNixDb;
};
- pullImage =
- let
- nameReplace = name: builtins.replaceStrings ["/" ":"] ["-" "-"] name;
- in
- # For simplicity we only support sha256.
- { imageName, imageTag ? "latest", imageId ? "${imageName}:${imageTag}"
- , sha256, name ? (nameReplace "docker-image-${imageName}-${imageTag}.tar") }:
- runCommand name {
- impureEnvVars=pkgs.stdenv.lib.fetchers.proxyImpureEnvVars;
- outputHashMode="flat";
- outputHashAlgo="sha256";
- outputHash=sha256;
- }
- "${pkgs.skopeo}/bin/skopeo copy docker://${imageId} docker-archive://$out:${imageId}";
+ pullImage = callPackage ./pull.nix {};
# We need to sum layer.tar, not a directory, hence tarsum instead of nix-hash.
# And we cannot untar it, because then we cannot preserve permissions ecc.
@@ -137,7 +124,7 @@ rec {
};
inherit fromImage fromImageName fromImageTag;
- buildInputs = [ utillinux e2fsprogs jshon rsync jq ];
+ buildInputs = [ utillinux e2fsprogs jshon rsync ];
} ''
rm -rf $out
@@ -146,29 +133,44 @@ rec {
mount /dev/${vmTools.hd} disk
cd disk
- layers=""
if [[ -n "$fromImage" ]]; then
echo "Unpacking base image..."
mkdir image
tar -C image -xpf "$fromImage"
- layers=$(jq -r '.[0].Layers | join(" ")' image/manifest.json)
+
+ # If the image name isn't set, read it from the image repository json.
+ if [[ -z "$fromImageName" ]]; then
+ fromImageName=$(jshon -k < image/repositories | head -n 1)
+ echo "From-image name wasn't set. Read $fromImageName."
+ fi
+
+ # If the tag isn't set, use the name as an index into the json
+ # and read the first key found.
+ if [[ -z "$fromImageTag" ]]; then
+ fromImageTag=$(jshon -e $fromImageName -k < image/repositories \
+ | head -n1)
+ echo "From-image tag wasn't set. Read $fromImageTag."
+ fi
+
+ # Use the name and tag to get the parent ID field.
+ parentID=$(jshon -e $fromImageName -e $fromImageTag -u \
+ < image/repositories)
fi
- # Unpack all of the layers into the image.
- # Layer list is ordered starting from the base image
+ # Unpack all of the parent layers into the image.
lowerdir=""
- for layer in $layers; do
- echo "Unpacking layer $layer"
- layerDir=image/$(echo $layer | cut -d':' -f2)"_unpacked"
- mkdir -p $layerDir
- tar -C $layerDir -xpf image/$layer
- chmod a+w image/$layer
- rm image/$layer
+ while [[ -n "$parentID" ]]; do
+ echo "Unpacking layer $parentID"
+ mkdir -p image/$parentID/layer
+ tar -C image/$parentID/layer -xpf image/$parentID/layer.tar
+ rm image/$parentID/layer.tar
- find $layerDir -name ".wh.*" -exec bash -c 'name="$(basename {}|sed "s/^.wh.//")"; mknod "$(dirname {})/$name" c 0 0; rm {}' \;
+ find image/$parentID/layer -name ".wh.*" -exec bash -c 'name="$(basename {}|sed "s/^.wh.//")"; mknod "$(dirname {})/$name" c 0 0; rm {}' \;
# Get the next lower directory and continue the loop.
- lowerdir=$lowerdir''${lowerdir:+:}$layerDir
+ lowerdir=$lowerdir''${lowerdir:+:}image/$parentID/layer
+ parentID=$(cat image/$parentID/json \
+ | (jshon -e parent -u 2>/dev/null || true))
done
mkdir work
@@ -446,17 +448,26 @@ rec {
mkdir image
touch baseFiles
- layers=""
if [[ -n "$fromImage" ]]; then
echo "Unpacking base image..."
tar -C image -xpf "$fromImage"
- config=$(jq -r '.[0].Config' image/manifest.json)
- layers=$(jq -r '.[0].Layers | join(" ")' image/manifest.json)
- for l in $layers; do
- ls_tar image/$l >> baseFiles
+ # Do not import the base image configuration and manifest
+ chmod a+w image image/*.json
+ rm -f image/*.json
+
+ if [[ -z "$fromImageName" ]]; then
+ fromImageName=$(jshon -k < image/repositories|head -n1)
+ fi
+ if [[ -z "$fromImageTag" ]]; then
+ fromImageTag=$(jshon -e $fromImageName -k \
+ < image/repositories|head -n1)
+ fi
+ parentID=$(jshon -e $fromImageName -e $fromImageTag -u \
+ < image/repositories)
+
+ for l in image/*/layer.tar; do
+ ls_tar $l >> baseFiles
done
- chmod u+w image image/$config
- rm image/$config
fi
chmod -R ug+rw image
@@ -483,28 +494,47 @@ rec {
tar -rpf temp/layer.tar --mtime="@$SOURCE_DATE_EPOCH" \
--owner=0 --group=0 --no-recursion --files-from newFiles
- gzip temp/layer.tar
- layerID="sha256:$(sha256sum temp/layer.tar.gz | cut -d ' ' -f 1)"
- mv temp/layer.tar.gz image/$layerID
+ echo "Adding meta..."
- echo "Generating image configuration and manifest..."
+ # If we have a parentID, add it to the json metadata.
+ if [[ -n "$parentID" ]]; then
+ cat temp/json | jshon -s "$parentID" -i parent > tmpjson
+ mv tmpjson temp/json
+ fi
+
+ # Take the sha256 sum of the generated json and use it as the layer ID.
+ # Compute the size and add it to the json under the 'Size' field.
+ layerID=$(sha256sum temp/json|cut -d ' ' -f 1)
+ size=$(stat --printf="%s" temp/layer.tar)
+ cat temp/json | jshon -s "$layerID" -i id -n $size -i Size > tmpjson
+ mv tmpjson temp/json
+
+ # Use the temp folder we've been working on to create a new image.
+ mv temp image/$layerID
+
+ # Create image json and image manifest
imageJson=$(cat ${baseJson} | jq ". + {\"rootfs\": {\"diff_ids\": [], \"type\": \"layers\"}}")
manifestJson=$(jq -n "[{\"RepoTags\":[\"$imageName:$imageTag\"]}]")
-
- # The layer list is ordered starting from the base image
- layers=$(echo $layers $layerID)
- for i in $(echo $layers); do
+ currentID=$layerID
+ while [[ -n "$currentID" ]]; do
+ layerChecksum=$(sha256sum image/$currentID/layer.tar | cut -d ' ' -f1)
imageJson=$(echo "$imageJson" | jq ".history |= [{\"created\": \"${created}\"}] + .")
- diffId=$(gzip -dc image/$i | sha256sum | cut -d" " -f1)
- imageJson=$(echo "$imageJson" | jq ".rootfs.diff_ids |= [\"sha256:$diffId\"] + .")
- manifestJson=$(echo "$manifestJson" | jq ".[0].Layers |= [\"$i\"] + .")
+ imageJson=$(echo "$imageJson" | jq ".rootfs.diff_ids |= [\"sha256:$layerChecksum\"] + .")
+ manifestJson=$(echo "$manifestJson" | jq ".[0].Layers |= [\"$currentID/layer.tar\"] + .")
+
+ currentID=$(cat image/$currentID/json | (jshon -e parent -u 2>/dev/null || true))
done
imageJsonChecksum=$(echo "$imageJson" | sha256sum | cut -d ' ' -f1)
- echo "$imageJson" > "image/sha256:$imageJsonChecksum"
- manifestJson=$(echo "$manifestJson" | jq ".[0].Config = \"sha256:$imageJsonChecksum\"")
+ echo "$imageJson" > "image/$imageJsonChecksum.json"
+ manifestJson=$(echo "$manifestJson" | jq ".[0].Config = \"$imageJsonChecksum.json\"")
echo "$manifestJson" > image/manifest.json
+ # Store the json under the name image/repositories.
+ jshon -n object \
+ -n object -s "$layerID" -i "$imageTag" \
+ -i "$imageName" > image/repositories
+
# Make the image read-only.
chmod -R a-w image
diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix
index 1a8b9c7f8ed4..b9a334971744 100644
--- a/pkgs/build-support/docker/examples.nix
+++ b/pkgs/build-support/docker/examples.nix
@@ -87,7 +87,7 @@ rec {
imageName = "nixos/nix";
imageTag = "1.11";
# this hash will need change if the tag is updated at docker hub
- sha256 = "18xvcnl0yvj9kfi5bkimrhhjaa8xhm3jhshh2xd7c0sbfrmfqzvi";
+ sha256 = "0nncn9pn5miygan51w34c2p9qssi96jgsaqv44dxxdprc8pg0g83";
};
# 5. example of multiple contents, emacs and vi happily coexisting
@@ -107,11 +107,13 @@ rec {
nix = buildImageWithNixDb {
name = "nix";
contents = [
- # nix-store -qR uses the 'more' program which is not included in
- # the pkgs.nix dependencies. We then have to manually get it
- # from the 'eject' package:/
- pkgs.eject
+ # nix-store uses cat program to display results as specified by
+ # the image env variable NIX_PAGER.
+ pkgs.coreutils
pkgs.nix
];
+ config = {
+ Env = [ "NIX_PAGER=cat" ];
+ };
};
}
diff --git a/pkgs/build-support/docker/pull.nix b/pkgs/build-support/docker/pull.nix
new file mode 100644
index 000000000000..5ccd0a41c5e4
--- /dev/null
+++ b/pkgs/build-support/docker/pull.nix
@@ -0,0 +1,32 @@
+{ stdenv, lib, docker, vmTools, utillinux, curl, kmod, dhcp, cacert, e2fsprogs }:
+let
+ nameReplace = name: builtins.replaceStrings ["/" ":"] ["-" "-"] name;
+in
+# For simplicity we only support sha256.
+{ imageName, imageTag ? "latest", imageId ? "${imageName}:${imageTag}"
+, sha256, name ? (nameReplace "docker-image-${imageName}-${imageTag}.tar") }:
+let
+ pullImage = vmTools.runInLinuxVM (
+ stdenv.mkDerivation {
+ inherit name imageId;
+
+ certs = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+
+ builder = ./pull.sh;
+
+ buildInputs = [ curl utillinux docker kmod dhcp cacert e2fsprogs ];
+
+ outputHashAlgo = "sha256";
+ outputHash = sha256;
+
+ impureEnvVars = lib.fetchers.proxyImpureEnvVars;
+
+ preVM = vmTools.createEmptyImage {
+ size = 2048;
+ fullName = "${name}-disk";
+ };
+
+ QEMU_OPTS = "-netdev user,id=net0 -device virtio-net-pci,netdev=net0";
+ });
+in
+ pullImage
diff --git a/pkgs/build-support/fetchadc/builder.sh b/pkgs/build-support/fetchadc/builder.sh
deleted file mode 100644
index ceeaa9213d65..000000000000
--- a/pkgs/build-support/fetchadc/builder.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-source $stdenv/setup
-
-loginpage=`curl --insecure -s -L -b cookies.txt "$url"`
-
-[[ $loginpage =~ form[^\>]+action=\"([^\"]+)\" ]] && loginurl=${BASH_REMATCH[1]}
-
-curl --insecure -s --output "$out" -L -b cookies.txt --data "appleId=${adc_user}&accountPassword=${adc_pass}" "https://idmsa.apple.com/IDMSWebAuth/${loginurl}"
diff --git a/pkgs/build-support/fetchadc/default.nix b/pkgs/build-support/fetchadc/default.nix
deleted file mode 100644
index 4d759e6f7f18..000000000000
--- a/pkgs/build-support/fetchadc/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, curl, adc_user, adc_pass }:
-
-{ # Path to fetch.
- path
-
- # Hash of the downloaded file
-, sha256
-
-, # Additional curl options needed for the download to succeed.
- curlOpts ? ""
-
-, # Name of the file. If empty, use the basename of `path'.
- name ? ""
-}:
-
-stdenv.mkDerivation {
- url = "https://developer.apple.com/downloads/download.action?path=${path}";
-
- name = if name != "" then name else baseNameOf path;
- builder = ./builder.sh;
-
- buildInputs = [ curl ];
-
- meta = {
- # Password-guarded files from ADC are certainly unfree, as far as we're concerned!
- license = stdenv.lib.licenses.unfree;
- };
-
- outputHashAlgo = "sha256";
- outputHash = sha256;
- outputHashMode = "flat";
-
- inherit curlOpts adc_user adc_pass;
-
- preferLocalBuild = true;
-}
diff --git a/pkgs/build-support/fetchbower/default.nix b/pkgs/build-support/fetchbower/default.nix
index dd0bac49cb6d..3e1f0eff84af 100644
--- a/pkgs/build-support/fetchbower/default.nix
+++ b/pkgs/build-support/fetchbower/default.nix
@@ -4,13 +4,13 @@ let
let
components = lib.splitString "#" version;
hash = lib.last components;
- ver = if builtins.length components == 1 then version else hash;
+ ver = if builtins.length components == 1 then (cleanName version) else hash;
in ver;
- bowerName = name: lib.replaceStrings ["/"] ["-"] name;
+ cleanName = name: lib.replaceStrings ["/" ":"] ["-" "-"] name;
fetchbower = name: version: target: outputHash: stdenv.mkDerivation {
- name = "${bowerName name}-${bowerVersion version}";
+ name = "${cleanName name}-${bowerVersion version}";
SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
buildCommand = ''
fetch-bower --quiet --out=$PWD/out "${name}" "${target}" "${version}"
diff --git a/pkgs/build-support/fetchbzr/builder.sh b/pkgs/build-support/fetchbzr/builder.sh
index af1257d3688c..e424fd92d51e 100644
--- a/pkgs/build-support/fetchbzr/builder.sh
+++ b/pkgs/build-support/fetchbzr/builder.sh
@@ -4,6 +4,6 @@ header "exporting \`$url' (revision $rev) into \`$out'"
# Perform a lightweight checkout so that we don't end up importing
# all the repository's history.
-bzr -Ossl.cert_reqs=none export -r "$rev" --format=dir "$out" "$url"
+BZR_LOG=/dev/null bzr -Ossl.cert_reqs=none export -r "$rev" --format=dir "$out" "$url"
stopNest
diff --git a/pkgs/build-support/fetchgit/gitrepotoname.nix b/pkgs/build-support/fetchgit/gitrepotoname.nix
deleted file mode 100644
index 90005b545692..000000000000
--- a/pkgs/build-support/fetchgit/gitrepotoname.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ lib }:
-
-let
- inherit (lib) removeSuffix hasPrefix removePrefix splitString stringToCharacters concatMapStrings last elem;
-
- allowedChars = stringToCharacters "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789+-._?=";
- sanitizeStoreName = s:
- let
- s' = concatMapStrings (c: if elem c allowedChars then c else "") (stringToCharacters s);
- s'' = if hasPrefix "." s' then "_${removePrefix "." s'}" else s';
- in
- s'';
-in
- urlOrRepo: rev:
- let
- repo' = last (splitString ":" (baseNameOf (removeSuffix ".git" (removeSuffix "/" urlOrRepo))));
- rev' = baseNameOf rev;
- in
- "${sanitizeStoreName repo'}-${sanitizeStoreName rev'}-src"
diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index a180509a3265..17962d08acc3 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -39,7 +39,7 @@ usage(){
Options:
--out path Path where the output would be stored.
- --url url Any url understand by 'git clone'.
+ --url url Any url understood by 'git clone'.
--rev ref Any sha1 or references (such as refs/heads/master)
--hash h Expected hash.
--deepClone Clone the entire repository.
diff --git a/pkgs/build-support/fetchgit/private.nix b/pkgs/build-support/fetchgit/private.nix
index dd3a8c1cb417..a1dd9210e731 100644
--- a/pkgs/build-support/fetchgit/private.nix
+++ b/pkgs/build-support/fetchgit/private.nix
@@ -1,19 +1,26 @@
-{ fetchgit, writeScript, openssh, stdenv }: args: derivation ((fetchgit args).drvAttrs // {
+{ fetchgit, runCommand, makeWrapper, openssh, stdenv }: args: derivation ((fetchgit args).drvAttrs // {
SSH_AUTH_SOCK = if (builtins.tryEval ).success
then builtins.toString
else null;
- GIT_SSH = writeScript "fetchgit-ssh" ''
- #! ${stdenv.shell}
- exec -a ssh ${openssh}/bin/ssh -F ${let
- sshConfigFile = if (builtins.tryEval ).success
- then
- else builtins.trace ''
- Please set your nix-path such that ssh-config-file points to a file that will allow ssh to access private repositories. The builder will not be able to see any running ssh agent sessions unless ssh-auth-sock is also set in the nix-path.
- Note that the config file and any keys it points to must be readable by the build user, which depending on your nix configuration means making it readable by the build-users-group, the user of the running nix-daemon, or the user calling the nix command which started the build. Similarly, if using an ssh agent ssh-auth-sock must point to a socket the build user can access.
+ GIT_SSH = let
+ config = ''${let
+ sshConfigFile = if (builtins.tryEval ).success
+ then
+ else builtins.trace ''
+ Please set your nix-path such that ssh-config-file points to a file that will allow ssh to access private repositories. The builder will not be able to see any running ssh agent sessions unless ssh-auth-sock is also set in the nix-path.
- You may need StrictHostKeyChecking=no in the config file. Since ssh will refuse to use a group-readable private key, if using build-users you will likely want to use something like IdentityFile /some/directory/%u/key and have a directory for each build user accessible to that user.
- '' "/var/lib/empty/config";
- in builtins.toString sshConfigFile} "$@"
- '';
+ Note that the config file and any keys it points to must be readable by the build user, which depending on your nix configuration means making it readable by the build-users-group, the user of the running nix-daemon, or the user calling the nix command which started the build. Similarly, if using an ssh agent ssh-auth-sock must point to a socket the build user can access.
+
+ You may need StrictHostKeyChecking=no in the config file. Since ssh will refuse to use a group-readable private key, if using build-users you will likely want to use something like IdentityFile /some/directory/%u/key and have a directory for each build user accessible to that user.
+ '' "/var/lib/empty/config";
+ in builtins.toString sshConfigFile}'';
+
+ ssh-wrapped = runCommand "fetchgit-ssh" {
+ buildInputs = [ makeWrapper ];
+ } ''
+ mkdir -p $out/bin
+ makeWrapper ${openssh}/bin/ssh $out/bin/ssh --prefix PATH : "$out/bin" --add-flags "-F ${config}" "$@"
+ '';
+ in "${ssh-wrapped}/bin/ssh";
})
diff --git a/pkgs/build-support/fetchgitrevision/default.nix b/pkgs/build-support/fetchgitrevision/default.nix
deleted file mode 100644
index e877648978d9..000000000000
--- a/pkgs/build-support/fetchgitrevision/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-runCommand: git: repository: branch:
- import (runCommand "head-revision"
- { buildInputs = [ git ];
- dummy = builtins.currentTime;
- }
- ''
- rev=$(git ls-remote ${repository} | grep "refs/${branch}$" | awk '{ print $1 }')
- echo "[ \"$rev\" ]" > $out
- echo Latest revision in ${branch} is $rev
- '')
diff --git a/pkgs/build-support/fetchipfs/builder.sh b/pkgs/build-support/fetchipfs/builder.sh
new file mode 100644
index 000000000000..7a6a517566f5
--- /dev/null
+++ b/pkgs/build-support/fetchipfs/builder.sh
@@ -0,0 +1,87 @@
+source $stdenv/setup
+
+# Curl flags to handle redirects, not use EPSV, handle cookies for
+# servers to need them during redirects, and work on SSL without a
+# certificate (this isn't a security problem because we check the
+# cryptographic hash of the output anyway).
+
+set -o noglob
+
+curl="curl \
+ --location \
+ --max-redirs 20 \
+ --retry 2 \
+ --disable-epsv \
+ --cookie-jar cookies \
+ --insecure \
+ --speed-time 5 \
+ -# \
+ --fail \
+ $curlOpts \
+ $NIX_CURL_FLAGS"
+
+finish() {
+ runHook postFetch
+ set +o noglob
+ exit 0
+}
+
+ipfs_add() {
+ if curl --retry 0 --head --silent "localhost:5001" > /dev/null; then
+ echo "[0m[01;36m=IPFS=[0m add $ipfs"
+ tar --owner=root --group=root -cWf "source.tar" $(echo *)
+ res=$(curl -# -F "file=@source.tar" "localhost:5001/api/v0/tar/add" | sed 's/.*"Hash":"\(.*\)".*/\1/')
+ if [ $ipfs != $res ]; then
+ echo "\`ipfs tar add' results in $res when $ipfs is expected"
+ exit 1
+ fi
+ rm "source.tar"
+ fi
+}
+
+echo
+
+mkdir download
+cd download
+
+if curl --retry 0 --head --silent "localhost:5001" > /dev/null; then
+ curlexit=18;
+ echo "[0m[01;36m=IPFS=[0m get $ipfs"
+ # if we get error code 18, resume partial download
+ while [ $curlexit -eq 18 ]; do
+ # keep this inside an if statement, since on failure it doesn't abort the script
+ if $curl -C - "http://localhost:5001/api/v0/tar/cat?arg=$ipfs" --output "$ipfs.tar"; then
+ unpackFile "$ipfs.tar"
+ rm "$ipfs.tar"
+ set +o noglob
+ mv $(echo *) "$out"
+ finish
+ else
+ curlexit=$?;
+ fi
+ done
+fi
+
+if test -n "$url"; then
+ curlexit=18;
+ echo "Downloading $url"
+ while [ $curlexit -eq 18 ]; do
+ # keep this inside an if statement, since on failure it doesn't abort the script
+ if $curl "$url" -O; then
+ set +o noglob
+ tmpfile=$(echo *)
+ unpackFile $tmpfile
+ rm $tmpfile
+ ipfs_add
+ mv $(echo *) "$out"
+ finish
+ else
+ curlexit=$?;
+ fi
+ done
+fi
+
+echo "[01;31merror:[0m cannot download $ipfs from ipfs or the given url"
+echo
+set +o noglob
+exit 1
diff --git a/pkgs/build-support/fetchipfs/default.nix b/pkgs/build-support/fetchipfs/default.nix
new file mode 100644
index 000000000000..196b3bebc916
--- /dev/null
+++ b/pkgs/build-support/fetchipfs/default.nix
@@ -0,0 +1,52 @@
+{ stdenv
+, curl
+}:
+
+{ ipfs
+, url ? ""
+, curlOpts ? ""
+, outputHash ? ""
+, outputHashAlgo ? ""
+, md5 ? ""
+, sha1 ? ""
+, sha256 ? ""
+, sha512 ? ""
+, meta ? {}
+, port ? "8080"
+, postFetch ? ""
+}:
+
+assert sha512 != "" -> builtins.compareVersions "1.11" builtins.nixVersion <= 0;
+
+let
+
+ hasHash = (outputHash != "" && outputHashAlgo != "")
+ || md5 != "" || sha1 != "" || sha256 != "" || sha512 != "";
+
+in
+
+if (!hasHash) then throw "Specify sha for fetchipfs fixed-output derivation" else stdenv.mkDerivation {
+ name = ipfs;
+ builder = ./builder.sh;
+ buildInputs = [ curl ];
+
+ # New-style output content requirements.
+ outputHashAlgo = if outputHashAlgo != "" then outputHashAlgo else
+ if sha512 != "" then "sha512" else if sha256 != "" then "sha256" else if sha1 != "" then "sha1" else "md5";
+ outputHash = if outputHash != "" then outputHash else
+ if sha512 != "" then sha512 else if sha256 != "" then sha256 else if sha1 != "" then sha1 else md5;
+
+ outputHashMode = "recursive";
+
+ inherit curlOpts
+ postFetch
+ ipfs
+ url
+ port;
+
+ # Doing the download on a remote machine just duplicates network
+ # traffic, so don't do that.
+ preferLocalBuild = true;
+
+ inherit meta;
+}
diff --git a/pkgs/build-support/fetchpatch/default.nix b/pkgs/build-support/fetchpatch/default.nix
index a9bfac320fb8..e3159d205301 100644
--- a/pkgs/build-support/fetchpatch/default.nix
+++ b/pkgs/build-support/fetchpatch/default.nix
@@ -27,4 +27,4 @@ fetchurl ({
"$tmpfile" > "$out"
${args.postFetch or ""}
'';
-} // builtins.removeAttrs args ["stripLen" "addPrefixes" "excludes"])
+} // builtins.removeAttrs args ["stripLen" "addPrefixes" "excludes" "postFetch"])
diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix
index 5811950bf053..8dac273eb1ca 100644
--- a/pkgs/build-support/fetchurl/default.nix
+++ b/pkgs/build-support/fetchurl/default.nix
@@ -84,6 +84,9 @@ in
, # Meta information, if any.
meta ? {}
+
+ # Passthru information, if any.
+, passthru ? {}
}:
assert builtins.isList urls;
@@ -139,4 +142,5 @@ else stdenv.mkDerivation {
'';
inherit meta;
+ inherit passthru;
}
diff --git a/pkgs/build-support/fetchzip/default.nix b/pkgs/build-support/fetchzip/default.nix
index 751dba56930e..4a5381d71f20 100644
--- a/pkgs/build-support/fetchzip/default.nix
+++ b/pkgs/build-support/fetchzip/default.nix
@@ -11,10 +11,11 @@
stripRoot ? true
, url
, extraPostFetch ? ""
+, name ? "source"
, ... } @ args:
lib.overrideDerivation (fetchurl ({
- name = args.name or (baseNameOf url);
+ inherit name;
recursiveHash = true;
diff --git a/pkgs/build-support/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix
index 70727f9b49dc..5353ae828410 100644
--- a/pkgs/build-support/kernel/make-initrd.nix
+++ b/pkgs/build-support/kernel/make-initrd.nix
@@ -12,21 +12,18 @@
# `contents = {object = ...; symlink = /init;}' is a typical
# argument.
-{ stdenv, perl, cpio, contents, ubootChooser, compressor, prepend
+{ stdenv, perl, cpio, contents, compressor, prepend, ubootTools
, hostPlatform
}:
-let
- inputsFun = ubootName : [ perl cpio ]
- ++ stdenv.lib.optional (ubootName != null) [ (ubootChooser ubootName) ];
- makeUInitrdFun = ubootName : (ubootName != null);
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
name = "initrd";
builder = ./make-initrd.sh;
- nativeBuildInputs = inputsFun hostPlatform.platform.uboot;
- makeUInitrd = makeUInitrdFun hostPlatform.platform.uboot;
+ makeUInitrd = hostPlatform.platform.kernelTarget == "uImage";
+
+ nativeBuildInputs = [ perl cpio ]
+ ++ stdenv.lib.optional makeUInitrd ubootTools;
# !!! should use XML.
objects = map (x: x.object) contents;
diff --git a/pkgs/build-support/kernel/paths-from-graph.pl b/pkgs/build-support/kernel/paths-from-graph.pl
index 9a199a2b3044..747e1edec811 100644
--- a/pkgs/build-support/kernel/paths-from-graph.pl
+++ b/pkgs/build-support/kernel/paths-from-graph.pl
@@ -1,8 +1,6 @@
# Parses a /nix/store/*-closure file and prints
# various information.
# By default, the nodes in the graph are printed to stdout.
-# If the environment variable printManifest is set,
-# then the graph is written as a manifest.
# If printRegistration is set, then the graph is written
# as a registration file for a manifest is written
# in the `nix-store --load-db' format.
@@ -46,26 +44,7 @@ foreach my $graph (@ARGV) {
}
-if ($ENV{"printManifest"} eq "1") {
- print "version {\n";
- print " ManifestVersion: 3\n";
- print "}\n";
-
- foreach my $storePath (sort (keys %storePaths)) {
- my $base = basename $storePath;
- print "localPath {\n";
- print " StorePath: $storePath\n";
- print " CopyFrom: /tmp/inst-store/$base\n";
- print " References: ";
- foreach my $ref (@{$refs{$storePath}}) {
- print "$ref ";
- }
- print "\n";
- print "}\n";
- }
-}
-
-elsif ($ENV{"printRegistration"} eq "1") {
+if ($ENV{"printRegistration"} eq "1") {
# This is the format used by `nix-store --register-validity
# --hash-given' / `nix-store --load-db'.
foreach my $storePath (sort (keys %storePaths)) {
diff --git a/pkgs/build-support/rust/cargo-vendor.nix b/pkgs/build-support/rust/cargo-vendor.nix
new file mode 100644
index 000000000000..6b50f8b83e73
--- /dev/null
+++ b/pkgs/build-support/rust/cargo-vendor.nix
@@ -0,0 +1,32 @@
+{ fetchurl, stdenv }:
+let
+ inherit (stdenv) system;
+
+ version = "0.1.12";
+
+ hashes = {
+ x86_64-linux = "1hxlavcxy374yypfamlkygjg662lhll8j434qcvdawkvlidg5ii5";
+ x86_64-darwin = "1jkvhh710gwjnnjx59kaplx2ncfvkx9agfa76rr94sbjqq4igddm";
+ };
+ hash = hashes. ${system} or (throw "missing bootstrap hash for platform ${system}");
+
+ platforms = {
+ x86_64-linux = "x86_64-unknown-linux-musl";
+ x86_64-darwin = "x86_64-apple-darwin";
+ };
+ platform = platforms . ${system};
+
+in stdenv.mkDerivation {
+ name = "cargo-vendor-${version}";
+
+ src = fetchurl {
+ url = "https://github.com/alexcrichton/cargo-vendor/releases/download/${version}/cargo-vendor-${version}-${platform}.tar.gz";
+ sha256 = hash;
+ };
+
+ phases = "unpackPhase installPhase";
+
+ installPhase = ''
+ install -Dm755 cargo-vendor $out/bin/cargo-vendor
+ '';
+}
diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index 36130289fbaa..37ea264a53fb 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -1,10 +1,14 @@
-{ stdenv, callPackage, path, cacert, git, rust, rustRegistry }:
-
+{ fetchurl, stdenv, path, cacert, git, rust }:
let
- rustRegistry' = rustRegistry;
+ cargoVendor = import ./cargo-vendor.nix {
+ inherit fetchurl stdenv;
+ };
+
+ fetchcargo = import ./fetchcargo.nix {
+ inherit stdenv cacert git rust cargoVendor;
+ };
in
-{ name, depsSha256
-, rustRegistry ? rustRegistry'
+{ name, cargoSha256
, src ? null
, srcs ? null
, sourceRoot ? null
@@ -18,17 +22,13 @@ in
let
lib = stdenv.lib;
- fetchDeps = import ./fetchcargo.nix {
- inherit stdenv cacert git rust rustRegistry;
- };
-
- cargoDeps = fetchDeps {
+ cargoDeps = fetchcargo {
inherit name src srcs sourceRoot cargoUpdateHook;
- sha256 = depsSha256;
+ sha256 = cargoSha256;
};
in stdenv.mkDerivation (args // {
- inherit cargoDeps rustRegistry;
+ inherit cargoDeps;
patchRegistryDeps = ./patch-registry-deps;
@@ -43,71 +43,24 @@ in stdenv.mkDerivation (args // {
postUnpack = ''
eval "$cargoDepsHook"
- echo "Using cargo deps from $cargoDeps"
+ mkdir .cargo
+ cat >.cargo/config <<-EOF
+ [source.crates-io]
+ registry = 'https://github.com/rust-lang/crates.io-index'
+ replace-with = 'vendored-sources'
- cp -a "$cargoDeps" deps
- chmod +w deps -R
-
- # It's OK to use /dev/null as the URL because by the time we do this, cargo
- # won't attempt to update the registry anymore, so the URL is more or less
- # irrelevant
-
- cat < deps/config
- [registry]
- index = "file:///dev/null"
+ [source.vendored-sources]
+ directory = '$cargoDeps'
EOF
- export CARGO_HOME="$(realpath deps)"
export RUST_LOG=${logLevel}
export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
-
- # Let's find out which $indexHash cargo uses for file:///dev/null
- (cd $sourceRoot && cargo fetch &>/dev/null) || true
- cd deps
- indexHash="$(basename $(echo registry/index/*))"
-
- echo "Using indexHash '$indexHash'"
-
- rm -rf -- "registry/cache/$indexHash" \
- "registry/index/$indexHash"
-
- mv registry/cache/HASH "registry/cache/$indexHash"
-
- echo "Using rust registry from $rustRegistry"
- ln -s "$rustRegistry" "registry/index/$indexHash"
-
- # Retrieved the Cargo.lock file which we saved during the fetch
- cd ..
- mv deps/Cargo.lock $sourceRoot/
-
- (
- cd $sourceRoot
-
- cargo fetch
- cargo clean
- )
'' + (args.postUnpack or "");
- prePatch = ''
- # Patch registry dependencies, using the scripts in $patchRegistryDeps
- (
- set -euo pipefail
-
- cd $NIX_BUILD_TOP/deps/registry/src/*
-
- for script in $patchRegistryDeps/*; do
- # Run in a subshell so that directory changes and shell options don't
- # affect any following commands
-
- ( . $script)
- done
- )
- '' + (args.prePatch or "");
-
buildPhase = with builtins; args.buildPhase or ''
runHook preBuild
echo "Running cargo build --release ${concatStringsSep " " cargoBuildFlags}"
- cargo build --release ${concatStringsSep " " cargoBuildFlags}
+ cargo build --release --frozen ${concatStringsSep " " cargoBuildFlags}
runHook postBuild
'';
@@ -126,4 +79,6 @@ in stdenv.mkDerivation (args // {
find target/release -maxdepth 1 -executable -exec cp "{}" $out/bin \;
runHook postInstall
'';
+
+ passthru = { inherit cargoDeps; } // (args.passthru or {});
})
diff --git a/pkgs/build-support/rust/fetch-cargo-deps b/pkgs/build-support/rust/fetch-cargo-deps
deleted file mode 100755
index 3c7e034364f4..000000000000
--- a/pkgs/build-support/rust/fetch-cargo-deps
+++ /dev/null
@@ -1,209 +0,0 @@
-# copied from libgit2 source code 'repo-template.h'
-makeGitTemplate() {
- local target="$1"
- mkdir -p -m777 "$target/info" "$target/pack" "$target/objects" "$target/refs"
- mkdir -p -m777 "$target/refs/heads" "$target/refs/tags" "$target/objects/info" "$target/objects/pack"
- cat <<'EOF' > "$target/description"
-Unnamed repository; edit this file 'description' to name the repository.
-EOF
- chmod 666 "$target/description"
- cat <<'EOF' > "$target/info/exclude"
-# File patterns to ignore; see `git help ignore` for more information.
-# Lines that start with '#' are comments.
-EOF
-}
-
-fetchCargoDeps() {
- src=$(realpath $1)
- out=$(realpath $2)
-
- echo "Fetching $src to $out"
-
- mkdir $out
-
- # Configure git template dir to make libgit2 more deterministic
- #
- # Without a template dir, libgit2 defaults to /usr/share/git-core/templates,
- # which can vary between systems if sandboxed builds aren't used.
- #
- # Note: we explictly set --tmpdir for mktemp here to make it more friendly
- # for nix-shell users, where $TMPDIR is not necessarily set to NIX_BUILD_TOP
- echo "Setting up git templatedir"
- export GIT_TEMPLATE_DIR="$(mktemp -d --tmpdir=$NIX_BUILD_TOP git-template.XXX)"
- makeGitTemplate "$GIT_TEMPLATE_DIR"
- export XDG_CONFIG_HOME="$(mktemp -d --tmpdir=$NIX_BUILD_TOP home.XXX)"
- mkdir -p $XDG_CONFIG_HOME/git
- cat < $XDG_CONFIG_HOME/git/config
-[init]
- templatedir = $GIT_TEMPLATE_DIR
-EOF
-
- # Configure cargo to fetch from a local copy of the crates.io registry
-
- echo "Using rust registry from $rustRegistry"
-
- cat < $out/config
-[registry]
-index = "file://$rustRegistry"
-EOF
-
- export CARGO_HOME=$out
- cd $src
-
- if [[ ! -f Cargo.lock ]]; then
- echo
- echo "ERROR: The Cargo.lock file doesn't exist"
- echo
- echo "Cargo.lock is needed to make sure that depsSha256 doesn't change"
- echo "when the registry is updated."
- echo
-
- exit 1
- fi
-
- # We need to do the following string replacement so that 'cargo fetch'
- # doesn't ignore the versions specified in Cargo.lock
- substituteInPlace Cargo.lock \
- --replace "registry+https://github.com/rust-lang/crates.io-index" \
- "registry+file://$rustRegistry"
-
- # Do any possible 'cargo update -p --precise ' ad-hoc updates
- eval "$cargoUpdateHook"
-
- # Do the fetch
- cargo fetch --verbose
-
- # Now that we have fetched everything, let's make the output deterministic
-
- # Cargo uses the following directory structure for fetched data, where
- # $indexHash is a hash of the registry index URL:
- #
- #
- # /config:
- #
- # Cargo config file. We'll delete this because it's not deterministic,
- # and instead recreate it just before running 'cargo build'.
- #
- # /registry/cache/$indexHash/:
- #
- # This is where tarballs of registry package dependencies are kept
- # We'll need to keep this, but make sure $indexHash is a fixed name.
- #
- # /registry/index/$indexHash/:
- #
- # A copy of the registry index is kept here. We can delete this, and
- # instead, just before running 'cargo build', we'll symlink this
- # directory to our static copy of the registry in the Nix store.
- #
- # /registry/src/$indexHash/{pkgName-pkgVersion}/:
- #
- # Here cargo keeps extracted sources of the cached tarballs.
- # We'll just delete this because cargo will re-populate them from the
- # tarballs.
- #
- # /git/db/{domain-hash}/:
- #
- # Here cargo keeps the `.git` directories of git dependencies.
- # We'll need to keep these, but make them deterministic.
- #
- # /git/checkouts/{domain-hash}/{branchName}/:
- #
- # Here cargo keeps checked-out sources of the git dependencies.
- # We can delete this, because cargo will re-populate them from the above
- # `.git` directories.
- #
- # Let's start
-
- # Remove cargo config file, which points to the ever-changing registry
- rm $out/config
-
- # Save the Cargo.lock file into the output, so that we don't have to do another
- # 'cargo update' during the build (which would try to access the network) for
- # any ad-hoc package updates (through $cargoUpdateHook).
- #
- # We need to replace the rustRegistry URL with something deterministic.
- # Since the URL won't actually be accessed anymore, it's fine to use /dev/null.
-
- substituteInPlace Cargo.lock \
- --replace "registry+file://$rustRegistry" \
- "registry+file:///dev/null"
- mv Cargo.lock $out/
-
-
- # Let's replace $indexHash with something more deterministic
- mv $out/registry/cache/* $out/registry/cache/HASH
-
- # The registry index changes all the time, so it's not deterministic
- # We'll symlink it before running 'cargo build'
- rm -rf $out/registry/index/*
-
- # Make git DBs deterministic
- # TODO: test with git submodules
- [[ ! -d $out/git/checkouts ]] || (cd $out/git/checkouts && for name in *; do
- revs=""
- cd "$out/git/checkouts/$name"
- while read dir; do
- # extract substring: [dir = "./xxx/yyy/.git"] => [branch = "xxx/yyy"]
- branch="${dir:2:$((${#dir}-7))}"
-
- cd "$out/git/checkouts/$name/$branch"
- rev="$(git rev-parse HEAD)"
- revs="$rev $revs"
- done < <(find . -type d -name .git -print)
-
- echo "List of revs to keep for git db $name: $revs"
-
- (
- # The following code was adapted from nix-prefetch-git
-
- cd "$out/git/db/$name"
-
- export GIT_DIR=.
-
- # Remove all remote branches
- git branch -r | while read branch; do
- git branch -rD "$branch" >&2
- done
-
- # Remove all tags
- git tag | while read tag; do
- git tag -d "$tag" >&2
- done
-
- # Remove all local branches
- branchrefs=()
- eval "$(git for-each-ref --shell --format='branchrefs+=(%(refname))' refs/heads/)"
-
- for branchref in "${branchrefs[@]}"; do
- git update-ref -d "$branchref" >&2
- done
-
- # Create ad-hoc branches for the revs we need
- echo "$revs" | while read -d " " rev; do
- echo "Creating git branch b_$rev $rev"
- git branch b_$rev $rev
- done
-
- # Remove files that have timestamps or otherwise have non-deterministic
- # properties.
- rm -rf logs/ hooks/ index FETCH_HEAD ORIG_HEAD refs/remotes/origin/HEAD config
-
- # Do a full repack. Must run single-threaded, or else we lose determinism.
- git config pack.threads 1
- git repack -A -d -f
- rm -f config
-
- # Garbage collect unreferenced objects.
- git gc --prune=all
- )
- done)
-
- # Remove unneeded outputs
- [[ ! -d $out/registry/src ]] || rm -rf $out/registry/src
- [[ ! -d $out/git/checkouts ]] || rm -rf $out/git/checkouts
-
- # XXX: provide some debugging output to see find out why we are seeing
- # sporadic hash mismatches
- find $out ! -type f
- find $out -type f -exec sha256sum {} +
-}
diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix
index 0c9625e51405..9b3ba5303398 100644
--- a/pkgs/build-support/rust/fetchcargo.nix
+++ b/pkgs/build-support/rust/fetchcargo.nix
@@ -1,19 +1,30 @@
-{ stdenv, cacert, git, rust, rustRegistry }:
+{ stdenv, cacert, git, rust, cargoVendor }:
{ name ? "cargo-deps", src, srcs, sourceRoot, sha256, cargoUpdateHook ? "" }:
-
stdenv.mkDerivation {
- name = "${name}-fetch";
- buildInputs = [ rust.cargo rust.rustc git ];
- inherit src srcs sourceRoot rustRegistry cargoUpdateHook;
+ name = "${name}-vendor";
+ buildInputs = [ cacert cargoVendor git rust.cargo ];
+ inherit src srcs sourceRoot;
phases = "unpackPhase installPhase";
installPhase = ''
- source ${./fetch-cargo-deps}
+ if [[ ! -f Cargo.lock ]]; then
+ echo
+ echo "ERROR: The Cargo.lock file doesn't exist"
+ echo
+ echo "Cargo.lock is needed to make sure that cargoSha256 doesn't change"
+ echo "when the registry is updated."
+ echo
+
+ exit 1
+ fi
export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
+ export CARGO_HOME=$(mktemp -d cargo-home.XXX)
- fetchCargoDeps . "$out"
+ cargo vendor
+
+ cp -ar vendor $out
'';
outputHashAlgo = "sha256";
diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index 14553c33e039..32214db65842 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -68,7 +68,7 @@ rec {
${text}
'';
checkPhase = ''
- ${stdenv.shell} -n $out
+ ${stdenv.shell} -n $out/bin/${name}
'';
};
diff --git a/pkgs/data/fonts/inconsolata/lgc.nix b/pkgs/data/fonts/inconsolata/lgc.nix
index e7445186b729..aa7d3d7def4f 100644
--- a/pkgs/data/fonts/inconsolata/lgc.nix
+++ b/pkgs/data/fonts/inconsolata/lgc.nix
@@ -24,6 +24,10 @@ stdenv.mkDerivation rec {
cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" || true
'';
+ outputHashAlgo = "sha256";
+ outputHashMode = "recursive";
+ outputHash = "18brmw0h4hjq1m2l0abwc3zmib4rnfalpywdk68djm711zldxr76";
+
meta = with stdenv.lib; {
description = "Fork of Inconsolata font, with proper support of Cyrillic and Greek";
longDescription = ''
diff --git a/pkgs/data/fonts/iwona/default.nix b/pkgs/data/fonts/iwona/default.nix
new file mode 100644
index 000000000000..3649aad99f43
--- /dev/null
+++ b/pkgs/data/fonts/iwona/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchzip }:
+
+stdenv.mkDerivation rec {
+ name = "iwona-${version}";
+ version = "0_995";
+
+ src = fetchzip {
+ url = "http://jmn.pl/pliki/Iwona-otf-${version}.zip";
+ sha256 = "1wj5bxbxpz5a8p3rhw708cyjc0lgqji8g0iv6brmmbrrkpb3jq2s";
+ };
+
+ installPhase = ''
+ install -m 444 -D -t $out/share/fonts/opentype/ *.otf
+ '';
+
+ outputHashAlgo = "sha256";
+ outputHashMode = "recursive";
+ outputHash = "1dcpn13bd31dw7ir0s722bv3nk136dy6qsab0kznjbzfqd7agswa";
+
+ meta = with stdenv.lib; {
+ description = "A two-element sans-serif typeface, created by Małgorzata Budyta";
+ homepage = http://jmn.pl/en/kurier-i-iwona/;
+ # "[...] GUST Font License (GFL), which is a free license, legally
+ # equivalent to the LaTeX Project Public # License (LPPL), version 1.3c or
+ # later." - GUST website
+ license = licenses.lppl13c;
+ maintainers = with maintainers; [ siddharthist ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/data/fonts/libertine/default.nix b/pkgs/data/fonts/libertine/default.nix
index c69cc7ae34de..91a7932c2caf 100644
--- a/pkgs/data/fonts/libertine/default.nix
+++ b/pkgs/data/fonts/libertine/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "0x7cz6hvhpil1rh03rax9zsfzm54bh7r4bbrq8rz673gl9h47v0v";
};
- setSourceRoot = "sourceRoot=`pwd`";
+ sourceRoot = ".";
nativeBuildInputs = [ fontforge ];
@@ -40,9 +40,14 @@ stdenv.mkDerivation rec {
cp *.map $out/share/texmf/fonts/map
'';
- meta = {
+ outputHashAlgo = "sha256";
+ outputHashMode = "recursive";
+ outputHash = "1mj0j0hkp8pn7jcs4pvcan6whba60bfd671g3vhx3s9kxwf7xjvr";
+
+ meta = with stdenv.lib; {
description = "Linux Libertine Fonts";
homepage = http://linuxlibertine.sf.net;
- platforms = stdenv.lib.platforms.all;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.volth ];
};
}
diff --git a/pkgs/data/fonts/libertinus/default.nix b/pkgs/data/fonts/libertinus/default.nix
new file mode 100644
index 000000000000..b4ce653da637
--- /dev/null
+++ b/pkgs/data/fonts/libertinus/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ name = "libertinus-${version}";
+ version = "6.4";
+
+ src = fetchFromGitHub {
+ rev = "v${version}";
+ owner = "khaledhosny";
+ repo = "libertinus";
+ sha256 = "0acnq4vpplp2s7kdnhncz61diji3wmhca04g27yqpk03ahb40x9g";
+ };
+
+ installPhase = ''
+ mkdir -p $out/share/fonts/opentype/
+ mkdir -p $out/share/doc/${name}/
+ cp *.otf $out/share/fonts/opentype/
+ cp *.txt $out/share/doc/${name}/
+ '';
+
+ outputHashAlgo = "sha256";
+ outputHashMode = "recursive";
+ outputHash = "0yn526kwb4xjyf6gvf0wflqi45z5dlzicycz2q003a6if5fgqcz3";
+
+ meta = with stdenv.lib; {
+ description = "A fork of the Linux Libertine and Linux Biolinum fonts";
+ longDescription = ''
+ Libertinus fonts is a fork of the Linux Libertine and Linux Biolinum fonts
+ that started as an OpenType math companion of the Libertine font family,
+ but grown as a full fork to address some of the bugs in the fonts.
+ '';
+ homepage = https://github.com/khaledhosny/libertinus;
+ license = licenses.ofl;
+ maintainers = with maintainers; [ siddharthist ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/data/fonts/lm-math/default.nix b/pkgs/data/fonts/lm-math/default.nix
new file mode 100644
index 000000000000..348373b89276
--- /dev/null
+++ b/pkgs/data/fonts/lm-math/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchzip }:
+
+stdenv.mkDerivation rec {
+ name = "latinmodern-math-${version}";
+ version = "1.959";
+
+ src = fetchzip {
+ url = "www.gust.org.pl/projects/e-foundry/lm-math/download/latinmodern-math-1959.zip";
+ sha256 = "15l3lxjciyjmbh0q6jjvzz16ibk4ij79in9fs47qhrfr2wrddpvs";
+ };
+
+ installPhase = ''
+ mkdir -p $out/share/fonts/opentype/
+ mkdir -p $out/share/doc/${name}/
+ cp otf/*.otf $out/share/fonts/opentype/
+ cp doc/*.txt $out/share/doc/${name}/
+ '';
+
+ outputHashAlgo = "sha256";
+ outputHashMode = "recursive";
+ outputHash = "05k145bxgxjh7i9gx1ahigxfpc2v2vwzsy2mc41jvvg51kjr8fnn";
+
+ meta = with stdenv.lib; {
+ description = "The Latin Modern Math (LM Math) font completes the modernization of the Computer Modern family of typefaces designed and programmed by Donald E. Knuth.";
+ homepage = http://www.gust.org.pl/projects/e-foundry/lm-math;
+ # "The Latin Modern Math font is licensed under the GUST Font License (GFL),
+ # which is a free license, legally equivalent to the LaTeX Project Public
+ # License (LPPL), version 1.3c or later." - GUST website
+ license = licenses.lppl13c;
+ maintainers = with maintainers; [ siddharthist ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/data/fonts/monoid/default.nix b/pkgs/data/fonts/monoid/default.nix
index 5e9a2c219167..77c311ce364c 100644
--- a/pkgs/data/fonts/monoid/default.nix
+++ b/pkgs/data/fonts/monoid/default.nix
@@ -13,15 +13,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ python fontforge ];
- enableParallelBuilding = true;
-
buildPhase = ''
local _d=""
local _l=""
for _d in {Monoisome,Source}/*.sfdir; do
_l="''${_d##*/}.log"
echo "Building $_d (log at $_l)"
- python Scripts/build.py ${if enableParallelBuilding then "$NIX_BUILD_CORES" else "1"} 0 $_d > $_l
+ python Scripts/build.py 1 0 $_d > $_l
done
'';
@@ -31,6 +29,10 @@ stdenv.mkDerivation rec {
cp -va Readme.md $out/share/doc
'';
+ outputHashAlgo = "sha256";
+ outputHashMode = "recursive";
+ outputHash = "0lbipgygiva3gg1pqw07phpnnf0s6ka9vqdk1pw7bkybjw3f7wzm";
+
meta = with stdenv.lib; {
homepage = http://larsenwork.com/monoid;
description = "Customisable coding font with alternates, ligatures and contextual positioning";
diff --git a/pkgs/data/fonts/nerdfonts/default.nix b/pkgs/data/fonts/nerdfonts/default.nix
index 6b1ebfd68d0d..8815bf688389 100644
--- a/pkgs/data/fonts/nerdfonts/default.nix
+++ b/pkgs/data/fonts/nerdfonts/default.nix
@@ -20,10 +20,6 @@ stdenv.mkDerivation rec {
./install.sh ${withFont}
'';
- outputHashAlgo = "sha256";
- outputHashMode = "recursive";
- outputHash = "1f3qvzl7blqddx3cm2sdml7hi8s56yjc0vqhfajndxr5ybz6g1rw";
-
meta = with stdenv.lib; {
description = ''
Nerd Fonts is a project that attempts to patch as many developer targeted
diff --git a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix
index 074fceeac94a..45618972c348 100644
--- a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix
+++ b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix
@@ -11,6 +11,13 @@ stdenv.mkDerivation rec {
};
buildPhase = ''
+ substituteInPlace apply-feature.py --replace \
+ 'ricty = ttLib.TTFont(options.in_font)' \
+ 'ricty = ttLib.TTFont(options.in_font, recalcTimestamp=False)'
+ substituteInPlace build-py3.py --replace \
+ 'datetime.date.today()' \
+ 'datetime.date.fromtimestamp(float(os.environ["SOURCE_DATE_EPOCH"]))'
+
make
'';
@@ -28,6 +35,10 @@ stdenv.mkDerivation rec {
]))
];
+ outputHashAlgo = "sha256";
+ outputHashMode = "recursive";
+ outputHash = "09ldviapljn4bb1mcxap2pkz7cq3wr2k2qialbnav5y7ii82acd4";
+
meta = with stdenv.lib; {
homepage = https://github.com/hakatashi/RictyDiminished-with-FiraCode;
description = "The best Japanese programming font meets the awesone ligatures of Firacode";
diff --git a/pkgs/data/fonts/source-sans-pro/default.nix b/pkgs/data/fonts/source-sans-pro/default.nix
index 4ae9ceac01df..fccb231f4caa 100644
--- a/pkgs/data/fonts/source-sans-pro/default.nix
+++ b/pkgs/data/fonts/source-sans-pro/default.nix
@@ -13,7 +13,7 @@ fetchzip {
sha256 = "17rgkh54arybmcdg750ynw32x2sps7p9vrvq9kpih8vdghwrh9k2";
meta = with stdenv.lib; {
- homepage = http://sourceforge.net/adobe/sourcesans;
+ homepage = https://sourceforge.net/adobe/sourcesans;
description = "A set of OpenType fonts designed by Adobe for UIs";
license = licenses.ofl;
platforms = platforms.all;
diff --git a/pkgs/data/fonts/source-serif-pro/default.nix b/pkgs/data/fonts/source-serif-pro/default.nix
index d627d813daa7..d58ccc338133 100644
--- a/pkgs/data/fonts/source-serif-pro/default.nix
+++ b/pkgs/data/fonts/source-serif-pro/default.nix
@@ -15,7 +15,7 @@ in fetchzip {
sha256 = "04447fbj7lwr2qmmvy7d7624qdh4in7hp627nsc8vbpxmb7bbmn1";
meta = with stdenv.lib; {
- homepage = http://sourceforge.net/adobe/sourceserifpro;
+ homepage = https://sourceforge.net/adobe/sourceserifpro;
description = "A set of OpenType fonts to complement Source Sans Pro";
license = licenses.ofl;
platforms = platforms.all;
diff --git a/pkgs/data/fonts/tex-gyre-math/default.nix b/pkgs/data/fonts/tex-gyre-math/default.nix
new file mode 100644
index 000000000000..e99e0bfb342f
--- /dev/null
+++ b/pkgs/data/fonts/tex-gyre-math/default.nix
@@ -0,0 +1,66 @@
+{ variant, stdenv, fetchzip }:
+
+let
+ variants = {
+ bonum = {
+ displayName = "Bonum";
+ version = "1.005";
+ sha256 = "1b6x7siypyxp1lhq7xxdqafwbn6p2p3xm3jb38q999sv8cgslxz8";
+ outputHash = "1zjaxkzidqmxakh9d61n0by9mi8hrmir45jppjj6hzwhm3rvknff";
+ };
+ pagella = {
+ displayName = "Pagella";
+ version = "1.632";
+ sha256 = "0f4cgq9w0lc1fbcbfqiv19mdhivbsscl13jmb0ln685641ci2sjr";
+ outputHash = "0wz2n1dpx9b8a0qgqy8vl712fxhi87mhcda281xaad62chndwf6k";
+ };
+ schola = {
+ displayName = "Schola";
+ version = "1.533";
+ sha256 = "0caqgkz7gz700h5a1mai0gq8hv7skrgs5nnrs1f7zw1mb9g53ya9";
+ outputHash = "0jk4bpxki95a9lmfj4cgpnv1jwlkh8qixbkf498n1x7hkaz03f5n";
+ };
+ termes = {
+ displayName = "Termes";
+ version = "1.543";
+ sha256 = "10ayqfpryfn1l35hy0vwyjzw3a6mfsnzgf78vsnccgk2gz1g9vhz";
+ outputHash = "0pa433cgshlypbyrrlp3qq0wg972rngcp37pr8pxdfshgz13q1mm";
+ };
+ };
+ current = variants."${variant}";
+ dotless_version = builtins.replaceStrings ["."] [""] current.version;
+in stdenv.mkDerivation rec {
+ name = "tex-gyre-${variant}-math-${current.version}";
+ version = "${current.version}";
+
+ src = fetchzip {
+ url = "www.gust.org.pl/projects/e-foundry/tg-math/download/texgyre${variant}-math-${dotless_version}.zip";
+ sha256 = current.sha256;
+ };
+
+ installPhase = ''
+ mkdir -p $out/share/fonts/opentype/
+ mkdir -p $out/share/doc/${name}/
+ cp -v opentype/*.otf $out/share/fonts/opentype/
+ cp -v doc/*.txt $out/share/doc/${name}/
+ '';
+
+ outputHashAlgo = "sha256";
+ outputHashMode = "recursive";
+ outputHash = current.outputHash;
+
+ meta = with stdenv.lib; {
+ longDescription = ''
+ TeX Gyre ${current.displayName} Math is a math companion for the TeX Gyre
+ ${current.displayName} family of fonts (see
+ http://www.gust.org.pl/projects/e-foundry/tex-gyre/) in the OpenType format.
+ '';
+ homepage = http://www.gust.org.pl/projects/e-foundry/tg-math;
+ # "The TeX Gyre Math fonts are licensed under the GUST Font License (GFL),
+ # which is a free license, legally equivalent to the LaTeX Project Public
+ # License (LPPL), version 1.3c or later." - GUST website
+ license = licenses.lppl13c;
+ maintainers = with maintainers; [ siddharthist ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/data/fonts/unscii/default.nix b/pkgs/data/fonts/unscii/default.nix
index 64e01124a67d..092537c216aa 100644
--- a/pkgs/data/fonts/unscii/default.nix
+++ b/pkgs/data/fonts/unscii/default.nix
@@ -23,6 +23,11 @@ stdenv.mkDerivation rec {
cp *.svg "$out/share/fonts/svg"
cp *.woff "$out/share/fonts/web"
'';
+
+ outputHashAlgo = "sha256";
+ outputHashMode = "recursive";
+ outputHash = "03zvczdka665zcyf9fjrnx434mwpr5q8396j34kjmc67w7nhc49r";
+
meta = {
inherit version;
description = ''Bitmapped character-art-friendly Unicode fonts'';
diff --git a/pkgs/data/fonts/xits-math/default.nix b/pkgs/data/fonts/xits-math/default.nix
index c3ba435cbbf9..25431c7f9d70 100644
--- a/pkgs/data/fonts/xits-math/default.nix
+++ b/pkgs/data/fonts/xits-math/default.nix
@@ -15,6 +15,10 @@ stdenv.mkDerivation rec {
postPatch = ''
rm *.otf
+
+ substituteInPlace tools/postprocess.py --replace \
+ 'font = ttLib.TTFont(sys.argv[1])' \
+ 'font = ttLib.TTFont(sys.argv[1], recalcTimestamp=False)'
'';
installPhase = ''
@@ -22,6 +26,10 @@ stdenv.mkDerivation rec {
cp *.otf $out/share/fonts/opentype
'';
+ outputHashAlgo = "sha256";
+ outputHashMode = "recursive";
+ outputHash = "00xycmb9ka67j5s66nkng53y8q6362igisxz04zb58r2717jk50m";
+
meta = with stdenv.lib; {
homepage = https://github.com/khaledhosny/xits-math;
description = "OpenType implementation of STIX fonts with math support";
diff --git a/pkgs/data/icons/elementary-icon-theme/default.nix b/pkgs/data/icons/elementary-icon-theme/default.nix
index 0a0ff4263ec6..77d29d52507e 100644
--- a/pkgs/data/icons/elementary-icon-theme/default.nix
+++ b/pkgs/data/icons/elementary-icon-theme/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- version = "4.2.0";
+ version = "4.3.1";
package-name = "elementary-icon-theme";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://launchpad.net/elementaryicons/4.x/${version}/+download/${name}.tar.xz";
- sha256 = "0w1l9hlih4ddkdjpha5lsyf6iagv436nhm4aphak8w8jyycg81bm";
+ sha256 = "1rp22igvnx71l94j5a6px142329djhk2psm1wfgbhdxbj23hw9kb";
};
dontBuild = true;
diff --git a/pkgs/data/icons/tango-icon-theme/default.nix b/pkgs/data/icons/tango-icon-theme/default.nix
index 0004302ab976..928c5396b61c 100644
--- a/pkgs/data/icons/tango-icon-theme/default.nix
+++ b/pkgs/data/icons/tango-icon-theme/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
patches = [ ./rsvg-convert.patch ];
- buildInputs = [ intltool pkgconfig iconnamingutils imagemagick librsvg ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ intltool iconnamingutils imagemagick librsvg ];
configureFlags = "--enable-png-creation";
diff --git a/pkgs/data/misc/brise/default.nix b/pkgs/data/misc/brise/default.nix
new file mode 100644
index 000000000000..8b27f4fbf729
--- /dev/null
+++ b/pkgs/data/misc/brise/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchFromGitHub, librime }:
+
+stdenv.mkDerivation rec {
+ name = "brise-unstable-2017-09-16";
+
+ src = fetchFromGitHub {
+ owner = "rime";
+ repo = "brise";
+ rev = "1cfb0fe1d3a4190ce5d034f141941156dd271e80";
+ sha256 = "1l13j3cfwida0ycl874fizz2jwjvlxid589a1iciqa9y25k21ql7";
+ };
+
+ buildInputs = [ librime ];
+
+ postPatch = ''
+ patchShebangs scripts/*
+ '';
+
+ # we need to use fetchFromGitHub to fetch sub-packages before we 'make',
+ # since nix won't allow networking during 'make'
+ preBuild = import ./fetchPackages.nix fetchFromGitHub;
+
+ makeFlags = [ "BRISE_BUILD_BINARIES=yes" "PREFIX=$(out)" ];
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ description = "Rime Schema Repository";
+ longDescription = ''
+ This software is a collection of data packages used by Rime
+ to support various Chinese input methods, including those based on
+ modern dialects or historical diasystems of the Chinese language.
+ '';
+ homepage = http://rime.im;
+ # Note that individual packages in this collection
+ # may be released under different licenses
+ license = licenses.gpl3;
+ platforms = platforms.all;
+ maintainers = [ maintainers.sifmelcara ];
+ };
+}
diff --git a/pkgs/data/misc/brise/fetchPackages.nix b/pkgs/data/misc/brise/fetchPackages.nix
new file mode 100644
index 000000000000..92930c67cc90
--- /dev/null
+++ b/pkgs/data/misc/brise/fetchPackages.nix
@@ -0,0 +1,130 @@
+fetchFromGitHub:
+# generated using https://gist.github.com/sifmelcara/895c71f99500b9d56d68e9a866b58821
+''
+ln -sv ${fetchFromGitHub {
+ owner = "rime";
+ repo = "rime-array";
+ rev = "9ca2b725ae52c9b3185213e3555df1f9d4f1c53f";
+ sha256 = "0x3sifdpdivr8ssynjhc4g1zfl6h9hm9nh9p9zb9wkh1ky9z7kha";
+}} array
+ln -sv ${fetchFromGitHub {
+ owner = "rime";
+ repo = "rime-bopomofo";
+ rev = "7046ffe42b46915947117f80d901fb9a6e19c1a7";
+ sha256 = "09w8jl2dlgp72k49x0l2jiaqb359v576kai4xww6cljgr24ng8pl";
+}} bopomofo
+ln -sv ${fetchFromGitHub {
+ owner = "rime";
+ repo = "rime-cangjie";
+ rev = "64242be99c1e6793c9f40fef296a81d07a84e976";
+ sha256 = "0v5sk8zrm5p5gg8lszqm0imj9jswjlnfq87nw6m9pg5h5al230ja";
+}} cangjie
+ln -sv ${fetchFromGitHub {
+ owner = "rime";
+ repo = "rime-combo-pinyin";
+ rev = "97a7dc4670e0f90ad28e7d67c1543f4f0adc531d";
+ sha256 = "0y8iyvq7z6xj3lk2ppk4ggz297wn1r2xxbv53f2710jc7gyzf04q";
+}} combo-pinyin
+ln -sv ${fetchFromGitHub {
+ owner = "rime";
+ repo = "rime-double-pinyin";
+ rev = "1b75af4239897fd1e4c99d625b62093e66baff14";
+ sha256 = "0p54qx5a6rr55hl997kdcfxjczd9lcddrc5xsy7nhlfyc6108s2v";
+}} double-pinyin
+ln -sv ${fetchFromGitHub {
+ owner = "rime";
+ repo = "rime-emoji";
+ rev = "7e527056fe055237fee59463e0d445f3909aaf0c";
+ sha256 = "04d35n254viw29yyjf3ml7xljmi63sqgg870swlbi5bikcx7n9jf";
+}} emoji
+ln -sv ${fetchFromGitHub {
+ owner = "rime";
+ repo = "rime-essay";
+ rev = "595e35756d16d57d09405e243302b65b4384b5b4";
+ sha256 = "10kqhvrz8x17b2pf6x2x2znz5y6cj05c4rgwi1f0xhxiyrgjw9gm";
+}} essay
+ln -sv ${fetchFromGitHub {
+ owner = "rime";
+ repo = "rime-ipa";
+ rev = "9e02f8a02e9febb7b2df25f6906881a1df934811";
+ sha256 = "1g4v4j1gnv1qspfz88liwj1aa4gaa3aax0x2cif4vxicsm7w372m";
+}} ipa
+ln -sv ${fetchFromGitHub {
+ owner = "rime";
+ repo = "rime-jyutping";
+ rev = "3cc76e6e15cc05f1f94b89e750c21f87ce8fc0e4";
+ sha256 = "1yggz0yb84z8810s2gmsxkm9lh57fdzddx5v2rb5mqcwnimsd6ap";
+}} jyutping
+ln -sv ${fetchFromGitHub {
+ owner = "rime";
+ repo = "rime-luna-pinyin";
+ rev = "da00c3a6f932f094666e98a09f6ce9c7d74c334c";
+ sha256 = "0q3g1hj9bay5865h3pz7gv46d7wfka1jdxnddxcbp4zn7gjpsd48";
+}} luna-pinyin
+ln -sv ${fetchFromGitHub {
+ owner = "rime";
+ repo = "rime-middle-chinese";
+ rev = "6f9731bac8f289f77d35f1090159f1937e38c1f7";
+ sha256 = "0xd9iwk4j5043gfmp7rb57hbarfm6sxr32wiasi6p3c5g355zn89";
+}} middle-chinese
+ln -sv ${fetchFromGitHub {
+ owner = "rime";
+ repo = "rime-pinyin-simp";
+ rev = "38c08403c22845f7e2965c1d7a1514b41755d7dc";
+ sha256 = "1c0cqljx3d93w27y2flxyqcfd3rd9fvixbw6mxgfjzdb3s42bn8h";
+}} pinyin-simp
+ln -sv ${fetchFromGitHub {
+ owner = "rime";
+ repo = "rime-prelude";
+ rev = "120c2aa73b1b5e1bce904901bf13f506295004a5";
+ sha256 = "1aah9z58gkqrc18zadsq598ybj8ra22bgka3gma2jmi3rls2znq4";
+}} prelude
+ln -sv ${fetchFromGitHub {
+ owner = "rime";
+ repo = "rime-quick";
+ rev = "638abf270e121bc2bfc6029a14ee85a3f4c2188b";
+ sha256 = "0l1pma0yxrypnb5cq7jiczy0wa42kdqsc1brqkkccdnp08pa1p1m";
+}} quick
+ln -sv ${fetchFromGitHub {
+ owner = "rime";
+ repo = "rime-scj";
+ rev = "6b74ce14be0464bf076d7adc40aea4b120f233ec";
+ sha256 = "0lr92knr41mlqd1s0g2lh2h2qr8xka1s46x7iv4d6ghjf0id4gz6";
+}} scj
+ln -sv ${fetchFromGitHub {
+ owner = "rime";
+ repo = "rime-soutzoe";
+ rev = "3ab93d1b9ca9ca7cf17ff32bb4418b7a095afc3c";
+ sha256 = "1glbvgzx4psasq23511k8ymd7mf1pqvm3z18nzszhs00iif66s3m";
+}} soutzoe
+ln -sv ${fetchFromGitHub {
+ owner = "rime";
+ repo = "rime-stenotype";
+ rev = "766f22565f83f5c63c0ea195c936779ec6ae824d";
+ sha256 = "0jsvfq7xim99zs5imyk7rpknlaimk6nlxy38fmfxa1r843781mfd";
+}} stenotype
+ln -sv ${fetchFromGitHub {
+ owner = "rime";
+ repo = "rime-stroke";
+ rev = "e048967a4c1b956575828f1a20e565efed4b1137";
+ sha256 = "10asdz5bj12pnji7afzls6jd9dn2v90l2dgdjf0jfp2kfzd6pxnl";
+}} stroke
+ln -sv ${fetchFromGitHub {
+ owner = "rime";
+ repo = "rime-terra-pinyin";
+ rev = "e303507e728def38739f5761c50722eae1f06dd5";
+ sha256 = "1krbmx2iq3zw4q1x4aa9c72b9xgrnjrhyxa4h5hnq5l29p9qms4d";
+}} terra-pinyin
+ln -sv ${fetchFromGitHub {
+ owner = "rime";
+ repo = "rime-wubi";
+ rev = "97b7d9f93378e98fd11167bd80d54c40e67076aa";
+ sha256 = "1cdpbqqkqjbizja0w3f7a826a5bxb39nlf9qf2130x9havmkc89z";
+}} wubi
+ln -sv ${fetchFromGitHub {
+ owner = "rime";
+ repo = "rime-wugniu";
+ rev = "de40b29f8218cc852bf82b315c7070f1d50bda02";
+ sha256 = "1m7miwsqpy49cgqd1bl7z5lkkirj3lc2bdwd1zqfg5zbgfwn0rp8";
+}} wugniu
+''
diff --git a/pkgs/data/misc/dns-root-data/default.nix b/pkgs/data/misc/dns-root-data/default.nix
index dade4be1aaff..88b608c78152 100644
--- a/pkgs/data/misc/dns-root-data/default.nix
+++ b/pkgs/data/misc/dns-root-data/default.nix
@@ -4,7 +4,7 @@ let
rootHints = fetchurl {
url = "https://www.internic.net/domain/named.root";
- sha256 = "01n4bqf95kbvig1hahqzmmdkpn4v7mzfc1p944gq922i5j3fjr92";
+ sha256 = "0vdrff4l8s8grif52dnh091s8qydhh88k25zqd9rj66sf1qwcwxl";
};
rootKey = ./root.key;
@@ -13,7 +13,7 @@ let
in
stdenv.mkDerivation {
- name = "dns-root-data-2017-08-29";
+ name = "dns-root-data-2017-10-24";
buildCommand = ''
mkdir $out
diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix
index 0522de227aa4..eaebc3aff268 100644
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -12,22 +12,22 @@ stdenv.mkDerivation rec {
srcGeoIP = fetchDB
"GeoLiteCountry/GeoIP.dat.gz"
- "04akk0jczvki8rdvz6z6v5s26ds0m27953lzvp3v0fsg7rl08q5n";
+ "1xqxlnxxk8grqr0nr9vaf5r6z5bcdbadh83qhzr6jvhs20s37lsl";
srcGeoIPv6 = fetchDB
"GeoIPv6.dat.gz"
- "0i0885vvj0s5sysyafvk8pc8gr3znh7gmiy8rp4iiai7qnbylb7y";
+ "0g3am25jmhm3r51hvz9lknkrnzj98hxdxav2cvrhz6b7wndgyspk";
srcGeoLiteCity = fetchDB
"GeoLiteCity.dat.gz"
- "1yqxqfndnsvqc3hrs0nm6nvs0wp8jh9phs0yzrn48rlb9agcb8gj";
+ "1syw19gx2mpqz9ypkaq2gh712bv60a7rf56afzd3qzkmgf6rw1qr";
srcGeoLiteCityv6 = fetchDB
"GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz"
- "05grm006r723l9zm7pdmwwycc658ni858hcrcf5mysv0hmc3wqb2";
+ "0ihbqm1f5b9qb68i73ghmk30b6i2n53fmmhv2wadja5zcdpkhdvk";
srcGeoIPASNum = fetchDB
"asnum/GeoIPASNum.dat.gz"
- "1gpvsqvq9z9pg9zfn86i50fb481llfyn79r1jwddwfflp1qqfrrv";
+ "0adddsk0g9a3xaa0f8qx12s07n31wvirymjzrhnsg66i2qlm0h34";
srcGeoIPASNumv6 = fetchDB
"asnum/GeoIPASNumv6.dat.gz"
- "0nmhz82dn9clm5w2y6z861ifj7i761spy1p1zcam93046cdpqqaa";
+ "1qar0vdlpk3razq83l5fzb54zihs2sma8xgngpql8njfgby0w825";
meta = with stdenv.lib; {
description = "GeoLite Legacy IP geolocation databases";
diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index 48b8e989e40d..91d38f3537e0 100644
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@@ -1,11 +1,6 @@
-{ fetchFromGitHub }:
+{ fetchurl }:
-# Use builtins.fetchTarball "https://github.com/commercialhaskell/all-cabal-hashes/archive/hackage.tar.gz"
-# instead if you want the latest Hackage automatically at the price of frequent re-downloads.
-
-fetchFromGitHub {
- owner = "commercialhaskell";
- repo = "all-cabal-hashes";
- rev = "b490d26340638934d13c0c0cd4089dec0fb6b85e";
- sha256 = "0cz76wcdlh5512g1aviv0ac9qwj1mmy9ncp6q4yywylxrlqgcbj5";
+fetchurl {
+ url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/5e87c40f2cd96bd5dd953758e82f302107c7895e.tar.gz";
+ sha256 = "0hjkddda9mdm21nb9bkhr9n5r9jllisif1qmzha91a9cps5w1mx5";
}
diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/data/misc/iana-etc/default.nix
index 842b031c6bed..249f0e5dcb91 100644
--- a/pkgs/data/misc/iana-etc/default.nix
+++ b/pkgs/data/misc/iana-etc/default.nix
@@ -2,16 +2,15 @@
stdenv.mkDerivation rec {
name = "iana-etc-${version}";
- version = "20170512";
+ version = "20171106";
src = fetchurl {
url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz";
- sha256 = "0zx2ag894qldvrv8f4hs84644kdcp8a83gjg33xsw8rrn38gll2a";
+ sha256 = "0pbmq95gdkp66cljwklv4gzh8lvl30l4k77hfwvrxz5mfqia6qdd";
};
installPhase = ''
- mkdir -p $out/etc
- cp services protocols $out/etc/
+ install -D -t $out/etc services protocols
'';
meta = with stdenv.lib; {
diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix
index 484aa4e5a232..64b0fd0c38a4 100644
--- a/pkgs/data/misc/shared-mime-info/default.nix
+++ b/pkgs/data/misc/shared-mime-info/default.nix
@@ -1,24 +1,25 @@
{stdenv, fetchurl, pkgconfig, gettext, perl, perlXMLParser, intltool
, libxml2, glib}:
-let version = "1.8"; in
+let version = "1.9"; in
stdenv.mkDerivation rec {
name = "shared-mime-info-${version}";
src = fetchurl {
url = "http://freedesktop.org/~hadess/${name}.tar.xz";
- sha256 = "1sc96lv9dp1lkvs8dh3ngm3hbjb274d363dl9avhb61il3qmxx9a";
+ sha256 = "10ywzhzg8v1xmb9sz5xbqaci90id38knswigynyl33i29vn360aw";
};
nativeBuildInputs = [
pkgconfig gettext intltool perl perlXMLParser libxml2 glib
];
- meta = {
+ meta = with stdenv.lib; {
inherit version;
description = "A database of common MIME types";
homepage = http://freedesktop.org/wiki/Software/shared-mime-info;
- license = stdenv.lib.licenses.gpl2Plus;
- platforms = stdenv.lib.platforms.unix;
+ license = licenses.gpl2Plus;
+ platforms = platforms.unix;
+ maintainers = [ maintainers.mimadrid ];
};
}
diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix
index 843055a2c450..ef2bae8dbaf9 100644
--- a/pkgs/data/misc/tzdata/default.nix
+++ b/pkgs/data/misc/tzdata/default.nix
@@ -2,16 +2,16 @@
stdenv.mkDerivation rec {
name = "tzdata-${version}";
- version = "2016j";
+ version = "2017c";
srcs =
[ (fetchurl {
url = "http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz";
- sha256 = "1j4xycpwhs57qnkcxwh3np8wnf3km69n3cf4w6p2yv2z247lxvpm";
+ sha256 = "02yrrfj0p7ar885ja41ylijzbr8wc6kz6kzlw8c670i9m693ym6n";
})
(fetchurl {
url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz";
- sha256 = "1dxhrk4z0n2di8p0yd6q00pa6bwyz5xqbrfbasiz8785ni7zrvxr";
+ sha256 = "1dvrq0b2hz7cjqdyd7x21wpy4qcng3rvysr61ij0c2g64fyb9s41";
})
];
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix
index 7ff79488a89f..d4cb7bc889d3 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, unzip}:
+{stdenv, fetchurl, unzip, findXMLCatalogs}:
let
@@ -12,7 +12,7 @@ let
in
import ./generic.nix {
- inherit stdenv fetchurl unzip;
+ inherit stdenv fetchurl unzip findXMLCatalogs;
name = "docbook-xml-4.1.2";
src = fetchurl {
url = http://www.docbook.org/xml/4.1.2/docbkx412.zip;
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix
index 3875362dcb3d..d2cc69559b86 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix
@@ -1,7 +1,7 @@
-{stdenv, fetchurl, unzip}:
+{stdenv, fetchurl, unzip, findXMLCatalogs}:
import ./generic.nix {
- inherit stdenv fetchurl unzip;
+ inherit stdenv fetchurl unzip findXMLCatalogs;
name = "docbook-xml-4.2";
src = fetchurl {
url = http://www.docbook.org/xml/4.2/docbook-xml-4.2.zip;
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix
index 19ad49aa9280..e1f9337df941 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix
@@ -1,7 +1,7 @@
-{stdenv, fetchurl, unzip}:
+{stdenv, fetchurl, unzip, findXMLCatalogs}:
import ./generic.nix {
- inherit stdenv fetchurl unzip;
+ inherit stdenv fetchurl unzip findXMLCatalogs;
name = "docbook-xml-4.3";
src = fetchurl {
url = http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip;
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix
index 98a1853e4942..1a9d622affc6 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix
@@ -1,7 +1,7 @@
-{stdenv, fetchurl, unzip}:
+{stdenv, fetchurl, unzip, findXMLCatalogs}:
import ./generic.nix {
- inherit stdenv fetchurl unzip;
+ inherit stdenv fetchurl unzip findXMLCatalogs;
name = "docbook-xml-4.4";
src = fetchurl {
url = http://www.docbook.org/xml/4.4/docbook-xml-4.4.zip;
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix
index 669536962a12..301b400ac7e1 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix
@@ -1,7 +1,7 @@
-{stdenv, fetchurl, unzip}:
+{stdenv, fetchurl, unzip, findXMLCatalogs}:
import ./generic.nix {
- inherit stdenv fetchurl unzip;
+ inherit stdenv fetchurl unzip findXMLCatalogs;
name = "docbook-xml-4.5";
src = fetchurl {
url = http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip;
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix
index fc3c4c3c8410..373778d43de6 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, src, name, postInstall ? "true", meta ? {} }:
+{ stdenv, fetchurl, unzip, src, name, postInstall ? "true", meta ? {}, findXMLCatalogs }:
assert unzip != null;
@@ -6,6 +6,7 @@ stdenv.mkDerivation {
inherit src name postInstall;
builder = ./builder.sh;
buildInputs = [unzip];
+ propagatedBuildInputs = [ findXMLCatalogs ];
meta = meta // {
platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
index a955f5cf8a48..7bae913ed5e6 100644
--- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
+++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl }:
+{ lib, stdenv, fetchurl, findXMLCatalogs }:
let
@@ -10,6 +10,8 @@ let
inherit sha256;
};
+ propagatedBuildInputs = [ findXMLCatalogs ];
+
dontBuild = true;
installPhase = ''
diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix
index 67840a4c9e61..be648bf66998 100644
--- a/pkgs/desktops/enlightenment/efl.nix
+++ b/pkgs/desktops/enlightenment/efl.nix
@@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
name = "efl-${version}";
- version = "1.20.3";
+ version = "1.20.5";
src = fetchurl {
url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz";
- sha256 = "148i8awjdrqzd0xqfc6q4qvhhs46jl15nx7n2nii7lrwzx502wqj";
+ sha256 = "07624c71l9d1jx1zvdhwkr1bgb1n7i0i5hyg6579zdwl3jw6jpns";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix
index b16b84acf148..44cb6809ea4c 100644
--- a/pkgs/desktops/enlightenment/enlightenment.nix
+++ b/pkgs/desktops/enlightenment/enlightenment.nix
@@ -4,11 +4,11 @@ mesa_glu, xkeyboard_config, pcre }:
stdenv.mkDerivation rec {
name = "enlightenment-${version}";
- version = "0.21.9";
+ version = "0.21.10";
src = fetchurl {
url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz";
- sha256 = "0w5f3707hyfc20i6xqh4jlr5p2yhy1z794061mjsz2rp4w00qmpb";
+ sha256 = "053zmlpjx45xg2rbbxyjh0phhgbsnmsnypzz2bib545klp51bfcv";
};
nativeBuildInputs = [ (pkgconfig.override { vanilla = true; }) ];
diff --git a/pkgs/desktops/gnome-2/bindings/libglademm/default.nix b/pkgs/desktops/gnome-2/bindings/libglademm/default.nix
index c140eb944c6c..8cf18b7018da 100644
--- a/pkgs/desktops/gnome-2/bindings/libglademm/default.nix
+++ b/pkgs/desktops/gnome-2/bindings/libglademm/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "1hrbg9l5qb7w0xvr7013qamkckyj0fqc426c851l69zpmhakqm1q";
};
- buildInputs = [ pkgconfig intltool ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ intltool ];
propagatedBuildInputs = [ gtkmm libglade ];
}
diff --git a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix
index ff4abf26ac83..c07dc9730e6d 100644
--- a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix
@@ -13,7 +13,8 @@ stdenv.mkDerivation {
sha256 = "0rkyg6naidql0nv74608mlsr2lzjgnndnxnxv3s0hp4f6mbqnmkw";
};
- buildInputs = [ pkgconfig dbus_glib libxml2Python libxslt libxklavier popt which python shared_mime_info desktop_file_utils
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ dbus_glib libxml2Python libxslt libxklavier popt which python shared_mime_info desktop_file_utils
gtk gnome_doc_utils intltool GConf libglade libgnomekbd libunique libtool bzip2
libgnomeui librsvg gnome_menus gnome_desktop gnome_panel metacity gnome_settings_daemon
libSM
diff --git a/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix
index 9f41a589220b..63df026836fa 100644
--- a/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix
@@ -10,6 +10,7 @@ stdenv.mkDerivation {
};
configureFlags = "--disable-scrollkeeper";
- buildInputs = [ pkgconfig python libxml2Python libxslt which libX11 gtk
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ python libxml2Python libxslt which libX11 gtk
intltool GConf gnome_doc_utils ];
}
diff --git a/pkgs/desktops/gnome-2/desktop/gnome-menus/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-menus/default.nix
index e114f72a21b8..0dcb409e0aae 100644
--- a/pkgs/desktops/gnome-2/desktop/gnome-menus/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gnome-menus/default.nix
@@ -8,5 +8,6 @@ stdenv.mkDerivation {
sha256 = "1ajckii51spmkgfc0168c56x0syz5vwb2fp8b81c5s6n0r85dk3d";
};
- buildInputs = [ pkgconfig python glib intltool ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ python glib intltool ];
}
diff --git a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
index 7c9cd42a0e97..bd8b71d0daca 100644
--- a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
@@ -26,8 +26,9 @@ stdenv.mkDerivation rec {
})
];
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig atk cairo glib gtk
+ atk cairo glib gtk
pango libxml2Python perl intltool
gettext
] ++ optionals stdenv.isDarwin [
diff --git a/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix b/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix
index ab01796197c2..f0882e39a857 100644
--- a/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix
@@ -8,5 +8,6 @@ stdenv.mkDerivation {
sha256 = "0mnjhdryx94c106fghzz01dyc1vlp16wn6sajvpxffnqqx62rmfx";
};
- buildInputs = [ pkgconfig dbus_glib libxklavier glib gtk intltool GConf libglade ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ dbus_glib libxklavier glib gtk intltool GConf libglade ];
}
diff --git a/pkgs/desktops/gnome-2/desktop/libgweather/default.nix b/pkgs/desktops/gnome-2/desktop/libgweather/default.nix
index 7a1b4d1f5318..4b1daa3af90b 100644
--- a/pkgs/desktops/gnome-2/desktop/libgweather/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/libgweather/default.nix
@@ -9,5 +9,6 @@ stdenv.mkDerivation rec {
sha256 = "0k16lpdyy8as8wgc5dqpy5b8i9i4mrl77qx8db23fgs2c533fddq";
};
configureFlags = "--with-zoneinfo-dir=${stdenv.glibc}/share/zoneinfo";
- buildInputs = [ pkgconfig libxml2 gtk intltool GConf libsoup libtasn1 nettle gmp ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libxml2 gtk intltool GConf libsoup libtasn1 nettle gmp ];
}
diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix
index 75db62554360..22604f214d48 100644
--- a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
sha256 = "1slb7gajn30vdaq0hf5rikwdly1npmg1cf83hpjs82xd98knl13d";
};
- buildInputs = [ pkgconfig glib dbus_glib gmime libnotify libgnome_keyring openssl cyrus_sasl gnonlin sylpheed gob2 gettext intltool gnome2.GConf gnome2.libgnomeui dbus_glib gmime libnotify gnome2.gnome_keyring gnome2.scrollkeeper libxml2 gnome2.gnome_icon_theme hicolor_icon_theme tango-icon-theme ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ glib dbus_glib gmime libnotify libgnome_keyring openssl cyrus_sasl gnonlin sylpheed gob2 gettext intltool gnome2.GConf gnome2.libgnomeui dbus_glib gmime libnotify gnome2.gnome_keyring gnome2.scrollkeeper libxml2 gnome2.gnome_icon_theme hicolor_icon_theme tango-icon-theme ];
prePatch = ''
sed -i -e '/jb_rule_set_install_message/d' -e '/jb_rule_add_install_command/d' jbsrc/jb.c
diff --git a/pkgs/desktops/gnome-2/desktop/rarian/default.nix b/pkgs/desktops/gnome-2/desktop/rarian/default.nix
index 77a2b710f447..d2bcaa7c5e10 100644
--- a/pkgs/desktops/gnome-2/desktop/rarian/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/rarian/default.nix
@@ -6,6 +6,7 @@ stdenv.mkDerivation rec {
url = "mirror://gnome/sources/rarian/0.8/${name}.tar.bz2";
sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577";
};
- buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ perl perlXMLParser libxml2 libxslt];
configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat";
}
diff --git a/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix b/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix
index 8cd8635c85c5..62a224eb504a 100644
--- a/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix
@@ -13,6 +13,7 @@ stdenv.mkDerivation {
cp ${automake}/share/automake*/config.{sub,guess} .
";
- buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt gettext];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ perl perlXMLParser libxml2 libxslt gettext];
configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/catalog.xml";
}
diff --git a/pkgs/desktops/gnome-2/desktop/vte/default.nix b/pkgs/desktops/gnome-2/desktop/vte/default.nix
index dc8181414ce1..e5d2489436ee 100644
--- a/pkgs/desktops/gnome-2/desktop/vte/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/vte/default.nix
@@ -18,7 +18,8 @@ in stdenv.mkDerivation rec {
./vte-0.28.2-limit-arguments.patch
];
- buildInputs = [ intltool pkgconfig glib gtk ncurses ] ++
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ intltool glib gtk ncurses ] ++
stdenv.lib.optionals pythonSupport [python pygtk];
configureFlags = ''
diff --git a/pkgs/desktops/gnome-2/platform/at-spi/default.nix b/pkgs/desktops/gnome-2/platform/at-spi/default.nix
index 6be2a440879f..b0b669148ff3 100644
--- a/pkgs/desktops/gnome-2/platform/at-spi/default.nix
+++ b/pkgs/desktops/gnome-2/platform/at-spi/default.nix
@@ -11,6 +11,7 @@ stdenv.mkDerivation {
hardeningDisable = [ "format" ];
- buildInputs = [ python pkgconfig popt atk gtk libX11 libICE libXtst libXi
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ python popt atk gtk libX11 libICE libXtst libXi
intltool libbonobo ORBit2 GConf dbus_glib ];
}
diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix
index 0f811471fb0c..029d751e7190 100644
--- a/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix
@@ -6,5 +6,6 @@ stdenv.mkDerivation {
url = mirror://gnome/sources/gnome-vfs-monikers/2.15/gnome-vfs-monikers-2.15.3.tar.bz2;
sha256 = "0gpgk5vwhgqfhrd8pf1314kh7sv3jfqll2xbdbrs5s5sxy3v7b15";
};
- buildInputs = [ pkgconfig glib intltool gnome_vfs libbonobo ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ glib intltool gnome_vfs libbonobo ];
}
diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
index 48523f512b3f..06af8a63200a 100644
--- a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
@@ -12,9 +12,10 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
+ nativeBuildInputs = [ intltool pkgconfig ];
buildInputs =
- [ pkgconfig libxml2 bzip2 openssl dbus_glib fam cdparanoia
- intltool gnome_mime_data avahi acl
+ [ libxml2 bzip2 openssl dbus_glib fam cdparanoia
+ gnome_mime_data avahi acl
];
propagatedBuildInputs = [ GConf glib ];
diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix
index 4525246c20ed..49b8cc88f9de 100644
--- a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix
+++ b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix
@@ -11,5 +11,6 @@ stdenv.mkDerivation rec {
};
propagatedBuildInputs = [ gsettings_desktop_schemas gtk3 gnome_icon_theme GConf ];
- buildInputs = [pkgconfig intltool enchant isocodes ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ intltool enchant isocodes ];
}
diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix
index 49161c1a7455..8927bd120f61 100644
--- a/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix
@@ -13,5 +13,6 @@ stdenv.mkDerivation rec {
#http://www.mail-archive.com/debian-bugs-rc@lists.debian.org/msg250091.html
patches = [ ./01_remove-disable-deprecated.patch ];
- buildInputs = [pkgconfig gtk intltool GConf enchant isocodes gnome_icon_theme ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk intltool GConf enchant isocodes gnome_icon_theme ];
}
diff --git a/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix b/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix
index efdc28aac424..a71d6eb789ba 100644
--- a/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "1kbgqh7bw0fdx4f1a1aqwpff7gp5mwhbaz60c6c98bc4djng5dgs";
};
+ outputs = [ "out" "dev" ];
+
nativeBuildInputs = [ pkgconfig intltool ];
buildInputs = [ bison popt gtk libxml2 GConf libglade libtool ];
propagatedBuildInputs = [ libbonobo libgnomecanvas libgnome ];
diff --git a/pkgs/desktops/gnome-2/platform/libglade/default.nix b/pkgs/desktops/gnome-2/platform/libglade/default.nix
index a20c419fe0fb..5003215529e4 100644
--- a/pkgs/desktops/gnome-2/platform/libglade/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libglade/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation {
outputs = [ "out" "dev" ];
- buildInputs = [ pkgconfig gtk python gettext ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk python gettext ];
propagatedBuildInputs = [ libxml2 ];
diff --git a/pkgs/desktops/gnome-2/platform/libgnome/default.nix b/pkgs/desktops/gnome-2/platform/libgnome/default.nix
index 1bffa6211dca..a9957c41ff5d 100644
--- a/pkgs/desktops/gnome-2/platform/libgnome/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnome/default.nix
@@ -11,9 +11,11 @@ stdenv.mkDerivation rec {
sha256 = "197pnq8y0knqjhm2fg4j6hbqqm3qfzfnd0irhwxpk1b4hqb3kimj";
};
- outputs = [ "out" "dev" ];
-
patches = [ ./new-glib.patch ];
+ /* There's a comment containing an invalid utf-8 sequence, breaking glib-mkenums. */
+ postPatch = "sed '/returns the true filename/d' -i libgnome/gnome-config.h";
+
+ outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ popt zlib intltool GConf gnome_vfs libcanberra libtool ];
diff --git a/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix
index 4d0f3061c450..9d22488c25da 100644
--- a/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix
@@ -8,5 +8,6 @@ stdenv.mkDerivation {
sha256 = "996577f97f459a574919e15ba7fee6af8cda38a87a98289e9a4f54752d83e918";
};
- buildInputs = [ pkgconfig libgnomecanvas gtkmm ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libgnomecanvas gtkmm ];
}
diff --git a/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix
index 7eef5af0adcb..2365e166d5ee 100644
--- a/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
patches = [ ./glib.patch ./cups_1.6.patch ];
- buildInputs = [ pkgconfig gtk gettext intltool libart_lgpl ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk gettext intltool libart_lgpl ];
propagatedBuildInputs = [ libxml2 ];
}
diff --git a/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix
index 390059089fc0..6945ad1f04b9 100644
--- a/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
patches = [ ./bug653388.patch ];
- buildInputs = [ pkgconfig gtk gettext intltool libart_lgpl libgnomecups bison flex ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk gettext intltool libart_lgpl libgnomecups bison flex ];
propagatedBuildInputs = [ libxml2 ];
diff --git a/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix
index a19b20e86b5c..a8072aa37525 100644
--- a/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix
@@ -8,5 +8,6 @@ stdenv.mkDerivation {
sha256 = "0spl8vinb5n6n1krnfnr61dwaxidg67h8j94z9p59k2xdsvfashm";
};
- buildInputs = [ pkgconfig gtk gettext intltool libgnomecanvas libgnomeprint gnomeicontheme];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk gettext intltool libgnomecanvas libgnomeprint gnomeicontheme];
}
diff --git a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix
index 961fb1c0a199..24cd851eef6a 100644
--- a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, xorg, glib, pango
+{ stdenv, fetchurl, fetchpatch, pkgconfig, libxml2, xorg, glib, pango
, intltool, libgnome, libgnomecanvas, libbonoboui, GConf, libtool
, gnome_vfs, libgnome_keyring, libglade }:
@@ -11,6 +11,16 @@ stdenv.mkDerivation rec {
sha256 = "03rwbli76crkjl6gp422wrc9lqpl174k56cp9i96b7l8jlj2yddf";
};
+ outputs = [ "out" "dev" ];
+
+ patches = [
+ (fetchpatch {
+ name = "0001-gnome-scores.h-Convert-to-UTF-8.patch";
+ url = https://github.com/GNOME/libgnomeui/commit/30334c28794ef85d8973f4ed0779b5ceed6594f2.diff;
+ sha256 = "1sn8j8dkam14wfkpw8nga3gk63wniff243mzv3jp0fvv52q8sqhk";
+ })
+ ];
+
nativeBuildInputs = [ pkgconfig intltool ];
buildInputs =
[ xorg.xlibsWrapper libxml2 GConf pango glib libgnome_keyring libglade libtool ];
diff --git a/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix b/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix
index be288b809d43..b9db3422723e 100644
--- a/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation {
sha256 = "0msajafd42545dxzyr5zqka990cjrxw2yz09ajv4zs8m1w6pm9rw";
};
- buildInputs = [ pkgconfig gtk gettext ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk gettext ];
propagatedBuildInputs = [ libxml2 ];
hardeningDisable = [ "format" ];
diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix
index 7a5ab769cc96..545e89a85125 100644
--- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix
+++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix
@@ -5,8 +5,9 @@
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) src name;
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig gtk3 wrapGAppsHook itstool libxml2 python3Packages.python python3Packages.pyatspi
+ gtk3 wrapGAppsHook itstool libxml2 python3Packages.python python3Packages.pyatspi
python3Packages.pygobject3 python3Packages.ipython
at_spi2_core dbus intltool libwnck3 gnome3.defaultIconTheme
];
diff --git a/pkgs/desktops/gnome-3/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/apps/bijiben/default.nix
index 00895f9a2bb2..9aae9215650f 100644
--- a/pkgs/desktops/gnome-3/apps/bijiben/default.nix
+++ b/pkgs/desktops/gnome-3/apps/bijiben/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
- buildInputs = [ pkgconfig glib intltool itstool libxml2
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ glib intltool itstool libxml2
clutter_gtk libuuid webkitgtk gnome3.tracker
gnome3.gnome_online_accounts zeitgeist desktop_file_utils
gnome3.gsettings_desktop_schemas makeWrapper
diff --git a/pkgs/desktops/gnome-3/apps/cheese/default.nix b/pkgs/desktops/gnome-3/apps/cheese/default.nix
index b5f70d84e520..a10864c347ef 100644
--- a/pkgs/desktops/gnome-3/apps/cheese/default.nix
+++ b/pkgs/desktops/gnome-3/apps/cheese/default.nix
@@ -6,7 +6,8 @@
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
- buildInputs = [ pkgconfig gtk3 glib intltool wrapGAppsHook gnome-video-effects itstool
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk3 glib intltool wrapGAppsHook gnome-video-effects itstool
gdk_pixbuf adwaita-icon-theme librsvg udev gst_all_1.gstreamer libxml2
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome_desktop
gst_all_1.gst-plugins-bad clutter_gtk clutter-gst
diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix
index a0f8d9669556..ce29ebf0a7ea 100644
--- a/pkgs/desktops/gnome-3/apps/glade/default.nix
+++ b/pkgs/desktops/gnome-3/apps/glade/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, intltool, fetchurl, python
+{ stdenv, intltool, fetchurl, python, autoreconfHook
, pkgconfig, gtk3, glib
, makeWrapper, itstool, libxml2, docbook_xsl
, gnome3, librsvg, gdk_pixbuf, libxslt }:
@@ -8,12 +8,25 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
- buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 python
- gnome3.gsettings_desktop_schemas makeWrapper docbook_xsl
- gdk_pixbuf gnome3.defaultIconTheme librsvg libxslt ];
+ nativeBuildInputs = [
+ pkgconfig intltool itstool makeWrapper docbook_xsl libxslt
+ # reconfiguration
+ autoreconfHook gnome3.gnome_common gnome3.yelp_tools
+ ];
+ buildInputs = [ gtk3 glib libxml2 python
+ gnome3.gsettings_desktop_schemas
+ gdk_pixbuf gnome3.defaultIconTheme librsvg ];
enableParallelBuilding = true;
+ patches = [
+ # https://bugzilla.gnome.org/show_bug.cgi?id=782161
+ (fetchurl {
+ url = https://bugzilla.gnome.org/attachment.cgi?id=351054;
+ sha256 = "093wjjj40027pkqqnm14jb2dp2i2m8p1bayqx1lw18pq66c8fahn";
+ })
+ ];
+
preFixup = ''
wrapProgram "$out/bin/glade" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
index fbd5d748f5eb..618d6152d81f 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
@@ -7,8 +7,9 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig gtk3 wrapGAppsHook intltool evolution_data_server
+ gtk3 wrapGAppsHook intltool evolution_data_server
sqlite libxml2 libsoup glib gnome3.defaultIconTheme gnome_online_accounts
gsettings_desktop_schemas
];
diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
index 0c7adcb03192..15f1f58b558c 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
@@ -4,8 +4,9 @@
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig gtk3 wrapGAppsHook intltool gjs gdk_pixbuf
+ gtk3 wrapGAppsHook intltool gjs gdk_pixbuf
librsvg gnome3.gsettings_desktop_schemas gnome3.defaultIconTheme
];
diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
index e39614e765d6..68cd2a42fa64 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
doCheck = true;
- buildInputs = [ pkgconfig gtk3 glib intltool itstool libcanberra_gtk3
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk3 glib intltool itstool libcanberra_gtk3
gnome3.gsettings_desktop_schemas makeWrapper
gdk_pixbuf gnome3.defaultIconTheme librsvg
gnome3.gnome_desktop gnome3.geocode_glib geoclue2
diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
index 4840d200cf99..d34334c4f64c 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
configureFlags = [ "--enable-getting-started" ];
- buildInputs = [ pkgconfig gtk3 glib intltool itstool libxslt
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk3 glib intltool itstool libxslt
docbook_xsl desktop_file_utils inkscape poppler_utils
gnome3.gsettings_desktop_schemas makeWrapper gmp
gdk_pixbuf gnome3.defaultIconTheme librsvg evince
diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
index 2fc27617d98e..91d5f7d00e49 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
@@ -6,8 +6,9 @@ stdenv.mkDerivation rec {
configureFlags = [ "--disable-tests" ];
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2
+ gtk3 wrapGAppsHook intltool itstool libxml2
systemd gnome3.gsettings_desktop_schemas gnome3.defaultIconTheme
];
diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
index 5af407ef15cd..bb8375d595ef 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
doCheck = true;
- buildInputs = [ pkgconfig intltool gobjectIntrospection wrapGAppsHook
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ intltool gobjectIntrospection wrapGAppsHook
gtk3 geoclue2 gnome3.gjs gnome3.libgee folks gfbgraph
gnome3.geocode_glib libchamplain file libsoup
gdk_pixbuf librsvg libgweather autoreconfHook
diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
index 4f11e7a28438..54e79872c679 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
- buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.libmediaart
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk3 glib intltool itstool gnome3.libmediaart
gdk_pixbuf gnome3.defaultIconTheme librsvg python3Packages.python
gnome3.grilo gnome3.grilo-plugins gnome3.totem-pl-parser libxml2 libnotify
python3Packages.pycairo python3Packages.dbus-python python3Packages.requests
diff --git a/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix b/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix
index 4c152777f2cb..dcee87dc799c 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix
@@ -9,8 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "1c9cvzvyqgfwa5zzyvp7118pkclji62fkbb33g4y9sp5kw6m397h";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig gtk3 wrapGAppsHook libgtop intltool itstool libxml2
+ gtk3 wrapGAppsHook libgtop intltool itstool libxml2
gnome3.defaultIconTheme
];
diff --git a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
index 6e8394950a6a..61ec2ac446ce 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
- buildInputs = [ pkgconfig gtk3 glib intltool itstool gegl babl gnome3.libgdata
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk3 glib intltool itstool gegl babl gnome3.libgdata
gnome3.gsettings_desktop_schemas makeWrapper gmp libmediaart
gdk_pixbuf gnome3.defaultIconTheme librsvg exempi
gnome3.gfbgraph gnome3.grilo-plugins gnome3.grilo
diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
index 3b5542544d50..d6804e09a482 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
@@ -4,8 +4,9 @@
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig gtk3 wrapGAppsHook gjs intltool itstool
+ gtk3 wrapGAppsHook gjs intltool itstool
libgweather gnome3.defaultIconTheme geoclue2 gnome3.gsettings_desktop_schemas
];
diff --git a/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix b/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix
index 093900dcb7ab..2812e7673b40 100644
--- a/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix
+++ b/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool
-, gobjectIntrospection, makeWrapper }:
+{ stdenv, fetchurl, meson, ninja, glib, pkgconfig, gnome3, appstream-glib, gettext }:
stdenv.mkDerivation rec {
name = "nautilus-sendto-${version}";
- version = "3.8.1";
+ version = "3.8.6";
src = fetchurl {
url = "mirror://gnome/sources/nautilus-sendto/3.8/${name}.tar.xz";
- sha256 = "03fa46bff271acdbdedab6243b2a84e5ed3daa19c81b69d087b3e852c8fe5dab";
+ sha256 = "164d7c6e8bae29c4579bcc67a7bf50d783662b1545b62f3008e7ea3c0410e04d";
};
- buildInputs = [ glib pkgconfig gobjectIntrospection intltool makeWrapper ];
+ nativeBuildInputs = [ meson ninja pkgconfig appstream-glib gettext ];
+ buildInputs = [ glib ];
meta = with stdenv.lib; {
description = "Integrates Evolution and Pidgin into the Nautilus file manager";
diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/pkgs/desktops/gnome-3/apps/polari/default.nix
index fc97d1b6d6e6..7c3da70edeb2 100644
--- a/pkgs/desktops/gnome-3/apps/polari/default.nix
+++ b/pkgs/desktops/gnome-3/apps/polari/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ telepathy_idle telepathy_logger ];
- buildInputs = [ pkgconfig gtk3 glib intltool itstool adwaita-icon-theme wrapGAppsHook gnome3.gsettings_desktop_schemas
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk3 glib intltool itstool adwaita-icon-theme wrapGAppsHook gnome3.gsettings_desktop_schemas
telepathy_glib telepathy_logger gjs gspell gdk_pixbuf librsvg libxml2 libsecret libsoup ];
enableParallelBuilding = true;
diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix
index 58d5a5b8cdc5..03dbdb1842a4 100644
--- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix
+++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
- buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gcr
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk3 glib intltool itstool gnome3.gcr
gnome3.gsettings_desktop_schemas wrapGAppsHook gnupg
gdk_pixbuf gnome3.defaultIconTheme librsvg gpgme
libsecret avahi libsoup p11_kit vala_0_32
diff --git a/pkgs/desktops/gnome-3/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/apps/vinagre/default.nix
index 8b8b6248642c..e719fbf9f219 100644
--- a/pkgs/desktops/gnome-3/apps/vinagre/default.nix
+++ b/pkgs/desktops/gnome-3/apps/vinagre/default.nix
@@ -4,7 +4,8 @@
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
- buildInputs = [ pkgconfig gtk3 vte libxml2 gtkvnc intltool libsecret
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk3 vte libxml2 gtkvnc intltool libsecret
itstool makeWrapper gnome3.defaultIconTheme librsvg ];
preFixup = ''
diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix
index 15db270e80c5..f94cb3c57c46 100644
--- a/pkgs/desktops/gnome-3/core/baobab/default.nix
+++ b/pkgs/desktops/gnome-3/core/baobab/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
- buildInputs = [ vala pkgconfig gtk3 glib libgtop intltool itstool libxml2
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ vala gtk3 glib libgtop intltool itstool libxml2
wrapGAppsHook file gdk_pixbuf gnome3.defaultIconTheme librsvg ];
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/core/dconf/default.nix b/pkgs/desktops/gnome-3/core/dconf/default.nix
index 9200c4180bd2..130e8255edca 100644
--- a/pkgs/desktops/gnome-3/core/dconf/default.nix
+++ b/pkgs/desktops/gnome-3/core/dconf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, vala_0_32, libxslt, pkgconfig, glib, dbus_glib, gnome3
+{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3
, libxml2, intltool, docbook_xsl_ns, docbook_xsl, makeWrapper }:
let
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
outputs = [ "out" "lib" "dev" ];
- buildInputs = [ vala_0_32 libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2
- intltool docbook_xsl docbook_xsl_ns makeWrapper ];
+ nativeBuildInputs = [ vala pkgconfig intltool libxslt libxml2 docbook_xsl docbook_xsl_ns makeWrapper ];
+ buildInputs = [ glib dbus_glib ];
postConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace client/Makefile \
diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix
index 9a29d11f1aea..ea257ed69f0f 100644
--- a/pkgs/desktops/gnome-3/core/empathy/default.nix
+++ b/pkgs/desktops/gnome-3/core/empathy/default.nix
@@ -25,7 +25,8 @@ stdenv.mkDerivation rec {
gnome_online_accounts shared_mime_info ];
propagatedBuildInputs = [ folks telepathy_logger evolution_data_server
telepathy_mission_control ];
- buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk3 glib webkitgtk intltool itstool
libxml2 libxslt icu file makeWrapper
telepathy_glib clutter_gtk clutter-gst cogl
gst_all_1.gstreamer gst_all_1.gst-plugins-base
diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix
index ec8cf1188156..35aae8cc9eb9 100644
--- a/pkgs/desktops/gnome-3/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig file wrapGAppsHook ];
- buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt pkgconfig file
+ buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt file
webkitgtk libsoup libsecret gnome_desktop libnotify libtool
sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools
gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common
diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
index 9d51dc969d33..e2472a403699 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ libsecret nss nspr libical db ];
# uoa irrelevant for now
- cmakeFlags = [ "-DENABLE_UOA=OFF" "-DENABLE_GOA=OFF" ]
+ cmakeFlags = [ "-DENABLE_UOA=OFF" ]
++ stdenv.lib.optionals valaSupport [
"-DENABLE_VALA_BINDINGS=ON" "-DENABLE_INTROSPECTION=ON"
"-DCMAKE_SKIP_BUILD_RPATH=OFF" ];
diff --git a/pkgs/desktops/gnome-3/core/folks/default.nix b/pkgs/desktops/gnome-3/core/folks/default.nix
index 171ad0774500..6fcaa67b7712 100644
--- a/pkgs/desktops/gnome-3/core/folks/default.nix
+++ b/pkgs/desktops/gnome-3/core/folks/default.nix
@@ -8,11 +8,11 @@ let
majorVersion = "0.11";
in
stdenv.mkDerivation rec {
- name = "folks-${majorVersion}.3";
+ name = "folks-${majorVersion}.4";
src = fetchurl {
url = "mirror://gnome/sources/folks/${majorVersion}/${name}.tar.xz";
- sha256 = "2a2828a7c87fd39e5786f8f2cf0ebe47576a74974f1355c478a6dc747d7bcb64";
+ sha256 = "16hqh2gxlbx0b0hgq216hndr1m72vj54jvryzii9zqkk0g9kxc57";
};
propagatedBuildInputs = [ glib gnome3.libgee sqlite ];
diff --git a/pkgs/desktops/gnome-3/core/gcr/default.nix b/pkgs/desktops/gnome-3/core/gcr/default.nix
index 55eebf77be59..e970dba5615e 100644
--- a/pkgs/desktops/gnome-3/core/gcr/default.nix
+++ b/pkgs/desktops/gnome-3/core/gcr/default.nix
@@ -5,12 +5,18 @@
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
- buildInputs = [
- pkgconfig intltool gnupg glib gobjectIntrospection libxslt
- libgcrypt libtasn1 dbus_glib gtk pango gdk_pixbuf atk makeWrapper vala_0_32
+ outputs = [ "out" "dev" ];
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ buildInputs = let
+ gpg = gnupg.override { guiSupport = false; }; # prevent build cycle with pinentry_gnome
+ in [
+ intltool gpg gobjectIntrospection libxslt
+ libgcrypt libtasn1 dbus_glib pango gdk_pixbuf atk makeWrapper vala_0_32
];
- propagatedBuildInputs = [ p11_kit ];
+ propagatedBuildInputs = [ glib gtk p11_kit ];
#doCheck = true;
diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix
index 59f0381f2e87..09e27e7c0c5f 100644
--- a/pkgs/desktops/gnome-3/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/core/gdm/default.nix
@@ -16,7 +16,8 @@ stdenv.mkDerivation rec {
"--with-plymouth=yes"
"--with-systemdsystemunitdir=$(out)/etc/systemd/system" ];
- buildInputs = [ pkgconfig glib itstool libxml2 intltool autoreconfHook
+ nativeBuildInputs = [ autoreconfHook pkgconfig ];
+ buildInputs = [ glib itstool libxml2 intltool
accountsservice gnome3.dconf systemd
gobjectIntrospection libX11 gtk
libcanberra_gtk3 pam libtool plymouth librsvg ];
diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/desktops/gnome-3/core/gjs/default.nix
index 10d9c46123dd..482d6ae64a40 100644
--- a/pkgs/desktops/gnome-3/core/gjs/default.nix
+++ b/pkgs/desktops/gnome-3/core/gjs/default.nix
@@ -4,7 +4,8 @@
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
- buildInputs = [ libxml2 gobjectIntrospection pkgconfig gtk3 glib pango readline dbus ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libxml2 gobjectIntrospection gtk3 glib pango readline dbus ];
propagatedBuildInputs = [ spidermonkey_38 ];
diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
index 7fae0b5c67f4..f237d745c1cc 100644
--- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
@@ -4,7 +4,8 @@
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
- buildInputs = [ pkgconfig intltool glib gtk3 udev libxml2 gnome3.defaultIconTheme
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ intltool glib gtk3 udev libxml2 gnome3.defaultIconTheme
makeWrapper gnome3.gsettings_desktop_schemas itstool
libnotify libcanberra_gtk3 ];
diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
index 66cc2cb24c73..e69092a57123 100644
--- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
@@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
touch src/*.vala
'';
- buildInputs = [ pkgconfig gtk3 glib intltool itstool evolution_data_server
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk3 glib intltool itstool evolution_data_server
gnome3.gsettings_desktop_schemas wrapGAppsHook file libnotify
folks gnome3.gnome_desktop telepathy_glib libsecret dbus_glib
libxml2 libsoup gnome3.gnome_online_accounts nspr nss
diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
index b116c2902da3..a6cc7ec962a0 100644
--- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
@@ -41,6 +41,9 @@ stdenv.mkDerivation rec {
preFixup = with gnome3; ''
gappsWrapperArgs+=(
--prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:${sound-theme-freedesktop}/share"
+ # Thumbnailers (for setting user profile pictures)
+ --prefix XDG_DATA_DIRS : "${gdk_pixbuf}/share"
+ --prefix XDG_DATA_DIRS : "${librsvg}/share"
)
for i in $out/share/applications/*; do
substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center"
diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
index 7265f09731fd..d56018bf1e8b 100644
--- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- buildInputs = [ pkgconfig python libxml2Python libxslt which libX11
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ python libxml2Python libxslt which libX11
xkeyboard_config isocodes itstool wayland
gtk3 glib intltool gnome_doc_utils libxkbfile
gobjectIntrospection ];
diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
index c94c178558da..77c4805a197e 100644
--- a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ];
- buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 file
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk3 glib intltool itstool libxml2 file
gnome3.gsettings_desktop_schemas makeWrapper ];
preFixup = ''
diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
index aef58567387b..f9380272f065 100644
--- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
- buildInputs = [ bash pkgconfig gtk3 glib intltool itstool
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ bash gtk3 glib intltool itstool
libxslt libtool libsecret libpwquality cracklib
libnotify libdvdread libcanberra_gtk3 docbook_xsl
gdk_pixbuf gnome3.defaultIconTheme
diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
index 16d7151ea096..14aeb69e14cb 100644
--- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
- buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gnome_desktop
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk3 glib intltool itstool gnome3.gnome_desktop
gdk_pixbuf gnome3.defaultIconTheme librsvg
gnome3.gsettings_desktop_schemas wrapGAppsHook ];
diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
index df47c1a477b9..4baafecadd0a 100644
--- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
@@ -5,6 +5,8 @@
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
+ outputs = [ "out" "dev" ];
+
buildInputs = with gnome3; [
dbus libgcrypt pam python gtk3 gconf libgnome_keyring
pango gcr gdk_pixbuf atk p11_kit
diff --git a/pkgs/desktops/gnome-3/core/gnome-menus/default.nix b/pkgs/desktops/gnome-3/core/gnome-menus/default.nix
index ee8c3a902d59..fdd23d134599 100644
--- a/pkgs/desktops/gnome-3/core/gnome-menus/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-menus/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";
- buildInputs = [ intltool pkgconfig glib gobjectIntrospection ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ intltool glib gobjectIntrospection ];
meta = {
homepage = http://www.gnome.org;
diff --git a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
index 29f6ae3e860e..1f64e10aa25d 100644
--- a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, libxslt, gtk, wrapGAppsHook
+{ stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk, wrapGAppsHook
, webkitgtk, json_glib, rest, libsecret, dbus_glib, gnome_common
, telepathy_glib, intltool, dbus_libs, icu, glib_networking
, libsoup, docbook_xsl_ns, docbook_xsl, gnome3
@@ -11,8 +11,9 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- buildInputs = [ pkgconfig glib libxslt gtk webkitgtk json_glib rest gnome_common wrapGAppsHook
- libsecret dbus_glib telepathy_glib glib_networking intltool icu libsoup
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ glib libxslt gtk webkitgtk json_glib rest gnome_common wrapGAppsHook
+ libsecret dbus_glib telepathy_glib glib_networking intltool icu libsoup vala
docbook_xsl_ns docbook_xsl gnome3.defaultIconTheme ];
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
index 90fc3a8737ae..cb50494bb404 100644
--- a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
@@ -4,7 +4,8 @@
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
- buildInputs = [ pkgconfig glib gnome3.libgdata libxml2 libsoup gmp openssl
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ glib gnome3.libgdata libxml2 libsoup gmp openssl
gnome3.grilo gnome3.libzapojit gnome3.grilo-plugins
gnome3.gnome_online_accounts makeWrapper gnome3.libmediaart
gnome3.tracker gnome3.gfbgraph json_glib gnome3.rest ];
diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
index 34f8cee625aa..1f933e1b3c57 100644
--- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ];
- buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libcanberra_gtk3
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ bash gtk3 glib intltool itstool libcanberra_gtk3
gnome3.gsettings_desktop_schemas wrapGAppsHook ];
preFixup = ''
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
index 83305f440b14..fd90b8867d7b 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
@@ -6,7 +6,8 @@ stdenv.mkDerivation rec {
doCheck = true;
- buildInputs = [ pkgconfig gtk3 glib libgtop intltool itstool
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk3 glib libgtop intltool itstool
makeWrapper file ];
configureFlags = [ "--enable-extensions=all" ];
diff --git a/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix
index aa6f48ac420b..d66efca66d9c 100644
--- a/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix
@@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ];
- buildInputs = [ bash pkgconfig gtk3 glib intltool itstool
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ bash gtk3 glib intltool itstool
gnome3.gsettings_desktop_schemas wrapGAppsHook libxml2 ];
preFixup = ''
diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
index 3164e4dd74b1..c32d9d95d88f 100644
--- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
- buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libxml2
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ bash gtk3 glib intltool itstool libxml2
gtkmm3 libgtop wrapGAppsHook
gdk_pixbuf gnome3.defaultIconTheme librsvg
gnome3.gsettings_desktop_schemas systemd ];
diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix
index 5cc3385ad841..3db252d063f2 100644
--- a/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix
@@ -4,7 +4,8 @@
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
- buildInputs = [ intltool gtk3 librsvg pkgconfig pango atk gtk2 gdk_pixbuf
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ intltool gtk3 librsvg pango atk gtk2 gdk_pixbuf
gnome3.defaultIconTheme ];
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-standard/src.nix b/pkgs/desktops/gnome-3/core/gnome-themes-standard/src.nix
index a5ccd23b9fc8..dcda746c8dd1 100644
--- a/pkgs/desktops/gnome-3/core/gnome-themes-standard/src.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-themes-standard/src.nix
@@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
- name = "gnome-themes-standard-3.22.1";
+ name = "gnome-themes-standard-3.22.3";
src = fetchurl {
- url = mirror://gnome/sources/gnome-themes-standard/3.22/gnome-themes-standard-3.22.1.tar.xz;
- sha256 = "90f6f4e79eaa42e424fa35144cdbcb5db93db56e73200ac045742ba320febb54";
+ url = mirror://gnome/sources/gnome-themes-standard/3.22/gnome-themes-standard-3.22.3.tar.xz;
+ sha256 = "61dc87c52261cfd5b94d65e8ffd923ddeb5d3944562f84942eeeb197ab8ab56a";
};
}
diff --git a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
index 4f02673e036f..6ab72ab7826d 100644
--- a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
@@ -3,7 +3,8 @@
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
- buildInputs = [ pkgconfig gnome3.yelp itstool libxml2 intltool ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gnome3.yelp itstool libxml2 intltool ];
meta = with stdenv.lib; {
homepage = "https://help.gnome.org/users/gnome-help/${gnome3.version}";
diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
index 587165e107b0..0b83f6eb2267 100644
--- a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
@@ -21,7 +21,8 @@ stdenv.mkDerivation rec {
"--with-systemduserunitdir=$(out)/etc/systemd/user"
"--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ];
- buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk3 glib intltool itstool libxml2 libtool
wrapGAppsHook file gdk_pixbuf gnome3.defaultIconTheme librsvg
nautilus libnotify libcanberra_gtk3 systemd ];
diff --git a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix
index 4b8fc90adad8..b8911dd5c1f1 100644
--- a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix
+++ b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix
@@ -4,17 +4,18 @@
stdenv.mkDerivation rec {
major = "0.3";
- minor = "3";
+ minor = "5";
name = "grilo-plugins-${major}.${minor}";
src = fetchurl {
url = "mirror://gnome/sources/grilo-plugins/${major}/${name}.tar.xz";
- sha256 = "fe66e887847fef9c361bcb7226047c43b2bc22b172aaf22afd5534947cc85b9c";
+ sha256 = "1yv8a0mfd5qmdbdrnd0is5c51s1mvibhw61na99iagnbirxq4xr9";
};
installFlags = [ "GRL_PLUGINS_DIR=$(out)/lib/grilo-${major}" ];
- buildInputs = [ pkgconfig gnome3.grilo libxml2 gupnp gssdp gnome3.libgdata
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gnome3.grilo libxml2 gupnp gssdp gnome3.libgdata
lua5 liboauth gupnp_av sqlite gnome3.gnome_online_accounts
gnome3.totem-pl-parser gnome3.rest gmime json_glib
avahi gnome3.libmediaart tracker intltool itstool ];
diff --git a/pkgs/desktops/gnome-3/core/grilo/default.nix b/pkgs/desktops/gnome-3/core/grilo/default.nix
index b4a794812a5c..ffa489927e2f 100644
--- a/pkgs/desktops/gnome-3/core/grilo/default.nix
+++ b/pkgs/desktops/gnome-3/core/grilo/default.nix
@@ -3,12 +3,12 @@
stdenv.mkDerivation rec {
major = "0.3"; # if you change this, also change ./setup-hook.sh
- minor = "3";
+ minor = "4";
name = "grilo-${major}.${minor}";
src = fetchurl {
url = "mirror://gnome/sources/grilo/${major}/${name}.tar.xz";
- sha256 = "1qx072m0gl6m3d5g5cbbf13p4h217icmlxjnrn829x5xqwi451sw";
+ sha256 = "0vh67gja6yn7czh77ssmx6ncp99fl2926pbi2hplqms27c2n8sbw";
};
setupHook = ./setup-hook.sh;
@@ -22,7 +22,8 @@ stdenv.mkDerivation rec {
done
'';
- buildInputs = [ pkgconfig file intltool glib libxml2 libsoup
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ file intltool glib libxml2 libsoup
gnome3.totem-pl-parser ];
propagatedBuildInputs = [ python3Packages.pygobject3 gobjectIntrospection ];
diff --git a/pkgs/desktops/gnome-3/core/gsound/default.nix b/pkgs/desktops/gnome-3/core/gsound/default.nix
index 95785d9ed4d2..8e72b7fb233e 100644
--- a/pkgs/desktops/gnome-3/core/gsound/default.nix
+++ b/pkgs/desktops/gnome-3/core/gsound/default.nix
@@ -10,7 +10,8 @@ in stdenv.mkDerivation rec {
sha256 = "ea0dd94429c0645f2f98824274ef04543fe459dd83a5449a68910acc3ba67f29";
};
- buildInputs = [ pkgconfig glib libcanberra_gtk2 gobjectIntrospection libtool ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ glib libcanberra_gtk2 gobjectIntrospection libtool ];
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Projects/GSound;
diff --git a/pkgs/desktops/gnome-3/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/core/gtksourceview/default.nix
index 3dfbe6fbf0b5..a39464449485 100644
--- a/pkgs/desktops/gnome-3/core/gtksourceview/default.nix
+++ b/pkgs/desktops/gnome-3/core/gtksourceview/default.nix
@@ -6,7 +6,8 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ gtk3 ];
- buildInputs = [ pkgconfig atk cairo glib pango
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ atk cairo glib pango
libxml2Python perl intltool gettext ];
preBuild = ''
diff --git a/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix b/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix
index 43e27cdb4814..7763867bcbff 100644
--- a/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix
+++ b/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix
@@ -3,7 +3,8 @@
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
- buildInputs = [ pkgconfig glibmm gtkmm gtksourceview ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ glibmm gtkmm gtksourceview ];
meta = with stdenv.lib; {
platforms = platforms.linux;
diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix
index 05aff866606f..58d9901ad012 100644
--- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix
+++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix
@@ -1,6 +1,7 @@
{ stdenv, intltool, fetchurl, pkgconfig, gtk3
, glib, desktop_file_utils, bash, appdata-tools
-, makeWrapper, gnome3, file, itstool, libxml2 }:
+, wrapGAppsHook, gnome3, itstool, libxml2
+, callPackage, unzip }:
# TODO: icons and theme still does not work
# use packaged gnome3.adwaita-icon-theme
@@ -12,16 +13,17 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
- preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
+ preConfigure = "patchShebangs gucharmap/gen-guch-unicode-tables.pl";
- buildInputs = [ pkgconfig gtk3 intltool itstool glib appdata-tools
- gnome3.yelp_tools libxml2 file desktop_file_utils
- gnome3.gsettings_desktop_schemas makeWrapper ];
+ nativeBuildInputs = [ pkgconfig wrapGAppsHook unzip ];
- preFixup = ''
- wrapProgram "$out/bin/gucharmap" \
- --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
- '';
+ buildInputs = [ gtk3 intltool itstool glib appdata-tools
+ gnome3.yelp_tools libxml2 desktop_file_utils
+ gnome3.gsettings_desktop_schemas ];
+
+ unicode-data = callPackage ./unicode-data.nix {};
+
+ configureFlags = "--with-unicode-data=${unicode-data}";
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Gucharmap;
diff --git a/pkgs/desktops/gnome-3/core/gucharmap/src.nix b/pkgs/desktops/gnome-3/core/gucharmap/src.nix
index 69c0dd600251..67d00c269f53 100644
--- a/pkgs/desktops/gnome-3/core/gucharmap/src.nix
+++ b/pkgs/desktops/gnome-3/core/gucharmap/src.nix
@@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
- name = "gucharmap-3.18.2";
+ name = "gucharmap-10.0.1";
src = fetchurl {
- url = mirror://gnome/sources/gucharmap/3.18/gucharmap-3.18.2.tar.xz;
- sha256 = "80141d3e892c3c4812c1a8fad8f89978559ef19e933843267e6e9a5524c09ec9";
+ url = mirror://gnome/sources/gucharmap/10.0/gucharmap-10.0.1.tar.xz;
+ sha256 = "51a2bf91c4590ea2159f828156864f088a0bd4c12e7a1c396002a23d48b2d5e2";
};
}
diff --git a/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix b/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix
new file mode 100644
index 000000000000..84770a17162c
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix
@@ -0,0 +1,44 @@
+{fetchurl, stdenv}:
+stdenv.mkDerivation {
+ name = "unicode-data-10.0.0";
+ srcs = [
+ (fetchurl {
+ url = "http://www.unicode.org/Public/10.0.0/ucd/Blocks.txt";
+ sha256 = "19zf2kd198mcv1paa194c1zf36hay1irbxssi35yi2pd8ad69qas";
+ })
+ (fetchurl {
+ url = "http://www.unicode.org/Public/10.0.0/ucd/DerivedAge.txt";
+ sha256 = "1h9p1g0wnh686l6cqar7cmky465vwc6vjzzn1s7v0i9zcjaqkr4h";
+ })
+ (fetchurl {
+ url = "http://www.unicode.org/Public/10.0.0/ucd/NamesList.txt";
+ sha256 = "0gvpcyq852rnlqmx4y5i1by7bavvcw6rj40i54w48yc7xr3zmgd1";
+ })
+ (fetchurl {
+ url = "http://www.unicode.org/Public/10.0.0/ucd/Scripts.txt";
+ sha256 = "0b9prz2hs6w61afqaplcxnv115f8yk4d5hn9dc5hks8nqpj28bnh";
+ })
+ (fetchurl {
+ url = "http://www.unicode.org/Public/10.0.0/ucd/UnicodeData.txt";
+ sha256 = "1cfak1j753zcrbgixwgppyxhm4w8vda8vxhqymi7n5ljfi6kwhjj";
+ })
+ (fetchurl {
+ url = "http://www.unicode.org/Public/10.0.0/ucd/Unihan.zip";
+ sha256 = "199kz6laypkvc0ykms6d7bkb571jmpds39sv2p7kd5jjm1ij08q1";
+ })
+ ];
+ phases = "installPhase";
+ installPhase = with stdenv.lib; ''
+ mkdir $out
+ for f in $srcs;do
+ cp $f $out/$(stripHash $f)
+ done
+ '';
+ meta = with stdenv.lib; {
+ homepage = http://www.unicode.org/ucd/;
+ description = "Unicode Character Database";
+ maintainers = gnome3.maintainers;
+ license = licenses.mit;
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/core/libgdata/default.nix b/pkgs/desktops/gnome-3/core/libgdata/default.nix
index 08f05bcaedc1..ddf245f49e06 100644
--- a/pkgs/desktops/gnome-3/core/libgdata/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgdata/default.nix
@@ -5,11 +5,11 @@ let
majorVersion = "0.17";
in
stdenv.mkDerivation rec {
- name = "libgdata-${majorVersion}.6";
+ name = "libgdata-${majorVersion}.9";
src = fetchurl {
url = "mirror://gnome/sources/libgdata/${majorVersion}/${name}.tar.xz";
- sha256 = "8b6a3ff1db23bd9e5ebbcc958b29b769a898f892eed4798222d562ba69df30b0";
+ sha256 = "0fj54yqxdapdppisqm1xcyrpgcichdmipq0a0spzz6009ikzgi45";
};
NIX_CFLAGS_COMPILE = "-I${gnome3.libsoup.dev}/include/libsoup-gnome-2.4/ -I${gnome3.gcr}/include/gcr-3 -I${gnome3.gcr}/include/gck-1";
diff --git a/pkgs/desktops/gnome-3/core/libgee/default.nix b/pkgs/desktops/gnome-3/core/libgee/default.nix
index d4697c99a938..04d9098764f6 100644
--- a/pkgs/desktops/gnome-3/core/libgee/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgee/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, autoconf, vala_0_32, pkgconfig, glib, gobjectIntrospection, gnome3 }:
+{ stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobjectIntrospection, gnome3 }:
let
- ver_maj = "0.18";
+ ver_maj = "0.20";
ver_min = "0";
in
stdenv.mkDerivation rec {
@@ -8,14 +8,15 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/libgee/${ver_maj}/${name}.tar.xz";
- sha256 = "16a34js81w9m2bw4qd8csm4pcgr3zq5z87867j4b8wfh6zwrxnaa";
+ sha256 = "1fy24dr8imrjlmsqj1syn0gi139gba6hwk3j5vd6sr3pxniqnc11";
};
doCheck = true;
patches = [ ./fix_introspection_paths.patch ];
- buildInputs = [ autoconf vala_0_32 pkgconfig glib gobjectIntrospection ];
+ nativeBuildInputs = [ pkgconfig autoconf vala pkgconfig gobjectIntrospection ];
+ buildInputs = [ glib ];
meta = with stdenv.lib; {
description = "Utility library providing GObject-based interfaces and classes for commonly used data structures";
diff --git a/pkgs/desktops/gnome-3/core/libgepub/default.nix b/pkgs/desktops/gnome-3/core/libgepub/default.nix
index 47cb96de6c34..56159500228a 100644
--- a/pkgs/desktops/gnome-3/core/libgepub/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgepub/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
doCheck = true;
- buildInputs = [ autoconf pkgconfig glib gobjectIntrospection webkitgtk libsoup
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ autoconf glib gobjectIntrospection webkitgtk libsoup
libxml2 libarchive ];
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/core/libgnomekbd/default.nix b/pkgs/desktops/gnome-3/core/libgnomekbd/default.nix
index 2bcbefc8dbf9..74636708988b 100644
--- a/pkgs/desktops/gnome-3/core/libgnomekbd/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgnomekbd/default.nix
@@ -3,7 +3,8 @@
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
- buildInputs = [ pkgconfig file intltool glib gtk3 libxklavier makeWrapper ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ file intltool glib gtk3 libxklavier makeWrapper ];
preFixup = ''
wrapProgram $out/bin/gkbd-keyboard-display \
diff --git a/pkgs/desktops/gnome-3/core/libgxps/default.nix b/pkgs/desktops/gnome-3/core/libgxps/default.nix
index b39e1f6fa56c..9e1e4588918f 100644
--- a/pkgs/desktops/gnome-3/core/libgxps/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgxps/default.nix
@@ -1,19 +1,23 @@
-{ stdenv, fetchurl, pkgconfig, glib, cairo, libarchive, freetype, libjpeg, libtiff
-, openssl, bzip2, acl, attr, libxml2
+{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobjectIntrospection, cairo
+, libarchive, freetype, libjpeg, libtiff
}:
stdenv.mkDerivation rec {
- name = "libgxps-0.2.2";
+ name = "libgxps-0.3.0";
src = fetchurl {
- url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz";
- sha256 = "1gi0b0x0354jyqc48vspk2hg2q1403cf2p9ibj847nzhkdrh9l9r";
+ url = "mirror://gnome/sources/libgxps/0.3/${name}.tar.xz";
+ sha256 = "412b1343bd31fee41f7204c47514d34c563ae34dafa4cc710897366bd6cd0fae";
};
- buildInputs = [ pkgconfig glib cairo freetype libjpeg libtiff acl openssl bzip2 attr libxml2 ];
+ nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ];
+ buildInputs = [ glib cairo freetype libjpeg libtiff ];
propagatedBuildInputs = [ libarchive ];
- configureFlags = "--without-liblcms2";
+ mesonFlags = [
+ "-Denable-test=false"
+ "-Dwith-liblcms2=false"
+ ];
meta = with stdenv.lib; {
platforms = platforms.linux;
diff --git a/pkgs/desktops/gnome-3/core/libpeas/default.nix b/pkgs/desktops/gnome-3/core/libpeas/default.nix
index 9f1f30965330..8fddd8f7d5a6 100644
--- a/pkgs/desktops/gnome-3/core/libpeas/default.nix
+++ b/pkgs/desktops/gnome-3/core/libpeas/default.nix
@@ -7,7 +7,8 @@ stdenv.mkDerivation rec {
configureFlags = [ "--enable-python3" ];
- buildInputs = [ intltool pkgconfig glib gtk3 gnome3.defaultIconTheme ncurses python3Packages.python python3Packages.pygobject3 gobjectIntrospection ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ intltool glib gtk3 gnome3.defaultIconTheme ncurses python3Packages.python python3Packages.pygobject3 gobjectIntrospection ];
meta = with stdenv.lib; {
description = "A GObject-based plugins engine";
diff --git a/pkgs/desktops/gnome-3/core/libpeas/src.nix b/pkgs/desktops/gnome-3/core/libpeas/src.nix
index cd440858946e..6f2cd82fb215 100644
--- a/pkgs/desktops/gnome-3/core/libpeas/src.nix
+++ b/pkgs/desktops/gnome-3/core/libpeas/src.nix
@@ -1,13 +1,13 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: rec {
- major = "1.18";
+ major = "1.22";
minor = "0";
version = "${major}.${minor}";
name = "libpeas-${version}";
src = fetchurl {
url = "mirror://gnome/sources/libpeas/${major}/${name}.tar.xz";
- sha256 = "09jy2rwwgp0xx7cnypxl56m7zzxnj3j4v58xqjxjasf3chn88jdz";
+ sha256 = "0qm908kisyjzjxvygdl18hjqxvvgkq9w0phs2g55pck277sw0bsv";
};
}
diff --git a/pkgs/desktops/gnome-3/core/libzapojit/default.nix b/pkgs/desktops/gnome-3/core/libzapojit/default.nix
index 5a8117528b68..dab1a0fea8a0 100644
--- a/pkgs/desktops/gnome-3/core/libzapojit/default.nix
+++ b/pkgs/desktops/gnome-3/core/libzapojit/default.nix
@@ -8,9 +8,11 @@ stdenv.mkDerivation rec {
sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x";
};
- buildInputs = [ pkgconfig glib intltool json_glib rest libsoup gtk gnome_online_accounts ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ glib intltool json_glib rest libsoup gtk gnome_online_accounts ];
meta = with stdenv.lib; {
+ description = "GObject wrapper for the SkyDrive and Hotmail REST APIs";
platforms = platforms.linux;
};
}
diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
index ebceb4ef706b..208b8b756488 100644
--- a/pkgs/desktops/gnome-3/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/default.nix
@@ -1,7 +1,7 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo
+{ fetchurl, fetchpatch, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo
, pango, cogl, clutter, libstartup_notification, libcanberra_gtk2, zenity, libcanberra_gtk3
, libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libudev, libinput
-, libgudev, xwayland }:
+, libgudev, libwacom, xwayland, autoreconfHook }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
@@ -9,29 +9,46 @@ stdenv.mkDerivation rec {
# fatal error: gio/gunixfdlist.h: No such file or directory
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0 -Wno-error=format -Wno-error=sign-compare";
- configureFlags = "--with-x --disable-static --enable-shape --enable-sm --enable-startup-notification --enable-xsync --enable-verbose-mode --with-libcanberra --with-xwayland-path=${xwayland}/bin/Xwayland";
+ configureFlags = [
+ "--with-x"
+ "--disable-static"
+ "--enable-shape"
+ "--enable-sm"
+ "--enable-startup-notification"
+ "--enable-xsync"
+ "--enable-verbose-mode"
+ "--with-libcanberra"
+ "--with-xwayland-path=${xwayland}/bin/Xwayland"
+ ];
propagatedBuildInputs = [
# required for pkgconfig to detect mutter-clutter
libXtst
];
+ nativeBuildInputs = [ autoreconfHook pkgconfig intltool libtool makeWrapper ];
+
buildInputs = with gnome3;
- [ pkgconfig intltool glib gobjectIntrospection gtk gsettings_desktop_schemas upower
+ [ glib gobjectIntrospection gtk gsettings_desktop_schemas upower
gnome_desktop cairo pango cogl clutter zenity libstartup_notification libcanberra_gtk2
- gnome3.geocode_glib libudev libinput libgudev
- libcanberra_gtk3 zenity libtool makeWrapper xkeyboard_config libxkbfile
+ gnome3.geocode_glib libudev libinput libgudev libwacom
+ libcanberra_gtk3 zenity xkeyboard_config libxkbfile
libxkbcommon ];
+ patches = [
+ # https://bugzilla.gnome.org/show_bug.cgi?id=760670
+ (fetchpatch {
+ name = "libgudev-232.patch";
+ url = https://bugzilla.gnome.org/attachment.cgi?id=358904;
+ sha256 = "0chvd7g9f2zp3a0gdhvinsfvp2h10rwb6a8ja386vsrl93ac8pix";
+ })
+ ];
+
preFixup = ''
wrapProgram "$out/bin/mutter" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
'';
- patches = [
- ./x86.patch # ./math.patch
- ];
-
enableParallelBuilding = true;
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/core/mutter/math.patch b/pkgs/desktops/gnome-3/core/mutter/math.patch
deleted file mode 100644
index dbdfd93f5e1d..000000000000
--- a/pkgs/desktops/gnome-3/core/mutter/math.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- mutter-3.18.0/src/backends/meta-cursor-renderer.c.orig 2015-09-23 13:54:31.297523343 +0200
-+++ mutter-3.18.0/src/backends/meta-cursor-renderer.c 2015-09-23 13:54:43.728271766 +0200
-@@ -31,6 +31,7 @@
-
- #include
- #include
-+#include
-
- #include "meta-stage.h"
-
diff --git a/pkgs/desktops/gnome-3/core/mutter/x86.patch b/pkgs/desktops/gnome-3/core/mutter/x86.patch
deleted file mode 100644
index 93df1e7f2831..000000000000
--- a/pkgs/desktops/gnome-3/core/mutter/x86.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/core/window.c 2015-05-26 10:52:41.382834963 +0200
-+++ b/src/core/window.c 2015-05-26 10:53:03.039948034 +0200
-@@ -3499,7 +3499,7 @@
-
- static MetaMonitorInfo *
- find_monitor_by_winsys_id (MetaWindow *window,
-- guint winsys_id)
-+ gint winsys_id)
- {
- int i;
-
-@@ -3618,7 +3618,7 @@
- */
-
- gboolean did_placement;
-- guint old_output_winsys_id;
-+ gint old_output_winsys_id;
- MetaRectangle unconstrained_rect;
- MetaRectangle constrained_rect;
- MetaMoveResizeResultFlags result = 0;
diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix
index d508f1483598..f987df460349 100644
--- a/pkgs/desktops/gnome-3/core/nautilus/default.nix
+++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, libxml2, dbus_glib, shared_mime_info, libexif
, gtk, gnome3, libunique, intltool, gobjectIntrospection, gnome-autoar, glib
-, libnotify, wrapGAppsHook, exempi, librsvg, tracker, libselinux }:
+, libnotify, wrapGAppsHook, exempi, librsvg, tracker, libselinux, gdk_pixbuf }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
@@ -16,6 +16,14 @@ stdenv.mkDerivation rec {
# fatal error: gio/gunixinputstream.h: No such file or directory
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
+ preFixup = ''
+ gappsWrapperArgs+=(
+ # Thumbnailers
+ --prefix XDG_DATA_DIRS : "${gdk_pixbuf}/share"
+ --prefix XDG_DATA_DIRS : "${librsvg}/share"
+ )
+ '';
+
# hardeningDisable = [ "format" ];
enableParallelBuilding = true;
diff --git a/pkgs/desktops/gnome-3/core/rest/default.nix b/pkgs/desktops/gnome-3/core/rest/default.nix
index d467cad93b4e..154e7221cc20 100644
--- a/pkgs/desktops/gnome-3/core/rest/default.nix
+++ b/pkgs/desktops/gnome-3/core/rest/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "e7b89b200c1417073aef739e8a27ff2ab578056c27796ec74f5886a5e0dff647";
};
- buildInputs = [ pkgconfig glib libsoup gobjectIntrospection];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ glib libsoup gobjectIntrospection];
configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt";
diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
similarity index 86%
rename from pkgs/applications/graphics/simple-scan/default.nix
rename to pkgs/desktops/gnome-3/core/simple-scan/default.nix
index 0c800ce98593..0b453d5c5332 100644
--- a/pkgs/applications/graphics/simple-scan/default.nix
+++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
@@ -3,14 +3,7 @@
, gnome3 }:
stdenv.mkDerivation rec {
- name = "simple-scan-${version}";
- version = "${major_version}.0.1";
- major_version = "3.22";
-
- src = fetchurl {
- url = "https://launchpad.net/simple-scan/${major_version}/${version}/+download/${name}.tar.xz";
- sha256 = "0l1b3llkdlqq0bcjx1cadba67l2zb4zfykdaprpjbjbr6gkbc1f5";
- };
+ inherit (import ./src.nix fetchurl) name src;
buildInputs = [ cairo colord glib gnome3.defaultIconTheme gusb gtk3 libusb1 libxml2 sane-backends vala_0_32 ];
nativeBuildInputs = [ intltool itstool pkgconfig wrapGAppsHook ];
diff --git a/pkgs/desktops/gnome-3/core/simple-scan/src.nix b/pkgs/desktops/gnome-3/core/simple-scan/src.nix
new file mode 100644
index 000000000000..cea148891a72
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/simple-scan/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "simple-scan-3.22.0.1";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/simple-scan/3.22/simple-scan-3.22.0.1.tar.xz;
+ sha256 = "c505b6e63379c9256fbeaa4def3e595fd063d46a8a852ed90218d336291d2b50";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome-3/core/sushi/default.nix
index fb010756f290..638c0cbe7dcd 100644
--- a/pkgs/desktops/gnome-3/core/sushi/default.nix
+++ b/pkgs/desktops/gnome-3/core/sushi/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ];
- buildInputs = [ pkgconfig file intltool gobjectIntrospection glib gtk3
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ file intltool gobjectIntrospection glib gtk3
clutter_gtk clutter-gst gnome3.gjs gtksourceview gdk_pixbuf
librsvg gnome3.defaultIconTheme libmusicbrainz5 webkitgtk
gnome3.evince icu makeWrapper harfbuzz ];
diff --git a/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix
index 63f36004bcd6..56fef3129272 100644
--- a/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix
+++ b/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix
@@ -1,14 +1,10 @@
{ stdenv, fetchurl, pkgconfig, file, intltool, gmime, libxml2, libsoup, gnome3 }:
stdenv.mkDerivation rec {
- name = "totem-pl-parser-3.10.2";
+ inherit (import ./src.nix fetchurl) name src;
- src = fetchurl {
- url = "mirror://gnome/sources/totem-pl-parser/3.10/${name}.tar.xz";
- sha256 = "38be09bddc46ddecd2b5ed7c82144ef52aafe879a5ec3d8b192b4b64ba995469";
- };
-
- buildInputs = [ pkgconfig file intltool gmime libxml2 libsoup ];
+ nativeBuildInputs = [ pkgconfig file intltool ];
+ buildInputs = [ gmime libxml2 libsoup ];
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Videos;
diff --git a/pkgs/desktops/gnome-3/core/totem-pl-parser/src.nix b/pkgs/desktops/gnome-3/core/totem-pl-parser/src.nix
new file mode 100644
index 000000000000..8e352ccfb4c4
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/totem-pl-parser/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "totem-pl-parser-3.10.2";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/totem-pl-parser/3.10/totem-pl-parser-3.10.2.tar.xz;
+ sha256 = "38be09bddc46ddecd2b5ed7c82144ef52aafe879a5ec3d8b192b4b64ba995469";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix
index b3e9e5dd1fee..34ec9b58116f 100644
--- a/pkgs/desktops/gnome-3/core/totem/default.nix
+++ b/pkgs/desktops/gnome-3/core/totem/default.nix
@@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
- buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 gnome3.grilo
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk3 glib intltool itstool libxml2 gnome3.grilo
clutter_gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins
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-plugins-ugly gst_all_1.gst-libav
diff --git a/pkgs/desktops/gnome-3/core/tracker/default.nix b/pkgs/desktops/gnome-3/core/tracker/default.nix
index a60c38015c08..0d3e8bd358d4 100644
--- a/pkgs/desktops/gnome-3/core/tracker/default.nix
+++ b/pkgs/desktops/gnome-3/core/tracker/default.nix
@@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- buildInputs = [ vala_0_32 pkgconfig gtk3 glib intltool itstool libxml2
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ vala_0_32 gtk3 glib intltool itstool libxml2
bzip2 gnome3.totem-pl-parser libxslt
gnome3.gsettings_desktop_schemas wrapGAppsHook
file gdk_pixbuf gnome3.defaultIconTheme librsvg sqlite
diff --git a/pkgs/desktops/gnome-3/core/vte/2.90.nix b/pkgs/desktops/gnome-3/core/vte/2.90.nix
index 4f56439311ec..7cd72ceee42c 100644
--- a/pkgs/desktops/gnome-3/core/vte/2.90.nix
+++ b/pkgs/desktops/gnome-3/core/vte/2.90.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
sha256 = "54e5b07be3c0f7b158302f54ee79d4de1cb002f4259b6642b79b1e0e314a959c";
};
- buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib gnome3.gtk3 ncurses ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gobjectIntrospection intltool gnome3.glib gnome3.gtk3 ncurses ];
configureFlags = [ "--enable-introspection" ];
diff --git a/pkgs/desktops/gnome-3/core/vte/default.nix b/pkgs/desktops/gnome-3/core/vte/default.nix
index 7eabe6ad9d4d..b3962015d3cc 100644
--- a/pkgs/desktops/gnome-3/core/vte/default.nix
+++ b/pkgs/desktops/gnome-3/core/vte/default.nix
@@ -6,7 +6,8 @@
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
- buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gobjectIntrospection intltool gnome3.glib
gnome3.gtk3 ncurses vala_0_32 libxml2 gperf ];
propagatedBuildInputs = [ gnutls pcre2 ];
diff --git a/pkgs/desktops/gnome-3/core/vte/fix_g_test_init_calls.patch b/pkgs/desktops/gnome-3/core/vte/fix_g_test_init_calls.patch
deleted file mode 100644
index 4c5696d4e17b..000000000000
--- a/pkgs/desktops/gnome-3/core/vte/fix_g_test_init_calls.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/src/vteconv.cc b/src/vteconv.cc
-index b78d3928..5cb63e7e 100644
---- a/src/vteconv.cc
-+++ b/src/vteconv.cc
-@@ -771,7 +771,7 @@ int
- main (int argc,
- char *argv[])
- {
-- g_test_init (&argc, &argv, NULL);
-+ g_test_init (&argc, &argv, (char *)NULL);
-
- g_test_add_func ("/vte/conv/utf8/strlen", test_utf8_strlen);
- g_test_add_func ("/vte/conv/utf8/validate", test_utf8_validate);
-diff --git a/src/vtetypes.cc b/src/vtetypes.cc
-index 1365a295..8f38c9d9 100644
---- a/src/vtetypes.cc
-+++ b/src/vtetypes.cc
-@@ -407,7 +407,7 @@ test_util_smart_fd(void)
- int
- main(int argc, char *argv[])
- {
-- g_test_init (&argc, &argv, NULL);
-+ g_test_init (&argc, &argv, (char *)NULL);
-
- g_test_add_func("/vte/c++/grid/coords", test_grid_coords);
- g_test_add_func("/vte/c++/grid/span", test_grid_span);
diff --git a/pkgs/desktops/gnome-3/core/vte/fix_vteseq_n_lookup_declaration.patch b/pkgs/desktops/gnome-3/core/vte/fix_vteseq_n_lookup_declaration.patch
deleted file mode 100644
index 70ef7faa782e..000000000000
--- a/pkgs/desktops/gnome-3/core/vte/fix_vteseq_n_lookup_declaration.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/vteseq.cc b/src/vteseq.cc
-index 2330939d..e0ac14eb 100644
---- a/src/vteseq.cc
-+++ b/src/vteseq.cc
-@@ -3409,7 +3409,7 @@ vte_sequence_handler_iterm2_1337(VteTerminalPrivate *that, GValueArray *params)
- #define VTE_SEQUENCE_HANDLER(name) name
-
- static const struct vteseq_n_struct *
--vteseq_n_lookup (register const char *str, register unsigned int len);
-+vteseq_n_lookup (register const char *str, register size_t len);
- #include"vteseq-n.cc"
-
- #undef VTE_SEQUENCE_HANDLER
diff --git a/pkgs/desktops/gnome-3/core/vte/ng.nix b/pkgs/desktops/gnome-3/core/vte/ng.nix
index ad0188b0053b..73bbba3e72bc 100644
--- a/pkgs/desktops/gnome-3/core/vte/ng.nix
+++ b/pkgs/desktops/gnome-3/core/vte/ng.nix
@@ -2,23 +2,17 @@
gnome3.vte.overrideAttrs (oldAttrs: rec {
name = "vte-ng-${version}";
- version = "0.46.1.a";
+ version = "0.50.2.a";
src = fetchFromGitHub {
owner = "thestinger";
repo = "vte-ng";
rev = version;
- sha256 = "125fpibid1liz50d7vbxy71pnm8b01x90xnkr4z3419b90lybr0a";
+ sha256 = "0i6hfzw9sq8521kz0l7lld2km56r0bfp1hw6kxq3j1msb8z8svcf";
};
- # The patches apply the changes from https://github.com/GNOME/vte/pull/7 and
- # can be removed once the commits are merged into vte-ng.
- patches = [
- ./fix_g_test_init_calls.patch
- ./fix_vteseq_n_lookup_declaration.patch
- ];
-
preConfigure = oldAttrs.preConfigure + "; ./autogen.sh";
- nativeBuildInputs = [ gtk_doc autoconf automake gettext libtool gperf ];
+ nativeBuildInputs = oldAttrs.nativeBuildInputs or []
+ ++ [ gtk_doc autoconf automake gettext libtool gperf ];
})
diff --git a/pkgs/desktops/gnome-3/core/vte/src.nix b/pkgs/desktops/gnome-3/core/vte/src.nix
index 841798848e60..45029e8bb8dd 100644
--- a/pkgs/desktops/gnome-3/core/vte/src.nix
+++ b/pkgs/desktops/gnome-3/core/vte/src.nix
@@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
- name = "vte-0.48.3";
+ name = "vte-0.50.1";
src = fetchurl {
- url = mirror://gnome/sources/vte/0.48/vte-0.48.3.tar.xz;
- sha256 = "a3a9fb182740b392a45cd3f46fa61a985f68bb6b1817b52daec22034c46158c3";
+ url = mirror://gnome/sources/vte/0.50/vte-0.50.1.tar.xz;
+ sha256 = "cf1708e3e573160e1db107014b3ef70888fefe6b668373fed70e8d1cac45a8c2";
};
}
diff --git a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix
index 9111802eb6a8..eaceadcc85c4 100644
--- a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix
@@ -3,7 +3,8 @@
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
- buildInputs = [ libxml2 libxslt itstool gnome3.yelp_xsl pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libxml2 libxslt itstool gnome3.yelp_xsl ];
doCheck = true;
diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
index 0a3976f35a15..353b9ccb55e3 100644
--- a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
@@ -6,7 +6,8 @@ stdenv.mkDerivation rec {
doCheck = true;
- buildInputs = [ pkgconfig intltool itstool libxml2 libxslt ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ intltool itstool libxml2 libxslt ];
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Yelp;
diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix
index 4ee79bbc3dc5..6b458598c299 100644
--- a/pkgs/desktops/gnome-3/core/yelp/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
- buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool sqlite
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk3 glib webkitgtk intltool itstool sqlite
libxml2 libxslt icu file makeWrapper gnome3.yelp_xsl
librsvg gdk_pixbuf gnome3.defaultIconTheme groff
gnome3.gsettings_desktop_schemas wrapGAppsHook
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 7be1f79be4c5..585f79ddea67 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -30,7 +30,7 @@ let
optionalPackages = with gnome3; [ baobab eog epiphany evince
gucharmap nautilus totem vino yelp gnome-bluetooth
gnome-calculator gnome-contacts gnome-font-viewer gnome-screenshot
- gnome-system-log gnome-system-monitor
+ gnome-system-log gnome-system-monitor simple-scan
gnome_terminal gnome-user-docs evolution file-roller gedit
gnome-clocks gnome-music gnome-tweak-tool gnome-photos
nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs
@@ -45,7 +45,7 @@ let
hitori gnome-taquin
];
- inherit (pkgs) glib gtk2 webkitgtk216x gtk3 gtkmm3 libcanberra_gtk2
+ inherit (pkgs) glib gtk2 webkitgtk gtk3 gtkmm3 libcanberra_gtk2
clutter clutter-gst clutter_gtk cogl gtkvnc;
inherit (pkgs.gnome2) ORBit2;
libsoup = pkgs.libsoup.override { gnomeSupport = true; };
@@ -56,7 +56,6 @@ let
gtkmm = gtkmm3;
vala = pkgs.vala_0_32;
gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; };
- webkitgtk = webkitgtk216x;
# Simplify the nixos module and gnome packages
defaultIconTheme = adwaita-icon-theme;
@@ -230,6 +229,8 @@ let
rest = callPackage ./core/rest { };
+ simple-scan = callPackage ./core/simple-scan { };
+
sushi = callPackage ./core/sushi { };
totem = callPackage ./core/totem { };
@@ -364,10 +365,7 @@ let
california = callPackage ./misc/california { };
- geary = callPackage ./misc/geary {
- # https://bugzilla.gnome.org/show_bug.cgi?id=728002
- webkitgtk = pkgs.webkitgtk24x-gtk3;
- };
+ geary = callPackage ./misc/geary { };
gfbgraph = callPackage ./misc/gfbgraph { };
diff --git a/pkgs/desktops/gnome-3/desktop/rarian/default.nix b/pkgs/desktops/gnome-3/desktop/rarian/default.nix
index a1b38b21869a..c6927111ed48 100644
--- a/pkgs/desktops/gnome-3/desktop/rarian/default.nix
+++ b/pkgs/desktops/gnome-3/desktop/rarian/default.nix
@@ -7,7 +7,8 @@ stdenv.mkDerivation rec {
sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577";
};
- buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ perl perlXMLParser libxml2 libxslt];
configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat";
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix
index 6a50834f105e..9ff98c2825e6 100644
--- a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix
@@ -6,7 +6,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- buildInputs = [ pkgconfig flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl
gnome3.libgda gnome3.gtksourceview intltool itstool python2 makeWrapper
gnome3.gsettings_desktop_schemas
];
diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
index f6e67be8d53a..08dbade67fbf 100644
--- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
@@ -4,8 +4,9 @@
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig gtk3 wrapGAppsHook webkitgtk intltool gnome3.defaultIconTheme
+ gtk3 wrapGAppsHook webkitgtk intltool gnome3.defaultIconTheme
gsettings_desktop_schemas
];
diff --git a/pkgs/desktops/gnome-3/devtools/gdl/default.nix b/pkgs/desktops/gnome-3/devtools/gdl/default.nix
index 156d91b3eae7..f12bbb0ca41d 100644
--- a/pkgs/desktops/gnome-3/devtools/gdl/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/gdl/default.nix
@@ -3,7 +3,8 @@
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
- buildInputs = [ pkgconfig libxml2 gtk3 intltool ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libxml2 gtk3 intltool ];
meta = with stdenv.lib; {
description = "Gnome docking library";
diff --git a/pkgs/desktops/gnome-3/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/games/aisleriot/default.nix
index 9e5d256741f6..40e1473b59e2 100644
--- a/pkgs/desktops/gnome-3/games/aisleriot/default.nix
+++ b/pkgs/desktops/gnome-3/games/aisleriot/default.nix
@@ -7,7 +7,8 @@ stdenv.mkDerivation rec {
configureFlags = [ "--with-card-theme-formats=svg" ];
- buildInputs = [ pkgconfig intltool itstool gtk3 wrapGAppsHook gconf
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ intltool itstool gtk3 wrapGAppsHook gconf
librsvg libxml2 desktop_file_utils guile_2_0 libcanberra_gtk3 ];
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/games/five-or-more/default.nix
index 50a7d2906a77..48b2b3823729 100644
--- a/pkgs/desktops/gnome-3/games/five-or-more/default.nix
+++ b/pkgs/desktops/gnome-3/games/five-or-more/default.nix
@@ -4,8 +4,9 @@
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2
+ gtk3 wrapGAppsHook librsvg intltool itstool libxml2
gnome3.defaultIconTheme
];
diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
index 68228750cd87..486fe5c486e0 100644
--- a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
+++ b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
@@ -4,8 +4,9 @@
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig gtk3 wrapGAppsHook intltool itstool libcanberra_gtk3 librsvg
+ gtk3 wrapGAppsHook intltool itstool libcanberra_gtk3 librsvg
libxml2 gnome3.defaultIconTheme
];
diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
index a96dae3c12cb..bfa345c4a40b 100644
--- a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
@@ -4,8 +4,9 @@
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libxml2
+ gtk3 wrapGAppsHook intltool itstool librsvg libxml2
gnome3.defaultIconTheme
];
diff --git a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
index dc2289daff82..13afae2eb2cb 100644
--- a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
@@ -4,8 +4,9 @@
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libxml2 libgee libgames-support
+ gtk3 wrapGAppsHook intltool itstool librsvg libxml2 libgee libgames-support
gnome3.defaultIconTheme
];
diff --git a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
index 43db32e88577..3d0d5d6df467 100644
--- a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
@@ -4,8 +4,9 @@
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2
+ gtk3 wrapGAppsHook librsvg intltool itstool libxml2
gnome3.defaultIconTheme
];
diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
index c55650e705a9..d76e585bb4eb 100644
--- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
@@ -4,8 +4,9 @@
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2
+ gtk3 wrapGAppsHook librsvg intltool itstool libxml2
gnome3.defaultIconTheme libgames-support libgee
];
diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
index cf2282188782..90fdccc11860 100644
--- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
@@ -5,8 +5,9 @@
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2
+ gtk3 wrapGAppsHook intltool itstool libxml2
librsvg libcanberra_gtk3 clutter_gtk gnome3.defaultIconTheme
libgee libgames-support
];
diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
index 9eafb166eee8..cd13e6ab9585 100644
--- a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
@@ -5,8 +5,9 @@
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libcanberra_gtk3
+ gtk3 wrapGAppsHook intltool itstool librsvg libcanberra_gtk3
libxml2 gnome3.defaultIconTheme libgames-support libgee
];
diff --git a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
index c8ba82c7246d..a0f83d48c3da 100644
--- a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
@@ -4,7 +4,8 @@
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
- buildInputs = [ pkgconfig intltool wrapGAppsHook gtk3 gnome3.libgee
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ intltool wrapGAppsHook gtk3 gnome3.libgee
json_glib qqwing itstool libxml2 ];
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
index 78eaa23e63bd..d456abe6dc1f 100644
--- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
@@ -4,8 +4,9 @@
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig gtk3 wrapGAppsHook librsvg libcanberra_gtk3
+ gtk3 wrapGAppsHook librsvg libcanberra_gtk3
intltool itstool libxml2 gnome3.defaultIconTheme
];
diff --git a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
index d6feab93dba1..37218776f123 100644
--- a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
@@ -4,8 +4,9 @@
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 gnome3.defaultIconTheme
+ gtk3 wrapGAppsHook intltool itstool libxml2 gnome3.defaultIconTheme
];
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/games/hitori/default.nix b/pkgs/desktops/gnome-3/games/hitori/default.nix
index bd6be7d43c58..21d4ed6f520e 100644
--- a/pkgs/desktops/gnome-3/games/hitori/default.nix
+++ b/pkgs/desktops/gnome-3/games/hitori/default.nix
@@ -9,8 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "07pm3xl05jgb8x151k1j2ap57dmfvk2nkz9dmqnn5iywfigsysd1";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2
+ gtk3 wrapGAppsHook intltool itstool libxml2
gnome3.defaultIconTheme
];
diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix
index 1b6f08d1fd65..3836548b3ab2 100644
--- a/pkgs/desktops/gnome-3/games/iagno/default.nix
+++ b/pkgs/desktops/gnome-3/games/iagno/default.nix
@@ -4,7 +4,8 @@
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
- buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
dconf libxml2 libcanberra_gtk3 wrapGAppsHook itstool intltool ];
enableParallelBuilding = true;
diff --git a/pkgs/desktops/gnome-3/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/games/lightsoff/default.nix
index 8ec54b489721..7bd3ca95de94 100644
--- a/pkgs/desktops/gnome-3/games/lightsoff/default.nix
+++ b/pkgs/desktops/gnome-3/games/lightsoff/default.nix
@@ -4,7 +4,8 @@
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
- buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg dconf
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg dconf
libxml2 clutter clutter_gtk wrapGAppsHook itstool intltool ];
enableParallelBuilding = true;
diff --git a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix
index f319608764d6..514b2a035575 100644
--- a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix
+++ b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix
@@ -5,7 +5,8 @@
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
- buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
libcanberra_gtk3 itstool intltool clutter
libxml2 clutter_gtk wrapGAppsHook ];
diff --git a/pkgs/desktops/gnome-3/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/games/swell-foop/default.nix
index a4cad01488d5..c6416960b7aa 100644
--- a/pkgs/desktops/gnome-3/games/swell-foop/default.nix
+++ b/pkgs/desktops/gnome-3/games/swell-foop/default.nix
@@ -4,7 +4,8 @@
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
- buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
dconf wrapGAppsHook itstool intltool clutter clutter_gtk libxml2 ];
enableParallelBuilding = true;
diff --git a/pkgs/desktops/gnome-3/games/tali/default.nix b/pkgs/desktops/gnome-3/games/tali/default.nix
index c2b1f5857124..6f6beee89615 100644
--- a/pkgs/desktops/gnome-3/games/tali/default.nix
+++ b/pkgs/desktops/gnome-3/games/tali/default.nix
@@ -4,7 +4,8 @@
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
- buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
libxml2 itstool intltool wrapGAppsHook ];
enableParallelBuilding = true;
diff --git a/pkgs/desktops/gnome-3/misc/california/default.nix b/pkgs/desktops/gnome-3/misc/california/default.nix
index ca0450dc7f94..b33488e34fce 100644
--- a/pkgs/desktops/gnome-3/misc/california/default.nix
+++ b/pkgs/desktops/gnome-3/misc/california/default.nix
@@ -14,7 +14,8 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
- buildInputs = [ makeWrapper intltool pkgconfig vala_0_32 glib gtk3 gnome3.libgee
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ makeWrapper intltool vala_0_32 glib gtk3 gnome3.libgee
libsoup libgdata gnome3.gnome_online_accounts gnome3.evolution_data_server
sqlite itstool xdg_utils gnome3.gsettings_desktop_schemas ];
diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix
index e0622b176218..6243d1b1d5f1 100644
--- a/pkgs/desktops/gnome-3/misc/geary/default.nix
+++ b/pkgs/desktops/gnome-3/misc/geary/default.nix
@@ -1,40 +1,34 @@
-{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_32
-, makeWrapper, gdk_pixbuf, cmake, desktop_file_utils
+{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_38, enchant
+, wrapGAppsHook, gdk_pixbuf, cmake, desktop_file_utils
, libnotify, libcanberra_gtk3, libsecret, gmime
, libpthreadstubs, sqlite
, gnome3, librsvg, gnome_doc_utils, webkitgtk }:
let
- majorVersion = "0.11";
+ majorVersion = "0.12";
in
stdenv.mkDerivation rec {
- name = "geary-${majorVersion}.3";
+ name = "geary-${majorVersion}.0";
src = fetchurl {
url = "mirror://gnome/sources/geary/${majorVersion}/${name}.tar.xz";
- sha256 = "1r42ijxafach5lv8ibs6y0l5k4nacjg427dnma8fj00xr1sri7j1";
+ sha256 = "0ii4qaqfqx90kvqwg0g9jahygkir4mb03ja55fa55yyx6cq0kwff";
};
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
- buildInputs = [ intltool pkgconfig gtk3 makeWrapper cmake desktop_file_utils gnome_doc_utils
- vala_0_32 webkitgtk libnotify libcanberra_gtk3 gnome3.libgee libsecret gmime sqlite
+ nativeBuildInputs = [ vala_0_38 intltool pkgconfig wrapGAppsHook cmake desktop_file_utils gnome_doc_utils ];
+ buildInputs = [ gtk3 enchant webkitgtk libnotify libcanberra_gtk3 gnome3.libgee libsecret gmime sqlite
libpthreadstubs gnome3.gsettings_desktop_schemas gnome3.gcr
gdk_pixbuf librsvg gnome3.defaultIconTheme ];
preConfigure = ''
- substituteInPlace src/CMakeLists.txt --replace '`pkg-config --variable=girdir gobject-introspection-1.0`' '${webkitgtk}/share/gir-1.0'
- '';
-
- postInstall = ''
- mkdir -p $out/share/gsettings-schemas/${name}/
- mv $out/share/glib-2.0 $out/share/gsettings-schemas/${name}
+ substituteInPlace src/CMakeLists.txt --replace '`''${PKG_CONFIG_EXECUTABLE} --variable=girdir gobject-introspection-1.0`' '${webkitgtk.dev}/share/gir-1.0'
'';
preFixup = ''
- wrapProgram "$out/bin/geary" \
- --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
- --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+ # Add geary to path for geary-attach
+ gappsWrapperArgs+=(--prefix PATH : "$out/bin")
'';
enableParallelBuilding = true;
diff --git a/pkgs/desktops/gnome-3/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/misc/gexiv2/default.nix
index 69d89bd58795..d0801714a0f9 100644
--- a/pkgs/desktops/gnome-3/misc/gexiv2/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gexiv2/default.nix
@@ -16,7 +16,8 @@ stdenv.mkDerivation rec {
patchShebangs .
'';
- buildInputs = [ pkgconfig glib libtool m4 ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ glib libtool m4 ];
propagatedBuildInputs = [ exiv2 ];
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix b/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix
index 46fa9bc39e5a..364a52ee5cdf 100644
--- a/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1dp0v8ia35fxs9yhnqpxj3ir5lh018jlbiwifjfn8ayy7h47j4fs";
};
- buildInputs = [ pkgconfig glib gnome3.gnome_online_accounts ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ glib gnome3.gnome_online_accounts ];
propagatedBuildInputs = [ libsoup json_glib gnome3.rest ];
enableParallelBuilding = true;
diff --git a/pkgs/desktops/gnome-3/misc/gitg/src.nix b/pkgs/desktops/gnome-3/misc/gitg/src.nix
index 9c6dd2148ccf..c72e2830ad1e 100644
--- a/pkgs/desktops/gnome-3/misc/gitg/src.nix
+++ b/pkgs/desktops/gnome-3/misc/gitg/src.nix
@@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
- name = "gitg-3.24.0";
+ name = "gitg-3.26.0";
src = fetchurl {
- url = mirror://gnome/sources/gitg/3.24/gitg-3.24.0.tar.xz;
- sha256 = "3e4ec4a8ae83bc7ced8c7610927ade70e37daa5e8beeb4f357a6ea30b4cc951e";
+ url = mirror://gnome/sources/gitg/3.26/gitg-3.26.0.tar.xz;
+ sha256 = "26730d437d6a30d6e341b9e8da99d2134dce4b96022c195609f45062f82b54d5";
};
}
diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix
index 1df3c1ffdb7c..ad415368368d 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
makeFlags = [ "DESTDIR=/" ];
- buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk3 glib intltool itstool libxml2
gnome3.gsettings_desktop_schemas file
gdk_pixbuf gnome3.defaultIconTheme librsvg
libnotify gnome3.gnome_shell python2Packages.pygobject3
diff --git a/pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix b/pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix
index c0bd2fed3f2d..dfeefe0def86 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0jl4iny2dqpcgi3sgxzpgnbw0752i8ay3rscp2cgdjlp79ql5gil";
};
- buildInputs = [ pkgconfig intltool ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ intltool ];
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Projects/GnomeVideoEffects;
diff --git a/pkgs/desktops/gnome-3/misc/gspell/default.nix b/pkgs/desktops/gnome-3/misc/gspell/default.nix
index 44573d1a5bb1..71e3ff19dc3f 100644
--- a/pkgs/desktops/gnome-3/misc/gspell/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gspell/default.nix
@@ -5,7 +5,8 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ enchant ]; # required for pkgconfig
- buildInputs = [ pkgconfig glib gtk3 isocodes vala ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ glib gtk3 isocodes vala ];
meta = with stdenv.lib; {
platforms = platforms.linux;
diff --git a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix
index 89703b61932b..3f65ab36b0bb 100644
--- a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix
@@ -4,7 +4,8 @@
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
- buildInputs = [ pkgconfig gtk3 intltool gnome3.adwaita-icon-theme
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk3 intltool gnome3.adwaita-icon-theme
gnome3.gsettings_desktop_schemas ];
propagatedBuildInputs = [ enchant isocodes ];
diff --git a/pkgs/desktops/gnome-3/misc/libgames-support/default.nix b/pkgs/desktops/gnome-3/misc/libgames-support/default.nix
index 98b71c9d9c9f..90ee658fd096 100644
--- a/pkgs/desktops/gnome-3/misc/libgames-support/default.nix
+++ b/pkgs/desktops/gnome-3/misc/libgames-support/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1rsyf5hbjim7zpk1yar3gv65g1nmw6zbbc0smrmxsfk0f9n3j9m6";
};
- buildInputs = [ pkgconfig glib gtk3 libgee intltool ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ glib gtk3 libgee intltool ];
meta = with stdenv.lib; {
description = "Small library intended for internal use by GNOME Games, but it may be used by others";
diff --git a/pkgs/desktops/gnome-3/misc/libgda/default.nix b/pkgs/desktops/gnome-3/misc/libgda/default.nix
index 2e5b0a4af840..f477c13c7bae 100644
--- a/pkgs/desktops/gnome-3/misc/libgda/default.nix
+++ b/pkgs/desktops/gnome-3/misc/libgda/default.nix
@@ -3,6 +3,14 @@
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
+ patches = [
+ (fetchurl {
+ name = "libgda-fix-encoding-of-copyright-headers.patch";
+ url = https://bug787685.bugzilla-attachments.gnome.org/attachment.cgi?id=359901;
+ sha256 = "11qj7f7zsiw8jy18vlwz2prlxpg4iq350sws3qwfwsv0lnmncmfq";
+ })
+ ];
+
configureFlags = [
"--enable-gi-system-install=no"
];
@@ -11,7 +19,8 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
- buildInputs = [ pkgconfig intltool itstool libxml2 gtk3 openssl ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ intltool itstool libxml2 gtk3 openssl ];
meta = with stdenv.lib; {
description = "Database access library";
diff --git a/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix
index 6915ede4ad51..36feb09d7eef 100644
--- a/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix
+++ b/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix
@@ -1,11 +1,14 @@
-{ stdenv, fetchurl, gnome3, libtool, pkgconfig, vala_0_32, libssh2
+{ stdenv, fetchurl, gnome3, libtool, pkgconfig, vala, libssh2
, gtk_doc, gobjectIntrospection, libgit2, glib }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
- buildInputs = [ gnome3.gnome_common libtool pkgconfig vala_0_32 libssh2
- gtk_doc gobjectIntrospection libgit2 glib ];
+ nativeBuildInputs = [
+ gnome3.gnome_common libtool pkgconfig vala gtk_doc gobjectIntrospection
+ ];
+
+ buildInputs = [ libssh2 libgit2 glib ];
meta = with stdenv.lib; {
platforms = platforms.linux;
diff --git a/pkgs/desktops/gnome-3/misc/libgit2-glib/src.nix b/pkgs/desktops/gnome-3/misc/libgit2-glib/src.nix
index b9abde42cbda..00e747500c61 100644
--- a/pkgs/desktops/gnome-3/misc/libgit2-glib/src.nix
+++ b/pkgs/desktops/gnome-3/misc/libgit2-glib/src.nix
@@ -1,12 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
-fetchurl: rec {
- major = "0.25";
- minor = "0";
- name = "libgit2-glib-${major}.${minor}";
+fetchurl: {
+ name = "libgit2-glib-0.26.0";
src = fetchurl {
- url = "mirror://gnome/sources/libgit2-glib/${major}/${name}.tar.xz";
- sha256 = "0rf5gcr3khp35wj9ax9cbyq5j3iiwa1l0fi16w6sfgmrryd6n9aa";
+ url = mirror://gnome/sources/libgit2-glib/0.26/libgit2-glib-0.26.0.tar.xz;
+ sha256 = "06b16cfcc3a53d9804858618d690e5509e9af2e2245b75f0479cadbbe39745c3";
};
}
diff --git a/pkgs/desktops/gnome-3/misc/libmediaart/default.nix b/pkgs/desktops/gnome-3/misc/libmediaart/default.nix
index 9988541e0f5b..abdcdef99379 100644
--- a/pkgs/desktops/gnome-3/misc/libmediaart/default.nix
+++ b/pkgs/desktops/gnome-3/misc/libmediaart/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "0jg9gwxmhdxcbwb5svgkxkd3yl1d14wqzckcgg2swkn81i7al52v";
};
- buildInputs = [ pkgconfig glib gdk_pixbuf gobjectIntrospection ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ glib gdk_pixbuf gobjectIntrospection ];
meta = with stdenv.lib; {
description = "Library tasked with managing, extracting and handling media art caches";
diff --git a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix
index 37cdfc730ab8..63f59357db5e 100644
--- a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix
+++ b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix
@@ -1,40 +1,34 @@
-{ stdenv, fetchFromGitHub, which, intltool, pkgconfig, libtool, makeWrapper,
- dbus_glib, libcanberra_gtk2, gst_all_1, vala_0_32, gnome3, gtk3, gst-plugins-base,
- glib, gobjectIntrospection, telepathy_glib
+{ stdenv, fetchFromGitHub, autoconf-archive, appstream-glib, intltool, pkgconfig, libtool, wrapGAppsHook,
+ dbus_glib, libcanberra_gtk2, gst_all_1, vala_0_34, gnome3, gtk3,
+ glib, gobjectIntrospection, libpeas
}:
stdenv.mkDerivation rec {
- version = "0.11.2";
+ version = "0.13.3";
name = "gnome-shell-pomodoro-${version}";
src = fetchFromGitHub {
- owner = "codito";
- repo = "gnome-pomodoro";
- rev = "${version}";
- sha256 = "0x656drq8vnvdj1x6ghnglgpa0z8yd2yj9dh5iqprwjv0z3qkw4l";
+ owner = "codito";
+ repo = "gnome-pomodoro";
+ rev = "${version}";
+ sha256 = "1hi4mdzyz2f8k19bkfzrrnavsbkr621w0bfpza8ij2yccpxz81h2";
};
- configureScript = ''./autogen.sh'';
+ configureScript = "./autogen.sh";
- buildInputs = [
- which intltool glib gobjectIntrospection pkgconfig libtool
- makeWrapper dbus_glib libcanberra_gtk2 vala_0_32 gst_all_1.gstreamer
- gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
- gnome3.gsettings_desktop_schemas gnome3.gnome_desktop
- gnome3.gnome_common gnome3.gnome_shell gtk3 telepathy_glib
- gnome3.defaultIconTheme
+ nativeBuildInputs = [
+ autoconf-archive libtool intltool appstream-glib
+ wrapGAppsHook pkgconfig
];
- preBuild = ''
- sed -i 's|\$(INTROSPECTION_GIRDIR)|${gnome3.gnome_desktop}/share/gir-1.0|' \
- vapi/Makefile
- '';
-
- preFixup = ''
- wrapProgram $out/bin/gnome-pomodoro \
- --prefix XDG_DATA_DIRS : \
- "$out/share:$GSETTINGS_SCHEMAS_PATH:$XDG_DATA_DIRS"
- '';
+ buildInputs = [
+ glib gobjectIntrospection libpeas
+ dbus_glib libcanberra_gtk2 vala_0_34 gst_all_1.gstreamer
+ gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
+ gnome3.gsettings_desktop_schemas
+ gnome3.gnome_common gnome3.gnome_shell gtk3
+ gnome3.defaultIconTheme
+ ];
meta = with stdenv.lib; {
homepage = https://github.com/codito/gnome-shell-pomodoro;
diff --git a/pkgs/desktops/gnustep/back/default.nix b/pkgs/desktops/gnustep/back/default.nix
index 6678b11df023..02f58f81200e 100644
--- a/pkgs/desktops/gnustep/back/default.nix
+++ b/pkgs/desktops/gnustep/back/default.nix
@@ -16,7 +16,8 @@ gsmakeDerivation {
url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${version}.tar.gz";
sha256 = "14gs1b32ahnihd7mwpjrws2b8hl11rl1wl24a7651d3z2l7f6xj2";
};
- buildInputs = [ cairo base gui freetype pkgconfig x11 libXmu ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ cairo base gui freetype x11 libXmu ];
meta = {
description = "A generic backend for GNUstep";
};
diff --git a/pkgs/desktops/lxqt/base/liblxqt/default.nix b/pkgs/desktops/lxqt/base/liblxqt/default.nix
index 9363dba86699..bb5a9be6d848 100644
--- a/pkgs/desktops/lxqt/base/liblxqt/default.nix
+++ b/pkgs/desktops/lxqt/base/liblxqt/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "liblxqt";
- version = "0.11.1";
+ version = "0.12.0";
src = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
- sha256 = "0dcsgj0qr4589wsibs6fdza4ncqavrhykd05d25rs78pa94lvvh5";
+ sha256 = "1852vfbkbpw49i8ad682jhqmnskmc9a90qwpalipgak7m64azg3j";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/base/libqtxdg/default.nix b/pkgs/desktops/lxqt/base/libqtxdg/default.nix
index 47d3fb2e91c3..966566db7c8d 100644
--- a/pkgs/desktops/lxqt/base/libqtxdg/default.nix
+++ b/pkgs/desktops/lxqt/base/libqtxdg/default.nix
@@ -2,24 +2,28 @@
stdenv.mkDerivation rec {
name = "libqtxdg-${version}";
- version = "2.0.0";
+ version = "3.1.0";
src = fetchFromGitHub {
owner = "lxde";
repo = "libqtxdg";
rev = version;
- sha256 = "1s5jw4q6gcivk7mc95ir9q2nry4yyhfwy039ddf5ymh79nynv8vy";
+ sha256 = "03kdrx5sgrl93yband87n30i0k2mv6dknwdw2adz45j5z9rhd3z6";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ qt5.qtbase qt5.qtsvg ];
+ preConfigure = ''
+ cmakeFlags+=" -DQTXDGX_ICONENGINEPLUGIN_INSTALL_PATH=$out/$qtPluginPrefix"
+ '';
+
meta = with stdenv.lib; {
description = "Qt implementation of freedesktop.org xdg specs";
homepage = https://github.com/lxde/libqtxdg;
license = licenses.lgpl21;
- maintainers = with maintainers; [ romildo ];
platforms = with platforms; unix;
+ maintainers = with maintainers; [ romildo ];
};
}
diff --git a/pkgs/desktops/lxqt/base/libsysstat/default.nix b/pkgs/desktops/lxqt/base/libsysstat/default.nix
index 2776a53fa833..b5013f5ac1aa 100644
--- a/pkgs/desktops/lxqt/base/libsysstat/default.nix
+++ b/pkgs/desktops/lxqt/base/libsysstat/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "libsysstat-${version}";
- version = "0.3.3";
+ version = "0.4.0";
src = fetchFromGitHub {
owner = "lxde";
repo = "libsysstat";
rev = version;
- sha256 = "1rkbh6jj69wsf8a7w7cq8psqw08vqf9rq5pdnv4xxqb036r4bi31";
+ sha256 = "0yl20dj553z1ijkfxl9n45qvkzxyl9rqw12vb4v6zj3ch6hzbzsx";
};
nativeBuildInputs = [ cmake lxqt.lxqt-build-tools ];
diff --git a/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix
index f8db33bc5a4d..8d369f464335 100644
--- a/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix
+++ b/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix
@@ -1,17 +1,19 @@
-{ stdenv, fetchFromGitHub, cmake, qt5 }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qt5 }:
stdenv.mkDerivation rec {
name = "lxqt-build-tools-${version}";
- version = "0.3.2";
+ version = "0.4.0";
src = fetchFromGitHub {
owner = "lxde";
repo = "lxqt-build-tools";
rev = version;
- sha256 = "1awd70ifbbi67pklhldjw968c1fw1lcif9nh4qbrjqmlg1gn3kmv";
+ sha256 = "0i3pzgyd80n73dnqs8f6axinaji7biflgqsi33baxn4r1hy58ym1";
};
- nativeBuildInputs = [ cmake qt5.qtbase ];
+ nativeBuildInputs = [ cmake pkgconfig pcre qt5.qtbase ];
+
+ preConfigure = ''cmakeFlags+=" -DLXQT_ETC_XDG_DIR=$out/etc/xdg"'';
meta = with stdenv.lib; {
description = "Various packaging tools and scripts for LXQt applications";
diff --git a/pkgs/desktops/lxqt/core/libfm-qt/default.nix b/pkgs/desktops/lxqt/core/libfm-qt/default.nix
index 78c0a926b9c8..612fbeafe199 100644
--- a/pkgs/desktops/lxqt/core/libfm-qt/default.nix
+++ b/pkgs/desktops/lxqt/core/libfm-qt/default.nix
@@ -1,19 +1,19 @@
{
stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools,
- xorg, libfm, menu-cache,
+ pcre, libexif, xorg, libfm, menu-cache,
qtx11extras, qttools
}:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "libfm-qt";
- version = "0.11.2";
+ version = "0.12.0";
src = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
- sha256 = "0k2g6bkz7bvawqkjzykbxi18wqsnhbxklqy6aqqkclpzcw45vk5v";
+ sha256 = "0932yl098pc5rwgy9irrc3ys47jx64m3wm702dvs8yy15alv6x4i";
};
nativeBuildInputs = [
@@ -23,6 +23,11 @@ stdenv.mkDerivation rec {
];
buildInputs = [
+ pcre
+ libexif
+ xorg.libpthreadstubs
+ xorg.libxcb
+ xorg.libXdmcp
qtx11extras
qttools
libfm
diff --git a/pkgs/desktops/lxqt/core/lxqt-about/default.nix b/pkgs/desktops/lxqt/core/lxqt-about/default.nix
index ac81391af1d9..645d634a26fe 100644
--- a/pkgs/desktops/lxqt/core/lxqt-about/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-about/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, standardPatch, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg }:
+{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-about";
- version = "0.11.1";
+ version = "0.12.0";
- srcs = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
- sha256 = "1pa68pr0iwvh34lippagc8kxdfd0l2071m0vh7dnvfqbnwly29dk";
+ sha256 = "13knjxbnq0mh9jgkllarf6rjxkvj2c93l0srnlrqp3939gcpwxh3";
};
nativeBuildInputs = [
@@ -28,8 +28,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
- postPatch = standardPatch;
-
meta = with stdenv.lib; {
description = "Dialogue window providing information about LXQt and the system it's running on";
homepage = https://github.com/lxde/lxqt-about;
diff --git a/pkgs/desktops/lxqt/core/lxqt-admin/default.nix b/pkgs/desktops/lxqt/core/lxqt-admin/default.nix
index 23b142f352f0..54731b22686c 100644
--- a/pkgs/desktops/lxqt/core/lxqt-admin/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-admin/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, standardPatch, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, polkit }:
+{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, polkit }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-admin";
- version = "0.11.1";
+ version = "0.12.0";
- srcs = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
- sha256 = "12c1wdciqgiifsk5aslw3990pk9ylk9jhgwnrxvh798rr48hhflr";
+ sha256 = "0dg3gm5m19dc4jarh8xcn0mcnpgxzz7nhy5dzm8chddaa6pdm7vi";
};
nativeBuildInputs = [
@@ -29,8 +29,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
- postPatch = standardPatch;
-
meta = with stdenv.lib; {
description = "LXQt system administration tool";
homepage = https://github.com/lxde/lxqt-admin;
diff --git a/pkgs/desktops/lxqt/core/lxqt-common/default.nix b/pkgs/desktops/lxqt/core/lxqt-common/default.nix
deleted file mode 100644
index cc114c31dfd5..000000000000
--- a/pkgs/desktops/lxqt/core/lxqt-common/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, fetchFromGitHub, cmake, qt5, lxqt, hicolor_icon_theme, xmessage }:
-
-stdenv.mkDerivation rec {
- name = "${pname}-${version}";
- pname = "lxqt-common";
- version = "0.11.2";
-
- src = fetchFromGitHub {
- owner = "lxde";
- repo = pname;
- rev = version;
- sha256 = "07ih2w9ksbxqwy36xvgb9b31740nhkm7ap70wvv8q6x0wyhn71gn";
- };
-
- nativeBuildInputs = [
- cmake
- lxqt.lxqt-build-tools
- ];
-
- buildInputs = [
- qt5.qtsvg
- hicolor_icon_theme
- xmessage
- ];
-
- postPatch = lxqt.standardPatch
- + ''
- substituteInPlace ./startlxqt.in \
- --replace "cp " "cp --no-preserve=mode " \
- --replace xmessage "${xmessage}"/bin/xmessage
- '';
-
- meta = with stdenv.lib; {
- description = "Common files for LXQt";
- homepage = https://github.com/lxde/lxqt-common;
- license = licenses.lgpl21;
- platforms = with platforms; unix;
- maintainers = with maintainers; [ romildo ];
- };
-}
diff --git a/pkgs/desktops/lxqt/core/lxqt-config/default.nix b/pkgs/desktops/lxqt/core/lxqt-config/default.nix
index 20e785ec5fda..191fe0796e88 100644
--- a/pkgs/desktops/lxqt/core/lxqt-config/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-config/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, lxqt-build-tools, standardPatch, qtbase, qtx11extras, qttools, qtsvg, kwindowsystem, libkscreen, liblxqt, libqtxdg, libpthreadstubs, xorg }:
+{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, lxqt-build-tools, qtbase, qtx11extras, qttools, qtsvg, kwindowsystem, libkscreen, liblxqt, libqtxdg, libpthreadstubs, xorg }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-config";
- version = "0.11.1";
+ version = "0.12.0";
- srcs = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
- sha256 = "0mqvv93djsw49n0gxpws3hrwimnyf9kzvc2vhjkzrjfxpabk2axx";
+ sha256 = "1ccxkdfhgf40jxiy0132yr9b28skvs9yr8j75w663hnqi6ccn377";
};
nativeBuildInputs = [
@@ -36,7 +36,10 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
- postPatch = standardPatch;
+ postPatch = ''
+ substituteInPlace src/CMakeLists.txt \
+ --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
+ '';
meta = with stdenv.lib; {
description = "Tools to configure LXQt and the underlying operating system";
@@ -46,12 +49,4 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ romildo ];
};
- patches = [
- # Fixes a FTBFS with CMake v3.8
- (fetchpatch {
- url = https://github.com/lxde/lxqt-config/commit/bca652a75f8a497a69b1fbc1c7eaa353f6b4eef8.patch;
- sha256 = "17k26xj97ks9gvcjhiwc5y39fciria4xyxrzcz67zj0flqm3cmrf";
- })
- ];
-
}
diff --git a/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix
index 73248da1ef80..9e74eee5ec17 100644
--- a/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, standardPatch, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg }:
+{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-globalkeys";
- version = "0.11.1";
+ version = "0.12.0";
- srcs = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
- sha256 = "1kwibll2azi4pafk7crfgibk5a54rnsia3c4cz680iny7xz1wy6h";
+ sha256 = "14icyik9x47wi3gfkmkyhag26a2ivyc42f4f8qwdgbr3dcg10b9a";
};
nativeBuildInputs = [
@@ -29,7 +29,12 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
- postPatch = standardPatch;
+ postPatch = ''
+ for dir in autostart xdg; do
+ substituteInPlace $dir/CMakeLists.txt \
+ --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
+ done
+ '';
meta = with stdenv.lib; {
description = "Daemon used to register global keyboard shortcuts";
diff --git a/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix b/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix
index b836b9776e65..10b767aedac0 100644
--- a/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "lxqt-l10n-${version}";
- version = "0.11.2";
+ version = "0.12.0";
src = fetchFromGitHub {
owner = "lxde";
repo = "lxqt-l10n";
rev = version;
- sha256 = "1vk4q98kraq0lba50n9z6jwiapc7nz2b143b4ldlmrz4wscd867h";
+ sha256 = "025zg5y9f286p74rab4yxyz4cqlh4hqjq43xxpi76ma2fy2s03a4";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix
index 8aea9a6458b3..061a8522a6fe 100644
--- a/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-common, qtx11extras }:
+{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, qtx11extras }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-notificationd";
- version = "0.11.1";
+ version = "0.12.0";
- srcs = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
- sha256 = "1n39zjczzhqn73vfyjngybmk9w8j1z3vjkaq80rf2hk89vwsm0wc";
+ sha256 = "0pmpdqgnb2dfxw5lirh89j8hnrwwcn2zc64byg4zi0xdvq6qms43";
};
nativeBuildInputs = [
@@ -17,6 +17,11 @@ stdenv.mkDerivation rec {
lxqt-build-tools
];
+ postPatch = ''
+ substituteInPlace autostart/CMakeLists.txt \
+ --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
+ '';
+
buildInputs = [
qtbase
qttools
@@ -24,7 +29,6 @@ stdenv.mkDerivation rec {
kwindowsystem
liblxqt
libqtxdg
- lxqt-common
qtx11extras
];
diff --git a/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix
index a52ce02cd14b..bcc00a0add50 100644
--- a/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-openssh-askpass";
- version = "0.11.1";
+ version = "0.12.0";
- srcs = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
- sha256 = "030pzys86s7rpgl35kl4b3y7gmv9982j3blmg8927nq4pw61gfj9";
+ sha256 = "16xcw4yll6i9vij16kdb10s4aq2s57x4yjlwv6d8r75y5gq9iiw6";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix
index d2faf9c0eee4..77a49410bb60 100644
--- a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix
@@ -1,22 +1,22 @@
{
- stdenv, fetchFromGitHub, fetchurl, standardPatch,
+ stdenv, fetchFromGitHub,
cmake, pkgconfig, lxqt-build-tools,
qtbase, qttools, qtx11extras, qtsvg, libdbusmenu, kwindowsystem, solid,
- kguiaddons, liblxqt, libqtxdg, lxqt-common, lxqt-globalkeys, libsysstat,
+ kguiaddons, liblxqt, libqtxdg, lxqt-globalkeys, libsysstat,
xorg, libstatgrab, lm_sensors, libpulseaudio, alsaLib, menu-cache,
- lxmenu-data
+ lxmenu-data, pcre
}:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-panel";
- version = "0.11.1";
+ version = "0.12.0";
- srcs = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
- sha256 = "097rivly61i99v0w9a3dgbwbc4c5x9nh3jl0n94dix1qgd4w983y";
+ sha256 = "01xmnb17jpydyfvxwaa6kymzdasnyd94z62gjah8y4pzsmykcr4x";
};
nativeBuildInputs = [
@@ -36,7 +36,6 @@ stdenv.mkDerivation rec {
kguiaddons
liblxqt
libqtxdg
- lxqt-common
lxqt-globalkeys
libsysstat
xorg.libpthreadstubs
@@ -47,18 +46,19 @@ stdenv.mkDerivation rec {
alsaLib
menu-cache
lxmenu-data
- ];
-
- patches = [
- (fetchurl {
- url = https://github.com/lxde/lxqt-panel/commit/ec62109e0fa678875a9b10fc6f1975267432712d.patch;
- sha256 = "1ywwk8gb6gbvs8z9gwgsnb13z1jvyvjij349nq7ij6iyhyld0jlr";
- })
+ pcre
];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
- postPatch = standardPatch;
+ postPatch = ''
+ for dir in autostart menu; do
+ substituteInPlace $dir/CMakeLists.txt \
+ --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
+ done
+ substituteInPlace panel/CMakeLists.txt \
+ --replace "DESTINATION \''${LXQT_ETC_XDG_DIR}" "DESTINATION etc/xdg"
+ '';
meta = with stdenv.lib; {
description = "The LXQt desktop panel";
diff --git a/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix
index bdcc0a4d606e..fca6a9ff1f61 100644
--- a/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix
@@ -1,19 +1,19 @@
{
stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools,
qtbase, qttools, qtx11extras, qtsvg, polkit-qt, kwindowsystem, liblxqt,
- libqtxdg,
+ libqtxdg, pcre
}:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-policykit";
- version = "0.11.1";
+ version = "0.12.0";
- srcs = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
- sha256 = "0sf8wj152z1xid1i2x5g1zpgh7lwq8f0rbrk3r9shyksxqcj2d8p";
+ sha256 = "1hxz5bxxi118g255aqb3da767va0wd25y671lk2w9r1641j8zf2d";
};
nativeBuildInputs = [
@@ -31,10 +31,16 @@ stdenv.mkDerivation rec {
kwindowsystem
liblxqt
libqtxdg
+ pcre
];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
+ postPatch = ''
+ substituteInPlace autostart/CMakeLists.txt \
+ --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
+ '';
+
meta = with stdenv.lib; {
description = "The LXQt PolicyKit agent";
homepage = https://github.com/lxde/lxqt-policykit;
diff --git a/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix
index d3793a9d9286..e5012abed6a4 100644
--- a/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-powermanagement";
- version = "0.11.1";
+ version = "0.12.0";
- srcs = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
- sha256 = "0rcjq20ap6kc3m1f2glb8c62qhsx8qh0rkzlj3rykdj6n4hc0x79";
+ sha256 = "1fxklxmvjaykdpf0nj6cpgwx4yf52087g25k1zdak9n0l9n7hm8d";
};
nativeBuildInputs = [
@@ -31,6 +31,11 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
+ postPatch = ''
+ substituteInPlace autostart/CMakeLists.txt \
+ --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
+ '';
+
meta = with stdenv.lib; {
description = "Power management module for LXQt";
homepage = https://github.com/lxde/lxqt-powermanagement;
diff --git a/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix
index d5b8987bbb82..c5fae1e9ecb3 100644
--- a/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix
@@ -1,19 +1,19 @@
{
- stdenv, fetchFromGitHub, standardPatch,
+ stdenv, fetchFromGitHub,
cmake, lxqt-build-tools,
- qtbase, qtx11extras, qttools, qtsvg, libdbusmenu, libqtxdg,
+ qtbase, qtx11extras, qttools, qtsvg, libdbusmenu, libqtxdg, libfm-qt
}:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-qtplugin";
- version = "0.11.1";
+ version = "0.12.0";
- srcs = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
- sha256 = "12hyw7rk3zx51n6g2bazlqv70xap0lygm9v21ibxgy1aw0j6iy02";
+ sha256 = "1i1rga0pg764ccwhq7acdsckxpl1apxwj4lv4gygxxmpkrg62zkv";
};
nativeBuildInputs = [
@@ -28,11 +28,13 @@ stdenv.mkDerivation rec {
qtsvg
libdbusmenu
libqtxdg
+ libfm-qt
];
- cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
-
- postPatch = standardPatch;
+ postPatch = ''
+ substituteInPlace src/CMakeLists.txt \
+ --replace "DESTINATION \"\''${QT_PLUGINS_DIR}" "DESTINATION \"$qtPluginPrefix"
+ '';
meta = with stdenv.lib; {
description = "LXQt Qt platform integration plugin";
diff --git a/pkgs/desktops/lxqt/core/lxqt-runner/default.nix b/pkgs/desktops/lxqt/core/lxqt-runner/default.nix
index 8e2332dad5c7..0c1f08b34d77 100644
--- a/pkgs/desktops/lxqt/core/lxqt-runner/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-runner/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-common, lxqt-globalkeys, qtx11extras,
-menu-cache, muparser }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-globalkeys, qtx11extras,
+menu-cache, muparser, pcre }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-runner";
- version = "0.11.1";
+ version = "0.12.0";
- srcs = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
- sha256 = "1nsxm0fplwrzz3vccd5fm82lpl4fqss6kv558zj44vzpsl13l954";
+ sha256 = "1354vdaskhch1n8v3kdy15nszgqb1092csr84nbhymzgrhrq1093";
};
nativeBuildInputs = [
@@ -27,14 +27,19 @@ stdenv.mkDerivation rec {
kwindowsystem
liblxqt
libqtxdg
- lxqt-common
lxqt-globalkeys
menu-cache
muparser
+ pcre
];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
+ postPatch = ''
+ substituteInPlace autostart/CMakeLists.txt \
+ --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
+ '';
+
meta = with stdenv.lib; {
description = "Tool used to launch programs quickly by typing their names";
homepage = https://github.com/lxde/lxqt-runner;
diff --git a/pkgs/desktops/lxqt/core/lxqt-session/default.nix b/pkgs/desktops/lxqt/core/lxqt-session/default.nix
index ba0bb69ce926..d3733950ed00 100644
--- a/pkgs/desktops/lxqt/core/lxqt-session/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-session/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg, lxqt-common, xorg, xdg-user-dirs }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg, xorg, xdg-user-dirs }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-session";
- version = "0.11.1";
+ version = "0.12.0";
- srcs = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
- sha256 = "14ahgix5jsv7fkmvz1imw9a12ygxccqrdxp9yfbpin1az9q1n1qv";
+ sha256 = "03gi9svxqsfjhk5ifbaalq9i44ggx8afwms1hb312czqn82wrszb";
};
nativeBuildInputs = [
@@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
kwindowsystem
liblxqt
libqtxdg
- lxqt-common
xorg.libpthreadstubs
xorg.libXdmcp
xdg-user-dirs
@@ -34,6 +33,13 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
+ postPatch = ''
+ for dir in autostart config; do
+ substituteInPlace $dir/CMakeLists.txt \
+ --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
+ done
+ '';
+
meta = with stdenv.lib; {
description = "An alternative session manager ported from the original razor-session";
homepage = https://github.com/lxde/lxqt-session;
diff --git a/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix
index 1e235af3c900..8700a768abdf 100644
--- a/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-sudo";
- version = "0.11.1";
+ version = "0.12.0";
- srcs = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
- sha256 = "0imy4cs51im81rd0wa03wy418cdv9gqqgmwkc7v58cip7h665pyk";
+ sha256 = "0ql436yb51qwbnj5gbzvqi4rqx4zkmja5rdjs6yavb1x8ggn1jv6";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/core/lxqt-themes/default.nix b/pkgs/desktops/lxqt/core/lxqt-themes/default.nix
new file mode 100644
index 000000000000..6251667430b2
--- /dev/null
+++ b/pkgs/desktops/lxqt/core/lxqt-themes/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, cmake, lxqt }:
+
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "lxqt-themes";
+ version = "0.12.0";
+
+ src = fetchFromGitHub {
+ owner = "lxde";
+ repo = pname;
+ rev = version;
+ sha256 = "0f7bipkxkl741lpb2cziw9wlqy05514nqqrppsz5g4y8bmzw910n";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ lxqt.lxqt-build-tools
+ ];
+
+ postPatch = ''
+ substituteInPlace CMakeLists.txt \
+ --replace "DESTINATION \"\''${LXQT_GRAPHICS_DIR}" "DESTINATION \"share/lxqt/graphics"
+ substituteInPlace themes/CMakeLists.txt \
+ --replace "DESTINATION \"\''${LXQT_SHARE_DIR}" "DESTINATION \"share/lxqt"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Themes, graphics and icons for LXQt";
+ homepage = https://github.com/lxde/lxqt-themes;
+ license = licenses.lgpl21;
+ platforms = with platforms; unix;
+ maintainers = with maintainers; [ romildo ];
+ };
+}
diff --git a/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix
index b8421d062021..862a4ff9cf99 100644
--- a/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix
+++ b/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, lxqt, libpulseaudio }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt, libpulseaudio, pcre, qtbase, qttools, qtx11extras }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "pavucontrol-qt";
- version = "0.2.0";
+ version = "0.3.0";
- srcs = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
- sha256 = "0k7sg4dxr48nk15gpqlnkjr9gbh7r5gs0s0ydifcmw281khrzlzj";
+ sha256 = "1pfqdzsbygvq77npsizydps25d9g6vgw177yqvmz3cg3a68dad27";
};
nativeBuildInputs = [
@@ -19,10 +19,11 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- qt5.qtbase
- qt5.qttools
- qt5.qtx11extras
+ qtbase
+ qttools
+ qtx11extras
libpulseaudio
+ pcre
];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
diff --git a/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix
index 7c115c2ca27f..d9e2a651c3a8 100644
--- a/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix
+++ b/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "pcmanfm-qt";
- version = "0.11.3";
+ version = "0.12.0";
- srcs = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
- sha256 = "04vhfhjmz1a4rhkpb6y35hwg565047rp53rcxf4pdn0i9f6zhr4f";
+ sha256 = "050h5w1wph35l5m69qbxzvc96y7y0bg1m7flqdadrp688pbnzcxb";
};
nativeBuildInputs = [
@@ -30,6 +30,13 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
+ postPatch = ''
+ for dir in autostart config; do
+ substituteInPlace $dir/CMakeLists.txt \
+ --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
+ done
+ '';
+
meta = with stdenv.lib; {
description = "File manager and desktop icon manager (Qt port of PCManFM and libfm)";
homepage = https://github.com/lxde/pcmanfm-qt;
diff --git a/pkgs/desktops/lxqt/core/qtermwidget/0.7.1.nix b/pkgs/desktops/lxqt/core/qtermwidget/0.7.1.nix
new file mode 100644
index 000000000000..6bd6e2833f5e
--- /dev/null
+++ b/pkgs/desktops/lxqt/core/qtermwidget/0.7.1.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, cmake, qt5 }:
+
+stdenv.mkDerivation rec {
+ name = "${pname}_0_7_1-${version}";
+ pname = "qtermwidget";
+ version = "0.7.1";
+
+ srcs = fetchFromGitHub {
+ owner = "lxde";
+ repo = pname;
+ rev = version;
+ sha256 = "0awp33cnkpi9brpx01mz5hwj7j2lq1wdi8cabk3wassd99vvxdxz";
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ buildInputs = [ qt5.qtbase ];
+
+ meta = with stdenv.lib; {
+ description = "A terminal emulator widget for Qt 5";
+ homepage = https://github.com/lxde/qtermwidget;
+ license = licenses.gpl2;
+ platforms = with platforms; unix;
+ maintainers = with maintainers; [ romildo ];
+ };
+}
diff --git a/pkgs/desktops/lxqt/core/qtermwidget/default.nix b/pkgs/desktops/lxqt/core/qtermwidget/default.nix
index 66620e195ec0..f882088d07b8 100644
--- a/pkgs/desktops/lxqt/core/qtermwidget/default.nix
+++ b/pkgs/desktops/lxqt/core/qtermwidget/default.nix
@@ -1,20 +1,22 @@
-{ stdenv, fetchFromGitHub, cmake, qt5 }:
+{ stdenv, fetchFromGitHub, cmake, qt5, lxqt }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "qtermwidget";
- version = "0.7.1";
+ version = "0.8.0";
- srcs = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
- sha256 = "0awp33cnkpi9brpx01mz5hwj7j2lq1wdi8cabk3wassd99vvxdxz";
+ sha256 = "14yjz6b1l2yd7sfsxjv26yg5153fpyq23443kswkgkd9jh32gxj4";
};
- nativeBuildInputs = [ cmake ];
+ nativeBuildInputs = [ cmake lxqt.lxqt-build-tools ];
- buildInputs = [ qt5.qtbase ];
+ buildInputs = [ qt5.qtbase qt5.qttools];
+
+ cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
meta = with stdenv.lib; {
description = "A terminal emulator widget for Qt 5";
diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index 735ba79b405c..40c25b3302ca 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -6,24 +6,6 @@ let
# For compiling information, see:
# - https://github.com/lxde/lxqt/wiki/Building-from-source
- standardPatch = ''
- for file in $(find . -name CMakeLists.txt); do
- substituteInPlace $file \
- --replace "DESTINATION \''${LXQT_ETC_XDG_DIR}" "DESTINATION etc/xdg" \
- --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" \
- --replace "DESTINATION \"\''${LXQT_SHARE_DIR}" "DESTINATION \"share/lxqt" \
- --replace "DESTINATION \"\''${LXQT_GRAPHICS_DIR}" "DESTINATION \"share/lxqt/graphics" \
- --replace "DESTINATION \"\''${QT_PLUGINS_DIR}" "DESTINATION \"$qtPluginPrefix" \
- --replace "\''${LXQT_TRANSLATIONS_DIR}" share/lxqt/translations
- echo ============================
- echo $file
- grep --color=always DESTINATION $file || true
- grep --color=always share/lxqt/translations $file || true
- grep --color=always platform $file || true
- done
- echo --------------------------------------------------------
- '';
-
### BASE
libqtxdg = callPackage ./base/libqtxdg { };
lxqt-build-tools = callPackage ./base/lxqt-build-tools { };
@@ -34,7 +16,6 @@ let
libfm-qt = callPackage ./core/libfm-qt { };
lxqt-about = callPackage ./core/lxqt-about { };
lxqt-admin = callPackage ./core/lxqt-admin { };
- lxqt-common = callPackage ./core/lxqt-common { };
lxqt-config = callPackage ./core/lxqt-config { };
lxqt-globalkeys = callPackage ./core/lxqt-globalkeys { };
lxqt-l10n = callPackage ./core/lxqt-l10n { };
@@ -45,8 +26,11 @@ let
lxqt-qtplugin = callPackage ./core/lxqt-qtplugin { };
lxqt-session = callPackage ./core/lxqt-session { };
lxqt-sudo = callPackage ./core/lxqt-sudo { };
- pavucontrol-qt = callPackage ./core/pavucontrol-qt { };
+ lxqt-themes = callPackage ./core/lxqt-themes { };
+ pavucontrol-qt = libsForQt5.callPackage ./core/pavucontrol-qt { };
qtermwidget = callPackage ./core/qtermwidget { };
+ # for now keep version 0.7.1 because virt-manager-qt currently does not compile with qtermwidget-0.8.0
+ qtermwidget_0_7_1 = callPackage ./core/qtermwidget/0.7.1.nix { };
### CORE 2
lxqt-panel = callPackage ./core/lxqt-panel { };
@@ -84,7 +68,6 @@ let
libfm-qt
lxqt-about
lxqt-admin
- lxqt-common
lxqt-config
lxqt-globalkeys
lxqt-l10n
@@ -95,6 +78,7 @@ let
lxqt-qtplugin
lxqt-session
lxqt-sudo
+ lxqt-themes
pavucontrol-qt
### CORE 2
diff --git a/pkgs/desktops/lxqt/optional/compton-conf/default.nix b/pkgs/desktops/lxqt/optional/compton-conf/default.nix
index 6e1ea1288539..253f8112f5b2 100644
--- a/pkgs/desktops/lxqt/optional/compton-conf/default.nix
+++ b/pkgs/desktops/lxqt/optional/compton-conf/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "compton-conf";
- version = "0.2.1";
+ version = "0.3.0";
- srcs = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
- sha256 = "1hmirhsz010h6a6k7my1krh5nw5ds4x00c5fq6apamrdd8d4zrmq";
+ sha256 = "1p1y7g5psczx1dgh6gd1h5iga8rylvczkwlfirzrh0rfl45dajgb";
};
nativeBuildInputs = [
@@ -26,6 +26,11 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
+ preConfigure = ''
+ substituteInPlace autostart/CMakeLists.txt \
+ --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" \
+ '';
+
meta = with stdenv.lib; {
description = "GUI configuration tool for compton X composite manager";
homepage = https://github.com/lxde/compton-conf;
diff --git a/pkgs/desktops/lxqt/optional/lximage-qt/default.nix b/pkgs/desktops/lxqt/optional/lximage-qt/default.nix
index 3308f0e412bd..80921cac891d 100644
--- a/pkgs/desktops/lxqt/optional/lximage-qt/default.nix
+++ b/pkgs/desktops/lxqt/optional/lximage-qt/default.nix
@@ -3,16 +3,15 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lximage-qt";
- version = "0.5.1";
+ version = "0.6.0";
- srcs = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
- sha256 = "0hyiarjjxjwvzinlfnfxbqx40dhgydd3ccv3xqwvj7yni1nfx7pb";
+ sha256 = "0zmrpfgmlq005zikyvhqbpip6mz6pfcf9aqjpncyc5vlggmh28ym";
};
-
nativeBuildInputs = [
cmake
pkgconfig
diff --git a/pkgs/desktops/lxqt/optional/obconf-qt/default.nix b/pkgs/desktops/lxqt/optional/obconf-qt/default.nix
index 36490b726e0f..e3cb02e8b8af 100644
--- a/pkgs/desktops/lxqt/optional/obconf-qt/default.nix
+++ b/pkgs/desktops/lxqt/optional/obconf-qt/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, xorg, lxqt, openbox, hicolor_icon_theme }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qt5, xorg, lxqt, openbox, hicolor_icon_theme }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "obconf-qt";
- version = "0.11.1";
+ version = "0.12.0";
- srcs = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
- sha256 = "1w94g8jk2j9qrkwg3i6qwgai2sj1m657bbk2zlk9bc3qvzmwxwrc";
+ sha256 = "1vwza1516z7f18s5vfnhzsiyxs6afb1hgr3yqkr7qhplmq5wjma5";
};
nativeBuildInputs = [
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
+ pcre
qt5.qtbase
qt5.qttools
qt5.qtx11extras
diff --git a/pkgs/desktops/lxqt/optional/qlipper/default.nix b/pkgs/desktops/lxqt/optional/qlipper/default.nix
index 376b8fb0190d..04b0cd3e6ac6 100644
--- a/pkgs/desktops/lxqt/optional/qlipper/default.nix
+++ b/pkgs/desktops/lxqt/optional/qlipper/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
pname = "qlipper";
version = "5.0.0";
- srcs = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "pvanek";
repo = pname;
rev = version;
diff --git a/pkgs/desktops/lxqt/optional/qps/default.nix b/pkgs/desktops/lxqt/optional/qps/default.nix
index d39341eb05d0..e27388fa1681 100644
--- a/pkgs/desktops/lxqt/optional/qps/default.nix
+++ b/pkgs/desktops/lxqt/optional/qps/default.nix
@@ -1,39 +1,20 @@
-{ stdenv, fetchFromGitHub, cmake, qt5, makeDesktopItem }:
+{ stdenv, fetchFromGitHub, cmake, qt5 }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "qps";
- version = "1.10.16";
+ version = "1.10.17";
- srcs = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "QtDesktop";
repo = pname;
- rev = "v${version}";
- sha256 = "1s6hvqfv9hv1cl5pfsmghqn1zqhibr4plq3glzgd8s7swwdnsvjj";
- };
-
- desktopItem = makeDesktopItem {
- name = "qps";
- exec = "qps";
- icon = "qps";
- comment = "Visual process manager - Qt version of ps/top";
- desktopName = "qps";
- genericName = meta.description;
- categories = "System;";
+ rev = version;
+ sha256 = "1d5r6w9wsxjdrzq2hllrj2n1d9azy6g05hg0w0s6pikrmn1yl0a3";
};
nativeBuildInputs = [ cmake ];
- buildInputs = [ qt5.qtbase qt5.qtx11extras ];
-
- installPhase = ''
- mkdir -p $out/{bin,share/{man/man1,doc,icons}}
- cp -a src/qps $out/bin/
- cp -a ../README.md $out/share/doc/
- cp -a ../qps.1 $out/share/man/man1/
- cp -a ../icon/icon.xpm $out/share/icons/qps.xpm
- ln -sv "${desktopItem}/share/applications" $out/share/
- '';
+ buildInputs = [ qt5.qtbase qt5.qtx11extras qt5.qttools ];
meta = with stdenv.lib; {
description = "The Qt process manager";
diff --git a/pkgs/desktops/lxqt/optional/qterminal/default.nix b/pkgs/desktops/lxqt/optional/qterminal/default.nix
index ff59a2d893c6..88c4740760f8 100644
--- a/pkgs/desktops/lxqt/optional/qterminal/default.nix
+++ b/pkgs/desktops/lxqt/optional/qterminal/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "qterminal";
- version = "0.7.1";
+ version = "0.8.0";
- srcs = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
- sha256 = "14pfwii8axyswrkwvfmc2i0a07fjnhpyk3hh06qkbj2w3r00xhyb";
+ sha256 = "1899a5zc5kx7mxiyrncigqjia1k98qg526qynf4754nr9ifghxdw";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/optional/screengrab/default.nix b/pkgs/desktops/lxqt/optional/screengrab/default.nix
index e8cc7c30fa15..3c4bebf39fd9 100644
--- a/pkgs/desktops/lxqt/optional/screengrab/default.nix
+++ b/pkgs/desktops/lxqt/optional/screengrab/default.nix
@@ -1,13 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, libqtxdg, xorg }:
stdenv.mkDerivation rec {
- name = "screengrab-unstable-2017-02-18";
+ name = "screengrab-${version}";
+ version = "1.97";
- srcs = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "QtDesktop";
repo = "screengrab";
- rev = "6fc03c70fe132b89f35d4cef2f62c9d804de3b64";
- sha256 = "1h3rlpmaqxzysaibcw7s5msbrwaxkg6sz7a8xv6cqzjvggv09my0";
+ rev = version;
+ sha256 = "0qhdxnv1pz745qgvdv5x7kyfx9dz9rrq0wxyfimppzxcszv4pl2z";
};
nativeBuildInputs = [ cmake pkgconfig ];
@@ -23,10 +24,6 @@ stdenv.mkDerivation rec {
xorg.libXdmcp
];
- cmakeFlags = [ "-DSG_USE_SYSTEM_QXT=ON" "-DCMAKE_INSTALL_LIBDIR=lib" ];
-
- NIX_CFLAGS_COMPILE = [ "-std=c++11" ];
-
meta = with stdenv.lib; {
description = "Crossplatform tool for fast making screenshots";
homepage = https://github.com/lxde/screengrab;
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 0db1d3f74c0e..dd7d8c5dbb26 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -25,6 +25,7 @@ let
mate-menus = callPackage ./mate-menus { };
mate-notification-daemon = callPackage ./mate-notification-daemon { };
mate-panel = callPackage ./mate-panel { };
+ mate-power-manager = callPackage ./mate-power-manager { };
mate-session-manager = callPackage ./mate-session-manager { };
mate-settings-daemon = callPackage ./mate-settings-daemon { };
mate-terminal = callPackage ./mate-terminal { };
@@ -55,6 +56,7 @@ let
engrampa
eom
mate-icon-theme-faenza
+ mate-power-manager
mate-terminal
pluma
];
diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix
new file mode 100644
index 000000000000..62b991632840
--- /dev/null
+++ b/pkgs/desktops/mate/mate-power-manager/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, libnotify, libcanberra_gtk3, dbus_glib, upower, gnome3, libtool, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+ name = "mate-power-manager-${version}";
+ version = "${major-ver}.${minor-ver}";
+ major-ver = "1.18";
+ minor-ver = "0";
+
+ src = fetchurl {
+ url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+ sha256 = "1gmka9ybxvkrdjaga1md6pbw6q1cx5yxb58ai5315a0f5p45y36x";
+ };
+
+ buildInputs = [
+ glib
+ itstool
+ libxml2
+ libcanberra_gtk3
+ gnome3.gtk
+ gnome3.libgnome_keyring
+ libnotify
+ dbus_glib
+ upower
+
+ mate.mate-panel
+ ];
+
+ nativeBuildInputs = [
+ pkgconfig
+ intltool
+ libtool
+ wrapGAppsHook
+ ];
+
+ configureFlags = [ "--enable-applets" ];
+
+ meta = with stdenv.lib; {
+ description = "The MATE Power Manager";
+ homepage = http://mate-desktop.org;
+ license = licenses.gpl3;
+ platforms = platforms.unix;
+ maintainers = [ maintainers.romildo maintainers.chpatrick ];
+ };
+}
diff --git a/pkgs/desktops/plasma-5/breeze-qt5.nix b/pkgs/desktops/plasma-5/breeze-qt5.nix
index c0e55dec76d5..1448bb40d78c 100644
--- a/pkgs/desktops/plasma-5/breeze-qt5.nix
+++ b/pkgs/desktops/plasma-5/breeze-qt5.nix
@@ -15,6 +15,6 @@ mkDerivation {
kguiaddons ki18n kwayland kwindowsystem plasma-framework qtdeclarative
qtx11extras
];
- outputs = [ "out" "dev" "bin" ];
+ outputs = [ "bin" "dev" "out" ];
cmakeFlags = [ "-DUSE_Qt4=OFF" ];
}
diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix
index a962d3054f81..a828ba0fe7bc 100644
--- a/pkgs/desktops/plasma-5/default.nix
+++ b/pkgs/desktops/plasma-5/default.nix
@@ -133,11 +133,12 @@ let
plasma-integration = callPackage ./plasma-integration.nix {};
plasma-nm = callPackage ./plasma-nm {};
plasma-pa = callPackage ./plasma-pa.nix { inherit gconf; };
+ plasma-vault = callPackage ./plasma-vault {};
plasma-workspace = callPackage ./plasma-workspace {};
plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix {};
polkit-kde-agent = callPackage ./polkit-kde-agent.nix {};
powerdevil = callPackage ./powerdevil.nix {};
- startkde = callPackage ./startkde {};
+ sddm-kcm = callPackage ./sddm-kcm.nix {};
systemsettings = callPackage ./systemsettings.nix {};
};
in
diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh
index 7513c83c107c..494b84923534 100644
--- a/pkgs/desktops/plasma-5/fetch.sh
+++ b/pkgs/desktops/plasma-5/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/plasma/5.10.5/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/plasma/5.11.3/ -A '*.tar.xz' )
diff --git a/pkgs/desktops/plasma-5/kde-cli-tools.nix b/pkgs/desktops/plasma-5/kde-cli-tools.nix
index 6bcafc5813a9..63219d8cbe1a 100644
--- a/pkgs/desktops/plasma-5/kde-cli-tools.nix
+++ b/pkgs/desktops/plasma-5/kde-cli-tools.nix
@@ -1,7 +1,7 @@
{
mkDerivation, extra-cmake-modules, kdoctools,
kcmutils, kconfig, kdesu, ki18n, kiconthemes, kinit, kio, kwindowsystem,
- qtsvg, qtx11extras,
+ qtsvg, qtx11extras, kactivities
}:
mkDerivation {
@@ -9,6 +9,6 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kcmutils kconfig kdesu ki18n kiconthemes kinit kio kwindowsystem qtsvg
- qtx11extras
+ qtx11extras kactivities
];
}
diff --git a/pkgs/desktops/plasma-5/khotkeys.nix b/pkgs/desktops/plasma-5/khotkeys.nix
index 77f1002c08aa..77763c5e203e 100644
--- a/pkgs/desktops/plasma-5/khotkeys.nix
+++ b/pkgs/desktops/plasma-5/khotkeys.nix
@@ -12,6 +12,6 @@ mkDerivation {
kcmutils kdbusaddons kdelibs4support kglobalaccel ki18n kio kxmlgui
plasma-framework plasma-workspace qtx11extras
];
- outputs = [ "out" "dev" "bin" ];
+ outputs = [ "bin" "dev" "out" ];
enableParallelBuilding = false;
}
diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix
index 09708b654877..f31294e00d6f 100644
--- a/pkgs/desktops/plasma-5/kwin/default.nix
+++ b/pkgs/desktops/plasma-5/kwin/default.nix
@@ -28,7 +28,7 @@ mkDerivation {
kidletime kinit kio knewstuff knotifications kpackage kscreenlocker kservice
kwayland kwidgetsaddons kwindowsystem kxmlgui plasma-framework
];
- outputs = [ "out" "dev" "bin" ];
+ outputs = [ "bin" "dev" "out" ];
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
NIX_CFLAGS_COMPILE = [
''-DNIXPKGS_XWAYLAND="${lib.getBin xwayland}/bin/Xwayland"''
diff --git a/pkgs/desktops/plasma-5/libksysguard/default.nix b/pkgs/desktops/plasma-5/libksysguard/default.nix
index 4e88cd3df0e7..0f9fe40d73c3 100644
--- a/pkgs/desktops/plasma-5/libksysguard/default.nix
+++ b/pkgs/desktops/plasma-5/libksysguard/default.nix
@@ -17,5 +17,5 @@ mkDerivation {
kcoreaddons kservice kwidgetsaddons plasma-framework qtscript qtx11extras
qtwebkit
];
- outputs = [ "out" "dev" "bin" ];
+ outputs = [ "bin" "dev" "out" ];
}
diff --git a/pkgs/desktops/plasma-5/oxygen.nix b/pkgs/desktops/plasma-5/oxygen.nix
index 97421191d905..1b1f34f17b53 100644
--- a/pkgs/desktops/plasma-5/oxygen.nix
+++ b/pkgs/desktops/plasma-5/oxygen.nix
@@ -14,5 +14,5 @@ mkDerivation {
ki18n kservice kwayland kwidgetsaddons kwindowsystem qtdeclarative
qtx11extras
];
- outputs = [ "out" "dev" "bin" ];
+ outputs = [ "bin" "dev" "out" ];
}
diff --git a/pkgs/desktops/plasma-5/plasma-desktop/ibus.patch b/pkgs/desktops/plasma-5/plasma-desktop/ibus.patch
deleted file mode 100644
index d5ac4b250875..000000000000
--- a/pkgs/desktops/plasma-5/plasma-desktop/ibus.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: plasma-desktop-5.8.5/kcms/keyboard/xkb_helper.cpp
-===================================================================
---- plasma-desktop-5.8.5.orig/kcms/keyboard/xkb_helper.cpp
-+++ plasma-desktop-5.8.5/kcms/keyboard/xkb_helper.cpp
-@@ -185,21 +185,5 @@ bool XkbHelper::initializeKeyboardLayout
-
- bool XkbHelper::preInitialize()
- {
-- // stop ibus so it does not mess with our layouts, we can remove this when we integrate IM into keyboard module
--
-- QString ibusExe = QStandardPaths::findExecutable(QStringLiteral("ibus"));
-- if( ibusExe.isEmpty() ) {
-- return 0;
-- }
--
-- KProcess ibusProcess;
-- ibusProcess << ibusExe << QStringLiteral("exit");
-- ibusProcess.setOutputChannelMode(KProcess::SeparateChannels);
-- int res = ibusProcess.execute();
--
-- if( res == 0 ) {
-- qCWarning(KCM_KEYBOARD) << "ibus successfully stopped";
-- }
--
- return 0;
- }
diff --git a/pkgs/desktops/plasma-5/plasma-desktop/qml-import-paths.patch b/pkgs/desktops/plasma-5/plasma-desktop/qml-import-paths.patch
index def5b577b972..d3f5166d5ed9 100644
--- a/pkgs/desktops/plasma-5/plasma-desktop/qml-import-paths.patch
+++ b/pkgs/desktops/plasma-5/plasma-desktop/qml-import-paths.patch
@@ -1,27 +1,14 @@
-Index: plasma-desktop-5.8.5/applets/pager/package/contents/ui/main.qml
-===================================================================
---- plasma-desktop-5.8.5.orig/applets/pager/package/contents/ui/main.qml
-+++ plasma-desktop-5.8.5/applets/pager/package/contents/ui/main.qml
-@@ -25,7 +25,7 @@ import org.kde.plasma.components 2.0 as
- import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddonsComponents
- import org.kde.draganddrop 2.0
- import org.kde.plasma.private.pager 2.0
--import "utils.js" as Utils
-+import "../code/utils.js" as Utils
-
- MouseArea {
- id: root
Index: plasma-desktop-5.8.5/containments/desktop/package/contents/ui/FolderView.qml
===================================================================
--- plasma-desktop-5.8.5.orig/containments/desktop/package/contents/ui/FolderView.qml
+++ plasma-desktop-5.8.5/containments/desktop/package/contents/ui/FolderView.qml
@@ -27,7 +27,7 @@ import org.kde.plasma.extras 2.0 as Plas
import org.kde.kquickcontrolsaddons 2.0
-
+
import org.kde.private.desktopcontainment.folder 0.1 as Folder
-import "FolderTools.js" as FolderTools
+import "../code/FolderTools.js" as FolderTools
-
+
Item {
id: main
Index: plasma-desktop-5.8.5/containments/desktop/package/contents/ui/main.qml
@@ -29,14 +16,14 @@ Index: plasma-desktop-5.8.5/containments/desktop/package/contents/ui/main.qml
--- plasma-desktop-5.8.5.orig/containments/desktop/package/contents/ui/main.qml
+++ plasma-desktop-5.8.5/containments/desktop/package/contents/ui/main.qml
@@ -30,8 +30,8 @@ import org.kde.kquickcontrolsaddons 2.0
-
+
import org.kde.private.desktopcontainment.desktop 0.1 as Desktop
-
+
-import "LayoutManager.js" as LayoutManager
-import "FolderTools.js" as FolderTools
+import "../code/LayoutManager.js" as LayoutManager
+import "../code/FolderTools.js" as FolderTools
-
+
DragDrop.DropArea {
id: root
Index: plasma-desktop-5.8.5/containments/panel/contents/ui/main.qml
@@ -46,9 +33,9 @@ Index: plasma-desktop-5.8.5/containments/panel/contents/ui/main.qml
@@ -25,7 +25,7 @@ import org.kde.plasma.components 2.0 as
import org.kde.kquickcontrolsaddons 2.0
import org.kde.draganddrop 2.0 as DragDrop
-
+
-import "LayoutManager.js" as LayoutManager
+import "../code/LayoutManager.js" as LayoutManager
-
+
DragDrop.DropArea {
id: root
diff --git a/pkgs/desktops/plasma-5/plasma-desktop/series b/pkgs/desktops/plasma-5/plasma-desktop/series
index 36778cd1c560..6334deb7d973 100644
--- a/pkgs/desktops/plasma-5/plasma-desktop/series
+++ b/pkgs/desktops/plasma-5/plasma-desktop/series
@@ -1,4 +1,3 @@
qml-import-paths.patch
hwclock-path.patch
tzdir.patch
-ibus.patch
diff --git a/pkgs/desktops/plasma-5/plasma-integration.nix b/pkgs/desktops/plasma-5/plasma-integration.nix
index de46bb4373c6..f69644287624 100644
--- a/pkgs/desktops/plasma-5/plasma-integration.nix
+++ b/pkgs/desktops/plasma-5/plasma-integration.nix
@@ -2,7 +2,7 @@
mkDerivation,
extra-cmake-modules,
breeze-qt5, kconfig, kconfigwidgets, kiconthemes, kio, knotifications,
- kwayland, libXcursor
+ kwayland, libXcursor, qtquickcontrols2
}:
# TODO: install Noto Sans and Oxygen Mono fonts with plasma-integration
@@ -12,6 +12,6 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
breeze-qt5 kconfig kconfigwidgets kiconthemes kio knotifications kwayland
- libXcursor
+ libXcursor qtquickcontrols2
];
}
diff --git a/pkgs/desktops/plasma-5/plasma-vault/cryfs-path.patch b/pkgs/desktops/plasma-5/plasma-vault/cryfs-path.patch
new file mode 100644
index 000000000000..b3f19c4e0025
--- /dev/null
+++ b/pkgs/desktops/plasma-5/plasma-vault/cryfs-path.patch
@@ -0,0 +1,17 @@
+diff --git a/kded/engine/backends/cryfs/cryfsbackend.cpp b/kded/engine/backends/cryfs/cryfsbackend.cpp
+index f6ef54f..160034a 100644
+--- a/kded/engine/backends/cryfs/cryfsbackend.cpp
++++ b/kded/engine/backends/cryfs/cryfsbackend.cpp
+@@ -136,11 +136,10 @@ bool CryFsBackend::isInitialized(const Device &device) const
+
+ QProcess *CryFsBackend::cryfs(const QStringList &arguments) const
+ {
+- return process("cryfs",
++ return process(NIXPKGS_CRYFS,
+ arguments,
+ { { "CRYFS_FRONTEND", "noninteractive" } });
+ }
+
+
+ } // namespace PlasmaVault
+-
diff --git a/pkgs/desktops/plasma-5/plasma-vault/default.nix b/pkgs/desktops/plasma-5/plasma-vault/default.nix
new file mode 100644
index 000000000000..203ff50d7357
--- /dev/null
+++ b/pkgs/desktops/plasma-5/plasma-vault/default.nix
@@ -0,0 +1,38 @@
+{
+ mkDerivation, lib,
+ extra-cmake-modules,
+
+ kactivities,
+ plasma-framework,
+ kwindowsystem,
+ libksysguard,
+
+ encfs,
+ cryfs,
+ fuse
+}:
+
+mkDerivation {
+ name = "plasma-vault";
+ nativeBuildInputs = [ extra-cmake-modules ];
+
+ patches = [
+ ./encfs-path.patch
+ ./cryfs-path.patch
+ ./fusermount-path.patch
+ ];
+
+ buildInputs = [
+ kactivities plasma-framework kwindowsystem libksysguard
+ ];
+
+ NIX_CFLAGS_COMPILE = [
+ ''-DNIXPKGS_ENCFS="${lib.getBin encfs}/bin/encfs"''
+ ''-DNIXPKGS_ENCFSCTL="${lib.getBin encfs}/bin/encfsctl"''
+
+ ''-DNIXPKGS_CRYFS="${lib.getBin cryfs}/bin/cryfs"''
+
+ ''-DNIXPKGS_FUSERMOUNT="${lib.getBin fuse}/bin/fusermount"''
+ ];
+
+}
diff --git a/pkgs/desktops/plasma-5/plasma-vault/encfs-path.patch b/pkgs/desktops/plasma-5/plasma-vault/encfs-path.patch
new file mode 100644
index 000000000000..b494df55c5d0
--- /dev/null
+++ b/pkgs/desktops/plasma-5/plasma-vault/encfs-path.patch
@@ -0,0 +1,24 @@
+diff --git a/kded/engine/backends/encfs/encfsbackend.cpp b/kded/engine/backends/encfs/encfsbackend.cpp
+index 47bb237..4ff064d 100644
+--- a/kded/engine/backends/encfs/encfsbackend.cpp
++++ b/kded/engine/backends/encfs/encfsbackend.cpp
+@@ -132,17 +132,16 @@ bool EncFsBackend::isInitialized(const Device &device) const
+
+ QProcess *EncFsBackend::encfs(const QStringList &arguments) const
+ {
+- return process("encfs", arguments, {});
++ return process(NIXPKGS_ENCFS, arguments, {});
+ }
+
+
+
+ QProcess *EncFsBackend::encfsctl(const QStringList &arguments) const
+ {
+- return process("encfsctl", arguments, {});
++ return process(NIXPKGS_ENCFSCTL, arguments, {});
+ }
+
+
+
+ } // namespace PlasmaVault
+-
diff --git a/pkgs/desktops/plasma-5/plasma-vault/fusermount-path.patch b/pkgs/desktops/plasma-5/plasma-vault/fusermount-path.patch
new file mode 100644
index 000000000000..cd1b736a103f
--- /dev/null
+++ b/pkgs/desktops/plasma-5/plasma-vault/fusermount-path.patch
@@ -0,0 +1,18 @@
+diff --git a/kded/engine/fusebackend_p.cpp b/kded/engine/fusebackend_p.cpp
+index 81ce494..d3c5c9f 100644
+--- a/kded/engine/fusebackend_p.cpp
++++ b/kded/engine/fusebackend_p.cpp
+@@ -103,7 +103,7 @@ QProcess *FuseBackend::process(const QString &executable,
+
+ QProcess *FuseBackend::fusermount(const QStringList &arguments) const
+ {
+- return process("fusermount", arguments, {});
++ return process(NIXPKGS_FUSERMOUNT, arguments, {});
+ }
+
+
+@@ -245,4 +245,3 @@ bool FuseBackend::isOpened(const MountPoint &mountPoint) const
+ }
+
+ } // namespace PlasmaVault
+-
diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix
index b28a1e87fb6a..0e98b095e893 100644
--- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix
@@ -1,19 +1,23 @@
{
- mkDerivation, lib, copyPathsToStore,
+ mkDerivation, lib,
extra-cmake-modules, kdoctools,
- isocodes, libdbusmenu, libSM, libXcursor, libXtst, pam, wayland,
+ coreutils, dbus, gnugrep, gnused, isocodes, libdbusmenu, libSM, libXcursor,
+ libXtst, pam, wayland, xmessage, xprop, xrdb, xsetroot,
baloo, kactivities, kcmutils, kconfig, kcrash, kdbusaddons, kdeclarative,
- kdelibs4support, kdesu, kglobalaccel, kidletime, kjsembed, knewstuff,
+ kdelibs4support, kdesu, kglobalaccel, kidletime, kinit, kjsembed, knewstuff,
knotifyconfig, kpackage, krunner, kscreenlocker, ktexteditor, ktextwidgets,
kwallet, kwayland, kwin, kxmlrpcclient, libkscreen, libksysguard,
networkmanager-qt, phonon, plasma-framework, prison, solid,
- qtgraphicaleffects, qtquickcontrols, qtquickcontrols2, qtscript, qtx11extras,
+ qtgraphicaleffects, qtquickcontrols, qtquickcontrols2, qtscript, qttools,
+ qtwayland, qtx11extras,
}:
+let inherit (lib) getBin getLib; in
+
mkDerivation {
name = "plasma-workspace";
@@ -27,21 +31,47 @@ mkDerivation {
kwallet kwayland kwin kxmlrpcclient libkscreen libksysguard
networkmanager-qt phonon plasma-framework prison solid
- qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtx11extras
+ qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtwayland qtx11extras
];
- outputs = [ "out" "dev" "bin" ];
+ outputs = [ "bin" "dev" "out" ];
- patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+ cmakeFlags = [
+ "-DNIXPKGS_XMESSAGE=${getBin xmessage}/bin/xmessage"
+ "-DNIXPKGS_MKDIR=${getBin coreutils}/bin/mkdir"
+ "-DNIXPKGS_XRDB=${getBin xrdb}/bin/xrdb"
+ "-DNIXPKGS_QTPATHS=${getBin qttools}/bin/qtpaths"
+ "-DNIXPKGS_XSETROOT=${getBin xsetroot}/bin/xsetroot"
+ "-DNIXPKGS_XPROP=${getBin xprop}/bin/xprop"
+ "-DNIXPKGS_ID=${getBin coreutils}/bin/id"
+ "-DNIXPKGS_DBUS_UPDATE_ACTIVATION_ENVIRONMENT=${getBin dbus}/bin/dbus-update-activation-environment"
+ "-DNIXPKGS_START_KDEINIT_WRAPPER=${getLib kinit}/lib/libexec/kf5/start_kdeinit_wrapper"
+ "-DNIXPKGS_QDBUS=${getBin qttools}/bin/qdbus"
+ "-DNIXPKGS_KWRAPPER5=${getBin kinit}/bin/kwrapper5"
+ "-DNIXPKGS_KREADCONFIG5=${getBin kconfig}/bin/kreadconfig5"
+ "-DNIXPKGS_GREP=${getBin gnugrep}/bin/grep"
+ "-DNIXPKGS_KDEINIT5_SHUTDOWN=${getBin kinit}/bin/kdeinit5_shutdown"
+ "-DNIXPKGS_SED=${getBin gnused}/bin/sed"
+ ];
- postPatch = ''
- substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \
- --replace kdostartupconfig5 ''${!outputBin}/bin/kdostartupconfig5
+ # To regenerate ./plasma-workspace.patch,
+ #
+ # > git clone https://github.com/ttuegel/plasma-workspace
+ # > cd plasma-workspace
+ # > git checkout nixpkgs/$x.$y # where $x.$y.$z == $version
+ # ... make some commits ...
+ # > git diff v$x.$y.$z
+ #
+ # Add upstream patches to the list below. For new patchs, particularly if not
+ # submitted upstream, please make a pull request and add it to
+ # ./plasma-workspace.patch.
+ patches = [ ./plasma-workspace.patch ];
+
+ preConfigure = ''
+ NIX_CFLAGS_COMPILE+=" -DNIXPKGS_KDOSTARTUPCONFIG5=\"''${!outputBin}/bin/kdostartupconfig5\""
+ cmakeFlags+=" -DNIXPKGS_STARTPLASMA=''${!outputBin}/lib/libexec/startplasma"
'';
postInstall = ''
- rm "''${!outputBin}/bin/startkde"
- rm "''${!outputBin}/bin/startplasmacompositor"
- rm "''${!outputLib}/lib/libexec/startplasma"
- rm -r "''${!outputBin}/share/wayland-sessions"
+ moveToOutput lib/libexec/startplasma ''${!outputBin}
'';
}
diff --git a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch
new file mode 100644
index 000000000000..598f043dcd53
--- /dev/null
+++ b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch
@@ -0,0 +1,1191 @@
+diff --git a/applets/batterymonitor/package/contents/ui/BatteryItem.qml b/applets/batterymonitor/package/contents/ui/BatteryItem.qml
+index 7e2d9758..40a5797b 100644
+--- a/applets/batterymonitor/package/contents/ui/BatteryItem.qml
++++ b/applets/batterymonitor/package/contents/ui/BatteryItem.qml
+@@ -26,7 +26,7 @@ import org.kde.plasma.components 2.0 as PlasmaComponents
+ import org.kde.plasma.extras 2.0 as PlasmaExtras
+ import org.kde.plasma.workspace.components 2.0
+ import org.kde.kcoreaddons 1.0 as KCoreAddons
+-import "logic.js" as Logic
++import "../code/logic.js" as Logic
+
+ Item {
+ id: batteryItem
+diff --git a/applets/batterymonitor/package/contents/ui/batterymonitor.qml b/applets/batterymonitor/package/contents/ui/batterymonitor.qml
+index ae6d5919..c2f99c86 100644
+--- a/applets/batterymonitor/package/contents/ui/batterymonitor.qml
++++ b/applets/batterymonitor/package/contents/ui/batterymonitor.qml
+@@ -25,7 +25,7 @@ import org.kde.plasma.plasmoid 2.0
+ import org.kde.plasma.core 2.0 as PlasmaCore
+ import org.kde.kcoreaddons 1.0 as KCoreAddons
+ import org.kde.kquickcontrolsaddons 2.0
+-import "logic.js" as Logic
++import "../code/logic.js" as Logic
+
+ Item {
+ id: batterymonitor
+diff --git a/applets/lock_logout/contents/ui/lockout.qml b/applets/lock_logout/contents/ui/lockout.qml
+index 80e7e53b..0083cf01 100644
+--- a/applets/lock_logout/contents/ui/lockout.qml
++++ b/applets/lock_logout/contents/ui/lockout.qml
+@@ -23,7 +23,7 @@ import org.kde.plasma.plasmoid 2.0
+ import org.kde.plasma.core 2.0 as PlasmaCore
+ import org.kde.plasma.components 2.0
+ import org.kde.kquickcontrolsaddons 2.0
+-import "data.js" as Data
++import "../code/data.js" as Data
+
+ Flow {
+ id: lockout
+diff --git a/applets/notifications/package/contents/ui/main.qml b/applets/notifications/package/contents/ui/main.qml
+index acdda88f..989de8ab 100644
+--- a/applets/notifications/package/contents/ui/main.qml
++++ b/applets/notifications/package/contents/ui/main.qml
+@@ -28,7 +28,7 @@ import org.kde.plasma.extras 2.0 as PlasmaExtras
+
+ import org.kde.plasma.private.notifications 1.0
+
+-import "uiproperties.js" as UiProperties
++import "../code/uiproperties.js" as UiProperties
+
+ MouseEventListener {
+ id: notificationsApplet
+diff --git a/krunner/dbus/org.kde.krunner.service.in b/krunner/dbus/org.kde.krunner.service.in
+index 85715214..294eab08 100644
+--- a/krunner/dbus/org.kde.krunner.service.in
++++ b/krunner/dbus/org.kde.krunner.service.in
+@@ -1,4 +1,4 @@
+ [D-BUS Service]
+ Name=org.kde.krunner
+-Exec=@CMAKE_INSTALL_PREFIX@/bin/krunner
++Exec=@CMAKE_INSTALL_FULL_BINDIR@/krunner
+
+diff --git a/kuiserver/org.kde.kuiserver.service.in b/kuiserver/org.kde.kuiserver.service.in
+index 7a86d07f..5b3030cc 100644
+--- a/kuiserver/org.kde.kuiserver.service.in
++++ b/kuiserver/org.kde.kuiserver.service.in
+@@ -1,3 +1,3 @@
+ [D-BUS Service]
+ Name=org.kde.kuiserver
+-Exec=@CMAKE_INSTALL_PREFIX@/bin/kuiserver5
++Exec=@CMAKE_INSTALL_FULL_BINDIR@/kuiserver5
+diff --git a/startkde/CMakeLists.txt b/startkde/CMakeLists.txt
+index fe29f57a..247db953 100644
+--- a/startkde/CMakeLists.txt
++++ b/startkde/CMakeLists.txt
+@@ -3,11 +3,6 @@ add_subdirectory(kstartupconfig)
+ add_subdirectory(ksyncdbusenv)
+ add_subdirectory(waitforname)
+
+-#FIXME: reconsider, looks fishy
+-if(NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr")
+- set(EXPORT_XCURSOR_PATH "XCURSOR_PATH=${CMAKE_INSTALL_PREFIX}/share/icons:$XCURSOR_PATH\":~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons\"; export XCURSOR_PATH")
+-endif()
+-
+ configure_file(startkde.cmake ${CMAKE_CURRENT_BINARY_DIR}/startkde @ONLY)
+ configure_file(startplasmacompositor.cmake ${CMAKE_CURRENT_BINARY_DIR}/startplasmacompositor @ONLY)
+ configure_file(startplasma.cmake ${CMAKE_CURRENT_BINARY_DIR}/startplasma @ONLY)
+diff --git a/startkde/kstartupconfig/kstartupconfig.cpp b/startkde/kstartupconfig/kstartupconfig.cpp
+index c9927855..bd506ce2 100644
+--- a/startkde/kstartupconfig/kstartupconfig.cpp
++++ b/startkde/kstartupconfig/kstartupconfig.cpp
+@@ -147,5 +147,5 @@ int main()
+ fclose( keys );
+ fclose( config );
+ doit:
+- return system( "kdostartupconfig5" );
++ return system( NIXPKGS_KDOSTARTUPCONFIG5 );
+ }
+diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
+index e9fa0bee..79e50a96 100644
+--- a/startkde/startkde.cmake
++++ b/startkde/startkde.cmake
+@@ -1,22 +1,31 @@
+ #!/bin/sh
+ #
+-# DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ )
++# NIXPKGS KDE STARTUP SCRIPT ( @PROJECT_VERSION@ )
+ #
+
++if test "x$1" = x--failsafe; then
++ KDE_FAILSAFE=1 # General failsafe flag
++ KWIN_COMPOSE=N # Disable KWin's compositing
++ QT_XCB_FORCE_SOFTWARE_OPENGL=1
++ export KWIN_COMPOSE KDE_FAILSAFE QT_XCB_FORCE_SOFTWARE_OPENGL
++fi
++
+ # When the X server dies we get a HUP signal from xinit. We must ignore it
+ # because we still need to do some cleanup.
+ trap 'echo GOT SIGHUP' HUP
+
+-# Check if a Plasma session already is running and whether it's possible to connect to X
+-kcheckrunning
++# we have to unset this for Darwin since it will screw up KDE's dynamic-loading
++unset DYLD_FORCE_FLAT_NAMESPACE
++
++# Check if a KDE session already is running and whether it's possible to connect to X
++@CMAKE_INSTALL_FULL_BINDIR@/kcheckrunning
+ kcheckrunning_result=$?
+-if test $kcheckrunning_result -eq 0 ; then
+- echo "Plasma seems to be already running on this display."
+- xmessage -geometry 500x100 "Plasma seems to be already running on this display." > /dev/null 2>/dev/null
+- exit 1
+-elif test $kcheckrunning_result -eq 2 ; then
+- echo "\$DISPLAY is not set or cannot connect to the X server."
+- exit 1
++if [ $kcheckrunning_result -eq 0 ]; then
++ echo "KDE seems to be already running on this display."
++ exit 1
++elif [ $kcheckrunning_result -eq 2 ]; then
++ echo "\$DISPLAY is not set or cannot connect to the X server."
++ exit 1
+ fi
+
+ # Boot sequence:
+@@ -33,59 +42,132 @@ fi
+ #
+ # * Then ksmserver is started which takes control of the rest of the startup sequence
+
+-# We need to create config folder so we can write startupconfigkeys
+-if [ ${XDG_CONFIG_HOME} ]; then
+- configDir=$XDG_CONFIG_HOME;
+-else
+- configDir=${HOME}/.config; #this is the default, http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
++export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
++@NIXPKGS_MKDIR@ -p "$XDG_CONFIG_HOME"
++
++# The KDE icon cache is supposed to update itself
++# automatically, but it uses the timestamp on the icon
++# theme directory as a trigger. Since in Nix the
++# timestamp is always the same, this doesn't work. So as
++# a workaround, nuke the icon cache on login. This isn't
++# perfect, since it may require logging out after
++# installing new applications to update the cache.
++# See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html
++rm -fv $HOME/.cache/icon-cache.kcache
++
++# Qt writes a weird ‘libraryPath’ line to
++# ~/.config/Trolltech.conf that causes the KDE plugin
++# paths of previous KDE invocations to be searched.
++# Obviously using mismatching KDE libraries is potentially
++# disastrous, so here we nuke references to the Nix store
++# in Trolltech.conf. A better solution would be to stop
++# Qt from doing this wackiness in the first place.
++if [ -e $XDG_CONFIG_HOME/Trolltech.conf ]; then
++ @NIXPKGS_SED@ -e '/nix\\store\|nix\/store/ d' -i $XDG_CONFIG_HOME/Trolltech.conf
+ fi
+
+-mkdir -p $configDir
++@NIXPKGS_KBUILDSYCOCA5@
++
++# Set the default GTK 2 theme
++gtkrc2="$HOME/.gtkrc-2.0"
++breeze_gtkrc2="/run/current-system/sw/share/themes/Breeze/gtk-2.0/gtkrc"
++if ! [ -e "$gtkrc2" ] && [ -e "$breeze_gtkrc2" ]; then
++ cat >"$gtkrc2" <"$gtk3_settings" <"$kcminputrc" <$configDir/startupconfigkeys <"$XDG_CONFIG_HOME/startupconfigkeys" <$plasmalocalerc <"$plasmalocalerc" <$kdeglobalsfile <"$kdeglobalsfile" <&2
+ exit 1
+ fi
+-[ -r $configDir/startupconfig ] && . $configDir/startupconfig
++if [ -r "$XDG_CONFIG_HOME/startupconfig" ]; then
++ . "$XDG_CONFIG_HOME/startupconfig"
++fi
+
+ if [ "$kdeglobals_kscreen_screenscalefactors" ]; then
+ export QT_SCREEN_SCALE_FACTORS="$kdeglobals_kscreen_screenscalefactors"
+@@ -94,26 +176,33 @@ fi
+ #otherwise apps that manually opt in for high DPI get auto scaled by the developer AND manually scaled by us
+ export QT_AUTO_SCREEN_SCALE_FACTOR=0
+
++#Set the QtQuickControls style to our own: for QtQuickControls1
++#it will fall back to Desktop, while it will use our own org.kde.desktop
++#for QtQuickControlsStyle and Kirigami
++export QT_QUICK_CONTROLS_STYLE=org.kde.desktop
++
++XCURSOR_PATH=~/.icons
++IFS=":" read -r -a xdgDirs <<< "$XDG_DATA_DIRS"
++for xdgDir in "${xdgDirs[@]}"; do
++ XCURSOR_PATH="$XCURSOR_PATH:$xdgDir/icons"
++done
++export XCURSOR_PATH
++
+ # XCursor mouse theme needs to be applied here to work even for kded or ksmserver
+ if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
+- @EXPORT_XCURSOR_PATH@
+-
+ kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
+- if test $? -eq 10; then
+- XCURSOR_THEME=breeze_cursors
+- export XCURSOR_THEME
+- elif test -n "$kcminputrc_mouse_cursortheme"; then
+- XCURSOR_THEME="$kcminputrc_mouse_cursortheme"
+- export XCURSOR_THEME
++ if [ $? -eq 10 ]; then
++ export XCURSOR_THEME=breeze_cursors
++ elif [ -n "$kcminputrc_mouse_cursortheme" ]; then
++ export XCURSOR_THEME="$kcminputrc_mouse_cursortheme"
+ fi
+- if test -n "$kcminputrc_mouse_cursorsize"; then
+- XCURSOR_SIZE="$kcminputrc_mouse_cursorsize"
+- export XCURSOR_SIZE
++ if [ -n "$kcminputrc_mouse_cursorsize" ]; then
++ export XCURSOR_SIZE="$kcminputrc_mouse_cursorsize"
+ fi
+ fi
+
+-if test "$kcmfonts_general_forcefontdpi" -ne 0; then
+- xrdb -quiet -merge -nocpp </plasma-workspace/env/*.sh
+-# (where correspond to the system and user's configuration
+-# directories, as identified by Qt's qtpaths, e.g. $HOME/.config
+-# and /etc/xdg/ on Linux)
+-#
+-# This is where you can define environment variables that will be available to
+-# all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent`
+-# or eval `gpg-agent --daemon`.
+-# Note: if you do that, you should also put "ssh-agent -k" as a shutdown script
+-#
+-# (see end of this file).
+-# For anything else (that doesn't set env vars, or that needs a window manager),
+-# better use the Autostart folder.
+-
+-scriptpath=`qtpaths --locate-dirs GenericConfigLocation plasma-workspace | tr ':' '\n'`
+-
+-# Add /env/ to the directory to locate the scripts to be sourced
+-for prefix in `echo $scriptpath`; do
+- for file in "$prefix"/env/*.sh; do
+- test -r "$file" && . "$file" || true
+- done
+-done
+-
+-# Activate the kde font directories.
+-#
+-# There are 4 directories that may be used for supplying fonts for KDE.
+-#
+-# There are two system directories. These belong to the administrator.
+-# There are two user directories, where the user may add her own fonts.
+-#
+-# The 'override' versions are for fonts that should come first in the list,
+-# i.e. if you have a font in your 'override' directory, it will be used in
+-# preference to any other.
+-#
+-# The preference order looks like this:
+-# user override, system override, X, user, system
+-#
+-# Where X is the original font database that was set up before this script
+-# runs.
+-
+-usr_odir=$HOME/.fonts/kde-override
+-usr_fdir=$HOME/.fonts
+-
+-if test -n "$KDEDIRS"; then
+- kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'`
+- sys_odir=$kdedirs_first/share/fonts/override
+- sys_fdir=$kdedirs_first/share/fonts
+-else
+- sys_odir=$KDEDIR/share/fonts/override
+- sys_fdir=$KDEDIR/share/fonts
+-fi
+-
+-# We run mkfontdir on the user's font dirs (if we have permission) to pick
+-# up any new fonts they may have installed. If mkfontdir fails, we still
+-# add the user's dirs to the font path, as they might simply have been made
+-# read-only by the administrator, for whatever reason.
+-
+-test -d "$sys_odir" && xset +fp "$sys_odir"
+-test -d "$usr_odir" && (mkfontdir "$usr_odir" ; xset +fp "$usr_odir")
+-test -d "$usr_fdir" && (mkfontdir "$usr_fdir" ; xset fp+ "$usr_fdir")
+-test -d "$sys_fdir" && xset fp+ "$sys_fdir"
+-
+-# Ask X11 to rebuild its font list.
+-xset fp rehash
+-
+ # Set a left cursor instead of the standard X11 "X" cursor, since I've heard
+ # from some users that they're confused and don't know what to do. This is
+ # especially necessary on slow machines, where starting KDE takes one or two
+@@ -208,28 +232,10 @@ xset fp rehash
+ # If the user has overwritten fonts, the cursor font may be different now
+ # so don't move this up.
+ #
+-xsetroot -cursor_name left_ptr
+-
+-# Get Ghostscript to look into user's KDE fonts dir for additional Fontmap
+-if test -n "$GS_LIB" ; then
+- GS_LIB=$usr_fdir:$GS_LIB
+- export GS_LIB
+-else
+- GS_LIB=$usr_fdir
+- export GS_LIB
+-fi
++@NIXPKGS_XSETROOT@ -cursor_name left_ptr
+
+ echo 'startkde: Starting up...' 1>&2
+
+-# Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all.
+-# The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend
+-# to set it to a list of paths *not* including the KDE prefix if it's not /usr or
+-# /usr/local.
+-if test -z "$XDG_DATA_DIRS"; then
+- XDG_DATA_DIRS="@CMAKE_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@:/usr/share:/usr/local/share"
+-fi
+-export XDG_DATA_DIRS
+-
+ # Mark that full KDE session is running (e.g. Konqueror preloading works only
+ # with full KDE running). The KDE_FULL_SESSION property can be detected by
+ # any X client connected to the same X session, even if not launched
+@@ -254,44 +260,65 @@ export XDG_DATA_DIRS
+ #
+ KDE_FULL_SESSION=true
+ export KDE_FULL_SESSION
+-xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
++@NIXPKGS_XPROP@ -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
+
+ KDE_SESSION_VERSION=5
+ export KDE_SESSION_VERSION
+-xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
++@NIXPKGS_XPROP@ -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
+
+-KDE_SESSION_UID=`id -ru`
++KDE_SESSION_UID=$(@NIXPKGS_ID@ -ru)
+ export KDE_SESSION_UID
+
+ XDG_CURRENT_DESKTOP=KDE
+ export XDG_CURRENT_DESKTOP
+
++# Enforce xcb QPA. Helps switching between Wayland and X sessions.
++export QT_QPA_PLATFORM=xcb
++
++# Source scripts found in /plasma-workspace/env/*.sh
++# (where correspond to the system and user's configuration
++# directories, as identified by Qt's qtpaths, e.g. $HOME/.config
++# and /etc/xdg/ on Linux)
++#
++# This is where you can define environment variables that will be available to
++# all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent`
++# or eval `gpg-agent --daemon`.
++# Note: if you do that, you should also put "ssh-agent -k" as a shutdown script
++#
++# (see end of this file).
++# For anything else (that doesn't set env vars, or that needs a window manager),
++# better use the Autostart folder.
++
++IFS=":" read -r -a scriptpath <<< $(@NIXPKGS_QTPATHS@ --paths GenericConfigLocation)
++# Add /env/ to the directory to locate the scripts to be sourced
++for prefix in "${scriptpath[@]}"; do
++ for file in "$prefix"/plasma-workspace/env/*.sh; do
++ if [ -r "$file" ]; then
++ . "$file"
++ fi
++ done
++done
++
+ # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment
+-if which dbus-update-activation-environment >/dev/null 2>/dev/null ; then
+- dbus-update-activation-environment --systemd --all
+-else
+- @CMAKE_INSTALL_FULL_LIBEXECDIR@/ksyncdbusenv
+-fi
+-if test $? -ne 0; then
++
++if ! @NIXPKGS_DBUS_UPDATE_ACTIVATION_ENVIRONMENT@ --systemd --all; then
+ # Startup error
+ echo 'startkde: Could not sync environment to dbus.' 1>&2
+ test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+- xmessage -geometry 500x100 "Could not sync environment to dbus."
+ exit 1
+ fi
+
+ # We set LD_BIND_NOW to increase the efficiency of kdeinit.
+ # kdeinit unsets this variable before loading applications.
+-LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup
++LD_BIND_NOW=true @NIXPKGS_START_KDEINIT_WRAPPER@ --kded +kcminit_startup
+ if test $? -ne 0; then
+ # Startup error
+ echo 'startkde: Could not start kdeinit5. Check your installation.' 1>&2
+ test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+- xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation."
+ exit 1
+ fi
+
+-qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit &
++@NIXPKGS_QDBUS@ org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit &
+
+ # finally, give the session control to the session manager
+ # see kdebase/ksmserver for the description of the rest of the startup sequence
+@@ -303,34 +330,37 @@ qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit &
+ # We only check for 255 which means that the ksmserver process could not be
+ # started, any problems thereafter, e.g. ksmserver failing to initialize,
+ # will remain undetected.
+-test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM"
++if [ -n "$KDEWM" ]; then
++ KDEWM="--windowmanager $KDEWM"
++fi
+ # If the session should be locked from the start (locked autologin),
+ # lock now and do the rest of the KDE startup underneath the locker.
+ KSMSERVEROPTIONS=""
+-test -n "$dl" && KSMSERVEROPTIONS=" --lockscreen"
+-kwrapper5 @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS
++if [ -n "$dl" ]; then
++ KSMSERVEROPTIONS=" --lockscreen"
++fi
++@NIXPKGS_KWRAPPER5@ @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS
+ if test $? -eq 255; then
+ # Startup error
+ echo 'startkde: Could not start ksmserver. Check your installation.' 1>&2
+ test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+- xmessage -geometry 500x100 "Could not start ksmserver. Check your installation."
+ fi
+
+ #Anything after here is logout/shutdown
+
+-wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true`
++wait_drkonqi=$(@NIXPKGS_KREADCONFIG5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true)
+
+-if test x"$wait_drkonqi"x = x"true"x ; then
++if [ x"$wait_drkonqi"x = x"true"x ]; then
+ # wait for remaining drkonqi instances with timeout (in seconds)
+- wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900`
++ wait_drkonqi_timeout=$(@NIXPKGS_KREADCONFIG5@ --file startkderc --group WaitForDrKonqi --key Timeout --default 900)
+ wait_drkonqi_counter=0
+- while qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
++ while @NIXPKGS_QDBUS@ | @NIXPKGS_GREP@ -q "^[^w]*org.kde.drkonqi" ; do
+ sleep 5
+ wait_drkonqi_counter=$((wait_drkonqi_counter+5))
+- if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then
++ if [ "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ]; then
+ # ask remaining drkonqis to die in a graceful way
+- qdbus | grep 'org.kde.drkonqi-' | while read address ; do
+- qdbus "$address" "/MainApplication" "quit"
++ @NIXPKGS_QDBUS@ | @NIXPKGS_GREP@ 'org.kde.drkonqi-' | while read address ; do
++ @NIXPKGS_QDBUS@ "$address" "/MainApplication" "quit"
+ done
+ break
+ fi
+@@ -339,15 +369,17 @@ fi
+
+ echo 'startkde: Shutting down...' 1>&2
+ # just in case
+-test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
++if [ -n "$ksplash_pid" ]; then
++ kill "$ksplash_pid" 2>/dev/null
++fi
+
+ # Clean up
+-kdeinit5_shutdown
++@NIXPKGS_KDEINIT5_SHUTDOWN@
+
+ unset KDE_FULL_SESSION
+-xprop -root -remove KDE_FULL_SESSION
++@NIXPKGS_XPROP@ -root -remove KDE_FULL_SESSION
+ unset KDE_SESSION_VERSION
+-xprop -root -remove KDE_SESSION_VERSION
++@NIXPKGS_XPROP@ -root -remove KDE_SESSION_VERSION
+ unset KDE_SESSION_UID
+
+ echo 'startkde: Done.' 1>&2
+diff --git a/startkde/startplasma.cmake b/startkde/startplasma.cmake
+index fd232bdf..e1c8fff6 100644
+--- a/startkde/startplasma.cmake
++++ b/startkde/startplasma.cmake
+@@ -1,4 +1,4 @@
+ #!/bin/sh
+ #
+-# DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ )
++# NIXPKGS Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ )
+ #
+
+ # Boot sequence:
+@@ -17,17 +17,13 @@
+ #
+ # * Then ksmserver is started which takes control of the rest of the startup sequence
+
+-# We need to create config folder so we can write startupconfigkeys
+-if [ ${XDG_CONFIG_HOME} ]; then
+- configDir=$XDG_CONFIG_HOME;
+-else
+- configDir=${HOME}/.config; #this is the default, http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
++export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
++if [ -r "$XDG_CONFIG_HOME/startupconfig" ]; then
++ . "$XDG_CONFIG_HOME/startupconfig"
+ fi
+
+-[ -r $configDir/startupconfig ] && . $configDir/startupconfig
+-
+-if test "$kcmfonts_general_forcefontdpi" -ne 0; then
+- xrdb -quiet -merge -nocpp <&2
+
+ # export our session variables to the Xwayland server
+-xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
+-xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
++@NIXPKGS_XPROP@ -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
++@NIXPKGS_XPROP@ -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
+
+ # We set LD_BIND_NOW to increase the efficiency of kdeinit.
+ # kdeinit unsets this variable before loading applications.
+-LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup
++LD_BIND_NOW=true @NIXPKGS_START_KDEINIT_WRAPPER@ --kded +kcminit_startup
+ if test $? -ne 0; then
+ # Startup error
+ echo 'startplasma: Could not start kdeinit5. Check your installation.' 1>&2
+ test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+- xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation."
+ exit 1
+ fi
+
+-qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit
++@NIXPKGS_QDBUS@ org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit
+
+ # finally, give the session control to the session manager
+ # see kdebase/ksmserver for the description of the rest of the startup sequence
+@@ -145,27 +89,26 @@ qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit
+ # If the session should be locked from the start (locked autologin),
+ # lock now and do the rest of the KDE startup underneath the locker.
+ KSMSERVEROPTIONS=" --no-lockscreen"
+-kwrapper5 @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS
++@NIXPKGS_KWRAPPER5@ @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS
+ if test $? -eq 255; then
+ # Startup error
+ echo 'startplasma: Could not start ksmserver. Check your installation.' 1>&2
+ test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+- xmessage -geometry 500x100 "Could not start ksmserver. Check your installation."
+ fi
+
+-wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true`
++wait_drkonqi=$(@NIXPKGS_KREADCONFIG5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true)
+
+-if test x"$wait_drkonqi"x = x"true"x ; then
++if [ x"$wait_drkonqi"x = x"true"x ]; then
+ # wait for remaining drkonqi instances with timeout (in seconds)
+- wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900`
++ wait_drkonqi_timeout=$(@NIXPKGS_KREADCONFIG5@ --file startkderc --group WaitForDrKonqi --key Timeout --default 900)
+ wait_drkonqi_counter=0
+- while qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
++ while @NIXPKGS_QDBUS@ | @NIXPKGS_GREP@ -q "^[^w]*org.kde.drkonqi" ; do
+ sleep 5
+ wait_drkonqi_counter=$((wait_drkonqi_counter+5))
+- if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then
++ if [ "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ]; then
+ # ask remaining drkonqis to die in a graceful way
+- qdbus | grep 'org.kde.drkonqi-' | while read address ; do
+- qdbus "$address" "/MainApplication" "quit"
++ @NIXPKGS_QDBUS@ | @NIXPKGS_GREP@ 'org.kde.drkonqi-' | while read address ; do
++ @NIXPKGS_QDBUS@ "$address" "/MainApplication" "quit"
+ done
+ break
+ fi
+@@ -174,15 +117,17 @@ fi
+
+ echo 'startplasma: Shutting down...' 1>&2
+ # just in case
+-test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
++if [ -n "$ksplash_pid" ]; then
++ kill "$ksplash_pid" 2>/dev/null
++fi
+
+ # Clean up
+-kdeinit5_shutdown
++@NIXPKGS_KDEINIT5_SHUTDOWN@
+
+ unset KDE_FULL_SESSION
+-xprop -root -remove KDE_FULL_SESSION
++@NIXPKGS_XPROP@ -root -remove KDE_FULL_SESSION
+ unset KDE_SESSION_VERSION
+-xprop -root -remove KDE_SESSION_VERSION
++@NIXPKGS_XPROP@ -root -remove KDE_SESSION_VERSION
+ unset KDE_SESSION_UID
+
+ echo 'startplasma: Done.' 1>&2
+diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacompositor.cmake
+index 417a87d4..3f62745a 100644
+--- a/startkde/startplasmacompositor.cmake
++++ b/startkde/startplasmacompositor.cmake
+@@ -1,173 +1,171 @@
+ #!/bin/sh
+ #
+-# DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ )
++# NIXPKGS Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ )
+ #
+
+-# in case we have been started with full pathname spec without being in PATH
+-bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
+-if [ -n "$bindir" ]; then
+- qbindir=`qtpaths --binaries-dir`
+- qdbus=$qbindir/qdbus
+- case $PATH in
+- $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
+- *) PATH=$bindir:$PATH; export PATH;;
+- esac
+-else
+- qdbus=qdbus
++# we have to unset this for Darwin since it will screw up KDE's dynamic-loading
++unset DYLD_FORCE_FLAT_NAMESPACE
++
++export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
++@NIXPKGS_MKDIR@ -p "$XDG_CONFIG_HOME"
++
++# The KDE icon cache is supposed to update itself
++# automatically, but it uses the timestamp on the icon
++# theme directory as a trigger. Since in Nix the
++# timestamp is always the same, this doesn't work. So as
++# a workaround, nuke the icon cache on login. This isn't
++# perfect, since it may require logging out after
++# installing new applications to update the cache.
++# See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html
++rm -fv $HOME/.cache/icon-cache.kcache
++
++# Qt writes a weird ‘libraryPath’ line to
++# ~/.config/Trolltech.conf that causes the KDE plugin
++# paths of previous KDE invocations to be searched.
++# Obviously using mismatching KDE libraries is potentially
++# disastrous, so here we nuke references to the Nix store
++# in Trolltech.conf. A better solution would be to stop
++# Qt from doing this wackiness in the first place.
++if [ -e $XDG_CONFIG_HOME/Trolltech.conf ]; then
++ @NIXPKGS_SED@ -e '/nix\\store\|nix\/store/ d' -i $XDG_CONFIG_HOME/Trolltech.conf
+ fi
+
+-# We need to create config folder so we can write startupconfigkeys
+-if [ ${XDG_CONFIG_HOME} ]; then
+- configDir=$XDG_CONFIG_HOME;
+-else
+- configDir=${HOME}/.config; #this is the default, http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
++@NIXPKGS_KBUILDSYCOCA5@
++
++# Set the default GTK 2 theme
++gtkrc2="$HOME/.gtkrc-2.0"
++breeze_gtkrc2="/run/current-system/sw/share/themes/Breeze/gtk-2.0/gtkrc"
++if ! [ -e "$gtkrc2" ] && [ -e "$breeze_gtkrc2" ]; then
++ cat >"$gtkrc2" <"$gtk3_settings" <"$kcminputrc" <$configDir/startupconfigkeys <"$XDG_CONFIG_HOME/startupconfigkeys" <$plasmalocalerc <"$plasmalocalerc" <$kdeglobalsfile <"$kdeglobalsfile" <