diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index e5708fba168f27195e9189b2fe546c01ea4f8afc..2405f7d4efa9c89dc198c224a4cc0b6c6df9f0aa 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -10,18 +10,19 @@
# This file
/.github/CODEOWNERS @edolstra
-# Boostraping and core infra
-/pkgs/stdenv @edolstra
-/pkgs/build-support/cc-wrapper @edolstra
-
# Libraries
/lib @edolstra @nbp
+/lib/systems @edolstra @nbp @ericson2314
# Nixpkgs Internals
-/default.nix @nbp
-/pkgs/top-level/default.nix @nbp
-/pkgs/top-level/impure.nix @nbp
-/pkgs/top-level/stage.nix @nbp
+/default.nix @nbp
+/pkgs/top-level/default.nix @nbp @Ericson2314
+/pkgs/top-level/impure.nix @nbp @Ericson2314
+/pkgs/top-level/stage.nix @nbp @Ericson2314
+/pkgs/stdenv @edolstra
+/pkgs/build-support/cc-wrapper @edolstra @Ericson2314
+/pkgs/build-support/bintools-wrapper @edolstra @Ericson2314
+/pkgs/build-support/setup-hooks @edolstra @Ericson2314
# NixOS Internals
/nixos/default.nix @nbp
@@ -84,3 +85,9 @@
# https://github.com/NixOS/nixpkgs/issues/31401
/lib/maintainers.nix @ghost
/lib/licenses.nix @ghost
+
+# Qt / KDE
+/pkgs/applications/kde @ttuegel
+/pkgs/desktops/plasma-5 @ttuegel
+/pkgs/development/libraries/kde-frameworks @ttuegel
+/pkgs/development/libraries/qt-5 @ttuegel
diff --git a/COPYING b/COPYING
index afc460fff5cbd448d08f2b4b7d76bc363077bd12..198597a1b410bb3fc3c4c5a3f6c7a488af220891 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Copyright (c) 2003-2017 Eelco Dolstra and the Nixpkgs/NixOS contributors
+Copyright (c) 2003-2018 Eelco Dolstra and the Nixpkgs/NixOS contributors
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
diff --git a/doc/coding-conventions.xml b/doc/coding-conventions.xml
index 765fc56c3bb3ca6faa76f3ecc827091d317eb813..d556c7ebe1ed40908b9a7032f0d839593d583cf2 100644
--- a/doc/coding-conventions.xml
+++ b/doc/coding-conventions.xml
@@ -18,9 +18,9 @@
tab settings so it’s asking for trouble.
Use lowerCamelCase for variable
- names, not UpperCamelCase. TODO: naming of
- attributes in
- all-packages.nix?
+ names, not UpperCamelCase. Note, this rule does
+ not apply to package attribute names, which instead follow the rules
+ in .
Function calls with attribute set arguments are
written as
@@ -220,9 +220,10 @@ args.stdenv.mkDerivation (args // {
The variable name used for the instantiated package
in all-packages.nix, and when passing it as a
- dependency to other functions. This is what Nix expression authors
- see. It can also be used when installing using nix-env
- -iA.
+ dependency to other functions. Typically this is called the
+ package attribute name. This is what Nix
+ expression authors see. It can also be used when installing using
+ nix-env -iA.
The filename for (the directory containing) the Nix
expression.
@@ -259,12 +260,12 @@ bound to the variable name e2fsprogs in
Also append "unstable" to the name - e.g.,
"pkgname-unstable-2014-09-23".
- Dashes in the package name should be preserved
- in new variable names, rather than converted to underscores
- (which was convention up to around 2013 and most names
- still have underscores instead of dashes) — e.g.,
- http-parser instead of
- http_parser.
+ Dashes in the package name should be preserved in
+ new variable names, rather than converted to underscores or camel
+ cased — e.g., http-parser instead of
+ http_parser or httpParser. The
+ hyphenated style is preferred in all three package
+ names.
If there are multiple versions of a package, this
should be reflected in the variable names in
diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml
index 4b35b72feae03655322555ddaf72476f9364df9b..118a82bf0b06c50c83ba66745852a06fce170d28 100644
--- a/doc/cross-compilation.xml
+++ b/doc/cross-compilation.xml
@@ -187,7 +187,7 @@
How does this work in practice? Nixpkgs is now structured so that build-time dependencies are taken from buildPackages, whereas run-time dependencies are taken from the top level attribute set.
For example, buildPackages.gcc should be used at build time, while gcc should be used at run time.
Now, for most of Nixpkgs's history, there was no buildPackages, and most packages have not been refactored to use it explicitly.
- Instead, one can use the four attributes used for specifying dependencies as documented in .
+ Instead, one can use the six (gasp) attributes used for specifying dependencies as documented in .
We "splice" together the run-time and build-time package sets with callPackage, and then mkDerivation for each of four attributes pulls the right derivation out.
This splicing can be skipped when not cross compiling as the package sets are the same, but is a bit slow for cross compiling.
Because of this, a best-of-both-worlds solution is in the works with no splicing or explicit access of buildPackages needed.
@@ -200,6 +200,45 @@
+
+ Cross packagaing cookbook
+
+ Some frequently problems when packaging for cross compilation are good to just spell and answer.
+ Ideally the information above is exhaustive, so this section cannot provide any new information,
+ but its ludicrous and cruel to expect everyone to spend effort working through the interaction of many features just to figure out the same answer to the same common problem.
+ Feel free to add to this list!
+
+
+
+
+ What if my package's build system needs to build a C program to be run under the build environment?
+
+
+ depsBuildBuild = [ buildPackages.stdenv.cc ];
+ Add it to your mkDerivation invocation.
+
+
+
+
+ My package fails to find ar.
+
+
+ Many packages assume that an unprefixed ar is available, but Nix doesn't provide one.
+ It only provides a prefixed one, just as it only does for all the other binutils programs.
+ It may be necessary to patch the package to fix the build system to use a prefixed `ar`.
+
+
+
+
+ My package's testsuite needs to run host platform code.
+
+
+ doCheck = stdenv.hostPlatform != stdenv.buildPlatfrom;
+ Add it to your mkDerivation invocation.
+
+
+
+
diff --git a/doc/default.nix b/doc/default.nix
index cfd51fba257e96a645f17d801857314be34a4c71..60c613878c72cf0e9549284f18559f70a1963268 100644
--- a/doc/default.nix
+++ b/doc/default.nix
@@ -23,11 +23,12 @@ pkgs.stdenv.mkDerivation {
buildCommand = let toDocbook = { useChapters ? false, inputFile, outputFile }:
let
- extraHeader = ''xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" '';
+ extraHeader = lib.optionalString (!useChapters)
+ ''xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" '';
in ''
{
- pandoc '${inputFile}' -w docbook ${lib.optionalString useChapters "--top-level-division=chapter"} \
- --smart \
+ pandoc '${inputFile}' -w docbook+smart ${lib.optionalString useChapters "--top-level-division=chapter"} \
+ -f markdown+smart \
| sed -e 's|||' \
-e 's|
- Some libraries require OCaml and sometimes also Camlp5. The exact
- versions that were used to build Coq are saved in the
+ Some libraries require OCaml and sometimes also Camlp5 or findlib.
+ The exact versions that were used to build Coq are saved in the
coq.ocaml and coq.camlp5
- attributes.
+ and coq.findlib attributes.
+
+
+ Coq libraries may be compatible with some specific versions of Coq only.
+ The compatibleCoqVersions attribute is used to
+ precisely select those versions of Coq that are compatible with this
+ derivation.
Here is a simple package example. It is a pure Coq library, thus it
- only depends on Coq. Its makefile has been
- generated using coq_makefile so we only have to
+ depends on Coq. It builds on the Mathematical Components library, thus it
+ also takes mathcomp as buildInputs.
+ Its Makefile has been generated using
+ coq_makefile so we only have to
set the $COQLIB variable at install time.
-{stdenv, fetchurl, coq}:
-stdenv.mkDerivation {
- src = fetchurl {
- url = http://coq.inria.fr/pylons/contribs/files/Karatsuba/v8.4/Karatsuba.tar.gz;
- sha256 = "0ymfpv4v49k4fm63nq6gcl1hbnnxrvjjp7yzc4973n49b853c5b1";
- };
+{ stdenv, fetchFromGitHub, coq, mathcomp }:
- name = "coq-karatsuba";
+stdenv.mkDerivation rec {
+ name = "coq${coq.coq-version}-multinomials-${version}";
+ version = "1.0";
+ src = fetchFromGitHub {
+ owner = "math-comp";
+ repo = "multinomials";
+ rev = version;
+ sha256 = "1qmbxp1h81cy3imh627pznmng0kvv37k4hrwi2faa101s6bcx55m";
+ };
buildInputs = [ coq ];
+ propagatedBuildInputs = [ mathcomp ];
installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
+
+ meta = {
+ description = "A Coq/SSReflect Library for Monoidal Rings and Multinomials";
+ inherit (src.meta) homepage;
+ license = stdenv.lib.licenses.cecill-b;
+ inherit (coq.meta) platforms;
+ };
+
+ passthru = {
+ compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ];
+ };
}
-
diff --git a/doc/languages-frameworks/haskell.md b/doc/languages-frameworks/haskell.md
index afcba13488be708a41de7fbe6cac0342f12aa374..629db289ab1d017f2a2674d88d1694c513e04e89 100644
--- a/doc/languages-frameworks/haskell.md
+++ b/doc/languages-frameworks/haskell.md
@@ -581,8 +581,8 @@ nix-shell "" -A haskellPackages.bar.env
Every Haskell package set takes a function called `overrides` that you can use
to manipulate the package as much as you please. One useful application of this
feature is to replace the default `mkDerivation` function with one that enables
-library profiling for all packages. To accomplish that, add configure the
-following snippet in your `~/.config/nixpkgs/config.nix` file:
+library profiling for all packages. To accomplish that add the following
+snippet to your `~/.config/nixpkgs/config.nix` file:
```nix
{
packageOverrides = super: let self = super.pkgs; in
@@ -777,14 +777,14 @@ to find out the store path of the system's zlib library. Now, you can
stack --extra-lib-dirs=/nix/store/alsvwzkiw4b7ip38l4nlfjijdvg3fvzn-zlib-1.2.8/lib build
```
- Typically, you'll need `--extra-include-dirs` as well. It's possible
- to add those flag to the project's `stack.yaml` or your user's
- global `~/.stack/global/stack.yaml` file so that you don't have to
- specify them manually every time. But again, you're likely better off
- using Stack's Nix support instead.
+Typically, you'll need `--extra-include-dirs` as well. It's possible
+to add those flag to the project's `stack.yaml` or your user's
+global `~/.stack/global/stack.yaml` file so that you don't have to
+specify them manually every time. But again, you're likely better off
+using Stack's Nix support instead.
- The same thing applies to `cabal configure`, of course, if you're
- building with `cabal-install` instead of Stack.
+The same thing applies to `cabal configure`, of course, if you're
+building with `cabal-install` instead of Stack.
### Creating statically linked binaries
diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md
index 9172d712213940f933a7bc879b8edf63ebdca5ff..3700d2e57d476662aa17da3d0bea7c0b7ee6fc2c 100644
--- a/doc/languages-frameworks/python.md
+++ b/doc/languages-frameworks/python.md
@@ -134,7 +134,7 @@ with
```nix
with import {};
-python35.withPackages (ps: [ps.numpy ps.toolz])
+(python35.withPackages (ps: [ps.numpy ps.toolz])).env
```
Executing `nix-shell` gives you again a Nix shell from which you can run Python.
diff --git a/doc/languages-frameworks/rust.md b/doc/languages-frameworks/rust.md
index bedda76a306656bd98b41814a845a61f3314683f..aa6a7d654108a37dbe793c5f0e95a11aa8527a62 100644
--- a/doc/languages-frameworks/rust.md
+++ b/doc/languages-frameworks/rust.md
@@ -20,7 +20,7 @@ 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
+## Compiling Rust applications with Cargo
Rust applications are packaged by using the `buildRustPackage` helper from `rustPlatform`:
@@ -56,6 +56,167 @@ checksum can be then take from the failed build.
To install crates with nix there is also an experimental project called
[nixcrates](https://github.com/fractalide/nixcrates).
+## Compiling Rust crates using Nix instead of Cargo
+
+When run, `cargo build` produces a file called `Cargo.lock`,
+containing pinned versions of all dependencies. Nixpkgs contains a
+tool called `carnix` (`nix-env -iA nixos.carnix`), which can be used
+to turn a `Cargo.lock` into a Nix expression.
+
+That Nix expression calls `rustc` directly (hence bypassing Cargo),
+and can be used to compile a crate and all its dependencies. Here is
+an example for a minimal `hello` crate:
+
+
+ $ cargo new hello
+ $ cd hello
+ $ cargo build
+ Compiling hello v0.1.0 (file:///tmp/hello)
+ Finished dev [unoptimized + debuginfo] target(s) in 0.20 secs
+ $ carnix -o hello.nix --src ./. Cargo.lock --standalone
+ $ nix-build hello.nix
+
+Now, the file produced by the call to `carnix`, called `hello.nix`, looks like:
+
+```
+with import {};
+let kernel = buildPlatform.parsed.kernel.name;
+ # ... (content skipped)
+ hello_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "hello";
+ version = "0.1.0";
+ authors = [ "Authorname " ];
+ src = ./.;
+ inherit dependencies buildDependencies features;
+ };
+in
+rec {
+ hello_0_1_0 = hello_0_1_0_ rec {};
+}
+```
+
+In particular, note that the argument given as `--src` is copied
+verbatim to the source. If we look at a more complicated
+dependencies, for instance by adding a single line `libc="*"` to our
+`Cargo.toml`, we first need to run `cargo build` to update the
+`Cargo.lock`. Then, `carnix` needs to be run again, and produces the
+following nix file:
+
+```
+with import {};
+let kernel = buildPlatform.parsed.kernel.name;
+ # ... (content skipped)
+ hello_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "hello";
+ version = "0.1.0";
+ authors = [ "Jörg Thalheim " ];
+ src = ./.;
+ inherit dependencies buildDependencies features;
+ };
+ libc_0_2_34_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "libc";
+ version = "0.2.34";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "11jmqdxmv0ka10ay0l8nzx0nl7s2lc3dbrnh1mgbr2grzwdyxi2s";
+ inherit dependencies buildDependencies features;
+ };
+in
+rec {
+ hello_0_1_0 = hello_0_1_0_ rec {
+ dependencies = [ libc_0_2_34 ];
+ };
+ libc_0_2_34_features."default".from_hello_0_1_0__default = true;
+ libc_0_2_34 = libc_0_2_34_ rec {
+ features = mkFeatures libc_0_2_34_features;
+ };
+ libc_0_2_34_features."use_std".self_default = hasDefault libc_0_2_34_features;
+}
+```
+
+Here, the `libc` crate has no `src` attribute, so `buildRustCrate`
+will fetch it from [crates.io](https://crates.io). A `sha256`
+attribute is still needed for Nix purity.
+
+Some crates require external libraries. For crates from
+[crates.io](https://crates.io), such libraries can be specified in
+`defaultCrateOverrides` package in nixpkgs itself.
+
+Starting from that file, one can add more overrides, to add features
+or build inputs by overriding the hello crate in a seperate file.
+
+```
+with import {};
+(import ./hello.nix).hello_0_1_0.override {
+ crateOverrides = defaultCrateOverrides // {
+ hello = attrs: { buildInputs = [ openssl ]; };
+ };
+}
+```
+
+Here, `crateOverrides` is expected to be a attribute set, where the
+key is the crate name without version number and the value a function.
+The function gets all attributes passed to `buildRustCrate` as first
+argument and returns a set that contains all attribute that should be
+overwritten.
+
+For more complicated cases, such as when parts of the crate's
+derivation depend on the the crate's version, the `attrs` argument of
+the override above can be read, as in the following example, which
+patches the derivation:
+
+```
+with import {};
+(import ./hello.nix).hello_0_1_0.override {
+ crateOverrides = defaultCrateOverrides // {
+ hello = attrs: lib.optionalAttrs (lib.versionAtLeast attrs.version "1.0") {
+ postPatch = ''
+ substituteInPlace lib/zoneinfo.rs \
+ --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
+ '';
+ };
+ };
+}
+```
+
+Another situation is when we want to override a nested
+dependency. This actually works in the exact same way, since the
+`crateOverrides` parameter is forwarded to the crate's
+dependencies. For instance, to override the build inputs for crate
+`libc` in the example above, where `libc` is a dependency of the main
+crate, we could do:
+
+```
+with import {};
+(import hello.nix).hello_0_1_0.override {
+ crateOverrides = defaultCrateOverrides // {
+ libc = attrs: { buildInputs = []; };
+ };
+}
+```
+
+Three more parameters can be overridden:
+
+- The version of rustc used to compile the crate:
+
+ ```
+ hello_0_1_0.override { rust = pkgs.rust; };
+ ```
+
+- Whether to build in release mode or debug mode (release mode by
+ default):
+
+ ```
+ hello_0_1_0.override { release = false; };
+ ```
+
+- Whether to print the commands sent to rustc when building
+ (equivalent to `--verbose` in cargo:
+
+ ```
+ hello_0_1_0.override { verbose = false; };
+ ```
+
+
## Using the Rust nightlies overlay
Mozilla provides an overlay for nixpkgs to bring a nightly version of Rust into scope.
diff --git a/doc/reviewing-contributions.xml b/doc/reviewing-contributions.xml
index 0813e0968e86e175ed9cfab3dc787455cef4778c..c4bd6c57ffdbfcb621d5f342d6451a25976ec517 100644
--- a/doc/reviewing-contributions.xml
+++ b/doc/reviewing-contributions.xml
@@ -7,123 +7,123 @@
Reviewing contributions
- The following section is a draft and reviewing policy is still being
+ The following section is a draft and reviewing policy is still being
discussed.
-The nixpkgs projects receives a fairly high number of contributions via
- GitHub pull-requests. Reviewing and approving these is an important task and a
+The nixpkgs projects receives a fairly high number of contributions via
+ GitHub pull-requests. Reviewing and approving these is an important task and a
way to contribute to the project.
-The high change rate of nixpkgs make any pull request that is open for
- long enough subject to conflicts that will require extra work from the
- submitter or the merger. Reviewing pull requests in a timely manner and being
- responsive to the comments is the key to avoid these. GitHub provides sort
- filters that can be used to see the most
- recently and the least
+The high change rate of nixpkgs make any pull request that is open for
+ long enough subject to conflicts that will require extra work from the
+ submitter or the merger. Reviewing pull requests in a timely manner and being
+ responsive to the comments is the key to avoid these. GitHub provides sort
+ filters that can be used to see the most
+ recently and the least
recently updated pull-requests.
-When reviewing a pull request, please always be nice and polite.
- Controversial changes can lead to controversial opinions, but it is important
+When reviewing a pull request, please always be nice and polite.
+ Controversial changes can lead to controversial opinions, but it is important
to respect every community members and their work.
-GitHub provides reactions, they are a simple and quick way to provide
- feedback to pull-requests or any comments. The thumb-down reaction should be
- used with care and if possible accompanied with some explanations so the
+GitHub provides reactions, they are a simple and quick way to provide
+ feedback to pull-requests or any comments. The thumb-down reaction should be
+ used with care and if possible accompanied with some explanations so the
submitter has directions to improve his contribution.
-Pull-requests reviews should include a list of what has been reviewed in a
- comment, so other reviewers and mergers can know the state of the
+Pull-requests reviews should include a list of what has been reviewed in a
+ comment, so other reviewers and mergers can know the state of the
review.
-All the review template samples provided in this section are generic and
- meant as examples. Their usage is optional and the reviewer is free to adapt
+All the review template samples provided in this section are generic and
+ meant as examples. Their usage is optional and the reviewer is free to adapt
them to his liking.
Package updates
-A package update is the most trivial and common type of pull-request.
- These pull-requests mainly consist in updating the version part of the package
+A package update is the most trivial and common type of pull-request.
+ These pull-requests mainly consist in updating the version part of the package
name and the source hash.
-It can happen that non trivial updates include patches or more complex
+It can happen that non trivial updates include patches or more complex
changes.
Reviewing process:
- Add labels to the pull-request. (Requires commit
+ Add labels to the pull-request. (Requires commit
rights)
- 8.has: package (update) and any topic
+ 8.has: package (update) and any topic
label that fit the updated package.
- Ensure that the package versioning is fitting the
+ Ensure that the package versioning is fitting the
guidelines.
- Ensure that the commit text is fitting the
+ Ensure that the commit text is fitting the
guidelines.
Ensure that the package maintainers are notified.
- mention-bot usually notify GitHub users based on the
- submitted changes, but it can happen that it misses some of the
+ mention-bot usually notify GitHub users based on the
+ submitted changes, but it can happen that it misses some of the
package maintainers.
- Ensure that the meta field contains correct
+ Ensure that the meta field contains correct
information.
- License can change with version updates, so it should be
+ License can change with version updates, so it should be
checked to be fitting upstream license.
- If the package has no maintainer, a maintainer must be
- set. This can be the update submitter or a community member that
+ If the package has no maintainer, a maintainer must be
+ set. This can be the update submitter or a community member that
accepts to take maintainership of the package.
Ensure that the code contains no typos.
Building the package locally.
- Pull-requests are often targeted to the master or staging
- branch so building the pull-request locally as it is submitted can
+ Pull-requests are often targeted to the master or staging
+ branch so building the pull-request locally as it is submitted can
trigger a large amount of source builds.
- It is possible to rebase the changes on nixos-unstable or
- nixpkgs-unstable for easier review by running the following commands
+ It is possible to rebase the changes on nixos-unstable or
+ nixpkgs-unstable for easier review by running the following commands
from a nixpkgs clone.
-$ git remote add channels https://github.com/NixOS/nixpkgs-channels.git
$ git fetch channels nixos-unstable
$ git fetch origin pull/PRNUMBER/head
-$ git rebase --onto nixos-unstable BASEBRANCH FETCH_HEAD
- This should be done only once to be able to fetch channel
+ This should be done only once to be able to fetch channel
branches from the nixpkgs-channels repository.
Fetching the nixos-unstable branch.
- Fetching the pull-request changes, PRNUMBER
- is the number at the end of the pull-request title and
- BASEBRANCH the base branch of the
+ Fetching the pull-request changes, PRNUMBER
+ is the number at the end of the pull-request title and
+ BASEBRANCH the base branch of the
pull-request.
- Rebasing the pull-request changes to the nixos-unstable
+ Rebasing the pull-request changes to the nixos-unstable
branch.
- The nox
- tool can be used to review a pull-request content in a single command.
- It doesn't rebase on a channel branch so it might trigger multiple
- source builds. PRNUMBER should be replaced by the
+ The nox
+ tool can be used to review a pull-request content in a single command.
+ It doesn't rebase on a channel branch so it might trigger multiple
+ source builds. PRNUMBER should be replaced by the
number at the end of the pull-request title.
$ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
@@ -153,42 +153,42 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
New packages
-New packages are a common type of pull-requests. These pull requests
+New packages are a common type of pull-requests. These pull requests
consists in adding a new nix-expression for a package.
Reviewing process:
- Add labels to the pull-request. (Requires commit
+ Add labels to the pull-request. (Requires commit
rights)
- 8.has: package (new) and any topic
+ 8.has: package (new) and any topic
label that fit the new package.
- Ensure that the package versioning is fitting the
+ Ensure that the package versioning is fitting the
guidelines.
- Ensure that the commit name is fitting the
+ Ensure that the commit name is fitting the
guidelines.
- Ensure that the meta field contains correct
+ Ensure that the meta field contains correct
information.
- License must be checked to be fitting upstream
+ License must be checked to be fitting upstream
license.
- Platforms should be set or the package will not get binary
+ Platforms should be set or the package will not get binary
substitutes.
- A maintainer must be set, this can be the package
- submitter or a community member that accepts to take maintainership of
+ A maintainer must be set, this can be the package
+ submitter or a community member that accepts to take maintainership of
the package.
Ensure that the code contains no typos.
Ensure the package source.
- Mirrors urls should be used when
+ Mirrors urls should be used when
available.
- The most appropriate function should be used (e.g.
- packages from GitHub should use
+ The most appropriate function should be used (e.g.
+ packages from GitHub should use
fetchFromGitHub).
@@ -223,49 +223,49 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
Module updates
-Module updates are submissions changing modules in some ways. These often
+Module updates are submissions changing modules in some ways. These often
contains changes to the options or introduce new options.
Reviewing process
- Add labels to the pull-request. (Requires commit
+ Add labels to the pull-request. (Requires commit
rights)
- 8.has: module (update) and any topic
+ 8.has: module (update) and any topic
label that fit the module.
Ensure that the module maintainers are notified.
- Mention-bot notify GitHub users based on the submitted
- changes, but it can happen that it miss some of the package
+ Mention-bot notify GitHub users based on the submitted
+ changes, but it can happen that it miss some of the package
maintainers.
- Ensure that the module tests, if any, are
+ Ensure that the module tests, if any, are
succeeding.
Ensure that the introduced options are correct.
- Type should be appropriate (string related types differs
- in their merging capabilities, optionSet and
+ Type should be appropriate (string related types differs
+ in their merging capabilities, optionSet and
string types are deprecated).
- Description, default and example should be
+ Description, default and example should be
provided.
Ensure that option changes are backward compatible.
- mkRenamedOptionModule and
- mkAliasOptionModule functions provide way to make
+ mkRenamedOptionModule and
+ mkAliasOptionModule functions provide way to make
option changes backward compatible.
- Ensure that removed options are declared with
+ Ensure that removed options are declared with
mkRemovedOptionModule
- Ensure that changes that are not backward compatible are
+ Ensure that changes that are not backward compatible are
mentioned in release notes.
- Ensure that documentations affected by the change is
+ Ensure that documentations affected by the change is
updated.
@@ -294,37 +294,37 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
New modules submissions introduce a new module to NixOS.
- Add labels to the pull-request. (Requires commit
+ Add labels to the pull-request. (Requires commit
rights)
- 8.has: module (new) and any topic label
+ 8.has: module (new) and any topic label
that fit the module.
- Ensure that the module tests, if any, are
+ Ensure that the module tests, if any, are
succeeding.
Ensure that the introduced options are correct.
- Type should be appropriate (string related types differs
- in their merging capabilities, optionSet and
+ Type should be appropriate (string related types differs
+ in their merging capabilities, optionSet and
string types are deprecated).
- Description, default and example should be
+ Description, default and example should be
provided.
- Ensure that module meta field is
+ Ensure that module meta field is
present
- Maintainers should be declared in
+ Maintainers should be declared in
meta.maintainers.
- Module documentation should be declared with
+ Module documentation should be declared with
meta.doc.
- Ensure that the module respect other modules
+ Ensure that the module respect other modules
functionality.
- For example, enabling a module should not open firewall
+ For example, enabling a module should not open firewall
ports by default.
@@ -340,7 +340,7 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
- [ ] options have default
- [ ] options have example
- [ ] options have descriptions
-- [ ] No unneeded package is added to system.environmentPackages
+- [ ] No unneeded package is added to environment.systemPackages
- [ ] meta.maintainers is set
- [ ] module documentation is declared in meta.doc
@@ -355,22 +355,22 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
Other type of submissions requires different reviewing steps.
-If you consider having enough knowledge and experience in a topic and
- would like to be a long-term reviewer for related submissions, please contact
- the current reviewers for that topic. They will give you information about the
+If you consider having enough knowledge and experience in a topic and
+ would like to be a long-term reviewer for related submissions, please contact
+ the current reviewers for that topic. They will give you information about the
reviewing process.
-The main reviewers for a topic can be hard to find as there is no list, but
-checking past pull-requests to see who reviewed or git-blaming the code to see
+The main reviewers for a topic can be hard to find as there is no list, but
+checking past pull-requests to see who reviewed or git-blaming the code to see
who committed to that topic can give some hints.
-Container system, boot system and library changes are some examples of the
+Container system, boot system and library changes are some examples of the
pull requests fitting this category.
Merging pull-requests
-It is possible for community members that have enough knowledge and
+It is possible for community members that have enough knowledge and
experience on a special topic to contribute by merging pull requests.
TODO: add the procedure to request merging rights.
@@ -380,13 +380,13 @@ The following paragraph about how to deal with unactive contributors is just a
proposition and should be modified to what the community agrees to be the right
policy.
-Please note that contributors with commit rights unactive for more than
+Please note that contributors with commit rights unactive for more than
three months will have their commit rights revoked.
-->
-In a case a contributor leaves definitively the Nix community, he should
- create an issue or notify the mailing list with references of packages and
- modules he maintains so the maintainership can be taken over by other
+In a case a contributor leaves definitively the Nix community, he should
+ create an issue or notify the mailing list with references of packages and
+ modules he maintains so the maintainership can be taken over by other
contributors.
diff --git a/doc/shell.md b/doc/shell.md
new file mode 100644
index 0000000000000000000000000000000000000000..079574d4ae86d71bd490b99e7c8be351634cba69
--- /dev/null
+++ b/doc/shell.md
@@ -0,0 +1,20 @@
+---
+title: pkgs.mkShell
+author: zimbatm
+date: 2017-10-30
+---
+
+pkgs.mkShell is a special kind of derivation that is only useful when using
+it combined with nix-shell. It will in fact fail to instantiate when invoked
+with nix-build.
+
+## Usage
+
+```nix
+{ pkgs ? import {} }:
+pkgs.mkShell {
+ # this will make all the build inputs from hello and gnutar available to the shell environment
+ inputsFrom = with pkgs; [ hello gnutar ];
+ buildInputs = [ pkgs.gnumake ];
+}
+```
diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index 46b562a794f02c39b7761b2e0a00c5e2b9c72df6..3a7b23baaa7e10c837faf4ce682e2f1b8e73dce3 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -179,68 +179,283 @@ genericBuild
-Attributes
+Specifying dependencies
+
+
+ As described in the Nix manual, almost any *.drv store path in a derivation's attribute set will induce a dependency on that derivation.
+ mkDerivation, however, takes a few attributes intended to, between them, include all the dependencies of a package.
+ This is done both for structure and consistency, but also so that certain other setup can take place.
+ For example, certain dependencies need their bin directories added to the PATH.
+ That is built-in, but other setup is done via a pluggable mechanism that works in conjunction with these dependency attributes.
+ See for details.
+
+
+ Dependencies can be broken down along three axes: their host and target platforms relative to the new derivation's, and whether they are propagated.
+ The platform distinctions are motivated by cross compilation; see for exactly what each platform means.
+
+ The build platform is ignored because it is a mere implementation detail of the package satisfying the dependency:
+ As a general programming principle, dependencies are always specified as interfaces, not concrete implementation.
+
+ But even if one is not cross compiling, the platforms imply whether or not the dependency is needed at run-time or build-time, a concept that makes perfect sense outside of cross compilation.
+ For now, the run-time/build-time distinction is just a hint for mental clarity, but in the future it perhaps could be enforced.
+
+
+ The extension of PATH with dependencies, alluded to above, proceeds according to the relative platforms alone.
+ The process is carried out only for dependencies whose host platform matches the new derivation's build platform–i.e. which run on the platform where the new derivation will be built.
+
+ Currently, that means for native builds all dependencies are put on the PATH.
+ But in the future that may not be the case for sake of matching cross:
+ the platforms would be assumed to be unique for native and cross builds alike, so only the depsBuild* and nativeBuildDependencies dependencies would affect the PATH.
+
+ For each dependency dep of those dependencies, dep/bin, if present, is added to the PATH environment variable.
+
+
+ The dependency is propagated when it forces some of its other-transitive (non-immediate) downstream dependencies to also take it on as an immediate dependency.
+ Nix itself already takes a package's transitive dependencies into account, but this propagation ensures nixpkgs-specific infrastructure like setup hooks (mentioned above) also are run as if the propagated dependency.
+
+
+ It is important to note dependencies are not necessary propagated as the same sort of dependency that they were before, but rather as the corresponding sort so that the platform rules still line up.
+ The exact rules for dependency propagation can be given by assigning each sort of dependency two integers based one how it's host and target platforms are offset from the depending derivation's platforms.
+ Those offsets are given are given below in the descriptions of each dependency list attribute.
+ Algorithmically, we traverse propagated inputs, accumulating every propagated dep's propagated deps and adjusting them to account for the "shift in perspective" described by the current dep's platform offsets.
+ This results in sort a transitive closure of the dependency relation, with the offsets being approximately summed when two dependency links are combined.
+ We also prune transitive deps whose combined offsets go out-of-bounds, which can be viewed as a filter over that transitive closure removing dependencies that are blatantly absurd.
+
+
+ We can define the process precisely with Natural Deduction using the inference rules.
+ This probably seems a bit obtuse, but so is the bash code that actually implements it!
+
+ The findInputs function, currently residing in pkgs/stdenv/generic/setup.sh, implements the propagation logic.
+
+ They're confusing in very different ways so...hopefully if something doesn't make sense in one presentation, it does in the other!
+
+let mapOffset(h, t, i) = i + (if i <= 0 then h else t - 1)
+
+propagated-dep(h0, t0, A, B)
+propagated-dep(h1, t1, B, C)
+h0 + h1 in {-1, 0, 1}
+h0 + t1 in {-1, 0, 1}
+-------------------------------------- Transitive property
+propagated-dep(mapOffset(h0, t0, h1),
+ mapOffset(h0, t0, t1),
+ A, C)
+
+let mapOffset(h, t, i) = i + (if i <= 0 then h else t - 1)
+
+dep(h0, _, A, B)
+propagated-dep(h1, t1, B, C)
+h0 + h1 in {-1, 0, 1}
+h0 + t1 in {-1, 0, -1}
+-------------------------------------- Take immediate deps' propagated deps
+propagated-dep(mapOffset(h0, t0, h1),
+ mapOffset(h0, t0, t1),
+ A, C)
+
+propagated-dep(h, t, A, B)
+-------------------------------------- Propagated deps count as deps
+dep(h, t, A, B)
+ Some explanation of this monstrosity is in order.
+ In the common case, the target offset of a dependency is the successor to the target offset: t = h + 1.
+ That means that:
+
+let f(h, t, i) = i + (if i <= 0 then h else t - 1)
+let f(h, h + 1, i) = i + (if i <= 0 then h else (h + 1) - 1)
+let f(h, h + 1, i) = i + (if i <= 0 then h else h)
+let f(h, h + 1, i) = i + h
+
+ This is where the "sum-like" comes from above:
+ We can just sum all the host offset to get the host offset of the transitive dependency.
+ The target offset is the transitive dep is simply the host offset + 1, just as it was with the dependencies composed to make this transitive one;
+ it can be ignored as it doesn't add any new information.
+
+
+ Because of the bounds checks, the uncommon cases are h = t and h + 2 = t.
+ In the former case, the motivation for mapOffset is that since its host and target platforms are the same, no transitive dep of it should be able to "discover" an offset greater than its reduced target offsets.
+ mapOffset effectively "squashes" all its transitive dependencies' offsets so that none will ever be greater than the target offset of the original h = t package.
+ In the other case, h + 1 is skipped over between the host and target offsets.
+ Instead of squashing the offsets, we need to "rip" them apart so no transitive dependencies' offset is that one.
+
+
+Overall, the unifying theme here is that propagation shouldn't be introducing transitive dependencies involving platforms the needing package is unaware of.
+The offset bounds checking and definition of mapOffset together ensure that this is the case.
+Discovering a new offset is discovering a new platform, and since those platforms weren't in the derivation "spec" of the needing package, they cannot be relevant.
+From a capability perspective, we can imagine that the host and target platforms of a package are the capabilities a package requires, and the depending package must provide the capability to the dependency.
+
- Variables affecting <literal>stdenv</literal>
- initialisation
+ Variables specifying dependencies
+
+
+ depsBuildBuild
+
+
+ A list of dependencies whose host and target platforms are the new derivation's build platform.
+ This means a -1 host and -1 target offset from the new derivation's platforms.
+ They are programs/libraries used at build time that furthermore produce programs/libraries also used at build time.
+ If the dependency doesn't care about the target platform (i.e. isn't a compiler or similar tool), put it in nativeBuildInputsinstead.
+ The most common use for this buildPackages.stdenv.cc, the default C compiler for this role.
+ That example crops up more than one might think in old commonly used C libraries.
+
+
+ Since these packages are able to be run at build time, that are always added to the PATH, as described above.
+ But since these packages are only guaranteed to be able to run then, they shouldn't persist as run-time dependencies.
+ This isn't currently enforced, but could be in the future.
+
+
+
- NIX_DEBUG
+ nativeBuildInputs
+
+
+ A list of dependencies whose host platform is the new derivation's build platform, and target platform is the new derivation's host platform.
+ This means a -1 host offset and 0 target offset from the new derivation's platforms.
+ They are programs/libraries used at build time that, if they are a compiler or similar tool, produce code to run at run time—i.e. tools used to build the new derivation.
+ If the dependency doesn't care about the target platform (i.e. isn't a compiler or similar tool), put it here, rather than in depsBuildBuild or depsBuildTarget.
+ This would be called depsBuildHost but for historical continuity.
+
+
+ Since these packages are able to be run at build time, that are added to the PATH, as described above.
+ But since these packages only are guaranteed to be able to run then, they shouldn't persist as run-time dependencies.
+ This isn't currently enforced, but could be in the future.
+
+
+
+
+
+ depsBuildTarget
+
+
+ A list of dependencies whose host platform is the new derivation's build platform, and target platform is the new derivation's target platform.
+ This means a -1 host offset and 1 target offset from the new derivation's platforms.
+ They are programs used at build time that produce code to run at run with code produced by the depending package.
+ Most commonly, these would tools used to build the runtime or standard library the currently-being-built compiler will inject into any code it compiles.
+ In many cases, the currently-being built compiler is itself employed for that task, but when that compiler won't run (i.e. its build and host platform differ) this is not possible.
+ Other times, the compiler relies on some other tool, like binutils, that is always built separately so the dependency is unconditional.
+
+
+ This is a somewhat confusing dependency to wrap ones head around, and for good reason.
+ As the only one where the platform offsets are not adjacent integers, it requires thinking of a bootstrapping stage two away from the current one.
+ It and it's use-case go hand in hand and are both considered poor form:
+ try not to need this sort dependency, and try not avoid building standard libraries / runtimes in the same derivation as the compiler produces code using them.
+ Instead strive to build those like a normal library, using the newly-built compiler just as a normal library would.
+ In short, do not use this attribute unless you are packaging a compiler and are sure it is needed.
+
+
+ Since these packages are able to be run at build time, that are added to the PATH, as described above.
+ But since these packages only are guaranteed to be able to run then, they shouldn't persist as run-time dependencies.
+ This isn't currently enforced, but could be in the future.
+
+
+
+
+
+ depsHostHost
- 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.
+ A list of dependencies whose host and target platforms match the new derivation's host platform.
+ This means a both 0 host offset and 0 target offset from the new derivation's host platform.
+ These are packages used at run-time to generate code also used at run-time.
+ In practice, that would usually be tools used by compilers for metaprogramming/macro systems, or libraries used by the macros/metaprogramming code itself.
+ It's always preferable to use a depsBuildBuild dependency in the derivation being built than a depsHostHost on the tool doing the building for this purpose.
-
+
+ buildInputs
+
+
+ A list of dependencies whose host platform and target platform match the new derivation's.
+ This means a 0 host offset and 1 target offset from the new derivation's host platform.
+ This would be called depsHostTarget but for historical continuity.
+ If the dependency doesn't care about the target platform (i.e. isn't a compiler or similar tool), put it here, rather than in depsBuildBuild.
+
+
+ These often are programs/libraries used by the new derivation at run-time, but that isn't always the case.
+ For example, the machine code in a statically linked library is only used at run time, but the derivation containing the library is only needed at build time.
+ Even in the dynamic case, the library may also be needed at build time to appease the linker.
+
+
+
-
- Variables specifying dependencies
+
+ depsTargetTarget
+
+ A list of dependencies whose host platform matches the new derivation's target platform.
+ This means a 1 offset from the new derivation's platforms.
+ These are packages that run on the target platform, e.g. the standard library or run-time deps of standard library that a compiler insists on knowing about.
+ It's poor form in almost all cases for a package to depend on another from a future stage [future stage corresponding to positive offset].
+ Do not use this attribute unless you are packaging a compiler and are sure it is needed.
+
+
- nativeBuildInputs
+ depsBuildBuildPropagated
- A list of dependencies used by the new derivation at build-time.
- I.e. these dependencies should not make it into the package's runtime-closure, though this is currently not checked.
- For each dependency dir, the directory dir/bin, if it exists, is added to the PATH environment variable.
- Other environment variables are also set up via a pluggable mechanism.
- For instance, if buildInputs contains Perl, then the lib/site_perl subdirectory of each input is added to the PERL5LIB environment variable.
- See for details.
+ The propagated equivalent of depsBuildBuild.
+ This perhaps never ought to be used, but it is included for consistency [see below for the others].
- buildInputs
+ propagatedNativeBuildInputs
- A list of dependencies used by the new derivation at run-time.
- Currently, the build-time environment is modified in the exact same way as with nativeBuildInputs.
- This is problematic in that when cross-compiling, foreign executables can clobber native ones on the PATH.
- Even more confusing is static-linking.
- A statically-linked library should be listed here because ultimately that generated machine code will be used at run-time, even though a derivation containing the object files or static archives will only be used at build-time.
- A less confusing solution to this would be nice.
+ The propagated equivalent of nativeBuildInputs.
+ This would be called depsBuildHostPropagated but for historical continuity.
+ For example, if package Y has propagatedNativeBuildInputs = [X], and package Z has buildInputs = [Y], then package Z will be built as if it included package X in its nativeBuildInputs.
+ If instead, package Z has nativeBuildInputs = [Y], then Z will be built as if it included X in the depsBuildBuild of package Z, because of the sum of the two -1 host offsets.
+
+ depsBuildTargetPropagated
+
+ The propagated equivalent of depsBuildTarget.
+ This is prefixed for the same reason of alerting potential users.
+
+
- propagatedNativeBuildInputs
+ depsHostHostPropagated
- Like nativeBuildInputs, but these dependencies are propagated:
- that is, the dependencies listed here are added to the nativeBuildInputs of any package that uses this package as a dependency.
- So if package Y has propagatedNativeBuildInputs = [X], and package Z has nativeBuildInputs = [Y],
- then package X will appear in Z’s build environment automatically.
+ The propagated equivalent of depsHostHost.
propagatedBuildInputs
- Like buildInputs, but propagated just like propagatedNativeBuildInputs.
- This inherits buildInputs's flaws of clobbering native executables when cross-compiling and being confusing for static linking.
+ The propagated equivalent of buildInputs.
+ This would be called depsHostTargetPropagated but for historical continuity.
+
+
+
+
+ depsTargetTarget
+
+ The propagated equivalent of depsTargetTarget.
+ This is prefixed for the same reason of alerting potential users.
+
+
+
+
+
+
+
+
+Attributes
+
+
+ Variables affecting <literal>stdenv</literal>
+ initialisation
+
+
+ NIX_DEBUG
+
+ 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.
@@ -251,10 +466,17 @@ genericBuild
enableParallelBuilding
- If set, stdenv will pass specific
- flags to make and other build tools to enable
- parallel building with up to build-cores
- workers.
+
+ If set to true, stdenv will
+ pass specific flags to make and other build tools to
+ enable parallel building with up to build-cores
+ workers.
+
+ Unless set to false, some build systems with good
+ support for parallel building including cmake,
+ meson, and qmake will set it to
+ true.
+
@@ -649,7 +871,7 @@ script) if it exists.
By default, when cross compiling, the configure script has and passed.
Packages can instead pass [ "build" "host" "target" ] or a subset to control exactly which platform flags are passed.
Compilers and other tools should use this to also pass the target platform, for example.
- Note eventually these will be passed when in native builds too, to improve determinism: build-time guessing, as is done today, is a risk of impurity.
+ Eventually these will be passed when in native builds too, to improve determinism: build-time guessing, as is done today, is a risk of impurity.
@@ -773,13 +995,14 @@ but only if the doCheck variable is enabled.
doCheck
- If set to a non-empty string, the check phase is
- executed, otherwise it is skipped (default). Thus you should set
-
-
-doCheck = true;
-
- in the derivation to enable checks.
+
+ Controls whether the check phase is executed.
+ By default it is skipped, but if doCheck is set to true, the check phase is usually executed.
+ Thus you should set doCheck = true; in the derivation to enable checks.
+ The exception is cross compilation.
+ Cross compiled builds never run tests, no matter how doCheck is set,
+ as the newly-built program won't run on the platform used to build it.
+
@@ -916,6 +1139,20 @@ following:
If set, libraries and executables are not
stripped. By default, they are.
+
+ dontStripHost
+
+ Like dontStripHost, but only affects the strip command targetting the package's host platform.
+ Useful when supporting cross compilation, but otherwise feel free to ignore.
+
+
+
+ dontStripTarget
+
+ Like dontStripHost, but only affects the strip command targetting the packages' target platform.
+ Useful when supporting cross compilation, but otherwise feel free to ignore.
+
+
dontMoveSbin
@@ -1044,12 +1281,14 @@ installcheck.
doInstallCheck
- If set to a non-empty string, the installCheck phase is
- executed, otherwise it is skipped (default). Thus you should set
-
- doInstallCheck = true;
-
- in the derivation to enable install checks.
+
+ Controls whether the installCheck phase is executed.
+ By default it is skipped, but if doInstallCheck is set to true, the installCheck phase is usually executed.
+ Thus you should set doInstallCheck = true; in the derivation to enable install checks.
+ The exception is cross compilation.
+ Cross compiled builds never run tests, no matter how doInstallCheck is set,
+ as the newly-built program won't run on the platform used to build it.
+
@@ -1346,46 +1585,127 @@ someVar=$(stripHash $name)
Package setup hooks
-The following packages provide a setup hook:
-
+
+ Nix itself considers a build-time dependency merely something that should previously be built and accessible at build time—packages themselves are on their own to perform any additional setup.
+ In most cases, that is fine, and the downstream derivation can deal with it's own dependencies.
+ But for a few common tasks, that would result in almost every package doing the same sort of setup work---depending not on the package itself, but entirely on which dependencies were used.
+
+
+ In order to alleviate this burden, the setup hook>mechanism was written, where any package can include a shell script that [by convention rather than enforcement by Nix], any downstream reverse-dependency will source as part of its build process.
+ That allows the downstream dependency to merely specify its dependencies, and lets those dependencies effectively initialize themselves.
+ No boilerplate mirroring the list of dependencies is needed.
+
+
+ The Setup hook mechanism is a bit of a sledgehammer though: a powerful feature with a broad and indiscriminate area of effect.
+ The combination of its power and implicit use may be expedient, but isn't without costs.
+ Nix itself is unchanged, but the spirit of adding dependencies being effect-free is violated even if the letter isn't.
+ For example, if a derivation path is mentioned more than once, Nix itself doesn't care and simply makes sure the dependency derivation is already built just the same—depending is just needing something to exist, and needing is idempotent.
+ However, a dependency specified twice will have its setup hook run twice, and that could easily change the build environment (though a well-written setup hook will therefore strive to be idempotent so this is in fact not observable).
+ More broadly, setup hooks are anti-modular in that multiple dependencies, whether the same or different, should not interfere and yet their setup hooks may well do so.
+
+
+ The most typical use of the setup hook is actually to add other hooks which are then run (i.e. after all the setup hooks) on each dependency.
+ For example, the C compiler wrapper's setup hook feeds itself flags for each dependency that contains relevant libaries and headers.
+ This is done by defining a bash function, and appending its name to one of
+ envBuildBuildHooks`,
+ envBuildHostHooks`,
+ envBuildTargetHooks`,
+ envHostHostHooks`,
+ envHostTargetHooks`, or
+ envTargetTargetHooks`.
+ These 6 bash variables correspond to the 6 sorts of dependencies by platform (there's 12 total but we ignore the propagated/non-propagated axis).
+
+
+ Packages adding a hook should not hard code a specific hook, but rather choose a variable relative to how they are included.
+ Returning to the C compiler wrapper example, if it itself is an n dependency, then it only wants to accumulate flags from n + 1 dependencies, as only those ones match the compiler's target platform.
+ The hostOffset variable is defined with the current dependency's host offset targetOffset with its target offset, before it's setup hook is sourced.
+ Additionally, since most environment hooks don't care about the target platform,
+ That means the setup hook can append to the right bash array by doing something like
+
+addEnvHooks "$hostOffset" myBashFunction
+
+
+
+ The existence of setups hooks has long been documented and packages inside Nixpkgs are free to use these mechanism.
+ Other packages, however, should not rely on these mechanisms not changing between Nixpkgs versions.
+ Because of the existing issues with this system, there's little benefit from mandating it be stable for any period of time.
+
+
+ Here are some packages that provide a setup hook.
+ Since the mechanism is modular, this probably isn't an exhaustive list.
+ Then again, since the mechanism is only to be used as a last resort, it might be.
- CC Wrapper
+ Bintools Wrapper
- CC Wrapper wraps a C toolchain for a bunch of miscellaneous purposes.
- Specifically, a C compiler (GCC or Clang), Binutils (or the CCTools + binutils mashup when targetting Darwin), and a C standard library (glibc or Darwin's libSystem) are all fed in, and dependency finding, hardening (see below), and purity checks for each are handled by CC Wrapper.
- Packages typically depend on only CC Wrapper, instead of those 3 inputs directly.
+ Bintools Wrapper wraps the binary utilities for a bunch of miscellaneous purposes.
+ These are GNU Binutils when targetting Linux, and a mix of cctools and GNU binutils for Darwin.
+ [The "Bintools" name is supposed to be a compromise between "Binutils" and "cctools" not denoting any specific implementation.]
+ Specifically, the underlying bintools package, and a C standard library (glibc or Darwin's libSystem, just for the dynamic loader) are all fed in, and dependency finding, hardening (see below), and purity checks for each are handled by Bintools Wrapper.
+ Packages typically depend on CC Wrapper, which in turn (at run time) depends on Bintools Wrapper.
- Dependency finding is undoubtedly the main task of CC wrapper.
+ Bintools Wrapper was only just recently split off from CC Wrapper, so the division of labor is still being worked out.
+ For example, it shouldn't care about about the C standard library, but just take a derivation with the dynamic loader (which happens to be the glibc on linux).
+ Dependency finding however is a task both wrappers will continue to need to share, and probably the most important to understand.
It is currently accomplished by collecting directories of host-platform dependencies (i.e. buildInputs and nativeBuildInputs) in environment variables.
- CC wrapper's setup hook causes any include subdirectory of such a dependency to be added to NIX_CFLAGS_COMPILE, and any lib and lib64 subdirectories to NIX_LDFLAGS.
- The setup hook itself contains some lengthy comments describing the exact convoluted mechanism by which this is accomplished.
+ Bintools Wrapper's setup hook causes any lib and lib64 subdirectories to be added to NIX_LDFLAGS.
+ Since CC Wrapper and Bintools Wrapper use the same strategy, most of the Bintools Wrapper code is sparsely commented and refers to CC Wrapper.
+ But CC Wrapper's code, by contrast, has quite lengthy comments.
+ Bintools Wrapper merely cites those, rather than repeating them, to avoid falling out of sync.
A final task of the setup hook is defining a number of standard environment variables to tell build systems which executables full-fill which purpose.
- They are defined to just be the base name of the tools, under the assumption that CC Wrapper's binaries will be on the path.
+ They are defined to just be the base name of the tools, under the assumption that Bintools Wrapper's binaries will be on the path.
Firstly, this helps poorly-written packages, e.g. ones that look for just gcc when CC isn't defined yet clang is to be used.
- Secondly, this helps packages not get confused when cross-compiling, in which case multiple CC wrappers may be simultaneous in use (targeting different platforms).
- BUILD_- and TARGET_-prefixed versions of the normal environment variable are defined for the additional CC Wrappers, properly disambiguating them.
+ Secondly, this helps packages not get confused when cross-compiling, in which case multiple Bintools Wrappers may simultaneously be in use.
+
+ Each wrapper targets a single platform, so if binaries for multiple platforms are needed, the underlying binaries must be wrapped multiple times.
+ As this is a property of the wrapper itself, the multiple wrappings are needed whether or not the same underlying binaries can target multiple platforms.
+
+ BUILD_- and TARGET_-prefixed versions of the normal environment variable are defined for the additional Bintools Wrappers, properly disambiguating them.
- A problem with this final task is that CC Wrapper is honest and defines LD as ld.
+ A problem with this final task is that Bintools Wrapper is honest and defines LD as ld.
Most packages, however, firstly use the C compiler for linking, secondly use LD anyways, defining it as the C compiler, and thirdly, only so define LD when it is undefined as a fallback.
- This triple-threat means CC Wrapper will break those packages, as LD is already defined as the actually linker which the package won't override yet doesn't want to use.
+ This triple-threat means Bintools Wrapper will break those packages, as LD is already defined as the actual linker which the package won't override yet doesn't want to use.
The workaround is to define, just for the problematic package, LD as the C compiler.
A good way to do this would be preConfigure = "LD=$CC".
+
+ CC Wrapper
+
+
+ CC Wrapper wraps a C toolchain for a bunch of miscellaneous purposes.
+ Specifically, a C compiler (GCC or Clang), wrapped binary tools, and a C standard library (glibc or Darwin's libSystem, just for the dynamic loader) are all fed in, and dependency finding, hardening (see below), and purity checks for each are handled by CC Wrapper.
+ Packages typically depend on CC Wrapper, which in turn (at run time) depends on Bintools Wrapper.
+
+
+ Dependency finding is undoubtedly the main task of CC Wrapper.
+ This works just like Bintools Wrapper, except that any include subdirectory of any relevant dependency is added to NIX_CFLAGS_COMPILE.
+ The setup hook itself contains some lengthy comments describing the exact convoluted mechanism by which this is accomplished.
+
+
+ CC Wrapper also like Bintools Wrapper defines standard environment variables with the names of the tools it wraps, for the same reasons described above.
+ Importantly, while it includes a cc symlink to the c compiler for portability, the CC will be defined using the compiler's "real name" (i.e. gcc or clang).
+ This helps lousy build systems that inspect on the name of the compiler rather than run it.
+
+
+
+
Perl
- Adds the lib/site_perl subdirectory
- of each build input to the PERL5LIB
- environment variable.
+
+
+ Adds the lib/site_perl subdirectory of each build input to the PERL5LIB environment variable.
+ For instance, if buildInputs contains Perl, then the lib/site_perl subdirectory of each input is added to the PERL5LIB environment variable.
+
+
diff --git a/lib/default.nix b/lib/default.nix
index 9dc4fea99fc27e7b919fae79362719c6b16aac9c..f729a36249aff7c74f9a91e2f2c4c28eb33e4a51 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -93,7 +93,7 @@ let
hiPrioSet;
inherit (sources) pathType pathIsDirectory cleanSourceFilter
cleanSource sourceByRegex sourceFilesBySuffices
- commitIdFromGitRepo;
+ commitIdFromGitRepo cleanSourceWith;
inherit (modules) evalModules closeModules unifyModuleSyntax
applyIfFunction unpackSubmodule packSubmodule mergeModules
mergeModules' mergeOptionDecls evalOptionValue mergeDefinitions
diff --git a/lib/generators.nix b/lib/generators.nix
index b27ab485f41ecd194b56e22da216ec6bc98a470f..f207033c95545bc8ba16f1869ff21681150f329b 100644
--- a/lib/generators.nix
+++ b/lib/generators.nix
@@ -130,6 +130,6 @@ rec {
(name: value:
"${toPretty args name} = ${toPretty args value};") v)
+ " }"
- else "toPretty: should never happen (v = ${v})";
+ else abort "toPretty: should never happen (v = ${v})";
}
diff --git a/lib/licenses.nix b/lib/licenses.nix
index 1f2c448470b382858f014cfb2f3e667df0191097..1fdcc15fd72544333a35fe37667a917e7aae760d 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -309,6 +309,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
free = false;
};
+ inria-icesl = {
+ fullName = "INRIA Non-Commercial License Agreement for IceSL";
+ url = "http://shapeforge.loria.fr/icesl/EULA_IceSL_binary.pdf";
+ free = false;
+ };
+
ipa = spdx {
spdxId = "IPA";
fullName = "IPA Font License";
diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index de8627b0804a277fb29072443acd382ec31f1ae8..a5ab074a3131f8cd889bb7dc3cfe08ad11c03ac2 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -28,6 +28,8 @@
afranchuk = "Alex Franchuk ";
aherrmann = "Andreas Herrmann ";
ahmedtd = "Taahir Ahmed ";
+ aij = "Ivan Jager ";
+ ajgrf = "Alex Griffin ";
ak = "Alexander Kjeldaas ";
akaWolf = "Artjom Vejsel ";
akc = "Anders Claesson ";
@@ -80,6 +82,7 @@
benley = "Benjamin Staffin ";
bennofs = "Benno Fünfstück ";
benwbooth = "Ben Booth ";
+ berce = "Bert Moens ";
berdario = "Dario Bertini ";
bergey = "Daniel Bergey ";
bhipple = "Benjamin Hipple ";
@@ -95,6 +98,7 @@
bradediger = "Brad Ediger ";
bramd = "Bram Duvigneau ";
bstrik = "Berno Strik ";
+ bugworm = "Roman Gerasimenko ";
bzizou = "Bruno Bzeznik ";
c0bw3b = "Renaud ";
c0dehero = "CodeHero ";
@@ -115,6 +119,7 @@
ChengCat = "Yucheng Zhang ";
choochootrain = "Hurshal Patel ";
chpatrick = "Patrick Chilton ";
+ chreekat = "Bryan Richter ";
chris-martin = "Chris Martin ";
chrisjefferson = "Christopher Jefferson ";
chrisrosset = "Christopher Rosset ";
@@ -122,7 +127,7 @@
ciil = "Simon Lackerbauer ";
ck3d = "Christian Kögler ";
ckampka = "Christian Kampka ";
- ckauhaus = "Christian Kauhaus ";
+ ckauhaus = "Christian Kauhaus ";
cko = "Christine Koppelt ";
cleverca22 = "Michael Bishop ";
cmcdragonkai = "Roger Qiu ";
@@ -186,6 +191,7 @@
dtzWill = "Will Dietz ";
dupgit = "Olivier Delhomme ";
dywedir = "Vladyslav M. ";
+ dzabraev = "Maksim Dzabraev ";
e-user = "Alexander Kahl ";
earldouglas = "James Earl Douglas ";
ebzzry = "Rommel Martinez ";
@@ -204,6 +210,7 @@
elijahcaine = "Elijah Caine ";
elitak = "Eric Litak ";
ellis = "Ellis Whitehead ";
+ enzime = "Michael Hoang ";
eperuffo = "Emanuele Peruffo ";
epitrochoid = "Mabry Cervin ";
eqyiel = "Ruben Maher ";
@@ -279,15 +286,18 @@
hodapp = "Chris Hodapp ";
hrdinka = "Christoph Hrdinka ";
htr = "Hugo Tavares Reis ";
+ hyphon81 = "Masato Yonekawa ";
iand675 = "Ian Duncan ";
ianwookim = "Ian-Woo Kim ";
iblech = "Ingo Blechschmidt ";
igsha = "Igor Sharonov ";
ikervagyok = "Balázs Lengyel ";
+ ilya-kolpakov = "Ilya Kolpakov ";
infinisil = "Silvan Mosberger ";
ironpinguin = "Michele Catalano ";
ivan-tkatchev = "Ivan Tkatchev ";
ixmatus = "Parnell Springmeyer ";
+ izorkin = "Yurii Izorkin ";
j-keck = "Jürgen Keck ";
jagajaga = "Arseniy Seroka ";
jammerful = "jammerful ";
@@ -319,6 +329,7 @@
joko = "Ioannis Koutras ";
jonafato = "Jon Banafato ";
joncojonathan = "Jonathan Haddock ";
+ jpdoyle = "Joe Doyle ";
jpierre03 = "Jean-Pierre PRUNARET ";
jpotier = "Martin Potier ";
jraygauthier = "Raymond Gauthier ";
@@ -354,6 +365,7 @@
ldesgoui = "Lucas Desgouilles ";
league = "Christopher League ";
lebastr = "Alexander Lebedev ";
+ ledif = "Adam Fidel ";
leemachin = "Lee Machin ";
leenaars = "Michiel Leenaars ";
leonardoce = "Leonardo Cecchi ";
@@ -389,6 +401,7 @@
manveru = "Michael Fellinger ";
marcweber = "Marc Weber ";
markus1189 = "Markus Hauck ";
+ markuskowa = "Markus Kowalewski ";
markWot = "Markus Wotringer ";
martijnvermaat = "Martijn Vermaat ";
martingms = "Martin Gammelsæter ";
@@ -400,6 +413,7 @@
mbakke = "Marius Bakke ";
mbbx6spp = "Susan Potter ";
mbe = "Brandon Edens ";
+ mbode = "Maximilian Bode ";
mboes = "Mathieu Boespflug ";
mbrgm = "Marius Bergmann ";
mcmtroffaes = "Matthias C. M. Troffaes ";
@@ -409,6 +423,7 @@
meisternu = "Matt Miemiec ";
metabar = "Celine Mercier ";
mgdelacroix = "Miguel de la Cruz ";
+ mgttlinger = "Merlin Göttlinger "\"hello\\\${}\\n\""
+ */
+ escapeNixString = s: escape ["$"] (builtins.toJSON s);
+
/* Obsolete - use replaceStrings instead. */
replaceChars = builtins.replaceStrings or (
del: new: s:
diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index ff2273febcb03e3299cf5926c1a66d08166247f7..90d7e956d2bab309dfb277eb3c15e0f1859c7afa 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -18,7 +18,6 @@ rec {
libc = "glibc";
platform = platforms.sheevaplug;
openssl.system = "linux-generic32";
- inherit (platform) gcc;
};
raspberryPi = rec {
@@ -31,7 +30,6 @@ rec {
libc = "glibc";
platform = platforms.raspberrypi;
openssl.system = "linux-generic32";
- inherit (platform) gcc;
};
armv7l-hf-multiplatform = rec {
@@ -44,7 +42,6 @@ rec {
libc = "glibc";
platform = platforms.armv7l-hf-multiplatform;
openssl.system = "linux-generic32";
- inherit (platform) gcc;
};
aarch64-multiplatform = rec {
@@ -54,23 +51,20 @@ rec {
withTLS = true;
libc = "glibc";
platform = platforms.aarch64-multiplatform;
- inherit (platform) gcc;
};
scaleway-c1 = armv7l-hf-multiplatform // rec {
platform = platforms.scaleway-c1;
- inherit (platform) gcc;
- inherit (gcc) fpu;
+ inherit (platform.gcc) fpu;
};
pogoplug4 = rec {
arch = "armv5tel";
- config = "armv5tel-softfloat-linux-gnueabi";
+ config = "armv5tel-unknown-linux-gnueabi";
float = "soft";
platform = platforms.pogoplug4;
- inherit (platform) gcc;
libc = "glibc";
withTLS = true;
@@ -86,7 +80,6 @@ rec {
libc = "glibc";
platform = platforms.fuloong2f_n32;
openssl.system = "linux-generic32";
- inherit (platform) gcc;
};
#
diff --git a/lib/types.nix b/lib/types.nix
index 46ed05d288f2e3ff2477fad7d0af2f5921384076..88fc90d05970ff69d4e838b4e94dcc03f80bf336 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -174,6 +174,13 @@ rec {
merge = mergeOneOption;
};
+ strMatching = pattern: mkOptionType {
+ name = "strMatching ${escapeNixString pattern}";
+ description = "string matching the pattern ${pattern}";
+ check = x: str.check x && builtins.match pattern x != null;
+ inherit (str) merge;
+ };
+
# Merge multiple definitions by concatenating them (with the given
# separator between the values).
separatedString = sep: mkOptionType rec {
diff --git a/maintainers/scripts/copy-tarballs.pl b/maintainers/scripts/copy-tarballs.pl
index 178dcfb38da4c07cc8d98902f790794169af6968..f3fe7236760bdd5a8e10fefef33e61fb90614b31 100755
--- a/maintainers/scripts/copy-tarballs.pl
+++ b/maintainers/scripts/copy-tarballs.pl
@@ -1,5 +1,5 @@
#! /usr/bin/env nix-shell
-#! nix-shell -i perl -p perl perlPackages.NetAmazonS3 perlPackages.FileSlurp nixUnstable
+#! nix-shell -i perl -p perl perlPackages.NetAmazonS3 perlPackages.FileSlurp nixUnstable nixUnstable.perl-bindings
# This command uploads tarballs to tarballs.nixos.org, the
# content-addressed cache used by fetchurl as a fallback for when
@@ -59,6 +59,7 @@ my $s3 = Net::Amazon::S3->new(
{ aws_access_key_id => $aws_access_key_id,
aws_secret_access_key => $aws_secret_access_key,
retry => 1,
+ host => "s3-eu-west-1.amazonaws.com",
});
my $bucket = $s3->bucket("nixpkgs-tarballs") or die;
diff --git a/maintainers/scripts/update-python-libraries b/maintainers/scripts/update-python-libraries
index 3ddc8c23a79be8d8b3ee7ad9a90f6b09b6385d9f..ec2691ff617c88817605e82b7e2785c8566d2ee8 100755
--- a/maintainers/scripts/update-python-libraries
+++ b/maintainers/scripts/update-python-libraries
@@ -1,5 +1,5 @@
#! /usr/bin/env nix-shell
-#! nix-shell -i python3 -p 'python3.withPackages(ps: with ps; [ requests toolz ])'
+#! nix-shell -i python3 -p 'python3.withPackages(ps: with ps; [ packaging requests toolz ])' -p git
"""
Update a Python package expression by passing in the `.nix` file, or the directory containing it.
@@ -18,7 +18,12 @@ import os
import re
import requests
import toolz
-from concurrent.futures import ThreadPoolExecutor as pool
+from concurrent.futures import ThreadPoolExecutor as Pool
+from packaging.version import Version as _Version
+from packaging.version import InvalidVersion
+from packaging.specifiers import SpecifierSet
+import collections
+import subprocess
INDEX = "https://pypi.io/pypi"
"""url of PyPI"""
@@ -26,10 +31,30 @@ INDEX = "https://pypi.io/pypi"
EXTENSIONS = ['tar.gz', 'tar.bz2', 'tar', 'zip', '.whl']
"""Permitted file extensions. These are evaluated from left to right and the first occurance is returned."""
+PRERELEASES = False
+
import logging
logging.basicConfig(level=logging.INFO)
+class Version(_Version, collections.abc.Sequence):
+
+ def __init__(self, version):
+ super().__init__(version)
+ # We cannot use `str(Version(0.04.21))` because that becomes `0.4.21`
+ # https://github.com/avian2/unidecode/issues/13#issuecomment-354538882
+ self.raw_version = version
+
+ def __getitem__(self, i):
+ return self._version.release[i]
+
+ def __len__(self):
+ return len(self._version.release)
+
+ def __iter__(self):
+ yield from self._version.release
+
+
def _get_values(attribute, text):
"""Match attribute in text and return all matches.
@@ -82,13 +107,59 @@ def _fetch_page(url):
else:
raise ValueError("request for {} failed".format(url))
-def _get_latest_version_pypi(package, extension):
+
+SEMVER = {
+ 'major' : 0,
+ 'minor' : 1,
+ 'patch' : 2,
+}
+
+
+def _determine_latest_version(current_version, target, versions):
+ """Determine latest version, given `target`.
+ """
+ current_version = Version(current_version)
+
+ def _parse_versions(versions):
+ for v in versions:
+ try:
+ yield Version(v)
+ except InvalidVersion:
+ pass
+
+ versions = _parse_versions(versions)
+
+ index = SEMVER[target]
+
+ ceiling = list(current_version[0:index])
+ if len(ceiling) == 0:
+ ceiling = None
+ else:
+ ceiling[-1]+=1
+ ceiling = Version(".".join(map(str, ceiling)))
+
+ # We do not want prereleases
+ versions = SpecifierSet(prereleases=PRERELEASES).filter(versions)
+
+ if ceiling is not None:
+ versions = SpecifierSet(f"<{ceiling}").filter(versions)
+
+ return (max(sorted(versions))).raw_version
+
+
+def _get_latest_version_pypi(package, extension, current_version, target):
"""Get latest version and hash from PyPI."""
url = "{}/{}/json".format(INDEX, package)
json = _fetch_page(url)
- version = json['info']['version']
- for release in json['releases'][version]:
+ versions = json['releases'].keys()
+ version = _determine_latest_version(current_version, target, versions)
+
+ try:
+ releases = json['releases'][version]
+ except KeyError as e:
+ raise KeyError('Could not find version {} for {}'.format(version, package)) from e
+ for release in releases:
if release['filename'].endswith(extension):
# TODO: In case of wheel we need to do further checks!
sha256 = release['digests']['sha256']
@@ -98,7 +169,7 @@ def _get_latest_version_pypi(package, extension):
return version, sha256
-def _get_latest_version_github(package, extension):
+def _get_latest_version_github(package, extension, current_version, target):
raise ValueError("updating from GitHub is not yet supported.")
@@ -141,9 +212,9 @@ def _determine_extension(text, fetcher):
"""
if fetcher == 'fetchPypi':
try:
- format = _get_unique_value('format', text)
+ src_format = _get_unique_value('format', text)
except ValueError as e:
- format = None # format was not given
+ src_format = None # format was not given
try:
extension = _get_unique_value('extension', text)
@@ -151,9 +222,11 @@ def _determine_extension(text, fetcher):
extension = None # extension was not given
if extension is None:
- if format is None:
- format = 'setuptools'
- extension = FORMATS[format]
+ if src_format is None:
+ src_format = 'setuptools'
+ elif src_format == 'flit':
+ raise ValueError("Don't know how to update a Flit package.")
+ extension = FORMATS[src_format]
elif fetcher == 'fetchurl':
url = _get_unique_value('url', text)
@@ -167,9 +240,7 @@ def _determine_extension(text, fetcher):
return extension
-def _update_package(path):
-
-
+def _update_package(path, target):
# Read the expression
with open(path, 'r') as f:
@@ -186,11 +257,13 @@ def _update_package(path):
extension = _determine_extension(text, fetcher)
- new_version, new_sha256 = _get_latest_version_pypi(pname, extension)
+ new_version, new_sha256 = FETCHERS[fetcher](pname, extension, version, target)
if new_version == version:
logging.info("Path {}: no update available for {}.".format(path, pname))
return False
+ elif new_version <= version:
+ raise ValueError("downgrade for {}.".format(pname))
if not new_sha256:
raise ValueError("no file available for {}.".format(pname))
@@ -202,10 +275,19 @@ def _update_package(path):
logging.info("Path {}: updated {} from {} to {}".format(path, pname, version, new_version))
- return True
+ result = {
+ 'path' : path,
+ 'target': target,
+ 'pname': pname,
+ 'old_version' : version,
+ 'new_version' : new_version,
+ #'fetcher' : fetcher,
+ }
+ return result
-def _update(path):
+
+def _update(path, target):
# We need to read and modify a Nix expression.
if os.path.isdir(path):
@@ -222,24 +304,58 @@ def _update(path):
return False
try:
- return _update_package(path)
+ return _update_package(path, target)
except ValueError as e:
logging.warning("Path {}: {}".format(path, e))
return False
+
+def _commit(path, pname, old_version, new_version, **kwargs):
+ """Commit result.
+ """
+
+ msg = f'python: {pname}: {old_version} -> {new_version}'
+
+ try:
+ subprocess.check_call(['git', 'add', path])
+ subprocess.check_call(['git', 'commit', '-m', msg])
+ except subprocess.CalledProcessError as e:
+ subprocess.check_call(['git', 'checkout', path])
+ raise subprocess.CalledProcessError(f'Could not commit {path}') from e
+
+ return True
+
+
def main():
parser = argparse.ArgumentParser()
parser.add_argument('package', type=str, nargs='+')
+ parser.add_argument('--target', type=str, choices=SEMVER.keys(), default='major')
+ parser.add_argument('--commit', action='store_true', help='Create a commit for each package update')
args = parser.parse_args()
+ target = args.target
+
+ packages = list(map(os.path.abspath, args.package))
+
+ logging.info("Updating packages...")
+
+ # Use threads to update packages concurrently
+ with Pool() as p:
+ results = list(p.map(lambda pkg: _update(pkg, target), packages))
+
+ logging.info("Finished updating packages.")
+
+ # Commits are created sequentially.
+ if args.commit:
+ logging.info("Committing updates...")
+ list(map(lambda x: _commit(**x), filter(bool, results)))
+ logging.info("Finished committing updates")
- packages = map(os.path.abspath, args.package)
+ count = sum(map(bool, results))
+ logging.info("{} package(s) updated".format(count))
- with pool() as p:
- count = list(p.map(_update, packages))
- logging.info("{} package(s) updated".format(sum(count)))
if __name__ == '__main__':
main()
\ No newline at end of file
diff --git a/nixos/doc/manual/configuration/firewall.xml b/nixos/doc/manual/configuration/firewall.xml
index 87406c28c2f767372cae9837d2f6835a253d91dd..75cccef95b38f06af0667772bcdd1c4b2c1b4c93 100644
--- a/nixos/doc/manual/configuration/firewall.xml
+++ b/nixos/doc/manual/configuration/firewall.xml
@@ -23,10 +23,23 @@ networking.firewall.allowedTCPPorts = [ 80 443 ];
Note that TCP port 22 (ssh) is opened automatically if the SSH daemon
-is enabled (). UDP
+is enabled (). UDP
ports can be opened through
-. Also of
-interest is
+.
+
+To open ranges of TCP ports:
+
+
+networking.firewall.allowedTCPPortRanges = [
+ { from = 4000; to = 4007; }
+ { from = 8000; to = 8010; }
+];
+
+
+Similarly, UDP port ranges can be opened through
+.
+
+Also of interest is
networking.firewall.allowPing = true;
diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml
index fc6082ce3afd6212845585dbebcb6eed9af2be07..9c2c59006f15d04453c352b8052e6802f22df60a 100644
--- a/nixos/doc/manual/configuration/x-windows.xml
+++ b/nixos/doc/manual/configuration/x-windows.xml
@@ -115,13 +115,14 @@ hardware.opengl.driSupport32Bit = true;
Support for Synaptics touchpads (found in many laptops such as
the Dell Latitude series) can be enabled as follows:
-services.xserver.synaptics.enable = true;
+services.xserver.libinput.enable = true;
The driver has many options (see ). For
-instance, the following enables two-finger scrolling:
+instance, the following disables tap-to-click behavior:
-services.xserver.synaptics.twoFingerScroll = true;
+services.xserver.libinput.tapping = false;
+Note: the use of services.xserver.synaptics is deprecated since NixOS 17.09.
@@ -129,7 +130,7 @@ services.xserver.synaptics.twoFingerScroll = true;
GTK/Qt themes
GTK themes can be installed either to user profile or system-wide (via
-system.environmentPackages). To make Qt 5 applications look similar
+environment.systemPackages). To make Qt 5 applications look similar
to GTK2 ones, you can install qt5.qtbase.gtk package into your
system environment. It should work for all Qt 5 library versions.
diff --git a/nixos/doc/manual/development/option-declarations.xml b/nixos/doc/manual/development/option-declarations.xml
index be793152f9ef982bae25ccddd9c2ec4811783b94..ed718c89eb77cf6577c09539701f66070f697529 100644
--- a/nixos/doc/manual/development/option-declarations.xml
+++ b/nixos/doc/manual/development/option-declarations.xml
@@ -22,6 +22,15 @@ options = {
};
+The attribute names within the name
+attribute path must be camel cased in general but should, as an
+exception, match the
+
+package attribute name when referencing a Nixpkgs package. For
+example, the option services.nix-serve.bindAddress
+references the nix-serve Nixpkgs package.
+
The function mkOption accepts the following arguments.
diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml
index 83dcf0232d9d3c4981b21f526f3357c9b913a9a5..ec940d5d2b865481bc8f89777d67f4a0404bdb71 100644
--- a/nixos/doc/manual/development/option-types.xml
+++ b/nixos/doc/manual/development/option-types.xml
@@ -110,6 +110,12 @@
A string. Multiple definitions are concatenated with a
collon ":".
+
+ types.strMatching
+ A string matching a specific regular expression. Multiple
+ definitions cannot be merged. The regular expression is processed using
+ builtins.match.
+
diff --git a/nixos/doc/manual/development/writing-nixos-tests.xml b/nixos/doc/manual/development/writing-nixos-tests.xml
index 7b25a39e83b82ba553d1b1280792378c4b5d5e72..a8f6aa00858e3229493a678372ec3a554e6b6a6a 100644
--- a/nixos/doc/manual/development/writing-nixos-tests.xml
+++ b/nixos/doc/manual/development/writing-nixos-tests.xml
@@ -272,8 +272,37 @@ startAll;
+
+ systemctl
+
+ Runs systemctl commands with optional support for
+ systemctl --user
+
+
+ $machine->systemctl("list-jobs --no-pager"); // runs `systemctl list-jobs --no-pager`
+ $machine->systemctl("list-jobs --no-pager", "any-user"); // spawns a shell for `any-user` and runs `systemctl --user list-jobs --no-pager`
+
+
+
+
+
+
+ To test user units declared by systemd.user.services the optional $user
+ argument can be used:
+
+
+ $machine->start;
+ $machine->waitForX;
+ $machine->waitForUnit("xautolock.service", "x-session-user");
+
+
+ This applies to systemctl, getUnitInfo,
+ waitForUnit, startJob
+ and stopJob.
+
+
diff --git a/nixos/doc/manual/installation/installing-uefi.xml b/nixos/doc/manual/installation/installing-uefi.xml
deleted file mode 100644
index 0d3eaa8bb1fb0c88479f977f02d8c2febc67766b..0000000000000000000000000000000000000000
--- a/nixos/doc/manual/installation/installing-uefi.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-UEFI Installation
-
-NixOS can also be installed on UEFI systems. The procedure
-is by and large the same as a BIOS installation, with the following
-changes:
-
-
-
- You should boot the live CD in UEFI mode (consult your
- specific hardware's documentation for instructions). You may find
- the rEFInd
- boot manager useful.
-
-
- Instead of fdisk, you should use
- gdisk to partition your disks. You will need to
- have a separate partition for /boot with
- partition code EF00, and it should be formatted as a
- vfat filesystem.
-
-
- Instead of ,
- you must set to
- true. nixos-generate-config
- should do this automatically for new configurations when booted in
- UEFI mode.
-
-
- After having mounted your installation partition to
- /mnt, you must mount the boot partition
- to /mnt/boot.
-
-
- You may want to look at the options starting with
- and
- as well.
-
-
-
-
-
diff --git a/nixos/doc/manual/installation/installing-usb.xml b/nixos/doc/manual/installation/installing-usb.xml
index 31d51816e39b0f0760673bfe1ccd741a583774c1..122a4745f1948acc2c29d8441892ca9ab67f9883 100644
--- a/nixos/doc/manual/installation/installing-usb.xml
+++ b/nixos/doc/manual/installation/installing-usb.xml
@@ -11,10 +11,24 @@ a USB stick. You can use the dd utility to write the image:
dd if=path-to-image
of=/dev/sdb. Be careful about specifying the
correct drive; you can use the lsblk command to get a list of
-block devices. If you're on macOS you can run diskutil list
-to see the list of devices; the device you'll use for the USB must be ejected
-before writing the image.
+block devices.
+On macOS:
+
+$ diskutil list
+[..]
+/dev/diskN (external, physical):
+ #: TYPE NAME SIZE IDENTIFIER
+[..]
+$ diskutil unmountDisk diskN
+Unmount of all volumes on diskN was successful
+$ sudo dd bs=1m if=nix.iso of=/dev/rdiskN
+
+Using the 'raw' rdiskN device instead of diskN
+completes in minutes instead of hours. After dd completes, a GUI
+dialog "The disk you inserted was not readable by this computer" will pop up, which
+can be ignored.
+
The dd utility will write the image verbatim to the drive,
making it the recommended option for both UEFI and non-UEFI installations. For
non-UEFI installations, you can alternatively use
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml
index b0674307a563d48ba44c6d065f0ecd239fa66f00..ab9108c30a71546b0093768f8caf658260c4acd6 100644
--- a/nixos/doc/manual/installation/installing.xml
+++ b/nixos/doc/manual/installation/installing.xml
@@ -6,9 +6,18 @@
Installing NixOS
+NixOS can be installed on BIOS or UEFI systems. The procedure
+for a UEFI installation is by and large the same as a BIOS installation. The differences are mentioned in the steps that follow.
+
- Boot from the CD.
+ Boot from the CD.
+
+ UEFI systems
+ You should boot the live CD in UEFI mode
+ (consult your specific hardware's documentation for instructions).
+ You may find the rEFInd boot
+ manager useful.
The CD contains a basic NixOS installation. (It
also contains Memtest86+, useful if you want to test new hardware).
@@ -50,7 +59,31 @@
For partitioning:
- fdisk.
+ fdisk.
+
+# fdisk /dev/sda # (or whatever device you want to install on)
+-- for UEFI systems only
+> n # (create a new partition for /boot)
+> 3 # (make it a partition number 3)
+> # (press enter to accept the default)
+> +512M # (the size of the UEFI boot partition)
+> t # (change the partition type ...)
+> 3 # (... of the boot partition ...)
+> 1 # (... to 'UEFI System')
+-- for BIOS or UEFI systems
+> n # (create a new partition for /swap)
+> 2 # (make it a partition number 2)
+> # (press enter to accept the default)
+> +8G # (the size of the swap partition, set to whatever you like)
+> n # (create a new partition for /)
+> 1 # (make it a partition number 1)
+> # (press enter to accept the default)
+> # (press enter to accept the default and use the rest of the remaining space)
+> a # (make the partition bootable)
+> x # (enter expert mode)
+> f # (fix up the partition ordering)
+> r # (exit expert mode)
+> w # (write the partition table to disk and exit)
For initialising Ext4 partitions:
mkfs.ext4. It is recommended that you assign a
@@ -67,7 +100,25 @@
For creating swap partitions:
mkswap. Again it’s recommended to assign a
label to the swap partition: .
+ label. For example:
+
+
+# mkswap -L swap /dev/sda2
+
+
+
+
+
+ UEFI systems
+ For creating boot partitions:
+ mkfs.fat. Again it’s recommended to assign a
+ label to the boot partition: . For example:
+
+
+# mkfs.fat -F 32 -L boot /dev/sda3
+
+
For creating LVM volumes, the LVM commands, e.g.,
@@ -95,11 +146,27 @@
+
+
+ UEFI systems
+ Mount the boot file system on /mnt/boot, e.g.
+
+
+# mount /dev/disk/by-label/boot /mnt/boot
+
+
+
+
If your machine has a limited amount of memory, you
may want to activate swap devices now (swapon
device). The installer (or
rather, the build actions that it may spawn) may need quite a bit of
- RAM, depending on your configuration.
+ RAM, depending on your configuration.
+
+
+# swapon /dev/sda2
+
+
@@ -135,10 +202,25 @@
install Emacs by running nix-env -i
emacs.
- You must set the option
+
+
+ BIOS systems
+ You must set the option
to specify on which disk
the GRUB boot loader is to be installed. Without it, NixOS cannot
- boot.
+ boot.
+
+ UEFI systems
+ You must set the option
+ to true.
+ nixos-generate-config should do this automatically for new
+ configurations when booted in
+ UEFI mode.
+ You may want to look at the options starting with
+ and
+ as well.
+
+
If there are other operating systems running on the machine before
installing NixOS, the
@@ -247,10 +329,34 @@ drive (here /dev/sda). Commands for Installing NixOS on <filename>/dev/sda</filename>
# fdisk /dev/sda # (or whatever device you want to install on)
+-- for UEFI systems only
+> n # (create a new partition for /boot)
+> 3 # (make it a partition number 3)
+> # (press enter to accept the default)
+> +512M # (the size of the UEFI boot partition)
+> t # (change the partition type ...)
+> 3 # (... of the boot partition ...)
+> 1 # (... to 'UEFI System')
+-- for BIOS or UEFI systems
+> n # (create a new partition for /swap)
+> 2 # (make it a partition number 2)
+> # (press enter to accept the default)
+> +8G # (the size of the swap partition)
+> n # (create a new partition for /)
+> 1 # (make it a partition number 1)
+> # (press enter to accept the default)
+> # (press enter to accept the default and use the rest of the remaining space)
+> a # (make the partition bootable)
+> x # (enter expert mode)
+> f # (fix up the partition ordering)
+> r # (exit expert mode)
+> w # (write the partition table to disk and exit)
# mkfs.ext4 -L nixos /dev/sda1
# mkswap -L swap /dev/sda2
# swapon /dev/sda2
+# mkfs.fat -F 32 -L boot /dev/sda3 # (for UEFI systems only)
# mount /dev/disk/by-label/nixos /mnt
+# mount /dev/disk/by-label/boot /mnt/boot # (for UEFI systems only)
# nixos-generate-config --root /mnt
# nano /mnt/etc/nixos/configuration.nix
# nixos-install
@@ -267,7 +373,8 @@ drive (here /dev/sda). (for BIOS systems only)
+ boot.loader.systemd-boot.enable = true; # (for UEFI systems only)
# Note: setting fileSystems is generally not
# necessary, since nixos-generate-config figures them out
@@ -279,7 +386,6 @@ drive (here /dev/sda).
-
diff --git a/nixos/doc/manual/installation/obtaining.xml b/nixos/doc/manual/installation/obtaining.xml
index 20a4838be88051245a20bd3772ed4a6a56cc7b2f..9b2b474c60ce5fa9d3b8cab146963208ef8d3c0c 100644
--- a/nixos/doc/manual/installation/obtaining.xml
+++ b/nixos/doc/manual/installation/obtaining.xml
@@ -12,11 +12,10 @@ download page. There are a number of installation options. If
you happen to have an optical drive and a spare CD, burning the
image to CD and booting from that is probably the easiest option.
Most people will need to prepare a USB stick to boot from.
-Unetbootin is recommended and the process is described in brief below.
-Note that systems which use UEFI require some additional manual steps.
-If you run into difficulty a number of alternative methods are presented
-in the NixOS
+ describes the preferred method
+to prepare a USB stick.
+A number of alternative methods are presented in the NixOS
Wiki.
As an alternative to installing NixOS yourself, you can get a
diff --git a/nixos/doc/manual/release-notes/rl-1404.xml b/nixos/doc/manual/release-notes/rl-1404.xml
index 36f67ed88b0ba6c0de23cb39433dc3674d0161bd..137caf14cba206492fa47d50fe78506467a6cde1 100644
--- a/nixos/doc/manual/release-notes/rl-1404.xml
+++ b/nixos/doc/manual/release-notes/rl-1404.xml
@@ -13,7 +13,7 @@ the following highlights:
Installation on UEFI systems is now supported. See
- for
+ for
details.
Systemd has been updated to version 212, which has
diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml
index b0e29182127eff79b46dc7c88a2f20cdcefd5d65..12ff2e39a1bf5c6e74960c1a64ef6ac77a89be33 100644
--- a/nixos/doc/manual/release-notes/rl-1803.xml
+++ b/nixos/doc/manual/release-notes/rl-1803.xml
@@ -20,6 +20,22 @@ has the following highlights:
+ MariaDB 10.2, updated from 10.1, is now the default MySQL implementation. While upgrading a few changes
+ have been made to the infrastructure involved:
+
+
+
+ libmysql has been deprecated, please use mysql.connector-c
+ instead, a compatibility passthru has been added to the MySQL packages.
+
+
+
+
+ The mysql57 package has a new static output containing
+ the static libraries including libmysqld.a
+
+
+
@@ -95,6 +111,34 @@ following incompatible changes:
here.
+
+
+ cc-wrapperhas been split in two; there is now also a bintools-wrapper.
+ The most commonly used files in nix-support are now split between the two wrappers.
+ Some commonly used ones, like nix-support/dynamic-linker, are duplicated for backwards compatability, even though they rightly belong only in bintools-wrapper.
+ Other more obscure ones are just moved.
+
+
+
+
+ The propagation logic has been changed.
+ The new logic, along with new types of dependencies that go with, is thoroughly documented in the "Specifying dependencies" section of the "Standard Environment" chapter of the nixpkgs manual.
+
+ The old logic isn't but is easy to describe: dependencies were propagated as the same type of dependency no matter what.
+ In practice, that means that many propagatedNativeBuildInputs should instead be propagatedBuildInputs.
+ Thankfully, that was and is the least used type of dependency.
+ Also, it means that some propagatedBuildInputs should instead be depsTargetTargetPropagated.
+ Other types dependencies should be unaffected.
+
+
+
+
+ The memcached service no longer accept dynamic socket
+ paths via . Unix sockets can be
+ still enabled by and
+ will be accessible at /run/memcached/memcached.sock.
+
+
@@ -131,6 +175,72 @@ following incompatible changes:
must be set to true.
+
+
+ The option is now 127.0.0.1 by default.
+ Previously the default behaviour was to listen on all interfaces.
+
+
+
+
+ services.btrfs.autoScrub has been added, to
+ periodically check btrfs filesystems for data corruption.
+ If there's a correct copy available, it will automatically repair
+ corrupted blocks.
+
+
+
+
+ displayManager.lightdm.greeters.gtk.clock-format.
+ has been added, the clock format string (as expected by
+ strftime, e.g. %H:%M) to use with the lightdm
+ gtk greeter panel.
+
+
+ If set to null the default clock format is used.
+
+
+
+
+ displayManager.lightdm.greeters.gtk.indicators
+ has been added, a list of allowed indicator modules to use with
+ the lightdm gtk greeter panel.
+
+
+ Built-in indicators include ~a11y,
+ ~language, ~session,
+ ~power, ~clock,
+ ~host, ~spacer. Unity
+ indicators can be represented by short name
+ (e.g. sound, power),
+ service file name, or absolute path.
+
+
+ If set to null the default indicators are
+ used.
+
+
+ In order to have the previous default configuration add
+
+ services.xserver.displayManager.lightdm.greeters.gtk.indicators = [
+ "~host" "~spacer"
+ "~clock" "~spacer"
+ "~session"
+ "~language"
+ "~a11y"
+ "~power"
+ ];
+
+ to your configuration.nix.
+
+
+
+
+ The NixOS test driver supports user services declared by systemd.user.services.
+ The methods waitForUnit, getUnitInfo, startJob
+ and stopJob provide an optional $user argument for that purpose.
+
+
diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix
index bf25e0cab2597fbbb80a6c278e8f19074f93a349..636d0223fb778b7734218b32b31aca025672b78e 100644
--- a/nixos/lib/make-disk-image.nix
+++ b/nixos/lib/make-disk-image.nix
@@ -129,6 +129,9 @@ let format' = format; in let
# TODO: Nix really likes to chown things it creates to its current user...
fakeroot nixos-prepare-root $root ${channelSources} ${config.system.build.toplevel} closure
+ # fakeroot seems to always give the owner write permissions, which we do not want
+ find $root/nix/store -mindepth 1 -maxdepth 1 -type f -o -type d | xargs chmod -R a-w
+
echo "copying staging root to image..."
cptofs ${optionalString partitioned "-P 1"} -t ${fsType} -i $diskImage $root/* /
'';
@@ -150,8 +153,6 @@ in pkgs.vmTools.runInLinuxVM (
}
''
${if partitioned then ''
- . /sys/class/block/vda1/uevent
- mknod /dev/vda1 b $MAJOR $MINOR
rootDisk=/dev/vda1
'' else ''
rootDisk=/dev/vda
diff --git a/nixos/lib/make-ext4-fs.nix b/nixos/lib/make-ext4-fs.nix
index f06649e1991a53a75c6bf073a70dd7524f605eab..21c69ed560a32e1014c56221ab51db71c2980900 100644
--- a/nixos/lib/make-ext4-fs.nix
+++ b/nixos/lib/make-ext4-fs.nix
@@ -10,7 +10,7 @@
pkgs.stdenv.mkDerivation {
name = "ext4-fs.img";
- buildInputs = with pkgs; [e2fsprogs libfaketime perl];
+ nativeBuildInputs = with pkgs; [e2fsprogs libfaketime perl];
# For obtaining the closure of `storePaths'.
exportReferencesGraph =
diff --git a/nixos/lib/make-squashfs.nix b/nixos/lib/make-squashfs.nix
index 4100af27becbbd2c4fef3acc7a2ba49161528fac..9d47a3222cc27ac689120c483a1cfa47462d7084 100644
--- a/nixos/lib/make-squashfs.nix
+++ b/nixos/lib/make-squashfs.nix
@@ -8,7 +8,7 @@
stdenv.mkDerivation {
name = "squashfs.img";
- buildInputs = [perl squashfsTools];
+ nativeBuildInputs = [perl squashfsTools];
# For obtaining the closure of `storeContents'.
exportReferencesGraph =
@@ -19,6 +19,33 @@ stdenv.mkDerivation {
# Add the closures of the top-level store objects.
storePaths=$(perl ${pathsFromGraph} closure-*)
+ # If a Hydra slave happens to have store paths with bad permissions/mtime,
+ # abort now so that they don't end up in ISO images in the channel.
+ # https://github.com/NixOS/nixpkgs/issues/32242
+ hasBadPaths=""
+ for path in $storePaths; do
+ if [ -h "$path" ]; then
+ continue
+ fi
+
+ mtime=$(stat -c %Y "$path")
+ mode=$(stat -c %a "$path")
+
+ if [ "$mtime" != 1 ]; then
+ echo "Store path '$path' has an invalid mtime."
+ hasBadPaths=1
+ fi
+ if [ "$mode" != 444 ] && [ "$mode" != 555 ]; then
+ echo "Store path '$path' has invalid permissions ($mode)."
+ hasBadPaths=1
+ fi
+ done
+
+ if [ -n "$hasBadPaths" ]; then
+ echo "You have bad paths in your store, please fix them."
+ exit 1
+ fi
+
# Also include a manifest of the closures in a format suitable
# for nix-store --load-db.
printRegistration=1 perl ${pathsFromGraph} closure-* > nix-path-registration
diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm
index a01c3c336a1b8e6c85c776927aff17534acb90c9..78598b3efb4b1f578b8d7710bbb44d42ec60b99b 100644
--- a/nixos/lib/test-driver/Machine.pm
+++ b/nixos/lib/test-driver/Machine.pm
@@ -362,8 +362,8 @@ sub mustFail {
sub getUnitInfo {
- my ($self, $unit) = @_;
- my ($status, $lines) = $self->execute("systemctl --no-pager show '$unit'");
+ my ($self, $unit, $user) = @_;
+ my ($status, $lines) = $self->systemctl("--no-pager show \"$unit\"", $user);
return undef if $status != 0;
my $info = {};
foreach my $line (split '\n', $lines) {
@@ -373,6 +373,16 @@ sub getUnitInfo {
return $info;
}
+sub systemctl {
+ my ($self, $q, $user) = @_;
+ if ($user) {
+ $q =~ s/'/\\'/g;
+ return $self->execute("su -l $user -c \$'XDG_RUNTIME_DIR=/run/user/`id -u` systemctl --user $q'");
+ }
+
+ return $self->execute("systemctl $q");
+}
+
# Fail if the given systemd unit is not in the "active" state.
sub requireActiveUnit {
my ($self, $unit) = @_;
@@ -387,16 +397,16 @@ sub requireActiveUnit {
# Wait for a systemd unit to reach the "active" state.
sub waitForUnit {
- my ($self, $unit) = @_;
+ my ($self, $unit, $user) = @_;
$self->nest("waiting for unit ‘$unit’", sub {
retry sub {
- my $info = $self->getUnitInfo($unit);
+ my $info = $self->getUnitInfo($unit, $user);
my $state = $info->{ActiveState};
die "unit ‘$unit’ reached state ‘$state’\n" if $state eq "failed";
if ($state eq "inactive") {
# If there are no pending jobs, then assume this unit
# will never reach active state.
- my ($status, $jobs) = $self->execute("systemctl list-jobs --full 2>&1");
+ my ($status, $jobs) = $self->systemctl("list-jobs --full 2>&1", $user);
if ($jobs =~ /No jobs/) { # FIXME: fragile
# Handle the case where the unit may have started
# between the previous getUnitInfo() and
@@ -430,14 +440,14 @@ sub waitForFile {
}
sub startJob {
- my ($self, $jobName) = @_;
- $self->execute("systemctl start $jobName");
+ my ($self, $jobName, $user) = @_;
+ $self->systemctl("start $jobName", $user);
# FIXME: check result
}
sub stopJob {
- my ($self, $jobName) = @_;
- $self->execute("systemctl stop $jobName");
+ my ($self, $jobName, $user) = @_;
+ $self->systemctl("stop $jobName", $user);
}
diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh
index dfc0f8d1146585fb349b60b41fc4ca84681eff5e..347e6b9c6e0dbb104847dc0bdab4085d8f0a10b9 100755
--- a/nixos/maintainers/scripts/ec2/create-amis.sh
+++ b/nixos/maintainers/scripts/ec2/create-amis.sh
@@ -18,7 +18,7 @@ rm -f ec2-amis.nix
types="hvm"
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"
+regions="eu-west-1 eu-west-2 eu-west-3 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
link=$stateDir/$type
diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix
index 619f36cd5150e6a59f84ff01530d23290f6a022c..4101ef82f3e1b46670905162d50cdc280991f878 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -290,8 +290,8 @@ in
ln -s /run/systemd/resolve/resolv.conf /run/resolvconf/interfaces/systemd
''}
- # Make sure resolv.conf is up to date if not managed by systemd
- ${optionalString (!config.services.resolved.enable) ''
+ # Make sure resolv.conf is up to date if not managed manually or by systemd
+ ${optionalString (!config.environment.etc?"resolv.conf") ''
${pkgs.openresolv}/bin/resolvconf -u
''}
'';
diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix
index ae3e17ac27b67dc65036b08bf1f0583af7b36ef0..e1c4d0d602afba9b028a149259fd69430ecbb9c0 100644
--- a/nixos/modules/config/no-x-libs.nix
+++ b/nixos/modules/config/no-x-libs.nix
@@ -35,7 +35,7 @@ with lib;
networkmanager_pptp = pkgs.networkmanager_pptp.override { withGnome = false; };
networkmanager_vpnc = pkgs.networkmanager_vpnc.override { withGnome = false; };
networkmanager_iodine = pkgs.networkmanager_iodine.override { withGnome = false; };
- pinentry = pkgs.pinentry.override { gtk2 = null; qt4 = null; };
+ pinentry = pkgs.pinentry_ncurses;
};
};
}
diff --git a/nixos/modules/installer/netboot/netboot.nix b/nixos/modules/installer/netboot/netboot.nix
index 0f6046339b371d57fdb7ce0e7793aab5b0667f50..52239b6191264b3d6733a8aaef1539b811405a94 100644
--- a/nixos/modules/installer/netboot/netboot.nix
+++ b/nixos/modules/installer/netboot/netboot.nix
@@ -18,17 +18,17 @@ with lib;
};
- config = {
-
- boot.loader.grub.version = 2;
-
+ config = rec {
# Don't build the GRUB menu builder script, since we don't need it
# here and it causes a cyclic dependency.
boot.loader.grub.enable = false;
# !!! Hack - attributes expected by other modules.
- system.boot.loader.kernelFile = "bzImage";
- environment.systemPackages = [ pkgs.grub2 pkgs.grub2_efi pkgs.syslinux ];
+ environment.systemPackages = [ pkgs.grub2_efi ]
+ ++ (if pkgs.stdenv.system == "aarch64-linux"
+ then []
+ else [ pkgs.grub2 pkgs.syslinux ]);
+ system.boot.loader.kernelFile = pkgs.stdenv.platform.kernelTarget;
fileSystems."/" =
{ fsType = "tmpfs";
@@ -84,7 +84,12 @@ with lib;
];
};
- system.build.netbootIpxeScript = pkgs.writeTextDir "netboot.ipxe" "#!ipxe\nkernel bzImage init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}\ninitrd initrd\nboot";
+ system.build.netbootIpxeScript = pkgs.writeTextDir "netboot.ipxe" ''
+ #!ipxe
+ kernel ${pkgs.stdenv.platform.kernelTarget} init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}
+ initrd initrd
+ boot
+ '';
boot.loader.timeout = 10;
diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix
index 321fb9a2030ad5ea6659235548ad2f7fcc88b311..131c779b1ab1c31d4747961cfe228d5fa481cce6 100644
--- a/nixos/modules/installer/tools/nix-fallback-paths.nix
+++ b/nixos/modules/installer/tools/nix-fallback-paths.nix
@@ -1,5 +1,6 @@
{
- x86_64-linux = "/nix/store/b4s1gxiis1ryvybnjhdjvgc5sr1nq0ys-nix-1.11.15";
- i686-linux = "/nix/store/kgb5hs7qw13bvb6icramv1ry9dard3h9-nix-1.11.15";
- x86_64-darwin = "/nix/store/dgwz3dxdzs2wwd7pg7cdhvl8rv0qpnbj-nix-1.11.15";
+ x86_64-linux = "/nix/store/gy4yv67gv3j6in0lalw37j353zdmfcwm-nix-1.11.16";
+ i686-linux = "/nix/store/ifmyq5ryfxhhrzh62hiq65xyz1fwffga-nix-1.11.16";
+ aarch64-linux = "/nix/store/y9mfv3sx75mbfibf1zna1kq9v98fk2nb-nix-1.11.16";
+ x86_64-darwin = "/nix/store/hwpp7kia2f0in5ns2hiw41q38k30jpj2-nix-1.11.16";
}
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index c10b5a0ec932d7714f0452440c042b663956a414..c6440dd906fdd7302039d8f2afdfab2cb69f59af 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -65,7 +65,7 @@
foldingathome = 37;
sabnzbd = 38;
#kdm = 39; # dropped in 17.03
- ghostone = 40;
+ #ghostone = 40; # dropped in 18.03
git = 41;
fourstore = 42;
fourstorehttp = 43;
@@ -197,10 +197,10 @@
#input = 174; # unused
sddm = 175;
tss = 176;
- memcached = 177;
+ #memcached = 177; removed 2018-01-03
ntp = 179;
zabbix = 180;
- redis = 181;
+ #redis = 181; removed 2018-01-03
unifi = 183;
uptimed = 184;
zope2 = 185;
@@ -281,8 +281,8 @@
stanchion = 262;
riak-cs = 263;
infinoted = 264;
- keystone = 265;
- glance = 266;
+ # keystone = 265; # unused, removed 2017-12-13
+ # glance = 266; # unused, removed 2017-12-13
couchpotato = 267;
gogs = 268;
pdns-recursor = 269;
@@ -348,7 +348,7 @@
#foldingathome = 37; # unused
#sabnzd = 38; # unused
#kdm = 39; # unused, even before 17.03
- ghostone = 40;
+ #ghostone = 40; # dropped in 18.03
git = 41;
fourstore = 42;
fourstorehttp = 43;
@@ -475,10 +475,10 @@
input = 174;
sddm = 175;
tss = 176;
- #memcached = 177; # unused
+ #memcached = 177; # unused, removed 2018-01-03
#ntp = 179; # unused
#zabbix = 180; # unused
- #redis = 181; # unused
+ #redis = 181; # unused, removed 2018-01-03
#unifi = 183; # unused
#uptimed = 184; # unused
#zope2 = 185; # unused
@@ -551,8 +551,8 @@
stanchion = 262;
riak-cs = 263;
infinoted = 264;
- keystone = 265;
- glance = 266;
+ # keystone = 265; # unused, removed 2017-12-13
+ # glance = 266; # unused, removed 2017-12-13
couchpotato = 267;
gogs = 268;
kresd = 270;
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 5e2161aacb66e946b60164f19b374bf0707211ca..8d329b5b4b25ed5e48028585cc63a8732372588b 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -71,6 +71,7 @@
./programs/bcc.nix
./programs/blcr.nix
./programs/browserpass.nix
+ ./programs/ccache.nix
./programs/cdemu.nix
./programs/chromium.nix
./programs/command-not-found/command-not-found.nix
@@ -91,6 +92,7 @@
./programs/npm.nix
./programs/oblogout.nix
./programs/qt5ct.nix
+ ./programs/rootston.nix
./programs/screen.nix
./programs/slock.nix
./programs/shadow.nix
@@ -104,6 +106,7 @@
./programs/tmux.nix
./programs/venus.nix
./programs/vim.nix
+ ./programs/way-cooler.nix
./programs/wireshark.nix
./programs/xfs_quota.nix
./programs/xonsh.nix
@@ -217,7 +220,6 @@
./services/editors/emacs.nix
./services/editors/infinoted.nix
./services/games/factorio.nix
- ./services/games/ghost-one.nix
./services/games/minecraft-server.nix
./services/games/minetest-server.nix
./services/games/terraria.nix
@@ -239,9 +241,11 @@
./services/hardware/tlp.nix
./services/hardware/thinkfan.nix
./services/hardware/trezord.nix
+ ./services/hardware/u2f.nix
./services/hardware/udev.nix
./services/hardware/udisks2.nix
./services/hardware/upower.nix
+ ./services/hardware/usbmuxd.nix
./services/hardware/thermald.nix
./services/logging/SystemdJournal2Gelf.nix
./services/logging/awstats.nix
@@ -257,6 +261,8 @@
./services/logging/rsyslogd.nix
./services/logging/syslog-ng.nix
./services/logging/syslogd.nix
+ ./services/mail/clamsmtp.nix
+ ./services/mail/dkimproxy-out.nix
./services/mail/dovecot.nix
./services/mail/dspam.nix
./services/mail/exim.nix
@@ -328,6 +334,7 @@
./services/misc/nix-ssh-serve.nix
./services/misc/nzbget.nix
./services/misc/octoprint.nix
+ ./services/misc/osrm.nix
./services/misc/packagekit.nix
./services/misc/parsoid.nix
./services/misc/phd.nix
@@ -352,6 +359,7 @@
./services/misc/taskserver
./services/misc/tzupdate.nix
./services/misc/uhub.nix
+ ./services/misc/xmr-stak.nix
./services/misc/zookeeper.nix
./services/monitoring/apcupsd.nix
./services/monitoring/arbtt.nix
@@ -398,7 +406,9 @@
./services/monitoring/vnstat.nix
./services/monitoring/zabbix-agent.nix
./services/monitoring/zabbix-server.nix
+ ./services/network-filesystems/beegfs.nix
./services/network-filesystems/cachefilesd.nix
+ ./services/network-filesystems/davfs2.nix
./services/network-filesystems/drbd.nix
./services/network-filesystems/glusterfs.nix
./services/network-filesystems/kbfs.nix
@@ -588,6 +598,7 @@
./services/system/cloud-init.nix
./services/system/dbus.nix
./services/system/earlyoom.nix
+ ./services/system/localtime.nix
./services/system/kerberos.nix
./services/system/nscd.nix
./services/system/saslauthd.nix
@@ -671,6 +682,7 @@
./system/activation/top-level.nix
./system/boot/coredump.nix
./system/boot/emergency-mode.nix
+ ./system/boot/grow-partition.nix
./system/boot/initrd-network.nix
./system/boot/initrd-ssh.nix
./system/boot/kernel.nix
@@ -737,6 +749,7 @@
./virtualisation/lxcfs.nix
./virtualisation/lxd.nix
./virtualisation/amazon-options.nix
+ ./virtualisation/hyperv-guest.nix
./virtualisation/openvswitch.nix
./virtualisation/parallels-guest.nix
./virtualisation/rkt.nix
@@ -745,6 +758,4 @@
./virtualisation/vmware-guest.nix
./virtualisation/xen-dom0.nix
./virtualisation/xe-guest-utilities.nix
- ./virtualisation/openstack/keystone.nix
- ./virtualisation/openstack/glance.nix
]
diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix
index 3c7e516c497f44b3ec7c5b6d72ce77345fb1335e..f56640f19782efef9589dadf367e8e448ac606fe 100644
--- a/nixos/modules/profiles/all-hardware.nix
+++ b/nixos/modules/profiles/all-hardware.nix
@@ -19,13 +19,12 @@
"sata_sil" "sata_sil24" "sata_sis" "sata_svw" "sata_sx4"
"sata_uli" "sata_via" "sata_vsc"
- "pata_ali" "pata_amd" "pata_artop" "pata_atiixp"
- "pata_cs5520" "pata_cs5530" "pata_cs5535" "pata_efar"
+ "pata_ali" "pata_amd" "pata_artop" "pata_atiixp" "pata_efar"
"pata_hpt366" "pata_hpt37x" "pata_hpt3x2n" "pata_hpt3x3"
"pata_it8213" "pata_it821x" "pata_jmicron" "pata_marvell"
"pata_mpiix" "pata_netcell" "pata_ns87410" "pata_oldpiix"
"pata_pcmcia" "pata_pdc2027x" "pata_qdi" "pata_rz1000"
- "pata_sc1200" "pata_serverworks" "pata_sil680" "pata_sis"
+ "pata_serverworks" "pata_sil680" "pata_sis"
"pata_sl82c105" "pata_triflex" "pata_via"
"pata_winbond"
diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix
index ef1acdfe66e60e2a506d23af21a4e68ac1a4e19f..1abdb4973a44b2416f4c2e2ce325929ff9f8abd2 100644
--- a/nixos/modules/programs/bash/bash.nix
+++ b/nixos/modules/programs/bash/bash.nix
@@ -14,13 +14,16 @@ let
bashCompletion = optionalString cfg.enableCompletion ''
# Check whether we're running a version of Bash that has support for
# programmable completion. If we do, enable all modules installed in
- # the system (and user profile).
+ # the system and user profile in obsolete /etc/bash_completion.d/
+ # directories. Bash loads completions in all
+ # $XDG_DATA_DIRS/share/bash-completion/completions/
+ # on demand, so they do not need to be sourced here.
if shopt -q progcomp &>/dev/null; then
. "${pkgs.bash-completion}/etc/profile.d/bash_completion.sh"
nullglobStatus=$(shopt -p nullglob)
shopt -s nullglob
for p in $NIX_PROFILES; do
- for m in "$p/etc/bash_completion.d/"* "$p/share/bash-completion/completions/"*; do
+ for m in "$p/etc/bash_completion.d/"*; do
. $m
done
done
diff --git a/nixos/modules/programs/ccache.nix b/nixos/modules/programs/ccache.nix
new file mode 100644
index 0000000000000000000000000000000000000000..874774c72b47cfed13afcf3ddcd0dcbb6f132854
--- /dev/null
+++ b/nixos/modules/programs/ccache.nix
@@ -0,0 +1,83 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+let
+ cfg = config.programs.ccache;
+in {
+ options.programs.ccache = {
+ # host configuration
+ enable = mkEnableOption "CCache";
+ cacheDir = mkOption {
+ type = types.path;
+ description = "CCache directory";
+ default = "/var/cache/ccache";
+ };
+ # target configuration
+ packageNames = mkOption {
+ type = types.listOf types.str;
+ description = "Nix top-level packages to be compiled using CCache";
+ default = [];
+ example = [ "wxGTK30" "qt48" "ffmpeg_3_3" "libav_all" ];
+ };
+ };
+
+ config = mkMerge [
+ # host configuration
+ (mkIf cfg.enable {
+ systemd.tmpfiles.rules = [ "d ${cfg.cacheDir} 0770 root nixbld -" ];
+
+ # "nix-ccache --show-stats" and "nix-ccache --clear"
+ security.wrappers.nix-ccache = {
+ group = "nixbld";
+ setgid = true;
+ source = pkgs.writeScript "nix-ccache.pl" ''
+ #!${pkgs.perl}/bin/perl
+
+ %ENV=( CCACHE_DIR => '${cfg.cacheDir}' );
+ sub untaint {
+ my $v = shift;
+ return '-C' if $v eq '-C' || $v eq '--clear';
+ return '-V' if $v eq '-V' || $v eq '--version';
+ return '-s' if $v eq '-s' || $v eq '--show-stats';
+ return '-z' if $v eq '-z' || $v eq '--zero-stats';
+ exec('${pkgs.ccache}/bin/ccache', '-h');
+ }
+ exec('${pkgs.ccache}/bin/ccache', map { untaint $_ } @ARGV);
+ '';
+ };
+ })
+
+ # target configuration
+ (mkIf (cfg.packageNames != []) {
+ nixpkgs.overlays = [
+ (self: super: genAttrs cfg.packageNames (pn: super.${pn}.override { stdenv = builtins.trace "with ccache: ${pn}" self.ccacheStdenv; }))
+
+ (self: super: {
+ ccacheWrapper = super.ccacheWrapper.override {
+ extraConfig = ''
+ export CCACHE_COMPRESS=1
+ export CCACHE_DIR="${cfg.cacheDir}"
+ export CCACHE_UMASK=007
+ if [ ! -d "$CCACHE_DIR" ]; then
+ echo "====="
+ echo "Directory '$CCACHE_DIR' does not exist"
+ echo "Please create it with:"
+ echo " sudo mkdir -m0770 '$CCACHE_DIR'"
+ echo " sudo chown root:nixbld '$CCACHE_DIR'"
+ echo "====="
+ exit 1
+ fi
+ if [ ! -w "$CCACHE_DIR" ]; then
+ echo "====="
+ echo "Directory '$CCACHE_DIR' is not accessible for user $(whoami)"
+ echo "Please verify its access permissions"
+ echo "====="
+ exit 1
+ fi
+ '';
+ };
+ })
+ ];
+ })
+ ];
+}
\ No newline at end of file
diff --git a/nixos/modules/programs/dconf.nix b/nixos/modules/programs/dconf.nix
index 1b7e20799819a6cf1ec9ec996011748bd5d514df..27bfdf022e7d46b1ef9b99bd052fec63a7c9a359 100644
--- a/nixos/modules/programs/dconf.nix
+++ b/nixos/modules/programs/dconf.nix
@@ -1,7 +1,8 @@
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
+
+with lib;
let
- inherit (lib) mkOption mkIf types mapAttrsToList;
cfg = config.programs.dconf;
mkDconfProfile = name: path:
@@ -13,6 +14,7 @@ in
options = {
programs.dconf = {
+ enable = mkEnableOption "dconf";
profiles = mkOption {
type = types.attrsOf types.path;
@@ -26,9 +28,15 @@ in
###### implementation
- config = mkIf (cfg.profiles != {}) {
- environment.etc =
+ config = mkIf (cfg.profiles != {} || cfg.enable) {
+ environment.etc = optionals (cfg.profiles != {})
(mapAttrsToList mkDconfProfile cfg.profiles);
+
+ environment.variables.GIO_EXTRA_MODULES = optional cfg.enable
+ "${pkgs.gnome3.dconf.lib}/lib/gio/modules";
+ # https://github.com/NixOS/nixpkgs/pull/31891
+ #environment.variables.XDG_DATA_DIRS = optional cfg.enable
+ # "$(echo ${pkgs.gnome3.gsettings_desktop_schemas}/share/gsettings-schemas/gsettings-desktop-schemas-*)";
};
}
diff --git a/nixos/modules/programs/rootston.nix b/nixos/modules/programs/rootston.nix
new file mode 100644
index 0000000000000000000000000000000000000000..1946b1db657b1ec8d6cffe58aee332f7f1c19bed
--- /dev/null
+++ b/nixos/modules/programs/rootston.nix
@@ -0,0 +1,103 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+ cfg = config.programs.rootston;
+
+ rootstonWrapped = pkgs.writeScriptBin "rootston" ''
+ #! ${pkgs.stdenv.shell}
+ if [[ "$#" -ge 1 ]]; then
+ exec ${pkgs.rootston}/bin/rootston "$@"
+ else
+ ${cfg.extraSessionCommands}
+ exec ${pkgs.rootston}/bin/rootston -C ${cfg.configFile}
+ fi
+ '';
+in {
+ options.programs.rootston = {
+ enable = mkEnableOption ''
+ rootston, the reference compositor for wlroots. The purpose of rootston
+ is to test and demonstrate the features of wlroots (if you want a real
+ Wayland compositor you should e.g. use Sway instead). You can manually
+ start the compositor by running "rootston" from a terminal'';
+
+ extraSessionCommands = mkOption {
+ type = types.lines;
+ default = "";
+ example = ''
+ # Define a keymap (US QWERTY is the default)
+ export XKB_DEFAULT_LAYOUT=de,us
+ export XKB_DEFAULT_VARIANT=nodeadkeys
+ export XKB_DEFAULT_OPTIONS=grp:alt_shift_toggle,caps:escape
+ '';
+ description = ''
+ Shell commands executed just before rootston is started.
+ '';
+ };
+
+ extraPackages = mkOption {
+ type = with types; listOf package;
+ default = with pkgs; [
+ westonLite xwayland rofi
+ ];
+ defaultText = literalExample ''
+ with pkgs; [
+ westonLite xwayland rofi
+ ]
+ '';
+ example = literalExample "[ ]";
+ description = ''
+ Extra packages to be installed system wide.
+ '';
+ };
+
+ config = mkOption {
+ type = types.str;
+ default = ''
+ [keyboard]
+ meta-key = Logo
+
+ # Sway/i3 like Keybindings
+ # Maps key combinations with commands to execute
+ # Commands include:
+ # - "exit" to stop the compositor
+ # - "exec" to execute a shell command
+ # - "close" to close the current view
+ # - "next_window" to cycle through windows
+ [bindings]
+ Logo+Shift+e = exit
+ Logo+q = close
+ Logo+m = maximize
+ Alt+Tab = next_window
+ Logo+Return = exec weston-terminal
+ Logo+d = exec rofi -show run
+ '';
+ description = ''
+ Default configuration for rootston (used when called without any
+ parameters).
+ '';
+ };
+
+ configFile = mkOption {
+ type = types.path;
+ default = "/etc/rootston.ini";
+ example = literalExample "${pkgs.rootston}/etc/rootston.ini";
+ description = ''
+ Path to the default rootston configuration file (the "config" option
+ will have no effect if you change the path).
+ '';
+ };
+ };
+
+ config = mkIf cfg.enable {
+ environment.etc."rootston.ini".text = cfg.config;
+ environment.systemPackages = [ rootstonWrapped ] ++ cfg.extraPackages;
+
+ hardware.opengl.enable = mkDefault true;
+ fonts.enableDefaultFonts = mkDefault true;
+ programs.dconf.enable = mkDefault true;
+ };
+
+ meta.maintainers = with lib.maintainers; [ primeos gnidorah ];
+}
diff --git a/nixos/modules/programs/sway.nix b/nixos/modules/programs/sway.nix
index 5d13b90daace0e4e09f60d3c44c4d59783e36d1c..d9503d6004ff6b45e02e434bbf1a8bffcf7431a8 100644
--- a/nixos/modules/programs/sway.nix
+++ b/nixos/modules/programs/sway.nix
@@ -4,36 +4,42 @@ with lib;
let
cfg = config.programs.sway;
- sway = pkgs.sway;
+ swayPackage = pkgs.sway;
- swayWrapped = pkgs.writeScriptBin "sway" ''
- #! ${pkgs.stdenv.shell}
- if [ "$1" != "" ]; then
- sway-setcap "$@"
- exit
+ swayWrapped = pkgs.writeShellScriptBin "sway" ''
+ if [[ "$#" -ge 1 ]]; then
+ exec sway-setcap "$@"
+ else
+ ${cfg.extraSessionCommands}
+ exec ${pkgs.dbus.dbus-launch} --exit-with-session sway-setcap
fi
- ${cfg.extraSessionCommands}
- exec ${pkgs.dbus.dbus-launch} --exit-with-session sway-setcap
'';
swayJoined = pkgs.symlinkJoin {
- name = "sway-wrapped";
- paths = [ swayWrapped sway ];
+ name = "sway-joined";
+ paths = [ swayWrapped swayPackage ];
};
-in
-{
+in {
options.programs.sway = {
- enable = mkEnableOption "sway";
+ enable = mkEnableOption ''
+ the tiling Wayland compositor Sway. After adding yourself to the "sway"
+ group you can manually launch Sway by executing "sway" from a terminal.
+ If you call "sway" with any parameters the extraSessionCommands won't be
+ executed and Sway won't be launched with dbus-launch'';
extraSessionCommands = mkOption {
- default = "";
- type = types.lines;
+ type = types.lines;
+ default = "";
example = ''
- export XKB_DEFAULT_LAYOUT=us,de
- export XKB_DEFAULT_VARIANT=,nodeadkeys
- export XKB_DEFAULT_OPTIONS=grp:alt_shift_toggle,
+ # Define a keymap (US QWERTY is the default)
+ export XKB_DEFAULT_LAYOUT=de,us
+ export XKB_DEFAULT_VARIANT=nodeadkeys
+ export XKB_DEFAULT_OPTIONS=grp:alt_shift_toggle,caps:escape
+ # Change the Keyboard repeat delay and rate
+ export WLC_REPEAT_DELAY=660
+ export WLC_REPEAT_RATE=25
'';
description = ''
- Shell commands executed just before sway is started.
+ Shell commands executed just before Sway is started.
'';
};
@@ -42,9 +48,12 @@ in
default = with pkgs; [
i3status xwayland rxvt_unicode dmenu
];
+ defaultText = literalExample ''
+ with pkgs; [ i3status xwayland rxvt_unicode dmenu ];
+ '';
example = literalExample ''
with pkgs; [
- i3status xwayland rxvt_unicode dmenu
+ i3lock light termite
]
'';
description = ''
@@ -57,7 +66,7 @@ in
environment.systemPackages = [ swayJoined ] ++ cfg.extraPackages;
security.wrappers.sway = {
program = "sway-setcap";
- source = "${sway}/bin/sway";
+ source = "${swayPackage}/bin/sway";
capabilities = "cap_sys_ptrace,cap_sys_tty_config=eip";
owner = "root";
group = "sway";
@@ -65,8 +74,12 @@ in
};
users.extraGroups.sway = {};
+ security.pam.services.swaylock = {};
hardware.opengl.enable = mkDefault true;
fonts.enableDefaultFonts = mkDefault true;
+ programs.dconf.enable = mkDefault true;
};
+
+ meta.maintainers = with lib.maintainers; [ gnidorah primeos ];
}
diff --git a/nixos/modules/programs/tmux.nix b/nixos/modules/programs/tmux.nix
index ed1d88a420a261741830bf1dec67ba3859f0ec16..1eb6fa6bf2fa62810d21e7a54ad77ba37d7a0e8c 100644
--- a/nixos/modules/programs/tmux.nix
+++ b/nixos/modules/programs/tmux.nix
@@ -151,6 +151,15 @@ in {
type = types.str;
description = "Set the $TERM variable.";
};
+
+ secureSocket = mkOption {
+ default = true;
+ type = types.bool;
+ description = ''
+ Store tmux socket under /run, which is more secure than /tmp, but as a
+ downside it doesn't survive user logout.
+ '';
+ };
};
};
@@ -163,7 +172,7 @@ in {
systemPackages = [ pkgs.tmux ];
variables = {
- TMUX_TMPDIR = ''''${XDG_RUNTIME_DIR:-"/run/user/\$(id -u)"}'';
+ TMUX_TMPDIR = lib.optional cfg.secureSocket ''''${XDG_RUNTIME_DIR:-"/run/user/\$(id -u)"}'';
};
};
};
diff --git a/nixos/modules/programs/way-cooler.nix b/nixos/modules/programs/way-cooler.nix
new file mode 100644
index 0000000000000000000000000000000000000000..633e959be9f329123d51b76f5b09d258e09ca603
--- /dev/null
+++ b/nixos/modules/programs/way-cooler.nix
@@ -0,0 +1,78 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+ cfg = config.programs.way-cooler;
+ way-cooler = pkgs.way-cooler;
+
+ wcWrapped = pkgs.writeShellScriptBin "way-cooler" ''
+ ${cfg.extraSessionCommands}
+ exec ${pkgs.dbus.dbus-launch} --exit-with-session ${way-cooler}/bin/way-cooler
+ '';
+ wcJoined = pkgs.symlinkJoin {
+ name = "way-cooler-wrapped";
+ paths = [ wcWrapped way-cooler ];
+ };
+ configFile = readFile "${way-cooler}/etc/way-cooler/init.lua";
+ spawnBar = ''
+ util.program.spawn_at_startup("lemonbar");
+ '';
+in
+{
+ options.programs.way-cooler = {
+ enable = mkEnableOption "way-cooler";
+
+ extraSessionCommands = mkOption {
+ default = "";
+ type = types.lines;
+ example = ''
+ export XKB_DEFAULT_LAYOUT=us,de
+ export XKB_DEFAULT_VARIANT=,nodeadkeys
+ export XKB_DEFAULT_OPTIONS=grp:caps_toggle,
+ '';
+ description = ''
+ Shell commands executed just before way-cooler is started.
+ '';
+ };
+
+ extraPackages = mkOption {
+ type = with types; listOf package;
+ default = with pkgs; [
+ westonLite xwayland dmenu
+ ];
+ example = literalExample ''
+ with pkgs; [
+ westonLite xwayland dmenu
+ ]
+ '';
+ description = ''
+ Extra packages to be installed system wide.
+ '';
+ };
+
+ enableBar = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Whether to enable an unofficial bar.
+ '';
+ };
+ };
+
+ config = mkIf cfg.enable {
+ environment.systemPackages = [ wcJoined ] ++ cfg.extraPackages;
+
+ security.pam.services.wc-lock = {};
+ environment.etc."way-cooler/init.lua".text = ''
+ ${configFile}
+ ${optionalString cfg.enableBar spawnBar}
+ '';
+
+ hardware.opengl.enable = mkDefault true;
+ fonts.enableDefaultFonts = mkDefault true;
+ programs.dconf.enable = mkDefault true;
+ };
+
+ meta.maintainers = with maintainers; [ gnidorah ];
+}
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index eb10d4f428be2703cb3c727b696b09cbeddb23f9..562be13a3f6408896ca174d6207e77520e040536 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -82,6 +82,10 @@ with lib;
(mkRenamedOptionModule [ "services" "virtualboxHost" "addNetworkInterface" ] [ "virtualisation" "virtualbox" "host" "addNetworkInterface" ])
(mkRenamedOptionModule [ "services" "virtualboxHost" "enableHardening" ] [ "virtualisation" "virtualbox" "host" "enableHardening" ])
+ # libvirtd
+ (mkRemovedOptionModule [ "virtualisation" "libvirtd" "enableKVM" ]
+ "Set the option `virtualisation.libvirtd.qemuPackage' instead.")
+
# Tarsnap
(mkRenamedOptionModule [ "services" "tarsnap" "config" ] [ "services" "tarsnap" "archives" ])
@@ -182,6 +186,9 @@ with lib;
(mkRenamedOptionModule [ "config" "fonts" "fontconfig" "ultimate" "forceAutohint" ] [ "config" "fonts" "fontconfig" "forceAutohint" ])
(mkRenamedOptionModule [ "config" "fonts" "fontconfig" "ultimate" "renderMonoTTFAsBitmap" ] [ "config" "fonts" "fontconfig" "renderMonoTTFAsBitmap" ])
+ # Profile splitting
+ (mkRenamedOptionModule [ "virtualization" "growPartition" ] [ "boot" "growPartition" ])
+
# Options that are obsolete and have no replacement.
(mkRemovedOptionModule [ "boot" "initrd" "luks" "enable" ] "")
(mkRemovedOptionModule [ "programs" "bash" "enable" ] "")
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 2d6713311a45f0f79d4661ab99ba612c47f2826d..3fff9e78aa19186571f020f3a730986c92b70f58 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -223,6 +223,17 @@ let
'';
};
+ enableGnomeKeyring = mkOption {
+ default = false;
+ type = types.bool;
+ description = ''
+ If enabled, pam_gnome_keyring will attempt to automatically unlock the
+ user's default Gnome keyring upon login. If the user login password does
+ not match their keyring password, Gnome Keyring will prompt separately
+ after login.
+ '';
+ };
+
text = mkOption {
type = types.nullOr types.lines;
description = "Contents of the PAM service file.";
@@ -273,7 +284,7 @@ let
# prompts the user for password so we run it once with 'required' at an
# earlier point and it will run again with 'sufficient' further down.
# We use try_first_pass the second time to avoid prompting password twice
- (optionalString (cfg.unixAuth && (config.security.pam.enableEcryptfs || cfg.pamMount || cfg.enableKwallet)) ''
+ (optionalString (cfg.unixAuth && (config.security.pam.enableEcryptfs || cfg.pamMount || cfg.enableKwallet || cfg.enableGnomeKeyring)) ''
auth required pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth
${optionalString config.security.pam.enableEcryptfs
"auth optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"}
@@ -282,6 +293,8 @@ let
${optionalString cfg.enableKwallet
("auth optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" +
" kwalletd=${pkgs.libsForQt5.kwallet.bin}/bin/kwalletd5")}
+ ${optionalString cfg.enableGnomeKeyring
+ ("auth optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so")}
'') + ''
${optionalString cfg.unixAuth
"auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth try_first_pass"}
@@ -351,6 +364,10 @@ let
${optionalString (cfg.enableKwallet)
("session optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" +
" kwalletd=${pkgs.libsForQt5.kwallet.bin}/bin/kwalletd5")}
+ ${optionalString (cfg.enableGnomeKeyring)
+ "session optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start"}
+ ${optionalString (config.virtualisation.lxc.lxcfs.enable)
+ "session optional ${pkgs.lxcfs}/lib/security/pam_cgfs.so -c freezer,memory,name=systemd,unified,cpuset"}
'');
};
@@ -519,7 +536,6 @@ in
ftp = {};
i3lock = {};
i3lock-color = {};
- swaylock = {};
screen = {};
vlock = {};
xlock = {};
diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index 1f64213accd46fb38361edfadf8e62575b980625..77e4b2a616d8ef404d91693c3277e48424c7f7b5 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -17,7 +17,7 @@ let
hardeningEnable = [ "pie" ];
installPhase = ''
mkdir -p $out/bin
- gcc -Wall -O2 -DWRAPPER_DIR=\"${parentWrapperDir}\" \
+ $CC -Wall -O2 -DWRAPPER_DIR=\"${parentWrapperDir}\" \
-lcap-ng -lcap ${./wrapper.c} -o $out/bin/security-wrapper
'';
};
@@ -79,7 +79,7 @@ let
({ owner = "root";
group = "root";
} // s)
- else if
+ else if
(s ? "setuid" && s.setuid) ||
(s ? "setgid" && s.setgid) ||
(s ? "permissions")
diff --git a/nixos/modules/services/audio/mopidy.nix b/nixos/modules/services/audio/mopidy.nix
index c0a0f03742942cf7493c09e525f7658c67b49eb6..52613d450b51eb83cbafd5c172695fd099e9ee08 100644
--- a/nixos/modules/services/audio/mopidy.nix
+++ b/nixos/modules/services/audio/mopidy.nix
@@ -4,17 +4,22 @@ with pkgs;
with lib;
let
-
uid = config.ids.uids.mopidy;
gid = config.ids.gids.mopidy;
cfg = config.services.mopidy;
mopidyConf = writeText "mopidy.conf" cfg.configuration;
- mopidyEnv = python.buildEnv.override {
- extraLibs = [ mopidy ] ++ cfg.extensionPackages;
+ mopidyEnv = buildEnv {
+ name = "mopidy-with-extensions-${mopidy.version}";
+ paths = closePropagation cfg.extensionPackages;
+ pathsToLink = [ "/${python.sitePackages}" ];
+ buildInputs = [ makeWrapper ];
+ postBuild = ''
+ makeWrapper ${mopidy}/bin/mopidy $out/bin/mopidy \
+ --prefix PYTHONPATH : $out/${python.sitePackages}
+ '';
};
-
in {
options = {
@@ -61,7 +66,6 @@ in {
};
-
###### implementation
config = mkIf cfg.enable {
diff --git a/nixos/modules/services/backup/tarsnap.nix b/nixos/modules/services/backup/tarsnap.nix
index 7c9dedb67ad2fa890b1a9577226775c9b3ef9bad..59e9d122fb50f309cc2225907375a207f996c77c 100644
--- a/nixos/modules/services/backup/tarsnap.nix
+++ b/nixos/modules/services/backup/tarsnap.nix
@@ -115,7 +115,7 @@ in
description = ''
Print global archive statistics upon completion.
The output is available via
- systemctl status tarsnap@archive-name.
+ systemctl status tarsnap-archive-name.
'';
};
diff --git a/nixos/modules/services/backup/znapzend.nix b/nixos/modules/services/backup/znapzend.nix
index baf99930e3eb23c2d661826d86531ecc6fc600a2..762bb4b38675c60d5cf3b2080f81374be0bcdff2 100644
--- a/nixos/modules/services/backup/znapzend.nix
+++ b/nixos/modules/services/backup/znapzend.nix
@@ -1,39 +1,372 @@
{ config, lib, pkgs, ... }:
with lib;
+with types;
let
+
+ # Converts a plan like
+ # { "1d" = "1h"; "1w" = "1d"; }
+ # into
+ # "1d=>1h,1w=>1d"
+ attrToPlan = attrs: concatStringsSep "," (builtins.attrValues (
+ mapAttrs (n: v: "${n}=>${v}") attrs));
+
+ planDescription = ''
+ The znapzend backup plan to use for the source.
+
+
+ The plan specifies how often to backup and for how long to keep the
+ backups. It consists of a series of retention periodes to interval
+ associations:
+
+
+
+ retA=>intA,retB=>intB,...
+
+
+
+ Both intervals and retention periods are expressed in standard units
+ of time or multiples of them. You can use both the full name or a
+ shortcut according to the following listing:
+
+
+
+ second|sec|s, minute|min, hour|h, day|d, week|w, month|mon|m, year|y
+
+
+
+ See znapzendzetup1 for more info.
+ '';
+ planExample = "1h=>10min,1d=>1h,1w=>1d,1m=>1w,1y=>1m";
+
+ # A type for a string of the form number{b|k|M|G}
+ mbufferSizeType = str // {
+ check = x: str.check x && builtins.isList (builtins.match "^[0-9]+[bkMG]$" x);
+ description = "string of the form number{b|k|M|G}";
+ };
+
+ # Type for a string that must contain certain other strings (the list parameter).
+ # Note that these would need regex escaping.
+ stringContainingStrings = list: let
+ matching = s: map (str: builtins.match ".*${str}.*" s) list;
+ in str // {
+ check = x: str.check x && all isList (matching x);
+ description = "string containing all of the characters ${concatStringsSep ", " list}";
+ };
+
+ timestampType = stringContainingStrings [ "%Y" "%m" "%d" "%H" "%M" "%S" ];
+
+ destType = srcConfig: submodule ({ name, ... }: {
+ options = {
+
+ label = mkOption {
+ type = str;
+ description = "Label for this destination. Defaults to the attribute name.";
+ };
+
+ plan = mkOption {
+ type = str;
+ description = planDescription;
+ example = planExample;
+ };
+
+ dataset = mkOption {
+ type = str;
+ description = "Dataset name to send snapshots to.";
+ example = "tank/main";
+ };
+
+ host = mkOption {
+ type = nullOr str;
+ description = ''
+ Host to use for the destination dataset. Can be prefixed with
+ user@ to specify the ssh user.
+ '';
+ default = null;
+ example = "john@example.com";
+ };
+
+ presend = mkOption {
+ type = nullOr str;
+ description = ''
+ Command to run before sending the snapshot to the destination.
+ Intended to run a remote script via ssh on the
+ destination, e.g. to bring up a backup disk or server or to put a
+ zpool online/offline. See also .
+ '';
+ default = null;
+ example = "ssh root@bserv zpool import -Nf tank";
+ };
+
+ postsend = mkOption {
+ type = nullOr str;
+ description = ''
+ Command to run after sending the snapshot to the destination.
+ Intended to run a remote script via ssh on the
+ destination, e.g. to bring up a backup disk or server or to put a
+ zpool online/offline. See also .
+ '';
+ default = null;
+ example = "ssh root@bserv zpool export tank";
+ };
+ };
+
+ config = {
+ label = mkDefault name;
+ plan = mkDefault srcConfig.plan;
+ };
+ });
+
+
+
+ srcType = submodule ({ name, config, ... }: {
+ options = {
+
+ enable = mkOption {
+ type = bool;
+ description = "Whether to enable this source.";
+ default = true;
+ };
+
+ recursive = mkOption {
+ type = bool;
+ description = "Whether to do recursive snapshots.";
+ default = false;
+ };
+
+ mbuffer = {
+ enable = mkOption {
+ type = bool;
+ description = "Whether to use mbuffer.";
+ default = false;
+ };
+
+ port = mkOption {
+ type = nullOr ints.u16;
+ description = ''
+ Port to use for mbuffer.
+
+
+ If this is null, it will run mbuffer through
+ ssh.
+
+
+ If this is not null, it will run mbuffer
+ directly through TCP, which is not encrypted but faster. In that
+ case the given port needs to be open on the destination host.
+ '';
+ default = null;
+ };
+
+ size = mkOption {
+ type = mbufferSizeType;
+ description = ''
+ The size for mbuffer.
+ Supports the units b, k, M, G.
+ '';
+ default = "1G";
+ example = "128M";
+ };
+ };
+
+ presnap = mkOption {
+ type = nullOr str;
+ description = ''
+ Command to run before snapshots are taken on the source dataset,
+ e.g. for database locking/flushing. See also
+ .
+ '';
+ default = null;
+ example = literalExample ''
+ ''${pkgs.mariadb}/bin/mysql -e "set autocommit=0;flush tables with read lock;\\! ''${pkgs.coreutils}/bin/sleep 600" & ''${pkgs.coreutils}/bin/echo $! > /tmp/mariadblock.pid ; sleep 10
+ '';
+ };
+
+ postsnap = mkOption {
+ type = nullOr str;
+ description = ''
+ Command to run after snapshots are taken on the source dataset,
+ e.g. for database unlocking. See also .
+ '';
+ default = null;
+ example = literalExample ''
+ ''${pkgs.coreutils}/bin/kill `''${pkgs.coreutils}/bin/cat /tmp/mariadblock.pid`;''${pkgs.coreutils}/bin/rm /tmp/mariadblock.pid
+ '';
+ };
+
+ timestampFormat = mkOption {
+ type = timestampType;
+ description = ''
+ The timestamp format to use for constructing snapshot names.
+ The syntax is strftime-like. The string must
+ consist of the mandatory %Y %m %d %H %M %S.
+ Optionally - _ . : characters as well as any
+ alphanumeric character are allowed. If suffixed by a
+ Z, times will be in UTC.
+ '';
+ default = "%Y-%m-%d-%H%M%S";
+ example = "znapzend-%m.%d.%Y-%H%M%SZ";
+ };
+
+ sendDelay = mkOption {
+ type = int;
+ description = ''
+ Specify delay (in seconds) before sending snaps to the destination.
+ May be useful if you want to control sending time.
+ '';
+ default = 0;
+ example = 60;
+ };
+
+ plan = mkOption {
+ type = str;
+ description = planDescription;
+ example = planExample;
+ };
+
+ dataset = mkOption {
+ type = str;
+ description = "The dataset to use for this source.";
+ example = "tank/home";
+ };
+
+ destinations = mkOption {
+ type = loaOf (destType config);
+ description = "Additional destinations.";
+ default = {};
+ example = literalExample ''
+ {
+ local = {
+ dataset = "btank/backup";
+ presend = "zpool import -N btank";
+ postsend = "zpool export btank";
+ };
+ remote = {
+ host = "john@example.com";
+ dataset = "tank/john";
+ };
+ };
+ '';
+ };
+ };
+
+ config = {
+ dataset = mkDefault name;
+ };
+
+ });
+
+ ### Generating the configuration from here
+
cfg = config.services.znapzend;
+
+ onOff = b: if b then "on" else "off";
+ nullOff = b: if isNull b then "off" else toString b;
+ stripSlashes = replaceStrings [ "/" ] [ "." ];
+
+ attrsToFile = config: concatStringsSep "\n" (builtins.attrValues (
+ mapAttrs (n: v: "${n}=${v}") config));
+
+ mkDestAttrs = dst: with dst;
+ mapAttrs' (n: v: nameValuePair "dst_${label}${n}" v) ({
+ "" = optionalString (! isNull host) "${host}:" + dataset;
+ _plan = plan;
+ } // optionalAttrs (presend != null) {
+ _precmd = presend;
+ } // optionalAttrs (postsend != null) {
+ _pstcmd = postsend;
+ });
+
+ mkSrcAttrs = srcCfg: with srcCfg; {
+ enabled = onOff enable;
+ mbuffer = with mbuffer; if enable then "${pkgs.mbuffer}/bin/mbuffer"
+ + optionalString (port != null) ":${toString port}" else "off";
+ mbuffer_size = mbuffer.size;
+ post_znap_cmd = nullOff postsnap;
+ pre_znap_cmd = nullOff presnap;
+ recursive = onOff recursive;
+ src = dataset;
+ src_plan = plan;
+ tsformat = timestampFormat;
+ zend_delay = toString sendDelay;
+ } // fold (a: b: a // b) {} (
+ map mkDestAttrs (builtins.attrValues destinations)
+ );
+
+ files = mapAttrs' (n: srcCfg: let
+ fileText = attrsToFile (mkSrcAttrs srcCfg);
+ in {
+ name = srcCfg.dataset;
+ value = pkgs.writeText (stripSlashes srcCfg.dataset) fileText;
+ }) cfg.zetup;
+
in
{
options = {
services.znapzend = {
- enable = mkEnableOption "ZnapZend daemon";
+ enable = mkEnableOption "ZnapZend ZFS backup daemon";
logLevel = mkOption {
default = "debug";
example = "warning";
- type = lib.types.enum ["debug" "info" "warning" "err" "alert"];
- description = "The log level when logging to file. Any of debug, info, warning, err, alert. Default in daemonized form is debug.";
+ type = enum ["debug" "info" "warning" "err" "alert"];
+ description = ''
+ The log level when logging to file. Any of debug, info, warning, err,
+ alert. Default in daemonized form is debug.
+ '';
};
logTo = mkOption {
- type = types.str;
+ type = str;
default = "syslog::daemon";
example = "/var/log/znapzend.log";
- description = "Where to log to (syslog::<facility> or <filepath>).";
+ description = ''
+ Where to log to (syslog::<facility> or <filepath>).
+ '';
};
noDestroy = mkOption {
- type = types.bool;
+ type = bool;
default = false;
description = "Does all changes to the filesystem except destroy.";
};
autoCreation = mkOption {
- type = types.bool;
+ type = bool;
+ default = false;
+ description = "Automatically create the destination dataset if it does not exists.";
+ };
+
+ zetup = mkOption {
+ type = loaOf srcType;
+ description = "Znapzend configuration.";
+ default = {};
+ example = literalExample ''
+ {
+ "tank/home" = {
+ # Make snapshots of tank/home every hour, keep those for 1 day,
+ # keep every days snapshot for 1 month, etc.
+ plan = "1d=>1h,1m=>1d,1y=>1m";
+ recursive = true;
+ # Send all those snapshots to john@example.com:rtank/john as well
+ destinations.remote = {
+ host = "john@example.com";
+ dataset = "rtank/john";
+ };
+ };
+ };
+ '';
+ };
+
+ pure = mkOption {
+ type = bool;
+ description = ''
+ Do not persist any stateful znapzend setups. If this option is
+ enabled, your previously set znapzend setups will be cleared and only
+ the ones defined with this module will be applied.
+ '';
default = false;
- description = "Automatically create the dataset on dest if it does not exists.";
};
};
};
@@ -49,12 +382,30 @@ in
path = with pkgs; [ zfs mbuffer openssh ];
+ preStart = optionalString cfg.pure ''
+ echo Resetting znapzend zetups
+ ${pkgs.znapzend}/bin/znapzendzetup list \
+ | grep -oP '(?<=\*\*\* backup plan: ).*(?= \*\*\*)' \
+ | xargs ${pkgs.znapzend}/bin/znapzendzetup delete
+ '' + concatStringsSep "\n" (mapAttrsToList (dataset: config: ''
+ echo Importing znapzend zetup ${config} for dataset ${dataset}
+ ${pkgs.znapzend}/bin/znapzendzetup import --write ${dataset} ${config}
+ '') files);
+
serviceConfig = {
- ExecStart = "${pkgs.znapzend}/bin/znapzend --logto=${cfg.logTo} --loglevel=${cfg.logLevel} ${optionalString cfg.noDestroy "--nodestroy"} ${optionalString cfg.autoCreation "--autoCreation"}";
+ ExecStart = let
+ args = concatStringsSep " " [
+ "--logto=${cfg.logTo}"
+ "--loglevel=${cfg.logLevel}"
+ (optionalString cfg.noDestroy "--nodestroy")
+ (optionalString cfg.autoCreation "--autoCreation")
+ ]; in "${pkgs.znapzend}/bin/znapzend ${args}";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
Restart = "on-failure";
};
};
};
};
+
+ meta.maintainers = with maintainers; [ infinisil ];
}
diff --git a/nixos/modules/services/continuous-integration/buildkite-agent.nix b/nixos/modules/services/continuous-integration/buildkite-agent.nix
index dcc5e717460100e8ec87cd6551e22bf771e498e7..1b0198ac93fe5bfec0811f29e71505733a5a6d8f 100644
--- a/nixos/modules/services/continuous-integration/buildkite-agent.nix
+++ b/nixos/modules/services/continuous-integration/buildkite-agent.nix
@@ -48,6 +48,15 @@ in
'';
};
+ hooksPath = mkOption {
+ type = types.path;
+ default = "${pkgs.buildkite-agent}/share/hooks";
+ defaultText = "${pkgs.buildkite-agent}/share/hooks";
+ description = ''
+ Path to the directory storing the hooks.
+ '';
+ };
+
meta-data = mkOption {
type = types.str;
default = "";
@@ -114,8 +123,8 @@ in
token="$(cat ${toString cfg.tokenPath})"
name="${cfg.name}"
meta-data="${cfg.meta-data}"
- hooks-path="${pkgs.buildkite-agent}/share/hooks"
build-path="${cfg.dataDir}/builds"
+ hooks-path="${cfg.hooksPath}"
bootstrap-script="${pkgs.buildkite-agent}/share/bootstrap.sh"
EOF
'';
diff --git a/nixos/modules/services/databases/memcached.nix b/nixos/modules/services/databases/memcached.nix
index c6875af506d35f9c7fd343d82fa857f399de6d83..46bc6fc5c1320f78390899ca4dbaaa22d8636c55 100644
--- a/nixos/modules/services/databases/memcached.nix
+++ b/nixos/modules/services/databases/memcached.nix
@@ -40,11 +40,7 @@ in
description = "The port to bind to";
};
- socket = mkOption {
- default = "";
- description = "Unix socket path to listen on. Setting this will disable network support";
- example = "/var/run/memcached";
- };
+ enableUnixSocket = mkEnableOption "unix socket at /run/memcached/memcached.sock";
maxMemory = mkOption {
default = 64;
@@ -68,31 +64,40 @@ in
config = mkIf config.services.memcached.enable {
- users.extraUsers.memcached =
- { name = cfg.user;
- uid = config.ids.uids.memcached;
- description = "Memcached server user";
- };
+ users.extraUsers = optional (cfg.user == "memcached") {
+ name = "memcached";
+ description = "Memcached server user";
+ };
environment.systemPackages = [ memcached ];
- systemd.services.memcached =
- { description = "Memcached server";
-
- wantedBy = [ "multi-user.target" ];
- after = [ "network.target" ];
-
- serviceConfig = {
- ExecStart =
- let
- networking = if cfg.socket != ""
- then "-s ${cfg.socket}"
- else "-l ${cfg.listen} -p ${toString cfg.port}";
- in "${memcached}/bin/memcached ${networking} -m ${toString cfg.maxMemory} -c ${toString cfg.maxConnections} ${concatStringsSep " " cfg.extraOptions}";
-
- User = cfg.user;
- };
+ systemd.services.memcached = {
+ description = "Memcached server";
+
+ wantedBy = [ "multi-user.target" ];
+ after = [ "network.target" ];
+
+ serviceConfig = {
+ PermissionsStartOnly = true;
+ ExecStartPre = optionals cfg.enableUnixSocket [
+ "${pkgs.coreutils}/bin/install -d -o ${cfg.user} /run/memcached/"
+ "${pkgs.coreutils}/bin/chown -R ${cfg.user} /run/memcached/"
+ ];
+ ExecStart =
+ let
+ networking = if cfg.enableUnixSocket
+ then "-s /run/memcached/memcached.sock"
+ else "-l ${cfg.listen} -p ${toString cfg.port}";
+ in "${memcached}/bin/memcached ${networking} -m ${toString cfg.maxMemory} -c ${toString cfg.maxConnections} ${concatStringsSep " " cfg.extraOptions}";
+
+ User = cfg.user;
};
+ };
};
+ imports = [
+ (mkRemovedOptionModule ["services" "memcached" "socket"] ''
+ This option was replaced by a fixed unix socket path at /run/memcached/memcached.sock enabled using services.memached.enableUnixSocket.
+ '')
+ ];
}
diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix
index a3bf4f9ba925c53a7416d99fa89ec648a9130d21..36d5340a306fa99e428d4242a7052e8674d0fcfb 100644
--- a/nixos/modules/services/databases/mysql.nix
+++ b/nixos/modules/services/databases/mysql.nix
@@ -7,14 +7,12 @@ let
cfg = config.services.mysql;
mysql = cfg.package;
-
- isMariaDB =
+
+ isMariaDB =
let
pName = _p: (builtins.parseDrvName (_p.name)).name;
in pName mysql == pName pkgs.mariadb;
- atLeast55 = versionAtLeast mysql.mysqlVersion "5.5";
-
pidFile = "${cfg.pidDir}/mysqld.pid";
mysqldOptions =
@@ -28,13 +26,6 @@ let
${optionalString (cfg.bind != null) "bind-address = ${cfg.bind}" }
${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") "log-bin=mysql-bin"}
${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") "server-id = ${toString cfg.replication.serverId}"}
- ${optionalString (cfg.replication.role == "slave" && !atLeast55)
- ''
- master-host = ${cfg.replication.masterHost}
- master-user = ${cfg.replication.masterUser}
- master-password = ${cfg.replication.masterPassword}
- master-port = ${toString cfg.replication.masterPort}
- ''}
${optionalString (cfg.ensureUsers != [])
''
plugin-load-add = auth_socket.so
@@ -315,7 +306,7 @@ in
fi
'') cfg.initialDatabases}
- ${optionalString (cfg.replication.role == "master" && atLeast55)
+ ${optionalString (cfg.replication.role == "master")
''
# Set up the replication master
@@ -326,7 +317,7 @@ in
) | ${mysql}/bin/mysql -u root -N
''}
- ${optionalString (cfg.replication.role == "slave" && atLeast55)
+ ${optionalString (cfg.replication.role == "slave")
''
# Set up the replication slave
diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix
index a039ad138f6fce97c9f1c56ba623e12f377d011b..e4e38a4364a0da0422b9e920000801ebbf6c931b 100644
--- a/nixos/modules/services/databases/redis.nix
+++ b/nixos/modules/services/databases/redis.nix
@@ -219,7 +219,6 @@ in
users.extraUsers.redis =
{ name = cfg.user;
- uid = config.ids.uids.redis;
description = "Redis database user";
};
diff --git a/nixos/modules/services/desktops/gnome3/at-spi2-core.nix b/nixos/modules/services/desktops/gnome3/at-spi2-core.nix
index 55ed2d9ee21b67db2bda8db7561fdfaf2f149b80..9e382241348b9f225db68cd2af72baed820ed190 100644
--- a/nixos/modules/services/desktops/gnome3/at-spi2-core.nix
+++ b/nixos/modules/services/desktops/gnome3/at-spi2-core.nix
@@ -28,14 +28,15 @@ with lib;
###### implementation
- config = mkIf config.services.gnome3.at-spi2-core.enable {
-
- environment.systemPackages = [ pkgs.at_spi2_core ];
-
- services.dbus.packages = [ pkgs.at_spi2_core ];
-
- systemd.packages = [ pkgs.at_spi2_core ];
-
- };
-
+ config = mkMerge [
+ (mkIf config.services.gnome3.at-spi2-core.enable {
+ environment.systemPackages = [ pkgs.at_spi2_core ];
+ services.dbus.packages = [ pkgs.at_spi2_core ];
+ systemd.packages = [ pkgs.at_spi2_core ];
+ })
+
+ (mkIf (!config.services.gnome3.at-spi2-core.enable) {
+ environment.variables.NO_AT_BRIDGE = "1";
+ })
+ ];
}
diff --git a/nixos/modules/services/games/ghost-one.nix b/nixos/modules/services/games/ghost-one.nix
deleted file mode 100644
index 71ff6bb2f3f06e794ec6442331c169199336658c..0000000000000000000000000000000000000000
--- a/nixos/modules/services/games/ghost-one.nix
+++ /dev/null
@@ -1,105 +0,0 @@
-{ config, lib, pkgs, ... }:
-with lib;
-let
-
- cfg = config.services.ghostOne;
- ghostUser = "ghostone";
- stateDir = "/var/lib/ghost-one";
-
-in
-{
-
- ###### interface
-
- options = {
- services.ghostOne = {
-
- enable = mkOption {
- default = false;
- description = "Enable Ghost-One Warcraft3 game hosting server.";
- };
-
- language = mkOption {
- default = "English";
- type = types.enum [ "English" "Spanish" "Russian" "Serbian" "Turkish" ];
- description = "The language of bot messages: English, Spanish, Russian, Serbian or Turkish.";
- };
-
- war3path = mkOption {
- default = "";
- description = ''
- The path to your local Warcraft III directory, which must contain war3.exe, storm.dll, and game.dll.
- '';
- };
-
- mappath = mkOption {
- default = "";
- description = ''
- The path to the directory where you keep your map files. GHost One doesn't require
- map files but if it has access to them it can send them to players and automatically
- calculate most map config values. GHost One will search [bot_mappath + map_localpath]
- for the map file (map_localpath is set in each map's config file).
- '';
- };
-
- config = mkOption {
- default = "";
- description = "Extra configuration options.";
- };
-
- };
- };
-
- ###### implementation
-
- config = mkIf cfg.enable {
-
- users.extraUsers = singleton
- { name = ghostUser;
- uid = config.ids.uids.ghostone;
- description = "Ghost One game server user";
- home = stateDir;
- };
-
- users.extraGroups = singleton
- { name = ghostUser;
- gid = config.ids.gids.ghostone;
- };
-
- services.ghostOne.config = ''
-# bot_log = /dev/stderr
- bot_language = ${pkgs.ghostOne}/share/ghost-one/languages/${cfg.language}.cfg
- bot_war3path = ${cfg.war3path}
-
- bot_mapcfgpath = mapcfgs
- bot_savegamepath = savegames
- bot_mappath = ${cfg.mappath}
- bot_replaypath = replays
- '';
-
- systemd.services."ghost-one" = {
- wantedBy = [ "multi-user.target" ];
- script = ''
- mkdir -p ${stateDir}
- cd ${stateDir}
- chown ${ghostUser}:${ghostUser} .
-
- mkdir -p mapcfgs
- chown ${ghostUser}:${ghostUser} mapcfgs
-
- mkdir -p replays
- chown ${ghostUser}:${ghostUser} replays
-
- mkdir -p savegames
- chown ${ghostUser}:${ghostUser} savegames
-
- ln -sf ${pkgs.writeText "ghost.cfg" cfg.config} ghost.cfg
- ln -sf ${pkgs.ghostOne}/share/ghost-one/ip-to-country.csv
- ${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${ghostUser} \
- -c "LANG=C ${pkgs.ghostOne}/bin/ghost++"
- '';
- };
-
- };
-
-}
diff --git a/nixos/modules/services/hardware/80-net-setup-link.rules b/nixos/modules/services/hardware/80-net-setup-link.rules
deleted file mode 100644
index 18547f170a3f9c0de47eea29c550d0244e432330..0000000000000000000000000000000000000000
--- a/nixos/modules/services/hardware/80-net-setup-link.rules
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copied from systemd 203.
-ACTION=="remove", GOTO="net_name_slot_end"
-SUBSYSTEM!="net", GOTO="net_name_slot_end"
-NAME!="", GOTO="net_name_slot_end"
-
-IMPORT{cmdline}="net.ifnames"
-ENV{net.ifnames}=="0", GOTO="net_name_slot_end"
-
-NAME=="", ENV{ID_NET_NAME_ONBOARD}!="", NAME="$env{ID_NET_NAME_ONBOARD}"
-NAME=="", ENV{ID_NET_NAME_SLOT}!="", NAME="$env{ID_NET_NAME_SLOT}"
-NAME=="", ENV{ID_NET_NAME_PATH}!="", NAME="$env{ID_NET_NAME_PATH}"
-
-LABEL="net_name_slot_end"
diff --git a/nixos/modules/services/hardware/thinkfan.nix b/nixos/modules/services/hardware/thinkfan.nix
index 018e82e58a3de046cfb580a3ad536b585fd0fa86..5a898631e0903a4f2b0aa9d0d3f596248175f674 100644
--- a/nixos/modules/services/hardware/thinkfan.nix
+++ b/nixos/modules/services/hardware/thinkfan.nix
@@ -55,7 +55,7 @@ in {
enable = mkOption {
default = false;
description = ''
- Whether to enable thinkfan, fan controller for ibm/lenovo thinkpads.
+ Whether to enable thinkfan, fan controller for IBM/Lenovo ThinkPads.
'';
};
diff --git a/nixos/modules/services/hardware/u2f.nix b/nixos/modules/services/hardware/u2f.nix
new file mode 100644
index 0000000000000000000000000000000000000000..bb4b2f05f890cb361ec3acbb87c386ae27bc9a71
--- /dev/null
+++ b/nixos/modules/services/hardware/u2f.nix
@@ -0,0 +1,23 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+let
+ cfg = config.hardware.u2f;
+in {
+ options = {
+ hardware.u2f = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Enable U2F hardware support.
+ '';
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+ services.udev.packages = [ pkgs.libu2f-host ];
+ };
+}
+
diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix
index 9f42f9e59ad5e0f1d3973606daa8984e98f51c41..730e538e72f61ead882dee076049fd95028243dc 100644
--- a/nixos/modules/services/hardware/udev.nix
+++ b/nixos/modules/services/hardware/udev.nix
@@ -119,7 +119,7 @@ let
fi
${optionalString config.networking.usePredictableInterfaceNames ''
- cp ${./80-net-setup-link.rules} $out/80-net-setup-link.rules
+ cp ${udev}/lib/udev/rules.d/80-net-setup-link.rules $out/80-net-setup-link.rules
''}
# If auto-configuration is disabled, then remove
diff --git a/nixos/modules/services/hardware/usbmuxd.nix b/nixos/modules/services/hardware/usbmuxd.nix
new file mode 100644
index 0000000000000000000000000000000000000000..7ebd49fa01c2752354068c59e880effd385bc24f
--- /dev/null
+++ b/nixos/modules/services/hardware/usbmuxd.nix
@@ -0,0 +1,74 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+ defaultUserGroup = "usbmux";
+ apple = "05ac";
+
+ cfg = config.services.usbmuxd;
+
+in
+
+{
+ options.services.usbmuxd = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Enable the usbmuxd ("USB multiplexing daemon") service. This daemon is
+ in charge of multiplexing connections over USB to an iOS device. This is
+ needed for transferring data from and to iOS devices (see ifuse). Also
+ this may enable plug-n-play tethering for iPhones.
+ '';
+ };
+
+ user = mkOption {
+ type = types.str;
+ default = defaultUserGroup;
+ description = ''
+ The user usbmuxd should use to run after startup.
+ '';
+ };
+
+ group = mkOption {
+ type = types.str;
+ default = defaultUserGroup;
+ description = ''
+ The group usbmuxd should use to run after startup.
+ '';
+ };
+ };
+
+ config = mkIf cfg.enable {
+
+ users.extraUsers = optional (cfg.user == defaultUserGroup) {
+ name = cfg.user;
+ description = "usbmuxd user";
+ group = cfg.group;
+ };
+
+ users.extraGroups = optional (cfg.group == defaultUserGroup) {
+ name = cfg.group;
+ };
+
+ # Give usbmuxd permission for Apple devices
+ services.udev.extraRules = ''
+ SUBSYSTEM=="usb", ATTR{idVendor}=="${apple}", GROUP="${cfg.group}"
+ '';
+
+ systemd.services.usbmuxd = {
+ description = "usbmuxd";
+ wantedBy = [ "multi-user.target" ];
+ unitConfig.Documentation = "man:usbmuxd(8)";
+ serviceConfig = {
+ # Trigger the udev rule manually. This doesn't require replugging the
+ # device when first enabling the option to get it to work
+ ExecStartPre = "${pkgs.libudev}/bin/udevadm trigger -s usb -a idVendor=${apple}";
+ ExecStart = "${pkgs.usbmuxd}/bin/usbmuxd -U ${cfg.user} -f";
+ };
+ };
+
+ };
+}
diff --git a/nixos/modules/services/logging/logcheck.nix b/nixos/modules/services/logging/logcheck.nix
index 2a8ac414720b7665f8f4d521d867ca7608ddc695..a4cab0c94cdccc6539bde652fdcca4e034b6b652 100644
--- a/nixos/modules/services/logging/logcheck.nix
+++ b/nixos/modules/services/logging/logcheck.nix
@@ -8,7 +8,7 @@ let
defaultRules = pkgs.runCommand "logcheck-default-rules" {} ''
cp -prd ${pkgs.logcheck}/etc/logcheck $out
chmod u+w $out
- rm $out/logcheck.*
+ rm -r $out/logcheck.*
'';
rulesDir = pkgs.symlinkJoin
diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix
index b4abd2cd7e5ebbfa7a2bbb2632ce07dc921f4e26..28d89a7463ab7d419e7a1f8eb594cdfbbceb20e7 100644
--- a/nixos/modules/services/logging/logstash.nix
+++ b/nixos/modules/services/logging/logstash.nix
@@ -103,7 +103,7 @@ in
listenAddress = mkOption {
type = types.str;
- default = "0.0.0.0";
+ default = "127.0.0.1";
description = "Address on which to start webserver.";
};
diff --git a/nixos/modules/services/mail/clamsmtp.nix b/nixos/modules/services/mail/clamsmtp.nix
new file mode 100644
index 0000000000000000000000000000000000000000..8f4f39aa72889046f41a853f18b33cca61e78b14
--- /dev/null
+++ b/nixos/modules/services/mail/clamsmtp.nix
@@ -0,0 +1,179 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+let
+ cfg = config.services.clamsmtp;
+ clamdSocket = "/run/clamav/clamd.ctl"; # See services/security/clamav.nix
+in
+{
+ ##### interface
+ options = {
+ services.clamsmtp = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Whether to enable clamsmtp.";
+ };
+
+ instances = mkOption {
+ description = "Instances of clamsmtp to run.";
+ type = types.listOf (types.submodule { options = {
+ action = mkOption {
+ type = types.enum [ "bounce" "drop" "pass" ];
+ default = "drop";
+ description =
+ ''
+ Action to take when a virus is detected.
+
+ Note that viruses often spoof sender addresses, so bouncing is
+ in most cases not a good idea.
+ '';
+ };
+
+ header = mkOption {
+ type = types.str;
+ default = "";
+ example = "X-Virus-Scanned: ClamAV using ClamSMTP";
+ description =
+ ''
+ A header to add to scanned messages. See clamsmtpd.conf(5) for
+ more details. Empty means no header.
+ '';
+ };
+
+ keepAlives = mkOption {
+ type = types.int;
+ default = 0;
+ description =
+ ''
+ Number of seconds to wait between each NOOP sent to the sending
+ server. 0 to disable.
+
+ This is meant for slow servers where the sending MTA times out
+ waiting for clamd to scan the file.
+ '';
+ };
+
+ listen = mkOption {
+ type = types.str;
+ example = "127.0.0.1:10025";
+ description =
+ ''
+ Address to wait for incoming SMTP connections on. See
+ clamsmtpd.conf(5) for more details.
+ '';
+ };
+
+ quarantine = mkOption {
+ type = types.bool;
+ default = false;
+ description =
+ ''
+ Whether to quarantine files that contain viruses by leaving them
+ in the temporary directory.
+ '';
+ };
+
+ maxConnections = mkOption {
+ type = types.int;
+ default = 64;
+ description = "Maximum number of connections to accept at once.";
+ };
+
+ outAddress = mkOption {
+ type = types.str;
+ description =
+ ''
+ Address of the SMTP server to send email to once it has been
+ scanned.
+ '';
+ };
+
+ tempDirectory = mkOption {
+ type = types.str;
+ default = "/tmp";
+ description =
+ ''
+ Temporary directory that needs to be accessible to both clamd
+ and clamsmtpd.
+ '';
+ };
+
+ timeout = mkOption {
+ type = types.int;
+ default = 180;
+ description = "Time-out for network connections.";
+ };
+
+ transparentProxy = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Enable clamsmtp's transparent proxy support.";
+ };
+
+ virusAction = mkOption {
+ type = with types; nullOr path;
+ default = null;
+ description =
+ ''
+ Command to run when a virus is found. Please see VIRUS ACTION in
+ clamsmtpd(8) for a discussion of this option and its safe use.
+ '';
+ };
+
+ xClient = mkOption {
+ type = types.bool;
+ default = false;
+ description =
+ ''
+ Send the XCLIENT command to the receiving server, for forwarding
+ client addresses and connection information if the receiving
+ server supports this feature.
+ '';
+ };
+ };});
+ };
+ };
+ };
+
+ ##### implementation
+ config = let
+ configfile = conf: pkgs.writeText "clamsmtpd.conf"
+ ''
+ Action: ${conf.action}
+ ClamAddress: ${clamdSocket}
+ Header: ${conf.header}
+ KeepAlives: ${toString conf.keepAlives}
+ Listen: ${conf.listen}
+ Quarantine: ${if conf.quarantine then "on" else "off"}
+ MaxConnections: ${toString conf.maxConnections}
+ OutAddress: ${conf.outAddress}
+ TempDirectory: ${conf.tempDirectory}
+ TimeOut: ${toString conf.timeout}
+ TransparentProxy: ${if conf.transparentProxy then "on" else "off"}
+ User: clamav
+ ${optionalString (conf.virusAction != null) "VirusAction: ${conf.virusAction}"}
+ XClient: ${if conf.xClient then "on" else "off"}
+ '';
+ in
+ mkIf cfg.enable {
+ assertions = [
+ { assertion = config.services.clamav.daemon.enable;
+ message = "clamsmtp requires clamav to be enabled";
+ }
+ ];
+
+ systemd.services = listToAttrs (imap1 (i: conf:
+ nameValuePair "clamsmtp-${toString i}" {
+ description = "ClamSMTP instance ${toString i}";
+ wantedBy = [ "multi-user.target" ];
+ script = "exec ${pkgs.clamsmtp}/bin/clamsmtpd -f ${configfile conf}";
+ after = [ "clamav-daemon.service" ];
+ requires = [ "clamav-daemon.service" ];
+ serviceConfig.Type = "forking";
+ serviceConfig.PrivateTmp = "yes";
+ unitConfig.JoinsNamespaceOf = "clamav-daemon.service";
+ }
+ ) cfg.instances);
+ };
+}
diff --git a/nixos/modules/services/mail/dkimproxy-out.nix b/nixos/modules/services/mail/dkimproxy-out.nix
new file mode 100644
index 0000000000000000000000000000000000000000..894b88e25c1b2f72534404dbe38e0a266202fadc
--- /dev/null
+++ b/nixos/modules/services/mail/dkimproxy-out.nix
@@ -0,0 +1,118 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+let
+ cfg = config.services.dkimproxy-out;
+ keydir = "/var/lib/dkimproxy-out";
+ privkey = "${keydir}/private.key";
+ pubkey = "${keydir}/public.key";
+in
+{
+ ##### interface
+ options = {
+ services.dkimproxy-out = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description =
+ ''
+ Whether to enable dkimproxy_out.
+
+ Note that a key will be auto-generated, and can be found in
+ ${keydir}.
+ '';
+ };
+
+ listen = mkOption {
+ type = types.str;
+ example = "127.0.0.1:10027";
+ description = "Address:port DKIMproxy should listen on.";
+ };
+
+ relay = mkOption {
+ type = types.str;
+ example = "127.0.0.1:10028";
+ description = "Address:port DKIMproxy should forward mail to.";
+ };
+
+ domains = mkOption {
+ type = with types; listOf str;
+ example = [ "example.org" "example.com" ];
+ description = "List of domains DKIMproxy can sign for.";
+ };
+
+ selector = mkOption {
+ type = types.str;
+ example = "selector1";
+ description =
+ ''
+ The selector to use for DKIM key identification.
+
+ For example, if 'selector1' is used here, then for each domain
+ 'example.org' given in `domain`, 'selector1._domainkey.example.org'
+ should contain the TXT record indicating the public key is the one
+ in ${pubkey}: "v=DKIM1; t=s; p=[THE PUBLIC KEY]".
+ '';
+ };
+
+ keySize = mkOption {
+ type = types.int;
+ default = 2048;
+ description =
+ ''
+ Size of the RSA key to use to sign outgoing emails. Note that the
+ maximum mandatorily verified as per RFC6376 is 2048.
+ '';
+ };
+
+ # TODO: allow signature for other schemes than dkim(c=relaxed/relaxed)?
+ # This being the scheme used by gmail, maybe nothing more is needed for
+ # reasonable use.
+ };
+ };
+
+ ##### implementation
+ config = let
+ configfile = pkgs.writeText "dkimproxy_out.conf"
+ ''
+ listen ${cfg.listen}
+ relay ${cfg.relay}
+
+ domain ${concatStringsSep "," cfg.domains}
+ selector ${cfg.selector}
+
+ signature dkim(c=relaxed/relaxed)
+
+ keyfile ${privkey}
+ '';
+ in
+ mkIf cfg.enable {
+ users.groups.dkimproxy-out = {};
+ users.users.dkimproxy-out = {
+ description = "DKIMproxy_out daemon";
+ group = "dkimproxy-out";
+ isSystemUser = true;
+ };
+
+ systemd.services.dkimproxy-out = {
+ description = "DKIMproxy_out";
+ wantedBy = [ "multi-user.target" ];
+ preStart = ''
+ if [ ! -d "${keydir}" ]; then
+ mkdir -p "${keydir}"
+ chmod 0700 "${keydir}"
+ ${pkgs.openssl}/bin/openssl genrsa -out "${privkey}" ${toString cfg.keySize}
+ ${pkgs.openssl}/bin/openssl rsa -in "${privkey}" -pubout -out "${pubkey}"
+ chown -R dkimproxy-out:dkimproxy-out "${keydir}"
+ fi
+ '';
+ script = ''
+ exec ${pkgs.dkimproxy}/bin/dkimproxy.out --conf_file=${configfile}
+ '';
+ serviceConfig = {
+ User = "dkimproxy-out";
+ PermissionsStartOnly = true;
+ };
+ };
+ };
+}
diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix
index 6d403e448e04750d841b9bc03513d99671f9579b..b80aa48f2c865e4f0a015d739abd2ef10dd29e6f 100644
--- a/nixos/modules/services/mail/rspamd.nix
+++ b/nixos/modules/services/mail/rspamd.nix
@@ -31,6 +31,8 @@ let
${mkBindSockets cfg.bindUISocket}
.include "$CONFDIR/worker-controller.inc"
}
+
+ ${cfg.extraConfig}
'';
in
@@ -79,6 +81,15 @@ in
'';
};
+ extraConfig = mkOption {
+ type = types.lines;
+ default = "";
+ description = ''
+ Extra configuration to add at the end of the rspamd configuration
+ file.
+ '';
+ };
+
user = mkOption {
type = types.string;
default = "rspamd";
diff --git a/nixos/modules/services/misc/dysnomia.nix b/nixos/modules/services/misc/dysnomia.nix
index df44d0a54866a647927be8a1a7ca77b4f19fd199..c5c41ad296dab8ae221efa5baa414a8381463db6 100644
--- a/nixos/modules/services/misc/dysnomia.nix
+++ b/nixos/modules/services/misc/dysnomia.nix
@@ -192,9 +192,11 @@ in
mysqlPassword = builtins.readFile (config.services.mysql.rootPassword);
};
}
- // lib.optionalAttrs (config.services.postgresql.enable && cfg.enableAuthentication) { postgresql-database = {
- postgresqlUsername = "root";
- }; }
+ // lib.optionalAttrs (config.services.postgresql.enable) { postgresql-database = {
+ } // lib.optionalAttrs (cfg.enableAuthentication) {
+ postgresqlUsername = "postgres";
+ };
+ }
// lib.optionalAttrs (config.services.tomcat.enable) { tomcat-webapplication = {
tomcatPort = 8080;
}; }
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 7b2b40e59232961992c223bde7d34cdaa0d56505..9ed5875a0191ddcf080c4ccc3b4bf54b22cf776a 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -29,8 +29,12 @@ let
gitalyToml = pkgs.writeText "gitaly.toml" ''
socket_path = "${lib.escape ["\""] gitalySocket}"
+ bin_dir = "${cfg.packages.gitaly}/bin"
prometheus_listen_addr = "localhost:9236"
+ [git]
+ bin_path = "${pkgs.git}/bin/git"
+
[gitaly-ruby]
dir = "${cfg.packages.gitaly.ruby}"
@@ -70,7 +74,7 @@ let
secret_key_base: ${cfg.secrets.secret}
otp_key_base: ${cfg.secrets.otp}
db_key_base: ${cfg.secrets.db}
- jws_private_key: ${builtins.toJSON cfg.secrets.jws}
+ openid_connect_signing_key: ${builtins.toJSON cfg.secrets.jws}
'';
gitlabConfig = {
@@ -104,6 +108,7 @@ let
ldap.enabled = false;
omniauth.enabled = false;
shared.path = "${cfg.statePath}/shared";
+ gitaly.client_path = "${cfg.packages.gitaly}/bin";
backup.path = "${cfg.backupPath}";
gitlab_shell = {
path = "${cfg.packages.gitlab-shell}";
@@ -117,8 +122,6 @@ let
};
git = {
bin_path = "git";
- max_size = 20971520; # 20MB
- timeout = 10;
};
monitoring = {
ip_whitelist = [ "127.0.0.0/8" "::1/128" ];
@@ -248,7 +251,6 @@ in {
databasePassword = mkOption {
type = types.str;
- default = "";
description = "Gitlab database user password.";
};
@@ -440,12 +442,6 @@ in {
environment.systemPackages = [ pkgs.git gitlab-rake cfg.packages.gitlab-shell ];
- assertions = [
- { assertion = cfg.databasePassword != "";
- message = "databasePassword must be set";
- }
- ];
-
# Redis is required for the sidekiq queue runner.
services.redis.enable = mkDefault true;
# We use postgres as the main data store.
@@ -496,7 +492,9 @@ in {
after = [ "network.target" "gitlab.service" ];
wantedBy = [ "multi-user.target" ];
environment.HOME = gitlabEnv.HOME;
- path = with pkgs; [ gitAndTools.git cfg.packages.gitaly.rubyEnv ];
+ environment.GEM_HOME = "${cfg.packages.gitaly.rubyEnv}/${ruby.gemPath}";
+ environment.GITLAB_SHELL_CONFIG_PATH = gitlabEnv.GITLAB_SHELL_CONFIG_PATH;
+ path = with pkgs; [ gitAndTools.git cfg.packages.gitaly.rubyEnv ruby ];
serviceConfig = {
#PermissionsStartOnly = true; # preStart must be run as root
Type = "simple";
diff --git a/nixos/modules/services/misc/gitolite.nix b/nixos/modules/services/misc/gitolite.nix
index f395b9558b5a4a985bfea1880a95328caa85e9b5..6e60316d000c0baafc575fc27db1a5af36dcf503 100644
--- a/nixos/modules/services/misc/gitolite.nix
+++ b/nixos/modules/services/misc/gitolite.nix
@@ -207,7 +207,7 @@ in
gitolite setup -pk ${pubkeyFile}
fi
if [ -n "${hooks}" ]; then
- cp ${hooks} .gitolite/hooks/common/
+ cp -f ${hooks} .gitolite/hooks/common/
chmod +x .gitolite/hooks/common/*
fi
gitolite setup # Upgrade if needed
diff --git a/nixos/modules/services/misc/gollum.nix b/nixos/modules/services/misc/gollum.nix
index 81fb024f9094d20b5ebd47a82096d35d746217dd..0888221ab62fc382f8af7822d18520a4662d5ce1 100644
--- a/nixos/modules/services/misc/gollum.nix
+++ b/nixos/modules/services/misc/gollum.nix
@@ -32,6 +32,24 @@ in
description = "Content of the configuration file";
};
+ mathjax = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Enable support for math rendering using MathJax";
+ };
+
+ allowUploads = mkOption {
+ type = types.nullOr (types.enum [ "dir" "page" ]);
+ default = null;
+ description = "Enable uploads of external files";
+ };
+
+ emoji = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Parse and interpret emoji tags";
+ };
+
branch = mkOption {
type = types.str;
default = "master";
@@ -84,6 +102,9 @@ in
--host ${cfg.address} \
--config ${builtins.toFile "gollum-config.rb" cfg.extraConfig} \
--ref ${cfg.branch} \
+ ${optionalString cfg.mathjax "--mathjax"} \
+ ${optionalString cfg.emoji "--emoji"} \
+ ${optionalString (cfg.allowUploads != null) "--allow-uploads ${cfg.allowUploads}"} \
${cfg.stateDir}
'';
};
diff --git a/nixos/modules/services/misc/logkeys.nix b/nixos/modules/services/misc/logkeys.nix
index 6051c884465da015ba0b21dd46380f4fb129e0a1..df0b3ae24c90143ab57cc1ac74d6286ec92c85aa 100644
--- a/nixos/modules/services/misc/logkeys.nix
+++ b/nixos/modules/services/misc/logkeys.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
with lib;
diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix
index 11463cf4500a9da35f67343a19e8ccb2e1c57f94..80979547d33929273239a31cac735ab800fe8af8 100644
--- a/nixos/modules/services/misc/matrix-synapse.nix
+++ b/nixos/modules/services/misc/matrix-synapse.nix
@@ -578,6 +578,18 @@ in {
Extra config options for matrix-synapse.
'';
};
+ extraConfigFiles = mkOption {
+ type = types.listOf types.path;
+ default = [];
+ description = ''
+ Extra config files to include.
+
+ The configuration files will be included based on the command line
+ argument --config-path. This allows to configure secrets without
+ having to go through the Nix store, e.g. based on deployment keys if
+ NixOPS is in use.
+ '';
+ };
logConfig = mkOption {
type = types.lines;
default = readFile ./matrix-synapse-log_config.yaml;
@@ -627,7 +639,11 @@ in {
Group = "matrix-synapse";
WorkingDirectory = cfg.dataDir;
PermissionsStartOnly = true;
- ExecStart = "${cfg.package}/bin/homeserver --config-path ${configFile} --keys-directory ${cfg.dataDir}";
+ ExecStart = ''
+ ${cfg.package}/bin/homeserver \
+ ${ concatMapStringsSep "\n " (x: "--config-path ${x} \\") ([ configFile ] ++ cfg.extraConfigFiles) }
+ --keys-directory ${cfg.dataDir}
+ '';
Restart = "on-failure";
};
};
diff --git a/nixos/modules/services/misc/mbpfan.nix b/nixos/modules/services/misc/mbpfan.nix
index 972d8b572d3693ef5a18a0415163b28bffa6cbc1..50f6f80ad00cac3ab4c71e45119817da7784f2ea 100644
--- a/nixos/modules/services/misc/mbpfan.nix
+++ b/nixos/modules/services/misc/mbpfan.nix
@@ -8,13 +8,7 @@ let
in {
options.services.mbpfan = {
- enable = mkOption {
- default = false;
- type = types.bool;
- description = ''
- Whether to enable the mbpfan daemon.
- '';
- };
+ enable = mkEnableOption "mbpfan, fan controller daemon for Apple Macs and MacBooks";
package = mkOption {
type = types.package;
diff --git a/nixos/modules/services/misc/osrm.nix b/nixos/modules/services/misc/osrm.nix
new file mode 100644
index 0000000000000000000000000000000000000000..7ec8b15906fcada44d55c07eefe27b88ad5ed345
--- /dev/null
+++ b/nixos/modules/services/misc/osrm.nix
@@ -0,0 +1,85 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.osrm;
+in
+
+{
+ options.services.osrm = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Enable the OSRM service.";
+ };
+
+ address = mkOption {
+ type = types.str;
+ default = "0.0.0.0";
+ description = "IP address on which the web server will listen.";
+ };
+
+ port = mkOption {
+ type = types.int;
+ default = 5000;
+ description = "Port on which the web server will run.";
+ };
+
+ threads = mkOption {
+ type = types.int;
+ default = 4;
+ description = "Number of threads to use.";
+ };
+
+ algorithm = mkOption {
+ type = types.enum [ "CH" "CoreCH" "MLD" ];
+ default = "MLD";
+ description = "Algorithm to use for the data. Must be one of CH, CoreCH, MLD";
+ };
+
+ extraFlags = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ example = [ "--max-table-size 1000" "--max-matching-size 1000" ];
+ description = "Extra command line arguments passed to osrm-routed";
+ };
+
+ dataFile = mkOption {
+ type = types.path;
+ example = "/var/lib/osrm/berlin-latest.osrm";
+ description = "Data file location";
+ };
+
+ };
+
+ config = mkIf cfg.enable {
+
+ users.users.osrm = {
+ group = config.users.users.osrm.name;
+ description = "OSRM user";
+ createHome = false;
+ };
+
+ users.groups.osrm = { };
+
+ systemd.services.osrm = {
+ description = "OSRM service";
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+
+ serviceConfig = {
+ User = config.users.extraUsers.osrm.name;
+ ExecStart = ''
+ ${pkgs.osrm-backend}/bin/osrm-routed \
+ --ip ${cfg.address} \
+ --port ${toString cfg.port} \
+ --threads ${toString cfg.threads} \
+ --algorithm ${cfg.algorithm} \
+ ${toString cfg.extraFlags} \
+ ${cfg.dataFile}
+ '';
+ };
+ };
+ };
+}
diff --git a/nixos/modules/services/misc/xmr-stak.nix b/nixos/modules/services/misc/xmr-stak.nix
new file mode 100644
index 0000000000000000000000000000000000000000..57f4393654717b56fb9acf3598e7eda9f2ae0501
--- /dev/null
+++ b/nixos/modules/services/misc/xmr-stak.nix
@@ -0,0 +1,73 @@
+{ lib, config, pkgs, ... }:
+
+with lib;
+
+let
+
+ cfg = config.services.xmr-stak;
+
+ pkg = pkgs.xmr-stak.override {
+ inherit (cfg) openclSupport cudaSupport;
+ };
+
+ xmrConfArg = optionalString (cfg.configText != "") ("-c " +
+ pkgs.writeText "xmr-stak-config.txt" cfg.configText);
+
+in
+
+{
+ options = {
+ services.xmr-stak = {
+ enable = mkEnableOption "xmr-stak miner";
+ openclSupport = mkEnableOption "support for OpenCL (AMD/ATI graphics cards)";
+ cudaSupport = mkEnableOption "support for CUDA (NVidia graphics cards)";
+
+ extraArgs = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ example = [ "--noCPU" "--currency monero" ];
+ description = "List of parameters to pass to xmr-stak.";
+ };
+
+ configText = mkOption {
+ type = types.lines;
+ default = "";
+ example = ''
+ "currency" : "monero",
+ "pool_list" :
+ [ { "pool_address" : "pool.supportxmr.com:5555",
+ "wallet_address" : "",
+ "pool_password" : "minername",
+ "pool_weight" : 1,
+ },
+ ],
+ '';
+ description = ''
+ Verbatim xmr-stak config.txt. If empty, the -c
+ parameter will not be added to the xmr-stak command.
+ '';
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+ systemd.services.xmr-stak = {
+ wantedBy = [ "multi-user.target" ];
+ bindsTo = [ "network-online.target" ];
+ after = [ "network-online.target" ];
+ environment = mkIf cfg.cudaSupport {
+ LD_LIBRARY_PATH = "${pkgs.linuxPackages_latest.nvidia_x11}/lib";
+ };
+ script = ''
+ exec ${pkg}/bin/xmr-stak ${xmrConfArg} ${concatStringsSep " " cfg.extraArgs}
+ '';
+ serviceConfig = let rootRequired = cfg.openclSupport || cfg.cudaSupport; in {
+ # xmr-stak generates cpu and/or gpu configuration files
+ WorkingDirectory = "/tmp";
+ PrivateTmp = true;
+ DynamicUser = !rootRequired;
+ LimitMEMLOCK = toString (1024*1024);
+ };
+ };
+ };
+}
diff --git a/nixos/modules/services/monitoring/smartd.nix b/nixos/modules/services/monitoring/smartd.nix
index 1d6940c516a994c05485b016d92346c52544f71c..b8d9e58a5a823cb5bb15e095b67774f29875b3cd 100644
--- a/nixos/modules/services/monitoring/smartd.nix
+++ b/nixos/modules/services/monitoring/smartd.nix
@@ -64,7 +64,7 @@ let
"DEVICESCAN ${notifyOpts}${cfg.defaults.autodetected}"}
'';
- smartdOpts = { name, ... }: {
+ smartdDeviceOpts = { name, ... }: {
options = {
@@ -108,6 +108,18 @@ in
'';
};
+ extraOptions = mkOption {
+ default = [];
+ type = types.listOf types.str;
+ example = ["-A /var/log/smartd/" "--interval=3600"];
+ description = ''
+ Extra command-line options passed to the smartd
+ daemon on startup.
+
+ (See man 8 smartd.)
+ '';
+ };
+
notifications = {
mail = {
@@ -197,7 +209,7 @@ in
devices = mkOption {
default = [];
example = [ { device = "/dev/sda"; } { device = "/dev/sdb"; options = "-d sat"; } ];
- type = with types; listOf (submodule smartdOpts);
+ type = with types; listOf (submodule smartdDeviceOpts);
description = "List of devices to monitor.";
};
@@ -222,7 +234,7 @@ in
path = [ pkgs.nettools ]; # for hostname and dnsdomanname calls in smartd
- serviceConfig.ExecStart = "${pkgs.smartmontools}/sbin/smartd --no-fork --configfile=${smartdConf}";
+ serviceConfig.ExecStart = "${pkgs.smartmontools}/sbin/smartd ${lib.concatStringsSep " " cfg.extraOptions} --no-fork --configfile=${smartdConf}";
};
};
diff --git a/nixos/modules/services/monitoring/statsd.nix b/nixos/modules/services/monitoring/statsd.nix
index df2adb9f27660edcbcf360bab5f1418c5b3b088f..7b0e9981cbb18532f5869b30a489050e8b8b539b 100644
--- a/nixos/modules/services/monitoring/statsd.nix
+++ b/nixos/modules/services/monitoring/statsd.nix
@@ -9,6 +9,12 @@ let
isBuiltinBackend = name:
builtins.elem name [ "graphite" "console" "repeater" ];
+ backendsToPackages = let
+ mkMap = list: name:
+ if isBuiltinBackend name then list
+ else list ++ [ pkgs.nodePackages.${name} ];
+ in foldl mkMap [];
+
configFile = pkgs.writeText "statsd.conf" ''
{
address: "${cfg.listenAddress}",
@@ -27,13 +33,21 @@ let
prettyprint: false
},
log: {
- backend: "syslog"
+ backend: "stdout"
},
automaticConfigReload: false${optionalString (cfg.extraConfig != null) ","}
${cfg.extraConfig}
}
'';
+ deps = pkgs.buildEnv {
+ name = "statsd-runtime-deps";
+ pathsToLink = [ "/lib" ];
+ ignoreCollisions = true;
+
+ paths = backendsToPackages cfg.backends;
+ };
+
in
{
@@ -42,11 +56,7 @@ in
options.services.statsd = {
- enable = mkOption {
- description = "Whether to enable statsd stats aggregation service";
- default = false;
- type = types.bool;
- };
+ enable = mkEnableOption "statsd";
listenAddress = mkOption {
description = "Address that statsd listens on over UDP";
@@ -110,6 +120,11 @@ in
config = mkIf cfg.enable {
+ assertions = map (backend: {
+ assertion = !isBuiltinBackend backend -> hasAttrByPath [ backend ] pkgs.nodePackages;
+ message = "Only builtin backends (graphite, console, repeater) or backends enumerated in `pkgs.nodePackages` are allowed!";
+ }) cfg.backends;
+
users.extraUsers = singleton {
name = "statsd";
uid = config.ids.uids.statsd;
@@ -120,9 +135,7 @@ in
description = "Statsd Server";
wantedBy = [ "multi-user.target" ];
environment = {
- NODE_PATH=concatMapStringsSep ":"
- (pkg: "${builtins.getAttr pkg pkgs.statsd.nodePackages}/lib/node_modules")
- (filter (name: !isBuiltinBackend name) cfg.backends);
+ NODE_PATH = "${deps}/lib/node_modules";
};
serviceConfig = {
ExecStart = "${pkgs.statsd}/bin/statsd ${configFile}";
diff --git a/nixos/modules/services/network-filesystems/beegfs.nix b/nixos/modules/services/network-filesystems/beegfs.nix
new file mode 100644
index 0000000000000000000000000000000000000000..a6a2ec6cbc366d43f43dde9e633a4a41d9806a0d
--- /dev/null
+++ b/nixos/modules/services/network-filesystems/beegfs.nix
@@ -0,0 +1,343 @@
+{ config, lib, pkgs, ...} :
+
+with lib;
+
+let
+ cfg = config.services.beegfs;
+
+ # functions for the generations of config files
+
+ configMgmtd = name: cfg: pkgs.writeText "mgmt-${name}.conf" ''
+ storeMgmtdDirectory = ${cfg.mgmtd.storeDir}
+ storeAllowFirstRunInit = false
+ connAuthFile = ${cfg.connAuthFile}
+ connPortShift = ${toString cfg.connPortShift}
+
+ ${cfg.mgmtd.extraConfig}
+ '';
+
+ configAdmon = name: cfg: pkgs.writeText "admon-${name}.conf" ''
+ sysMgmtdHost = ${cfg.mgmtdHost}
+ connAuthFile = ${cfg.connAuthFile}
+ connPortShift = ${toString cfg.connPortShift}
+
+ ${cfg.admon.extraConfig}
+ '';
+
+ configMeta = name: cfg: pkgs.writeText "meta-${name}.conf" ''
+ storeMetaDirectory = ${cfg.meta.storeDir}
+ sysMgmtdHost = ${cfg.mgmtdHost}
+ connAuthFile = ${cfg.connAuthFile}
+ connPortShift = ${toString cfg.connPortShift}
+ storeAllowFirstRunInit = false
+
+ ${cfg.mgmtd.extraConfig}
+ '';
+
+ configStorage = name: cfg: pkgs.writeText "storage-${name}.conf" ''
+ storeStorageDirectory = ${cfg.storage.storeDir}
+ sysMgmtdHost = ${cfg.mgmtdHost}
+ connAuthFile = ${cfg.connAuthFile}
+ connPortShift = ${toString cfg.connPortShift}
+ storeAllowFirstRunInit = false
+
+ ${cfg.storage.extraConfig}
+ '';
+
+ configHelperd = name: cfg: pkgs.writeText "helperd-${name}.conf" ''
+ connAuthFile = ${cfg.connAuthFile}
+ ${cfg.helperd.extraConfig}
+ '';
+
+ configClientFilename = name : "/etc/beegfs/client-${name}.conf";
+
+ configClient = name: cfg: ''
+ sysMgmtdHost = ${cfg.mgmtdHost}
+ connAuthFile = ${cfg.connAuthFile}
+ connPortShift = ${toString cfg.connPortShift}
+
+ ${cfg.client.extraConfig}
+ '';
+
+ serviceList = [
+ { service = "admon"; cfgFile = configAdmon; }
+ { service = "meta"; cfgFile = configMeta; }
+ { service = "mgmtd"; cfgFile = configMgmtd; }
+ { service = "storage"; cfgFile = configStorage; }
+ ];
+
+ # functions to generate systemd.service entries
+
+ systemdEntry = service: cfgFile: (mapAttrs' ( name: cfg:
+ (nameValuePair "beegfs-${service}-${name}" (mkIf cfg."${service}".enable {
+ wantedBy = [ "multi-user.target" ];
+ requires = [ "network-online.target" ];
+ after = [ "network-online.target" ];
+ serviceConfig = rec {
+ ExecStart = ''
+ ${pkgs.beegfs}/bin/beegfs-${service} \
+ cfgFile=${cfgFile name cfg} \
+ pidFile=${PIDFile}
+ '';
+ PIDFile = "/run/beegfs-${service}-${name}.pid";
+ TimeoutStopSec = "300";
+ };
+ }))) cfg);
+
+ systemdHelperd = mapAttrs' ( name: cfg:
+ (nameValuePair "beegfs-helperd-${name}" (mkIf cfg.client.enable {
+ wantedBy = [ "multi-user.target" ];
+ requires = [ "network-online.target" ];
+ after = [ "network-online.target" ];
+ serviceConfig = rec {
+ ExecStart = ''
+ ${pkgs.beegfs}/bin/beegfs-helperd \
+ cfgFile=${configHelperd name cfg} \
+ pidFile=${PIDFile}
+ '';
+ PIDFile = "/run/beegfs-helperd-${name}.pid";
+ TimeoutStopSec = "300";
+ };
+ }))) cfg;
+
+ # wrappers to beegfs tools. Avoid typing path of config files
+ utilWrappers = mapAttrsToList ( name: cfg:
+ ( pkgs.runCommand "beegfs-utils-${name}" { nativeBuildInputs = [ pkgs.makeWrapper ]; } ''
+ mkdir -p $out/bin
+
+ makeWrapper ${pkgs.beegfs}/bin/beegfs-check-servers \
+ $out/bin/beegfs-check-servers-${name} \
+ --add-flags "-c ${configClientFilename name}" \
+ --prefix PATH : ${lib.makeBinPath [ pkgs.beegfs ]}
+
+ makeWrapper ${pkgs.beegfs}/bin/beegfs-ctl \
+ $out/bin/beegfs-ctl-${name} \
+ --add-flags "--cfgFile=${configClientFilename name}"
+
+ makeWrapper ${pkgs.beegfs}/bin/beegfs-ctl \
+ $out/bin/beegfs-df-${name} \
+ --add-flags "--cfgFile=${configClientFilename name}" \
+ --add-flags --listtargets \
+ --add-flags --hidenodeid \
+ --add-flags --pools \
+ --add-flags --spaceinfo
+
+ makeWrapper ${pkgs.beegfs}/bin/beegfs-fsck \
+ $out/bin/beegfs-fsck-${name} \
+ --add-flags "--cfgFile=${configClientFilename name}"
+ ''
+ )) cfg;
+in
+{
+ ###### interface
+
+ options = {
+ services.beegfsEnable = mkEnableOption "BeeGFS";
+
+ services.beegfs = mkOption {
+ default = {};
+ description = ''
+ BeeGFS configurations. Every mount point requires a separate configuration.
+ '';
+ type = with types; attrsOf (submodule ({ config, ... } : {
+ options = {
+ mgmtdHost = mkOption {
+ type = types.str;
+ default = null;
+ example = "master";
+ description = ''Hostname of managament host.'';
+ };
+
+ connAuthFile = mkOption {
+ type = types.str;
+ default = "";
+ example = "/etc/my.key";
+ description = "File containing shared secret authentication.";
+ };
+
+ connPortShift = mkOption {
+ type = types.int;
+ default = 0;
+ example = 5;
+ description = ''
+ For each additional beegfs configuration shift all
+ service TCP/UDP ports by at least 5.
+ '';
+ };
+
+ client = {
+ enable = mkEnableOption "BeeGFS client";
+
+ mount = mkOption {
+ type = types.bool;
+ default = true;
+ description = "Create fstab entry automatically";
+ };
+
+ mountPoint = mkOption {
+ type = types.str;
+ default = "/run/beegfs";
+ description = ''
+ Mount point under which the beegfs filesytem should be mounted.
+ If mounted manually the mount option specifing the config file is needed:
+ cfgFile=/etc/beegfs/beegfs-client-<name>.conf
+ '';
+ };
+
+ extraConfig = mkOption {
+ type = types.lines;
+ default = "";
+ description = ''
+ Additional lines for beegfs-client.conf.
+ See documentation for further details.
+ '';
+ };
+ };
+
+ helperd = {
+ extraConfig = mkOption {
+ type = types.lines;
+ default = "";
+ description = ''
+ Additional lines for beegfs-helperd.conf. See documentation
+ for further details.
+ '';
+ };
+ };
+
+ mgmtd = {
+ enable = mkEnableOption "BeeGFS mgmtd daemon";
+
+ storeDir = mkOption {
+ type = types.path;
+ default = null;
+ example = "/data/beegfs-mgmtd";
+ description = ''
+ Data directory for mgmtd.
+ Must not be shared with other beegfs daemons.
+ This directory must exist and it must be initialized
+ with beegfs-setup-mgmtd, e.g. "beegfs-setup-mgmtd -C -p <storeDir>"
+ '';
+ };
+
+ extraConfig = mkOption {
+ type = types.lines;
+ default = "";
+ description = ''
+ Additional lines for beegfs-mgmtd.conf. See documentation
+ for further details.
+ '';
+ };
+ };
+
+ admon = {
+ enable = mkEnableOption "BeeGFS admon daemon";
+
+ extraConfig = mkOption {
+ type = types.lines;
+ default = "";
+ description = ''
+ Additional lines for beegfs-admon.conf. See documentation
+ for further details.
+ '';
+ };
+ };
+
+ meta = {
+ enable = mkEnableOption "BeeGFS meta data daemon";
+
+ storeDir = mkOption {
+ type = types.path;
+ default = null;
+ example = "/data/beegfs-meta";
+ description = ''
+ Data directory for meta data service.
+ Must not be shared with other beegfs daemons.
+ The underlying filesystem must be mounted with xattr turned on.
+ This directory must exist and it must be initialized
+ with beegfs-setup-meta, e.g.
+ "beegfs-setup-meta -C -s <serviceID> -p <storeDir>"
+ '';
+ };
+
+ extraConfig = mkOption {
+ type = types.str;
+ default = "";
+ description = ''
+ Additional lines for beegfs-meta.conf. See documentation
+ for further details.
+ '';
+ };
+ };
+
+ storage = {
+ enable = mkEnableOption "BeeGFS storage daemon";
+
+ storeDir = mkOption {
+ type = types.path;
+ default = null;
+ example = "/data/beegfs-storage";
+ description = ''
+ Data directories for storage service.
+ Must not be shared with other beegfs daemons.
+ The underlying filesystem must be mounted with xattr turned on.
+ This directory must exist and it must be initialized
+ with beegfs-setup-storage, e.g.
+ "beegfs-setup-storage -C -s <serviceID> -i <storageTargetID> -p <storeDir>"
+ '';
+ };
+
+ extraConfig = mkOption {
+ type = types.str;
+ default = "";
+ description = ''
+ Addional lines for beegfs-storage.conf. See documentation
+ for further details.
+ '';
+ };
+ };
+ };
+ }));
+ };
+ };
+
+ ###### implementation
+
+ config =
+ mkIf config.services.beegfsEnable {
+
+ environment.systemPackages = utilWrappers;
+
+ # Put the client.conf files in /etc since they are needed
+ # by the commandline tools
+ environment.etc = mapAttrs' ( name: cfg:
+ (nameValuePair "beegfs/client-${name}.conf" (mkIf (cfg.client.enable)
+ {
+ enable = true;
+ text = configClient name cfg;
+ }))) cfg;
+
+ # Kernel module, we need it only once per host.
+ boot = mkIf (
+ foldr (a: b: a || b) false
+ (map (x: x.client.enable) (collect (x: x ? client) cfg)))
+ {
+ kernelModules = [ "beegfs" ];
+ extraModulePackages = [ pkgs.linuxPackages.beegfs-module ];
+ };
+
+ # generate fstab entries
+ fileSystems = mapAttrs' (name: cfg:
+ (nameValuePair cfg.client.mountPoint (optionalAttrs cfg.client.mount (mkIf cfg.client.enable {
+ device = "beegfs_nodev";
+ fsType = "beegfs";
+ mountPoint = cfg.client.mountPoint;
+ options = [ "cfgFile=${configClientFilename name}" "_netdev" ];
+ })))) cfg;
+
+ # generate systemd services
+ systemd.services = systemdHelperd //
+ foldr (a: b: a // b) {}
+ (map (x: systemdEntry x.service x.cfgFile) serviceList);
+ };
+}
diff --git a/nixos/modules/services/network-filesystems/davfs2.nix b/nixos/modules/services/network-filesystems/davfs2.nix
new file mode 100644
index 0000000000000000000000000000000000000000..6b2a770100c5b28f8616127eefb786729e1130ad
--- /dev/null
+++ b/nixos/modules/services/network-filesystems/davfs2.nix
@@ -0,0 +1,74 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.davfs2;
+ cfgFile = pkgs.writeText "davfs2.conf" ''
+ dav_user ${cfg.davUser}
+ dav_group ${cfg.davGroup}
+ ${cfg.extraConfig}
+ '';
+in
+{
+ options.services.davfs2 = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to enable davfs2.
+ '';
+ };
+
+ davUser = mkOption {
+ type = types.string;
+ default = "davfs2";
+ description = ''
+ When invoked by root the mount.davfs daemon will run as this user.
+ Value must be given as name, not as numerical id.
+ '';
+ };
+
+ davGroup = mkOption {
+ type = types.string;
+ default = "davfs2";
+ description = ''
+ The group of the running mount.davfs daemon. Ordinary users must be
+ member of this group in order to mount a davfs2 file system. Value must
+ be given as name, not as numerical id.
+ '';
+ };
+
+ extraConfig = mkOption {
+ type = types.lines;
+ default = "";
+ example = ''
+ kernel_fs coda
+ proxy foo.bar:8080
+ use_locks 0
+ '';
+ description = ''
+ Extra lines appended to the configuration of davfs2.
+ '' ;
+ };
+ };
+
+ config = mkIf cfg.enable {
+ environment.systemPackages = [ pkgs.davfs2 ];
+ environment.etc."davfs2/davfs2.conf".source = cfgFile;
+
+ users.extraGroups = optionalAttrs (cfg.davGroup == "davfs2") (singleton {
+ name = "davfs2";
+ gid = config.ids.gids.davfs2;
+ });
+
+ users.extraUsers = optionalAttrs (cfg.davUser == "davfs2") (singleton {
+ name = "davfs2";
+ createHome = false;
+ group = cfg.davGroup;
+ uid = config.ids.uids.davfs2;
+ description = "davfs2 user";
+ });
+ };
+
+}
diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix
index 9b9c91a4f16726b30eff6d59a3ba01f4b39764ee..09cd9cb22ca858f7c0767d97e63f10d4d7f641b4 100644
--- a/nixos/modules/services/network-filesystems/samba.nix
+++ b/nixos/modules/services/network-filesystems/samba.nix
@@ -56,6 +56,7 @@ let
serviceConfig = {
ExecStart = "${samba}/sbin/${appName} ${args}";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+ LimitNOFILE = 16384;
Type = "notify";
};
diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix
index ed658258c7f9d27242f171dad997b398e8337207..857657eea4db4f4c1da8148b8a79575ce312f378 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.nix
+++ b/nixos/modules/services/networking/dnscrypt-proxy.nix
@@ -10,7 +10,7 @@ let
# This is somewhat more flexible than preloading the key as an
# embedded string.
upstreamResolverListPubKey = pkgs.fetchurl {
- url = https://raw.githubusercontent.com/jedisct1/dnscrypt-proxy/master/minisign.pub;
+ url = https://raw.githubusercontent.com/dyne/dnscrypt-proxy/master/minisign.pub;
sha256 = "18lnp8qr6ghfc2sd46nn1rhcpr324fqlvgsp4zaigw396cd7vnnh";
};
@@ -258,9 +258,9 @@ in
domain=raw.githubusercontent.com
get="curl -fSs --resolve $domain:443:$(hostip -r 8.8.8.8 $domain | head -1)"
$get -o dnscrypt-resolvers.csv.tmp \
- https://$domain/jedisct1/dnscrypt-proxy/master/dnscrypt-resolvers.csv
+ https://$domain/dyne/dnscrypt-proxy/master/dnscrypt-resolvers.csv
$get -o dnscrypt-resolvers.csv.minisig.tmp \
- https://$domain/jedisct1/dnscrypt-proxy/master/dnscrypt-resolvers.csv.minisig
+ https://$domain/dyne/dnscrypt-proxy/master/dnscrypt-resolvers.csv.minisig
mv dnscrypt-resolvers.csv.minisig{.tmp,}
if ! minisign -q -V -p ${upstreamResolverListPubKey} \
-m dnscrypt-resolvers.csv.tmp -x dnscrypt-resolvers.csv.minisig ; then
diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix
index ca2e2a065dcf3ffb38c12980b339421ad7c253ce..8f5aeee4a16b4e956bd65f8dd80d61d3386c5943 100644
--- a/nixos/modules/services/networking/i2pd.nix
+++ b/nixos/modules/services/networking/i2pd.nix
@@ -126,6 +126,7 @@ let
[${tun.name}]
type = client
destination = ${tun.destination}
+ destinationport = ${toString tun.destinationPort}
keys = ${tun.keys}
address = ${tun.address}
port = ${toString tun.port}
@@ -137,15 +138,15 @@ let
'')
}
${flip concatMapStrings
- (collect (tun: tun ? port && tun ? host) cfg.inTunnels)
- (tun: let portStr = toString tun.port; in ''
+ (collect (tun: tun ? port && tun ? address) cfg.inTunnels)
+ (tun: ''
[${tun.name}]
type = server
destination = ${tun.destination}
keys = ${tun.keys}
host = ${tun.address}
- port = ${tun.port}
- inport = ${tun.inPort}
+ port = ${toString tun.port}
+ inport = ${toString tun.inPort}
accesslist = ${builtins.concatStringsSep "," tun.accessList}
'')
}
@@ -405,7 +406,13 @@ in
default = {};
type = with types; loaOf (submodule (
{ name, config, ... }: {
- options = commonTunOpts name;
+ options = {
+ destinationPort = mkOption {
+ type = types.int;
+ default = 0;
+ description = "Connect to particular port at destination.";
+ };
+ } // commonTunOpts name;
config = {
name = mkDefault name;
};
diff --git a/nixos/modules/services/networking/kresd.nix b/nixos/modules/services/networking/kresd.nix
index 18e2ab9aebf10129dd037e83e90f9d5acf4c7c3f..011a9b2f58ea0b1328ef2bce9547deab623f57a8 100644
--- a/nixos/modules/services/networking/kresd.nix
+++ b/nixos/modules/services/networking/kresd.nix
@@ -72,6 +72,7 @@ in
(iface: if elem ":" (stringToCharacters iface) then "[${iface}]:53" else "${iface}:53")
cfg.interfaces;
socketConfig.ListenDatagram = listenStreams;
+ socketConfig.FreeBind = true;
};
systemd.sockets.kresd-control = rec {
@@ -82,20 +83,11 @@ in
socketConfig = {
FileDescriptorName = "control";
Service = "kresd.service";
- SocketMode = "0660"; # only root user/group may connect
+ SocketMode = "0660"; # only root user/group may connect and control kresd
};
};
- # Create the cacheDir; tmpfiles don't work on nixos-rebuild switch.
- systemd.services.kresd-cachedir = {
- serviceConfig.Type = "oneshot";
- script = ''
- if [ ! -d '${cfg.cacheDir}' ]; then
- mkdir -p '${cfg.cacheDir}'
- chown kresd:kresd '${cfg.cacheDir}'
- fi
- '';
- };
+ systemd.tmpfiles.rules = [ "d '${cfg.cacheDir}' 0770 kresd kresd - -" ];
systemd.services.kresd = {
description = "Knot-resolver daemon";
@@ -104,16 +96,15 @@ in
User = "kresd";
Type = "notify";
WorkingDirectory = cfg.cacheDir;
+ Restart = "on-failure";
};
script = ''
exec '${package}/bin/kresd' --config '${configFile}' \
- -k '${cfg.cacheDir}/root.key'
+ -k '${pkgs.dns-root-data}/root.key'
'';
- after = [ "kresd-cachedir.service" ];
- requires = [ "kresd.socket" "kresd-cachedir.service" ];
- wantedBy = [ "sockets.target" ];
+ requires = [ "kresd.socket" ];
};
};
}
diff --git a/nixos/modules/services/networking/lldpd.nix b/nixos/modules/services/networking/lldpd.nix
index ba4e1b1542fe4c756e0af50a39c75b1712076ba7..db1534edfd7c0c4e14b5e31afcb91712726a7b67 100644
--- a/nixos/modules/services/networking/lldpd.nix
+++ b/nixos/modules/services/networking/lldpd.nix
@@ -24,6 +24,7 @@ in
description = "lldpd user";
group = "_lldpd";
home = "/var/run/lldpd";
+ isSystemUser = true;
};
users.extraGroups._lldpd = {};
diff --git a/nixos/modules/services/networking/nat.nix b/nixos/modules/services/networking/nat.nix
index 366bb2ed7a80348e521a3abfec3f7007d3bf416f..df4246d216d8df1a90e4881f66591695d3b2a1ae 100644
--- a/nixos/modules/services/networking/nat.nix
+++ b/nixos/modules/services/networking/nat.nix
@@ -19,6 +19,8 @@ let
iptables -w -t nat -D POSTROUTING -j nixos-nat-post 2>/dev/null || true
iptables -w -t nat -F nixos-nat-post 2>/dev/null || true
iptables -w -t nat -X nixos-nat-post 2>/dev/null || true
+
+ ${cfg.extraStopCommands}
'';
setupNat = ''
@@ -53,6 +55,14 @@ let
-j DNAT --to-destination ${fwd.destination}
'') cfg.forwardPorts}
+ ${optionalString (cfg.dmzHost != null) ''
+ iptables -w -t nat -A nixos-nat-pre \
+ -i ${cfg.externalInterface} -j DNAT \
+ --to-destination ${cfg.dmzHost}
+ ''}
+
+ ${cfg.extraCommands}
+
# Append our chains to the nat tables
iptables -w -t nat -A PREROUTING -j nixos-nat-pre
iptables -w -t nat -A POSTROUTING -j nixos-nat-post
@@ -125,15 +135,15 @@ in
type = with types; listOf (submodule {
options = {
sourcePort = mkOption {
- type = types.int;
+ type = types.either types.int (types.strMatching "[[:digit:]]+:[[:digit:]]+");
example = 8080;
- description = "Source port of the external interface";
+ description = "Source port of the external interface; to specify a port range, use a string with a colon (e.g. \"60000:61000\")";
};
destination = mkOption {
type = types.str;
example = "10.0.0.1:80";
- description = "Forward connection to destination ip:port";
+ description = "Forward connection to destination ip:port; to specify a port range, use ip:start-end";
};
proto = mkOption {
@@ -153,6 +163,39 @@ in
'';
};
+ networking.nat.dmzHost = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ example = "10.0.0.1";
+ description =
+ ''
+ The local IP address to which all traffic that does not match any
+ forwarding rule is forwarded.
+ '';
+ };
+
+ networking.nat.extraCommands = mkOption {
+ type = types.lines;
+ default = "";
+ example = "iptables -A INPUT -p icmp -j ACCEPT";
+ description =
+ ''
+ Additional shell commands executed as part of the nat
+ initialisation script.
+ '';
+ };
+
+ networking.nat.extraStopCommands = mkOption {
+ type = types.lines;
+ default = "";
+ example = "iptables -D INPUT -p icmp -j ACCEPT || true";
+ description =
+ ''
+ Additional shell commands executed as part of the nat
+ teardown script.
+ '';
+ };
+
};
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 6bdae32f72bb329328353d8d55fca5d85f56a047..62afbf32c2f6105c800ccc9cbf0ae7b6839625af 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -241,6 +241,19 @@ in {
A list of scripts which will be executed in response to network events.
'';
};
+
+ enableStrongSwan = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Enable the StrongSwan plugin.
+
+ If you enable this option the
+ networkmanager_strongswan plugin will be added to
+ the option
+ so you don't need to to that yourself.
+ '';
+ };
};
};
@@ -333,13 +346,13 @@ in {
wireless.enable = lib.mkDefault false;
};
- powerManagement.resumeCommands = ''
- ${config.systemd.package}/bin/systemctl restart network-manager
- '';
-
security.polkit.extraConfig = polkitConf;
- services.dbus.packages = cfg.packages;
+ networking.networkmanager.packages =
+ mkIf cfg.enableStrongSwan [ pkgs.networkmanager_strongswan ];
+
+ services.dbus.packages =
+ optional cfg.enableStrongSwan pkgs.strongswanNM ++ cfg.packages;
services.udev.packages = cfg.packages;
};
diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix
index c8b8ed547ebbe0c64e3a40fbed292c0d8b7892da..4241e6fcceab9e7f533176bec1183b44e988a5f8 100644
--- a/nixos/modules/services/networking/nsd.nix
+++ b/nixos/modules/services/networking/nsd.nix
@@ -11,6 +11,8 @@ let
# build nsd with the options needed for the given config
nsdPkg = pkgs.nsd.override {
+ configFile = "${configFile}/nsd.conf";
+
bind8Stats = cfg.bind8Stats;
ipv6 = cfg.ipv6;
ratelimit = cfg.ratelimit.enable;
@@ -788,6 +790,8 @@ in
config = mkIf cfg.enable {
+ environment.systemPackages = [ nsdPkg ];
+
users.extraGroups = singleton {
name = username;
gid = config.ids.gids.nsd;
@@ -845,4 +849,6 @@ in
};
};
+
+ meta.maintainers = with lib.maintainers; [ hrdinka ];
}
diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix
index fb9c9dc67f249d2e8088872a87d517603d98f831..f34d8e172b46a87aa589d67425b9c0dde0491806 100644
--- a/nixos/modules/services/networking/prosody.nix
+++ b/nixos/modules/services/networking/prosody.nix
@@ -10,98 +10,126 @@ let
options = {
- # TODO: require attribute
key = mkOption {
- type = types.str;
- description = "Path to the key file";
+ type = types.path;
+ description = "Path to the key file.";
};
- # TODO: require attribute
cert = mkOption {
- type = types.str;
- description = "Path to the certificate file";
+ type = types.path;
+ description = "Path to the certificate file.";
+ };
+
+ extraOptions = mkOption {
+ type = types.attrs;
+ default = {};
+ description = "Extra SSL configuration options.";
};
+
};
};
moduleOpts = {
roster = mkOption {
+ type = types.bool;
default = true;
description = "Allow users to have a roster";
};
saslauth = mkOption {
+ type = types.bool;
default = true;
description = "Authentication for clients and servers. Recommended if you want to log in.";
};
tls = mkOption {
+ type = types.bool;
default = true;
description = "Add support for secure TLS on c2s/s2s connections";
};
dialback = mkOption {
+ type = types.bool;
default = true;
description = "s2s dialback support";
};
disco = mkOption {
+ type = types.bool;
default = true;
description = "Service discovery";
};
legacyauth = mkOption {
+ type = types.bool;
default = true;
description = "Legacy authentication. Only used by some old clients and bots";
};
version = mkOption {
+ type = types.bool;
default = true;
description = "Replies to server version requests";
};
uptime = mkOption {
+ type = types.bool;
default = true;
description = "Report how long server has been running";
};
time = mkOption {
+ type = types.bool;
default = true;
description = "Let others know the time here on this server";
};
ping = mkOption {
+ type = types.bool;
default = true;
description = "Replies to XMPP pings with pongs";
};
console = mkOption {
+ type = types.bool;
default = false;
description = "telnet to port 5582";
};
bosh = mkOption {
+ type = types.bool;
default = false;
description = "Enable BOSH clients, aka 'Jabber over HTTP'";
};
httpserver = mkOption {
+ type = types.bool;
default = false;
description = "Serve static files from a directory over HTTP";
};
websocket = mkOption {
+ type = types.bool;
default = false;
description = "Enable WebSocket support";
};
};
- createSSLOptsStr = o:
- if o ? key && o ? cert then
- ''ssl = { key = "${o.key}"; certificate = "${o.cert}"; };''
- else "";
+ toLua = x:
+ if builtins.isString x then ''"${x}"''
+ else if builtins.isBool x then toString x
+ else if builtins.isInt x then toString x
+ else throw "Invalid Lua value";
+
+ createSSLOptsStr = o: ''
+ ssl = {
+ key = "${o.key}";
+ certificate = "${o.cert}";
+ ${concatStringsSep "\n" (mapAttrsToList (name: value: "${name} = ${toLua value};") o.extraOptions)}
+ };
+ '';
vHostOpts = { ... }: {
@@ -114,18 +142,20 @@ let
};
enabled = mkOption {
+ type = types.bool;
default = false;
description = "Whether to enable the virtual host";
};
ssl = mkOption {
- description = "Paths to SSL files";
+ type = types.nullOr (types.submodule sslOpts);
default = null;
- options = [ sslOpts ];
+ description = "Paths to SSL files";
};
extraConfig = mkOption {
- default = '''';
+ type = types.lines;
+ default = "";
description = "Additional virtual host specific configuration";
};
@@ -144,11 +174,13 @@ in
services.prosody = {
enable = mkOption {
+ type = types.bool;
default = false;
description = "Whether to enable the prosody server";
};
allowRegistration = mkOption {
+ type = types.bool;
default = false;
description = "Allow account creation";
};
@@ -156,8 +188,9 @@ in
modules = moduleOpts;
extraModules = mkOption {
- description = "Enable custom modules";
+ type = types.listOf types.str;
default = [];
+ description = "Enable custom modules";
};
virtualHosts = mkOption {
@@ -183,20 +216,21 @@ in
};
ssl = mkOption {
- description = "Paths to SSL files";
+ type = types.nullOr (types.submodule sslOpts);
default = null;
- options = [ sslOpts ];
+ description = "Paths to SSL files";
};
admins = mkOption {
- description = "List of administrators of the current host";
- example = [ "admin1@example.com" "admin2@example.com" ];
+ type = types.listOf types.str;
default = [];
+ example = [ "admin1@example.com" "admin2@example.com" ];
+ description = "List of administrators of the current host";
};
extraConfig = mkOption {
type = types.lines;
- default = '''';
+ default = "";
description = "Additional prosody configuration";
};
@@ -263,17 +297,17 @@ in
};
systemd.services.prosody = {
-
description = "Prosody XMPP server";
after = [ "network-online.target" ];
wants = [ "network-online.target" ];
wantedBy = [ "multi-user.target" ];
+ restartTriggers = [ config.environment.etc."prosody/prosody.cfg.lua".source ];
serviceConfig = {
User = "prosody";
+ Type = "forking";
PIDFile = "/var/lib/prosody/prosody.pid";
ExecStart = "${pkgs.prosody}/bin/prosodyctl start";
};
-
};
};
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index f0fddcca766f0eb444ad9b3de563e8412799d40b..aa9c0fa1c09faba492cdb85fa8ff314446784074 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -248,13 +248,10 @@ in
let
service =
{ description = "SSH Daemon";
-
wantedBy = optional (!cfg.startWhenNeeded) "multi-user.target";
-
+ after = [ "network.target" ];
stopIfChanged = false;
-
path = [ cfgc.package pkgs.gawk ];
-
environment.LD_LIBRARY_PATH = nssModulesPath;
preStart =
diff --git a/nixos/modules/services/scheduling/fcron.nix b/nixos/modules/services/scheduling/fcron.nix
index ac589be57736b73f8ab9ccc291b0ad796b2ebbab..e3b6b638f5a715d83f67d196fa90f13b1688aa84 100644
--- a/nixos/modules/services/scheduling/fcron.nix
+++ b/nixos/modules/services/scheduling/fcron.nix
@@ -90,16 +90,24 @@ in
[ (allowdeny "allow" (cfg.allow))
(allowdeny "deny" cfg.deny)
# see man 5 fcron.conf
- { source = pkgs.writeText "fcron.conf" ''
- fcrontabs = /var/spool/fcron
- pidfile = /var/run/fcron.pid
- fifofile = /var/run/fcron.fifo
- fcronallow = /etc/fcron.allow
- fcrondeny = /etc/fcron.deny
- shell = /bin/sh
- sendmail = /run/wrappers/bin/sendmail
- editor = ${pkgs.vim}/bin/vim
- '';
+ { source =
+ let
+ isSendmailWrapped =
+ lib.hasAttr "sendmail" config.security.wrappers;
+ sendmailPath =
+ if isSendmailWrapped then "/run/wrappers/bin/sendmail"
+ else "${config.system.path}/bin/sendmail";
+ in
+ pkgs.writeText "fcron.conf" ''
+ fcrontabs = /var/spool/fcron
+ pidfile = /var/run/fcron.pid
+ fifofile = /var/run/fcron.fifo
+ fcronallow = /etc/fcron.allow
+ fcrondeny = /etc/fcron.deny
+ shell = /bin/sh
+ sendmail = ${sendmailPath}
+ editor = ${pkgs.vim}/bin/vim
+ '';
target = "fcron.conf";
gid = config.ids.gids.fcron;
mode = "0644";
diff --git a/nixos/modules/services/security/clamav.nix b/nixos/modules/services/security/clamav.nix
index 7de2d121e76cf8897fab97a089f19e6d8852427c..4161c61ed375eee5868d3d4f92d18c9b7242ba70 100644
--- a/nixos/modules/services/security/clamav.nix
+++ b/nixos/modules/services/security/clamav.nix
@@ -97,8 +97,8 @@ in
systemd.services.clamav-daemon = optionalAttrs cfg.daemon.enable {
description = "ClamAV daemon (clamd)";
- after = mkIf cfg.updater.enable [ "clamav-freshclam.service" ];
- requires = mkIf cfg.updater.enable [ "clamav-freshclam.service" ];
+ after = optional cfg.updater.enable "clamav-freshclam.service";
+ requires = optional cfg.updater.enable "clamav-freshclam.service";
wantedBy = [ "multi-user.target" ];
restartTriggers = [ clamdConfigFile ];
diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix
index bc79d9f2a590c8853ded3e6ad5781b6ca19aa7a3..fa4aeb22ae9de2580964d280ebeae700e83b73a0 100644
--- a/nixos/modules/services/security/tor.nix
+++ b/nixos/modules/services/security/tor.nix
@@ -9,6 +9,26 @@ let
opt = name: value: optionalString (value != null) "${name} ${value}";
optint = name: value: optionalString (value != null && value != 0) "${name} ${toString value}";
+ isolationOptions = {
+ type = types.listOf (types.enum [
+ "IsolateClientAddr"
+ "IsolateSOCKSAuth"
+ "IsolateClientProtocol"
+ "IsolateDestPort"
+ "IsolateDestAddr"
+ ]);
+ default = [];
+ example = [
+ "IsolateClientAddr"
+ "IsolateSOCKSAuth"
+ "IsolateClientProtocol"
+ "IsolateDestPort"
+ "IsolateDestAddr"
+ ];
+ description = "Tor isolation options";
+ };
+
+
torRc = ''
User tor
DataDirectory ${torDirectory}
@@ -20,10 +40,20 @@ let
${optint "ControlPort" cfg.controlPort}
''
# Client connection config
- + optionalString cfg.client.enable ''
- SOCKSPort ${cfg.client.socksListenAddress} IsolateDestAddr
+ + optionalString cfg.client.enable ''
+ SOCKSPort ${cfg.client.socksListenAddress} ${toString cfg.client.socksIsolationOptions}
SOCKSPort ${cfg.client.socksListenAddressFaster}
${opt "SocksPolicy" cfg.client.socksPolicy}
+
+ ${optionalString cfg.client.transparentProxy.enable ''
+ TransPort ${cfg.client.transparentProxy.listenAddress} ${toString cfg.client.transparentProxy.isolationOptions}
+ ''}
+
+ ${optionalString cfg.client.dns.enable ''
+ DNSPort ${cfg.client.dns.listenAddress} ${toString cfg.client.dns.isolationOptions}
+ AutomapHostsOnResolve 1
+ AutomapHostsSuffixes ${concatStringsSep "," cfg.client.dns.automapHostsSuffixes}
+ ''}
''
# Relay config
+ optionalString cfg.relay.enable ''
@@ -154,6 +184,55 @@ in
'';
};
+ socksIsolationOptions = mkOption (isolationOptions // {
+ default = ["IsolateDestAddr"];
+ });
+
+ transparentProxy = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Whether to enable tor transaprent proxy";
+ };
+
+ listenAddress = mkOption {
+ type = types.str;
+ default = "127.0.0.1:9040";
+ example = "192.168.0.1:9040";
+ description = ''
+ Bind transparent proxy to this address.
+ '';
+ };
+
+ isolationOptions = mkOption isolationOptions;
+ };
+
+ dns = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Whether to enable tor dns resolver";
+ };
+
+ listenAddress = mkOption {
+ type = types.str;
+ default = "127.0.0.1:9053";
+ example = "192.168.0.1:9053";
+ description = ''
+ Bind tor dns to this address.
+ '';
+ };
+
+ isolationOptions = mkOption isolationOptions;
+
+ automapHostsSuffixes = mkOption {
+ type = types.listOf types.str;
+ default = [".onion" ".exit"];
+ example = [".onion"];
+ description = "List of suffixes to use with automapHostsOnResolve";
+ };
+ };
+
privoxy.enable = mkOption {
type = types.bool;
default = true;
diff --git a/nixos/modules/services/security/usbguard.nix b/nixos/modules/services/security/usbguard.nix
index 1f2c56a9efa15c5704619fe674fc04f412d0a4f2..4e685e633354d617ad6d06a9bd0373159a0f60db 100644
--- a/nixos/modules/services/security/usbguard.nix
+++ b/nixos/modules/services/security/usbguard.nix
@@ -56,7 +56,7 @@ in {
};
rules = mkOption {
- type = types.nullOr types.str;
+ type = types.nullOr types.lines;
default = null;
example = ''
allow with-interface equals { 08:*:* }
diff --git a/nixos/modules/services/system/localtime.nix b/nixos/modules/services/system/localtime.nix
new file mode 100644
index 0000000000000000000000000000000000000000..b9355bbb94419a6fdacc0fe0be9849c0e8fe6e8a
--- /dev/null
+++ b/nixos/modules/services/system/localtime.nix
@@ -0,0 +1,60 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.localtime;
+in {
+ options = {
+ services.localtime = {
+ enable = mkOption {
+ default = false;
+ description = ''
+ Enable localtime, simple daemon for keeping the system
+ timezone up-to-date based on the current location. It uses geoclue2 to
+ determine the current location and systemd-timedated to actually set
+ the timezone.
+ '';
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+ services.geoclue2.enable = true;
+
+ security.polkit.extraConfig = ''
+ polkit.addRule(function(action, subject) {
+ if (action.id == "org.freedesktop.timedate1.set-timezone"
+ && subject.user == "localtimed") {
+ return polkit.Result.YES;
+ }
+ });
+ '';
+
+ users.users = [{
+ name = "localtimed";
+ description = "Taskserver user";
+ }];
+
+ systemd.services.localtime = {
+ description = "localtime service";
+ wantedBy = [ "multi-user.target" ];
+ partOf = [ "geoclue.service "];
+
+ serviceConfig = {
+ Restart = "on-failure";
+ # TODO: make it work with dbus
+ #DynamicUser = true;
+ Nice = 10;
+ User = "localtimed";
+ PrivateTmp = "yes";
+ PrivateDevices = true;
+ PrivateNetwork = "yes";
+ NoNewPrivileges = "yes";
+ ProtectSystem = "strict";
+ ProtectHome = true;
+ ExecStart = "${pkgs.localtime}/bin/localtimed";
+ };
+ };
+ };
+}
diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix
index 76b0ee6da96857d41e9fa05f53627bb49f0c0f7d..c784f4756d1976b8ad0c0c91fc963a72d410b76d 100644
--- a/nixos/modules/services/web-apps/tt-rss.nix
+++ b/nixos/modules/services/web-apps/tt-rss.nix
@@ -99,8 +99,8 @@ let
user = mkOption {
type = types.str;
- default = "nginx";
- example = "nginx";
+ default = "tt_rss";
+ example = "tt_rss";
description = ''
User account under which both the update daemon and the web-application run.
'';
@@ -466,26 +466,28 @@ let
'';
};
- services.nginx.virtualHosts = mkIf (cfg.virtualHost != null) {
- "${cfg.virtualHost}" = {
- root = "${cfg.root}";
-
- locations."/" = {
- index = "index.php";
- };
-
- locations."~ \.php$" = {
- extraConfig = ''
- fastcgi_split_path_info ^(.+\.php)(/.+)$;
- fastcgi_pass unix:${phpfpmSocketName};
- fastcgi_index index.php;
- fastcgi_param SCRIPT_FILENAME ${cfg.root}/$fastcgi_script_name;
- '';
+ services.nginx = {
+ enable = true;
+ # NOTE: No configuration is done if not using virtual host
+ virtualHosts = mkIf (cfg.virtualHost != null) {
+ "${cfg.virtualHost}" = {
+ root = "${cfg.root}";
+
+ locations."/" = {
+ index = "index.php";
+ };
+
+ locations."~ \.php$" = {
+ extraConfig = ''
+ fastcgi_split_path_info ^(.+\.php)(/.+)$;
+ fastcgi_pass unix:${phpfpmSocketName};
+ fastcgi_index index.php;
+ '';
+ };
};
};
};
-
systemd.services.tt-rss = let
dbService = if cfg.database.type == "pgsql" then "postgresql.service" else "mysql.service";
in {
@@ -496,7 +498,7 @@ let
callSql = e:
if cfg.database.type == "pgsql" then ''
${optionalString (cfg.database.password != null) "PGPASSWORD=${cfg.database.password}"} \
- ${pkgs.postgresql95}/bin/psql \
+ ${pkgs.sudo}/bin/sudo -u ${cfg.user} ${config.services.postgresql.package}/bin/psql \
-U ${cfg.database.user} \
${optionalString (cfg.database.host != null) "-h ${cfg.database.host} --port ${toString dbPort}"} \
-c '${e}' \
@@ -521,6 +523,14 @@ let
''
+ (optionalString (cfg.database.type == "pgsql") ''
+ ${optionalString (cfg.database.host == null && cfg.database.password == null) ''
+ if ! [ -e ${cfg.root}/.db-created ]; then
+ ${pkgs.sudo}/bin/sudo -u ${config.services.postgresql.superUser} ${config.services.postgresql.package}/bin/createuser ${cfg.database.user}
+ ${pkgs.sudo}/bin/sudo -u ${config.services.postgresql.superUser} ${config.services.postgresql.package}/bin/createdb -O ${cfg.database.user} ${cfg.database.name}
+ touch ${cfg.root}/.db-created
+ fi
+ ''}
+
exists=$(${callSql "select count(*) > 0 from pg_tables where tableowner = user"} \
| tail -n+3 | head -n-2 | sed -e 's/[ \n\t]*//')
@@ -554,5 +564,28 @@ let
requires = ["${dbService}"];
after = ["network.target" "${dbService}"];
};
+
+ services.mysql = optionalAttrs (cfg.database.type == "mysql") {
+ enable = true;
+ package = mkDefault pkgs.mysql;
+ ensureDatabases = [ cfg.database.name ];
+ ensureUsers = [
+ {
+ name = cfg.user;
+ ensurePermissions = {
+ "${cfg.database.name}.*" = "ALL PRIVILEGES";
+ };
+ }
+ ];
+ };
+
+ services.postgresql = optionalAttrs (cfg.database.type == "pgsql") {
+ enable = mkDefault true;
+ };
+
+ users = optionalAttrs (cfg.user == "tt_rss") {
+ extraUsers.tt_rss.group = "tt_rss";
+ extraGroups.tt_rss = {};
+ };
};
}
diff --git a/nixos/modules/services/web-servers/lighttpd/default.nix b/nixos/modules/services/web-servers/lighttpd/default.nix
index 700b4469c565ab7a5c828ec7c790cff7ab488c10..d23e810dcc6265a4c41f3ac336a59e343a3ecd36 100644
--- a/nixos/modules/services/web-servers/lighttpd/default.nix
+++ b/nixos/modules/services/web-servers/lighttpd/default.nix
@@ -50,11 +50,14 @@ let
"mod_geoip"
"mod_magnet"
"mod_mysql_vhost"
+ "mod_openssl" # since v1.4.46
"mod_scgi"
"mod_setenv"
"mod_trigger_b4_dl"
"mod_uploadprogress"
+ "mod_vhostdb" # since v1.4.46
"mod_webdav"
+ "mod_wstunnel" # since v1.4.46
];
maybeModuleString = moduleName:
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 97511aac973744764dc48be6dd45902183c463d9..2951e63e863e12e3c78a80d102a4dbb8ab072ab0 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -167,7 +167,8 @@ let
listenString = { addr, port, ssl, ... }:
"listen ${addr}:${toString port} "
- + optionalString ssl "ssl http2 "
+ + optionalString ssl "ssl "
+ + optionalString (ssl && vhost.http2) "http2 "
+ optionalString vhost.default "default_server "
+ ";";
diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix
index 801601aafd9d64064f2d75c43452b5bb23386d8d..29f08cc4f307ebc3d1c1f3833d0818b3c7b5c7d3 100644
--- a/nixos/modules/services/web-servers/nginx/vhost-options.nix
+++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix
@@ -114,6 +114,20 @@ with lib;
description = "Path to server SSL certificate key.";
};
+ http2 = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Whether to enable HTTP 2.
+ Note that (as of writing) due to nginx's implementation, to disable
+ HTTP 2 you have to disable it on all vhosts that use a given
+ IP address / port.
+ If there is one server block configured to enable http2,then it is
+ enabled for all server blocks on this IP.
+ See https://stackoverflow.com/a/39466948/263061.
+ '';
+ };
+
root = mkOption {
type = types.nullOr types.path;
default = null;
diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix
index 943415e08c64548c99eb21409c77ae6bdf98029a..0b2e5c0b69d9ea8e925fd42b18a7282a381ec904 100644
--- a/nixos/modules/services/web-servers/tomcat.nix
+++ b/nixos/modules/services/web-servers/tomcat.nix
@@ -29,7 +29,7 @@ in
type = types.package;
default = pkgs.tomcat85;
defaultText = "pkgs.tomcat85";
- example = lib.literalExample "pkgs.tomcatUnstable";
+ example = lib.literalExample "pkgs.tomcat9";
description = ''
Which tomcat package to use.
'';
diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix
index 39b27d4ceb612dcae99cfe2f4a06ef525c82f13e..4622c7b760f01f4a27f77538cc353015079d6a9d 100644
--- a/nixos/modules/services/x11/desktop-managers/default.nix
+++ b/nixos/modules/services/x11/desktop-managers/default.nix
@@ -109,9 +109,5 @@ in
};
- config = {
- services.xserver.displayManager.session = cfg.session.list;
- environment.systemPackages =
- mkIf cfg.session.needBGPackages [ pkgs.feh ]; # xsetroot via xserver.enable
- };
+ config.services.xserver.displayManager.session = cfg.session.list;
}
diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
index 8a523f0d8036486d509400746fdf3827724566ff..7f3dc0d7847bae5e4761e7340b54ea420e0cfaaa 100644
--- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix
+++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
@@ -47,7 +47,7 @@ in
export GTK_DATA_PREFIX=${config.system.path}
# find theme engines
export GTK_PATH=${config.system.path}/lib/gtk-3.0:${config.system.path}/lib/gtk-2.0
- export XDG_MENU_PREFIX=enlightenment
+ export XDG_MENU_PREFIX=e-
export GST_PLUGIN_PATH="${GST_PLUGIN_PATH}"
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index d2c856fc93328a6750ea93b495efda6181d3c041..21d30df5b6959156d1b30adaf7af2e974d07bcdf 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -136,7 +136,7 @@ in {
# find theme engines
export GTK_PATH=${config.system.path}/lib/gtk-3.0:${config.system.path}/lib/gtk-2.0
- export XDG_MENU_PREFIX=gnome
+ export XDG_MENU_PREFIX=gnome-
${concatMapStrings (p: ''
if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then
diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix
index ab8a0a48b4837d18097aff4d6f1e2557646f2301..814503ab0bc49b43ee25bdd3b3567232049f5c53 100644
--- a/nixos/modules/services/x11/desktop-managers/mate.nix
+++ b/nixos/modules/services/x11/desktop-managers/mate.nix
@@ -12,6 +12,17 @@ let
in
filter (x: !(builtins.elem (pkgName x) ysNames)) xs;
+ addToXDGDirs = p: ''
+ if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then
+ export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name}
+ fi
+
+ if [ -d "${p}/lib/girepository-1.0" ]; then
+ export GI_TYPELIB_PATH=$GI_TYPELIB_PATH''${GI_TYPELIB_PATH:+:}${p}/lib/girepository-1.0
+ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${p}/lib
+ fi
+ '';
+
xcfg = config.services.xserver;
cfg = xcfg.desktopManager.mate;
@@ -20,10 +31,14 @@ in
{
options = {
- services.xserver.desktopManager.mate.enable = mkOption {
- type = types.bool;
- default = false;
- description = "Enable the MATE desktop environment";
+ services.xserver.desktopManager.mate = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Enable the MATE desktop environment";
+ };
+
+ debug = mkEnableOption "mate-session debug messages";
};
environment.mate.excludePackages = mkOption {
@@ -47,15 +62,34 @@ in
# Find theme engines
export GTK_PATH=${config.system.path}/lib/gtk-3.0:${config.system.path}/lib/gtk-2.0
- export XDG_MENU_PREFIX=mate
+ export XDG_MENU_PREFIX=mate-
# Find the mouse
export XCURSOR_PATH=~/.icons:${config.system.path}/share/icons
+ # Let caja find extensions
+ export CAJA_EXTENSION_DIRS=$CAJA_EXTENSION_DIRS''${CAJA_EXTENSION_DIRS:+:}${config.system.path}/lib/caja/extensions-2.0
+
+ # Let caja extensions find gsettings schemas
+ ${concatMapStrings (p: ''
+ if [ -d "${p}/lib/caja/extensions-2.0" ]; then
+ ${addToXDGDirs p}
+ fi
+ '')
+ config.environment.systemPackages
+ }
+
+ # Let mate-panel find applets
+ export MATE_PANEL_APPLETS_DIR=$MATE_PANEL_APPLETS_DIR''${MATE_PANEL_APPLETS_DIR:+:}${config.system.path}/share/mate-panel/applets
+ export MATE_PANEL_EXTRA_MODULES=$MATE_PANEL_EXTRA_MODULES''${MATE_PANEL_EXTRA_MODULES:+:}${config.system.path}/lib/mate-panel/applets
+
+ # Add mate-control-center paths to some XDG variables because its schemas are needed by mate-settings-daemon, and mate-settings-daemon is a dependency for mate-control-center (that is, they are mutually recursive)
+ ${addToXDGDirs pkgs.mate.mate-control-center}
+
# Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/
${pkgs.xdg-user-dirs}/bin/xdg-user-dirs-update
- ${pkgs.mate.mate-session-manager}/bin/mate-session &
+ ${pkgs.mate.mate-session-manager}/bin/mate-session ${optionalString cfg.debug "--debug"} &
waitPID=$!
'';
};
diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index bb4f4e868fea1aae08f3b377e42da8d51e80b390..17a2cde3a65d1af86cfd06ff5e8cfc26a81ffc75 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -25,8 +25,8 @@ in
type = types.bool;
default = true;
description = ''
- Enable support for Qt 4-based applications. Particularly, install the
- Qt 4 version of the Breeze theme and a default backend for Phonon.
+ Enable support for Qt 4-based applications. Particularly, install a
+ default backend for Phonon.
'';
};
@@ -142,11 +142,13 @@ in
kde-gtk-config breeze-gtk
+ qtvirtualkeyboard
+
libsForQt56.phonon-backend-gstreamer
libsForQt5.phonon-backend-gstreamer
]
- ++ lib.optionals cfg.enableQt4Support [ breeze-qt4 pkgs.phonon-backend-gstreamer ]
+ ++ lib.optionals cfg.enableQt4Support [ pkgs.phonon-backend-gstreamer ]
# Optional hardware support features
++ lib.optional config.hardware.bluetooth.enable bluedevil
@@ -193,16 +195,6 @@ in
theme = mkDefault "breeze";
};
- boot.plymouth = {
- theme = mkDefault "breeze";
- themePackages = mkDefault [
- (pkgs.breeze-plymouth.override {
- nixosBranding = true;
- nixosVersion = config.system.nixosRelease;
- })
- ];
- };
-
security.pam.services.kde = { allowNullPassword = true; };
# Doing these one by one seems silly, but we currently lack a better
diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix
index 9c42dc8781b9f492723f6af7eca626e1784a63db..9d5d03638e0499dffd0d2b44d2cd5b8e67f8736c 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce.nix
@@ -3,15 +3,13 @@
with lib;
let
-
xcfg = config.services.xserver;
+ pcfg = config.hardware.pulseaudio;
cfg = xcfg.desktopManager.xfce;
-
in
{
options = {
-
services.xserver.desktopManager.xfce = {
enable = mkOption {
type = types.bool;
@@ -96,8 +94,8 @@ in
pkgs.xfce.xfce4icontheme
pkgs.xfce.xfce4session
pkgs.xfce.xfce4settings
- pkgs.xfce.xfce4mixer
- pkgs.xfce.xfce4volumed
+ (if pcfg.enable then pkgs.xfce.xfce4mixer_pulse else pkgs.xfce.xfce4mixer)
+ (if pcfg.enable then pkgs.xfce.xfce4volumed_pulse else pkgs.xfce.xfce4volumed)
pkgs.xfce.xfce4-screenshooter
pkgs.xfce.xfconf
# This supplies some "abstract" icons such as
@@ -124,6 +122,7 @@ in
[ "/share/xfce4" "/share/themes" "/share/mime" "/share/desktop-directories" "/share/gtksourceview-2.0" ];
environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.xfce.gvfs}/lib/gio/modules" ];
+ environment.variables.GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache";
# Enable helpful DBus services.
services.udisks2.enable = true;
diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
index 1d5dcb2c7cbe1107733c3559e296757dda747ada..35b715b98fcd0375d538954347b90b79b30d23a5 100644
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
@@ -45,6 +45,8 @@ let
theme-name = ${cfg.theme.name}
icon-theme-name = ${cfg.iconTheme.name}
background = ${ldmcfg.background}
+ ${optionalString (cfg.clock-format != null) "clock-format = ${cfg.clock-format}"}
+ ${optionalString (cfg.indicators != null) "indicators = ${concatStringsSep ";" cfg.indicators}"}
${cfg.extraConfig}
'';
@@ -104,6 +106,35 @@ in
};
+ clock-format = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ example = "%F";
+ description = ''
+ Clock format string (as expected by strftime, e.g. "%H:%M")
+ to use with the lightdm gtk greeter panel.
+
+ If set to null the default clock format is used.
+ '';
+ };
+
+ indicators = mkOption {
+ type = types.nullOr (types.listOf types.str);
+ default = null;
+ example = [ "~host" "~spacer" "~clock" "~spacer" "~session" "~language" "~a11y" "~power" ];
+ description = ''
+ List of allowed indicator modules to use for the lightdm gtk
+ greeter panel.
+
+ Built-in indicators include "~a11y", "~language", "~session",
+ "~power", "~clock", "~host", "~spacer". Unity indicators can be
+ represented by short name (e.g. "sound", "power"), service file name,
+ or absolute path.
+
+ If set to null the default indicators are used.
+ '';
+ };
+
extraConfig = mkOption {
type = types.lines;
default = "";
diff --git a/nixos/modules/services/x11/hardware/libinput.nix b/nixos/modules/services/x11/hardware/libinput.nix
index 5aecdef812e6136eba6ab3f36f09b03c602234c7..d0a87f183b6fb934f8d2e290610479cae157d8f1 100644
--- a/nixos/modules/services/x11/hardware/libinput.nix
+++ b/nixos/modules/services/x11/hardware/libinput.nix
@@ -170,7 +170,7 @@ in {
disableWhileTyping = mkOption {
type = types.bool;
- default = true;
+ default = false;
description =
''
Disable input method while typing.
diff --git a/nixos/modules/services/x11/window-managers/awesome.nix b/nixos/modules/services/x11/window-managers/awesome.nix
index eb97449c6bd9122a8005e5ebbc3ce7cbefe853d5..71eb02ec595498181630ba331a72db19c1430608 100644
--- a/nixos/modules/services/x11/window-managers/awesome.nix
+++ b/nixos/modules/services/x11/window-managers/awesome.nix
@@ -6,7 +6,11 @@ let
cfg = config.services.xserver.windowManager.awesome;
awesome = cfg.package;
- inherit (pkgs.luaPackages) getLuaPath getLuaCPath;
+ getLuaPath = lib : dir : "${lib}/${dir}/lua/${pkgs.luaPackages.lua.luaversion}";
+ makeSearchPath = lib.concatMapStrings (path:
+ " --search " + (getLuaPath path "share") +
+ " --search " + (getLuaPath path "lib")
+ );
in
{
@@ -46,10 +50,7 @@ in
{ name = "awesome";
start =
''
- export LUA_CPATH="${lib.concatStringsSep ";" (map getLuaCPath cfg.luaModules)}"
- export LUA_PATH="${lib.concatStringsSep ";" (map getLuaPath cfg.luaModules)}"
-
- ${awesome}/bin/awesome &
+ ${awesome}/bin/awesome ${makeSearchPath cfg.luaModules} &
waitPID=$!
'';
};
diff --git a/nixos/modules/system/boot/grow-partition.nix b/nixos/modules/system/boot/grow-partition.nix
new file mode 100644
index 0000000000000000000000000000000000000000..c4c6d82dc5c8100f59cf514aa9a8e92a093de067
--- /dev/null
+++ b/nixos/modules/system/boot/grow-partition.nix
@@ -0,0 +1,43 @@
+# This module automatically grows the root partition.
+# This allows an instance to be created with a bigger root filesystem
+# than provided by the machine image.
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+
+ options = {
+ boot.growPartition = mkEnableOption "grow the root partition on boot";
+ };
+
+ config = mkIf config.boot.growPartition {
+
+ boot.initrd.extraUtilsCommands = ''
+ copy_bin_and_libs ${pkgs.gawk}/bin/gawk
+ copy_bin_and_libs ${pkgs.gnused}/bin/sed
+ copy_bin_and_libs ${pkgs.utillinux}/sbin/sfdisk
+ copy_bin_and_libs ${pkgs.utillinux}/sbin/lsblk
+
+ 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
+ '';
+
+ boot.initrd.postDeviceCommands = ''
+ rootDevice="${config.fileSystems."/".device}"
+ if [ -e "$rootDevice" ]; then
+ rootDevice="$(readlink -f "$rootDevice")"
+ parentDevice="$(lsblk -npo PKNAME "$rootDevice")"
+ TMPDIR=/run sh $(type -P growpart) "$parentDevice" "''${rootDevice#$parentDevice}"
+ udevadm settle
+ fi
+ '';
+
+ };
+
+}
diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix
index d78775c27582699d48b2dabce32ed17a6d8ab9be..cdeff48459486e58607ffa58c332a1fde62b0495 100644
--- a/nixos/modules/system/boot/initrd-ssh.nix
+++ b/nixos/modules/system/boot/initrd-ssh.nix
@@ -89,9 +89,6 @@ in
config = mkIf (config.boot.initrd.network.enable && cfg.enable) {
assertions = [
- { assertion = cfg.hostRSAKey != null || cfg.hostDSSKey != null || cfg.hostECDSAKey != null;
- message = "You should specify at least one host key for initrd SSH";
- }
{ assertion = cfg.authorizedKeys != [];
message = "You should specify at least one authorized key for initrd SSH";
}
@@ -121,7 +118,7 @@ in
echo ${escapeShellArg key} >> /root/.ssh/authorized_keys
'') cfg.authorizedKeys)}
- dropbear -s -j -k -E -m -p ${toString cfg.port}
+ dropbear -s -j -k -E -m -p ${toString cfg.port} ${optionalString (cfg.hostRSAKey == null && cfg.hostDSSKey == null && cfg.hostECDSAKey == null) "-R"}
'';
boot.initrd.secrets =
diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index 4db9631743e3b5a92766a9d020d59362bd8ec8f1..90074a1ba77b59a96cfa6665c79c8b410dc5480e 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -197,7 +197,7 @@ in
"mmc_block"
# Support USB keyboards, in case the boot fails and we only have
- # a USB keyboard.
+ # a USB keyboard, or for LUKS passphrase prompt.
"uhci_hcd"
"ehci_hcd"
"ehci_pci"
@@ -206,7 +206,7 @@ in
"xhci_hcd"
"xhci_pci"
"usbhid"
- "hid_generic" "hid_lenovo" "hid_apple" "hid_roccat"
+ "hid_generic" "hid_lenovo" "hid_apple" "hid_roccat" "hid_logitech_hidpp"
# Misc. keyboard stuff.
"pcips2" "atkbd" "i8042"
diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index 06f004fb06ecc2a9c79d0f6e94630b6f02747a56..eefee5a479e7231d6fca6ce98589035c70d60443 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -227,6 +227,11 @@ in
default =
[ "aes" "aes_generic" "blowfish" "twofish"
"serpent" "cbc" "xts" "lrw" "sha1" "sha256" "sha512"
+
+ # workaround until https://marc.info/?l=linux-crypto-vger&m=148783562211457&w=4 is merged
+ # remove once 'modprobe --show-depends xts' shows ecb as a dependency
+ "ecb"
+
(if pkgs.stdenv.system == "x86_64-linux" then "aes_x86_64" else "aes_i586")
];
description = ''
@@ -434,7 +439,9 @@ in
["firewire_ohci" "firewire_core" "firewire_sbp2"];
# Some modules that may be needed for mounting anything ciphered
- boot.initrd.availableKernelModules = [ "dm_mod" "dm_crypt" "cryptd" ] ++ luks.cryptoModules;
+ # Also load input_leds to get caps lock light working (#12456)
+ boot.initrd.availableKernelModules = [ "dm_mod" "dm_crypt" "cryptd" "input_leds" ]
+ ++ luks.cryptoModules;
# copy the cryptsetup binary and it's dependencies
boot.initrd.extraUtilsCommands = ''
diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix
index 4b0c498424b53a7c3a856c0b3e0df3dd780469a2..e78fdf1311d38e26fe334a43a5002df144481660 100644
--- a/nixos/modules/system/boot/plymouth.nix
+++ b/nixos/modules/system/boot/plymouth.nix
@@ -8,9 +8,14 @@ let
cfg = config.boot.plymouth;
+ breezePlymouth = pkgs.breeze-plymouth.override {
+ nixosBranding = true;
+ nixosVersion = config.system.nixosRelease;
+ };
+
themesEnv = pkgs.buildEnv {
name = "plymouth-themes";
- paths = [ plymouth ] ++ cfg.themePackages;
+ paths = [ plymouth breezePlymouth ] ++ cfg.themePackages;
};
configFile = pkgs.writeText "plymouthd.conf" ''
@@ -38,7 +43,7 @@ in
};
theme = mkOption {
- default = "fade-in";
+ default = "breeze";
type = types.str;
description = ''
Splash screen theme.
diff --git a/nixos/modules/tasks/filesystems/btrfs.nix b/nixos/modules/tasks/filesystems/btrfs.nix
index 8cfa1b6921d37a250c01334cccab27ec5d88295d..1384873b66315c74de77e28cbd6c509d4f55b380 100644
--- a/nixos/modules/tasks/filesystems/btrfs.nix
+++ b/nixos/modules/tasks/filesystems/btrfs.nix
@@ -1,35 +1,132 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, utils, ... }:
with lib;
let
inInitrd = any (fs: fs == "btrfs") config.boot.initrd.supportedFilesystems;
+ inSystem = any (fs: fs == "btrfs") config.boot.supportedFilesystems;
+
+ cfgScrub = config.services.btrfs.autoScrub;
+
+ enableAutoScrub = cfgScrub.enable;
+ enableBtrfs = inInitrd || inSystem || enableAutoScrub;
in
{
- config = mkIf (any (fs: fs == "btrfs") config.boot.supportedFilesystems) {
+ options = {
+ # One could also do regular btrfs balances, but that shouldn't be necessary
+ # during normal usage and as long as the filesystems aren't filled near capacity
+ services.btrfs.autoScrub = {
+ enable = mkEnableOption "Enable regular btrfs scrub";
- system.fsPackages = [ pkgs.btrfs-progs ];
+ fileSystems = mkOption {
+ type = types.listOf types.path;
+ example = [ "/" ];
+ description = ''
+ List of paths to btrfs filesystems to regularily call btrfs scrub on.
+ Defaults to all mount points with btrfs filesystems.
+ If you mount a filesystem multiple times or additionally mount subvolumes,
+ you need to manually specify this list to avoid scrubbing multiple times.
+ '';
+ };
- boot.initrd.kernelModules = mkIf inInitrd [ "btrfs" "crc32c" ];
+ interval = mkOption {
+ default = "monthly";
+ type = types.str;
+ example = "weekly";
+ description = ''
+ Systemd calendar expression for when to scrub btrfs filesystems.
+ The recommended period is a month but could be less
+ (btrfs-scrub
+ 8).
+ See
+ systemd.time
+ 7
+ for more information on the syntax.
+ '';
+ };
+
+ };
+ };
- boot.initrd.extraUtilsCommands = mkIf inInitrd
+ config = mkMerge [
+ (mkIf enableBtrfs {
+ system.fsPackages = [ pkgs.btrfs-progs ];
+
+ boot.initrd.kernelModules = mkIf inInitrd [ "btrfs" "crc32c" ];
+
+ boot.initrd.extraUtilsCommands = mkIf inInitrd
''
copy_bin_and_libs ${pkgs.btrfs-progs}/bin/btrfs
ln -sv btrfs $out/bin/btrfsck
ln -sv btrfsck $out/bin/fsck.btrfs
'';
- boot.initrd.extraUtilsCommandsTest = mkIf inInitrd
+ boot.initrd.extraUtilsCommandsTest = mkIf inInitrd
''
$out/bin/btrfs --version
'';
- boot.initrd.postDeviceCommands = mkIf inInitrd
+ boot.initrd.postDeviceCommands = mkIf inInitrd
''
btrfs device scan
'';
- };
+ })
+
+ (mkIf enableAutoScrub {
+ assertions = [
+ {
+ assertion = cfgScrub.enable -> (cfgScrub.fileSystems != []);
+ message = ''
+ If 'services.btrfs.autoScrub' is enabled, you need to have at least one
+ btrfs file system mounted via 'fileSystems' or specify a list manually
+ in 'services.btrfs.autoScrub.fileSystems'.
+ '';
+ }
+ ];
+
+ # This will yield duplicated units if the user mounts a filesystem multiple times
+ # or additionally mounts subvolumes, but going the other way around via devices would
+ # yield duplicated units when a filesystem spans multiple devices.
+ # This way around seems like the more sensible default.
+ services.btrfs.autoScrub.fileSystems = mkDefault (mapAttrsToList (name: fs: fs.mountPoint)
+ (filterAttrs (name: fs: fs.fsType == "btrfs") config.fileSystems));
+
+ # TODO: Did not manage to do it via the usual btrfs-scrub@.timer/.service
+ # template units due to problems enabling the parameterized units,
+ # so settled with many units and templating via nix for now.
+ # https://github.com/NixOS/nixpkgs/pull/32496#discussion_r156527544
+ systemd.timers = let
+ scrubTimer = fs: let
+ fs' = utils.escapeSystemdPath fs;
+ in nameValuePair "btrfs-scrub-${fs'}" {
+ description = "regular btrfs scrub timer on ${fs}";
+
+ wantedBy = [ "timers.target" ];
+ timerConfig = {
+ OnCalendar = cfgScrub.interval;
+ AccuracySec = "1d";
+ Persistent = true;
+ };
+ };
+ in listToAttrs (map scrubTimer cfgScrub.fileSystems);
+
+ systemd.services = let
+ scrubService = fs: let
+ fs' = utils.escapeSystemdPath fs;
+ in nameValuePair "btrfs-scrub-${fs'}" {
+ description = "btrfs scrub on ${fs}";
+
+ serviceConfig = {
+ Type = "oneshot";
+ Nice = 19;
+ IOSchedulingClass = "idle";
+ ExecStart = "${pkgs.btrfs-progs}/bin/btrfs scrub start -B ${fs}";
+ };
+ };
+ in listToAttrs (map scrubService cfgScrub.fileSystems);
+ })
+ ];
}
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index 7fee99115329fc90d7e330ba6327b6379b529164..2c0a165887bd8cda5c2393b1e7581e5e3b92fc00 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -268,7 +268,7 @@ in
assertions = [
{
assertion = config.networking.hostId != null;
- message = "ZFS requires config.networking.hostId to be set";
+ message = "ZFS requires networking.hostId to be set";
}
{
assertion = !cfgZfs.forceImportAll || cfgZfs.forceImportRoot;
diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix
index 1d6c41406107cd8ee3fcdd96555d3a504e539bfe..9b4136223c0f2af829422f4ee7a74fac45f87713 100644
--- a/nixos/modules/testing/test-instrumentation.nix
+++ b/nixos/modules/testing/test-instrumentation.nix
@@ -128,7 +128,7 @@ in
# Make it easy to log in as root when running the test interactively.
users.extraUsers.root.initialHashedPassword = mkOverride 150 "";
- services.xserver.displayManager.logToJournal = true;
+ services.xserver.displayManager.job.logToJournal = true;
};
}
diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix
index 6cb9e07ae82011d706a15bd5a4c30e7c236161de..f74c42a777f53a069405191754a24579a026a78c 100644
--- a/nixos/modules/virtualisation/amazon-image.nix
+++ b/nixos/modules/virtualisation/amazon-image.nix
@@ -11,7 +11,7 @@ with lib;
let cfg = config.ec2; in
{
- imports = [ ../profiles/headless.nix ./ec2-data.nix ./grow-partition.nix ./amazon-init.nix ];
+ imports = [ ../profiles/headless.nix ./ec2-data.nix ./amazon-init.nix ];
config = {
@@ -21,7 +21,7 @@ let cfg = config.ec2; in
}
];
- virtualisation.growPartition = cfg.hvm;
+ boot.growPartition = cfg.hvm;
fileSystems."/" = {
device = "/dev/disk/by-label/nixos";
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index e68bfd86060109d678a3b9a98fd1cda9f4ed0126..4038454b2d2fcb715e74ca1c6b4daf47c6d0fdd5 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -726,6 +726,11 @@ in
networking.dhcpcd.denyInterfaces = [ "ve-*" "vb-*" ];
+ services.udev.extraRules = optionalString config.networking.networkmanager.enable ''
+ # Don't manage interfaces created by nixos-container.
+ ENV{INTERFACE}=="v[eb]-*", ENV{NM_UNMANAGED}="1"
+ '';
+
environment.systemPackages = [ pkgs.nixos-container ];
});
}
diff --git a/nixos/modules/virtualisation/ec2-amis.nix b/nixos/modules/virtualisation/ec2-amis.nix
index 14826b6272f7c83cf38f7655a91002314c81258f..01512911a057ec2bfc66b070775b74364511ff55 100644
--- a/nixos/modules/virtualisation/ec2-amis.nix
+++ b/nixos/modules/virtualisation/ec2-amis.nix
@@ -223,21 +223,22 @@ let self = {
"17.03".us-west-2.hvm-ebs = "ami-a93daac9";
"17.03".us-west-2.hvm-s3 = "ami-5139ae31";
- # 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";
+ # 17.09.2681.59661f21be6
+ "17.09".eu-west-1.hvm-ebs = "ami-a30192da";
+ "17.09".eu-west-2.hvm-ebs = "ami-295a414d";
+ "17.09".eu-west-3.hvm-ebs = "ami-8c0eb9f1";
+ "17.09".eu-central-1.hvm-ebs = "ami-266cfe49";
+ "17.09".us-east-1.hvm-ebs = "ami-40bee63a";
+ "17.09".us-east-2.hvm-ebs = "ami-9d84aff8";
+ "17.09".us-west-1.hvm-ebs = "ami-d14142b1";
+ "17.09".us-west-2.hvm-ebs = "ami-3eb40346";
+ "17.09".ca-central-1.hvm-ebs = "ami-ca8207ae";
+ "17.09".ap-southeast-1.hvm-ebs = "ami-84bccff8";
+ "17.09".ap-southeast-2.hvm-ebs = "ami-0dc5386f";
+ "17.09".ap-northeast-1.hvm-ebs = "ami-89b921ef";
+ "17.09".ap-northeast-2.hvm-ebs = "ami-179b3b79";
+ "17.09".sa-east-1.hvm-ebs = "ami-4762202b";
+ "17.09".ap-south-1.hvm-ebs = "ami-4e376021";
latest = self."17.09";
}; in self
diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix
index e3b3e6a5f4ab8735ef38f9cd1ce9e122f60e87d0..75717e08ab2afa0e0da6c2d5df450ae18657137c 100644
--- a/nixos/modules/virtualisation/google-compute-image.nix
+++ b/nixos/modules/virtualisation/google-compute-image.nix
@@ -6,7 +6,7 @@ let
gce = pkgs.google-compute-engine;
in
{
- imports = [ ../profiles/headless.nix ../profiles/qemu-guest.nix ./grow-partition.nix ];
+ imports = [ ../profiles/headless.nix ../profiles/qemu-guest.nix ];
system.build.googleComputeImage = import ../../lib/make-disk-image.nix {
name = "google-compute-image";
@@ -29,6 +29,7 @@ in
autoResize = true;
};
+ boot.growPartition = true;
boot.kernelParams = [ "console=ttyS0" "panic=1" "boot.panic_on_fail" ];
boot.initrd.kernelModules = [ "virtio_scsi" ];
boot.kernelModules = [ "virtio_pci" "virtio_net" ];
diff --git a/nixos/modules/virtualisation/grow-partition.nix b/nixos/modules/virtualisation/grow-partition.nix
index 2cb932d208f0f53941dd7c7010a4372b8f5133d2..444c0bc1630e6e286f20c1f19e4ec50a3cd1f82e 100644
--- a/nixos/modules/virtualisation/grow-partition.nix
+++ b/nixos/modules/virtualisation/grow-partition.nix
@@ -1,48 +1,3 @@
-# This module automatically grows the root partition on virtual machines.
-# This allows an instance to be created with a bigger root filesystem
-# than provided by the machine image.
-
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
-
- options = {
-
- virtualisation.growPartition = mkOption {
- type = types.bool;
- default = true;
- };
-
- };
-
- config = mkIf config.virtualisation.growPartition {
-
- boot.initrd.extraUtilsCommands = ''
- copy_bin_and_libs ${pkgs.gawk}/bin/gawk
- copy_bin_and_libs ${pkgs.gnused}/bin/sed
- copy_bin_and_libs ${pkgs.utillinux}/sbin/sfdisk
- copy_bin_and_libs ${pkgs.utillinux}/sbin/lsblk
-
- 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
- '';
-
- boot.initrd.postDeviceCommands = ''
- rootDevice="${config.fileSystems."/".device}"
- if [ -e "$rootDevice" ]; then
- rootDevice="$(readlink -f "$rootDevice")"
- parentDevice="$(lsblk -npo PKNAME "$rootDevice")"
- TMPDIR=/run sh $(type -P growpart) "$parentDevice" "''${rootDevice#$parentDevice}"
- udevadm settle
- fi
- '';
-
- };
-
-}
+# This profile is deprecated, use boot.growPartition directly.
+builtins.trace "the profile is deprecated, use boot.growPartition instead"
+{ }
diff --git a/nixos/modules/virtualisation/hyperv-guest.nix b/nixos/modules/virtualisation/hyperv-guest.nix
new file mode 100644
index 0000000000000000000000000000000000000000..ecd2a8117710fea7a2b9370434b59a0dc8fbacc3
--- /dev/null
+++ b/nixos/modules/virtualisation/hyperv-guest.nix
@@ -0,0 +1,37 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.virtualisation.hypervGuest;
+
+in {
+ options = {
+ virtualisation.hypervGuest = {
+ enable = mkEnableOption "Hyper-V Guest Support";
+ };
+ };
+
+ config = mkIf cfg.enable {
+ environment.systemPackages = [ config.boot.kernelPackages.hyperv-daemons.bin ];
+
+ security.rngd.enable = false;
+
+ # enable hotadding memory
+ services.udev.packages = lib.singleton (pkgs.writeTextFile {
+ name = "hyperv-memory-hotadd-udev-rules";
+ destination = "/etc/udev/rules.d/99-hyperv-memory-hotadd.rules";
+ text = ''
+ ACTION="add", SUBSYSTEM=="memory", ATTR{state}="online"
+ '';
+ });
+
+ systemd = {
+ packages = [ config.boot.kernelPackages.hyperv-daemons.lib ];
+
+ targets.hyperv-daemons = {
+ wantedBy = [ "multi-user.target" ];
+ };
+ };
+ };
+}
diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix
index 8aa7ad8e3911cf2c84c0d20880476a350eae4468..64465ae185223a9848930dec6aa13d5b475fabcc 100644
--- a/nixos/modules/virtualisation/libvirtd.nix
+++ b/nixos/modules/virtualisation/libvirtd.nix
@@ -37,11 +37,13 @@ in {
'';
};
- virtualisation.libvirtd.enableKVM = mkOption {
- type = types.bool;
- default = true;
+ virtualisation.libvirtd.qemuPackage = mkOption {
+ type = types.package;
+ default = pkgs.qemu;
description = ''
- This option enables support for QEMU/KVM in libvirtd.
+ Qemu package to use with libvirt.
+ `pkgs.qemu` can emulate alien architectures (e.g. aarch64 on x86)
+ `pkgs.qemu_kvm` saves disk space allowing to emulate only host architectures.
'';
};
@@ -102,7 +104,7 @@ in {
config = mkIf cfg.enable {
- environment.systemPackages = with pkgs; [ libvirt netcat-openbsd qemu_kvm ];
+ environment.systemPackages = with pkgs; [ libvirt netcat-openbsd cfg.qemuPackage ];
boot.kernelModules = [ "tun" ];
@@ -154,9 +156,9 @@ in {
# stable (not GC'able as in /nix/store) paths for using in section of xml configs
mkdir -p /run/libvirt/nix-emulators
- ln -s --force ${pkgs.libvirt}/libexec/libvirt_lxc /run/libvirt/nix-emulators/
- ${optionalString pkgs.stdenv.isAarch64 "ln -s --force ${pkgs.qemu}/bin/qemu-system-aarch64 /run/libvirt/nix-emulators/"}
- ${optionalString cfg.enableKVM "ln -s --force ${pkgs.qemu_kvm}/bin/qemu-kvm /run/libvirt/nix-emulators/"}
+ for emulator in ${pkgs.libvirt}/libexec/libvirt_lxc ${cfg.qemuPackage}/bin/qemu-kvm ${cfg.qemuPackage}/bin/qemu-system-*; do
+ ln -s --force "$emulator" /run/libvirt/nix-emulators/
+ done
${optionalString cfg.qemuOvmf ''
mkdir -p /run/libvirt/nix-ovmf
diff --git a/nixos/modules/virtualisation/lxcfs.nix b/nixos/modules/virtualisation/lxcfs.nix
index 48462dc66da84c261e6447070e2461437dcdef4c..b2457403463a5daf69fa47389bc0836a4f763998 100644
--- a/nixos/modules/virtualisation/lxcfs.nix
+++ b/nixos/modules/virtualisation/lxcfs.nix
@@ -28,13 +28,9 @@ in {
###### implementation
config = mkIf cfg.enable {
- services.cgmanager.enable = true;
-
systemd.services.lxcfs = {
description = "FUSE filesystem for LXC";
wantedBy = [ "multi-user.target" ];
- requires = [ "cgmanager.service" ];
- after = [ "cgmanager.service" ];
before = [ "lxc.service" ];
restartIfChanged = false;
serviceConfig = {
diff --git a/nixos/modules/virtualisation/nova-config.nix b/nixos/modules/virtualisation/nova-config.nix
index c865cf451e405989ba1b6975350d763f1c939ea4..c1d2a314daf2d25d2772fe3d2a650b656c8719fa 100644
--- a/nixos/modules/virtualisation/nova-config.nix
+++ b/nixos/modules/virtualisation/nova-config.nix
@@ -6,7 +6,6 @@ with lib;
imports = [
../profiles/qemu-guest.nix
../profiles/headless.nix
- ./grow-partition.nix
];
config = {
@@ -15,8 +14,7 @@ with lib;
autoResize = true;
};
- virtualisation.growPartition = true;
-
+ boot.growPartition = true;
boot.kernelParams = [ "console=ttyS0" ];
boot.loader.grub.device = "/dev/vda";
boot.loader.timeout = 0;
diff --git a/nixos/modules/virtualisation/nova.nix b/nixos/modules/virtualisation/nova.nix
deleted file mode 100644
index c2837d0e2e242ed7e398f0c66eb94eb9d0b9c2ed..0000000000000000000000000000000000000000
--- a/nixos/modules/virtualisation/nova.nix
+++ /dev/null
@@ -1,174 +0,0 @@
-# Module for Nova, a.k.a. OpenStack Compute.
-
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
- cfg = config.virtualisation.nova;
-
- nova = pkgs.nova;
-
- novaConf = pkgs.writeText "nova.conf"
- ''
- --nodaemon
- --verbose
- ${cfg.extraConfig}
- '';
-
-in
-
-{
-
- ###### interface
-
- options = {
-
- virtualisation.nova.enableSingleNode =
- mkOption {
- default = false;
- description =
- ''
- This option enables Nova, also known as OpenStack Compute,
- a cloud computing system, as a single-machine
- installation. That is, all of Nova's components are
- enabled on this machine, using SQLite as Nova's database.
- This is useful for evaluating and experimenting with Nova.
- However, for a real cloud computing environment, you'll
- want to enable some of Nova's services on other machines,
- and use a database such as MySQL.
- '';
- };
-
- virtualisation.nova.extraConfig =
- mkOption {
- default = "";
- description =
- ''
- Additional text appended to nova.conf,
- the main Nova configuration file.
- '';
- };
-
- };
-
-
- ###### implementation
-
- config = mkIf cfg.enableSingleNode {
-
- environment.systemPackages = [ nova pkgs.euca2ools pkgs.novaclient ];
-
- environment.etc =
- [ { source = novaConf;
- target = "nova/nova.conf";
- }
- ];
-
- # Nova requires libvirtd and RabbitMQ.
- virtualisation.libvirtd.enable = true;
- services.rabbitmq.enable = true;
-
- # `qemu-nbd' required the `nbd' kernel module.
- boot.kernelModules = [ "nbd" ];
-
- system.activationScripts.nova =
- ''
- mkdir -m 755 -p /var/lib/nova
- mkdir -m 755 -p /var/lib/nova/networks
- mkdir -m 700 -p /var/lib/nova/instances
- mkdir -m 700 -p /var/lib/nova/keys
-
- # Allow the CA certificate generation script (called by
- # nova-api) to work.
- mkdir -m 700 -p /var/lib/nova/CA /var/lib/nova/CA/private
-
- # Initialise the SQLite database.
- ${nova}/bin/nova-manage db sync
- '';
-
- # `nova-api' receives and executes external client requests from
- # tools such as euca2ools. It listens on port 8773 (XML) and 8774
- # (JSON).
- jobs.nova_api =
- { name = "nova-api";
-
- description = "Nova API service";
-
- startOn = "ip-up";
-
- # `openssl' is required to generate the CA. `openssh' is
- # required to generate key pairs.
- path = [ pkgs.openssl config.programs.ssh.package pkgs.bash ];
-
- respawn = false;
-
- exec = "${nova}/bin/nova-api --flagfile=${novaConf} --api_paste_config=${nova}/etc/nova/api-paste.ini";
- };
-
- # `nova-objectstore' is a simple image server. Useful if you're
- # not running the OpenStack Imaging Service (Swift). It serves
- # images placed in /var/lib/nova/images/.
- jobs.nova_objectstore =
- { name = "nova-objectstore";
-
- description = "Nova Simple Object Store Service";
-
- startOn = "ip-up";
-
- preStart =
- ''
- mkdir -m 700 -p /var/lib/nova/images
- '';
-
- exec = "${nova}/bin/nova-objectstore --flagfile=${novaConf}";
- };
-
- # `nova-scheduler' schedules VM execution requests.
- jobs.nova_scheduler =
- { name = "nova-scheduler";
-
- description = "Nova Scheduler Service";
-
- startOn = "ip-up";
-
- exec = "${nova}/bin/nova-scheduler --flagfile=${novaConf}";
- };
-
- # `nova-compute' starts and manages virtual machines.
- jobs.nova_compute =
- { name = "nova-compute";
-
- description = "Nova Compute Service";
-
- startOn = "ip-up";
-
- path =
- [ pkgs.sudo pkgs.vlan pkgs.nettools pkgs.iptables pkgs.qemu_kvm
- pkgs.e2fsprogs pkgs.utillinux pkgs.multipath-tools pkgs.iproute
- pkgs.bridge-utils
- ];
-
- exec = "${nova}/bin/nova-compute --flagfile=${novaConf}";
- };
-
- # `nova-network' manages networks and allocates IP addresses.
- jobs.nova_network =
- { name = "nova-network";
-
- description = "Nova Network Service";
-
- startOn = "ip-up";
-
- path =
- [ pkgs.sudo pkgs.vlan pkgs.dnsmasq pkgs.nettools pkgs.iptables
- pkgs.iproute pkgs.bridge-utils pkgs.radvd
- ];
-
- exec = "${nova}/bin/nova-network --flagfile=${novaConf}";
- };
-
- };
-
-}
diff --git a/nixos/modules/virtualisation/openstack/common.nix b/nixos/modules/virtualisation/openstack/common.nix
deleted file mode 100644
index 2feb0a8739512db064f00d300405d9c27f74f33b..0000000000000000000000000000000000000000
--- a/nixos/modules/virtualisation/openstack/common.nix
+++ /dev/null
@@ -1,84 +0,0 @@
-{ lib }:
-
-with lib;
-
-rec {
- # A shell script string helper to get the value of a secret at
- # runtime.
- getSecret = secretOption:
- if secretOption.storage == "fromFile"
- then ''$(cat ${secretOption.value})''
- else ''${secretOption.value}'';
-
-
- # A shell script string help to replace at runtime in a file the
- # pattern of a secret by its value.
- replaceSecret = secretOption: filename: ''
- sed -i "s/${secretOption.pattern}/${getSecret secretOption}/g" ${filename}
- '';
-
- # This generates an option that can be used to declare secrets which
- # can be stored in the nix store, or not. A pattern is written in
- # the nix store to represent the secret. The pattern can
- # then be overwritten with the value of the secret at runtime.
- mkSecretOption = {name, description ? ""}:
- mkOption {
- description = description;
- type = types.submodule ({
- options = {
- pattern = mkOption {
- type = types.str;
- default = "##${name}##";
- description = "The pattern that represent the secret.";
- };
- storage = mkOption {
- type = types.enum [ "fromNixStore" "fromFile" ];
- description = ''
- Choose the way the password is provisionned. If
- fromNixStore is used, the value is the password and it is
- written in the nix store. If fromFile is used, the value
- is a path from where the password will be read at
- runtime. This is generally used with
- deployment keys of Nixops.
- '';};
- value = mkOption {
- type = types.str;
- description = ''
- If the storage is fromNixStore, the value is the password itself,
- otherwise it is a path to the file that contains the password.
- '';
- };
- };});
- };
-
- databaseOption = name: {
- host = mkOption {
- type = types.str;
- default = "localhost";
- description = ''
- Host of the database.
- '';
- };
-
- name = mkOption {
- type = types.str;
- default = name;
- description = ''
- Name of the existing database.
- '';
- };
-
- user = mkOption {
- type = types.str;
- default = name;
- description = ''
- The database user. The user must exist and has access to
- the specified database.
- '';
- };
- password = mkSecretOption {
- name = name + "MysqlPassword";
- description = "The database user's password";};
- };
-}
diff --git a/nixos/modules/virtualisation/openstack/glance.nix b/nixos/modules/virtualisation/openstack/glance.nix
deleted file mode 100644
index 7862409a65ecaaada2b48740a8412be4835620cc..0000000000000000000000000000000000000000
--- a/nixos/modules/virtualisation/openstack/glance.nix
+++ /dev/null
@@ -1,245 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib; with import ./common.nix {inherit lib;};
-
-let
- cfg = config.virtualisation.openstack.glance;
- commonConf = ''
- [database]
- connection = "mysql://${cfg.database.user}:${cfg.database.password.pattern}@${cfg.database.host}/${cfg.database.name}"
- notification_driver = noop
-
- [keystone_authtoken]
- auth_url = ${cfg.authUrl}
- auth_plugin = password
- project_name = service
- project_domain_id = default
- user_domain_id = default
- username = ${cfg.serviceUsername}
- password = ${cfg.servicePassword.pattern}
-
- [glance_store]
- default_store = file
- filesystem_store_datadir = /var/lib/glance/images/
- '';
- glanceApiConfTpl = pkgs.writeText "glance-api.conf" ''
- ${commonConf}
-
- [paste_deploy]
- flavor = keystone
- config_file = ${cfg.package}/etc/glance-api-paste.ini
- '';
- glanceRegistryConfTpl = pkgs.writeText "glance-registry.conf" ''
- ${commonConf}
-
- [paste_deploy]
- config_file = ${cfg.package}/etc/glance-registry-paste.ini
- '';
- glanceApiConf = "/var/lib/glance/glance-api.conf";
- glanceRegistryConf = "/var/lib/glance/glance-registry.conf";
-
-in {
- options.virtualisation.openstack.glance = {
- package = mkOption {
- type = types.package;
- default = pkgs.glance;
- defaultText = "pkgs.glance";
- description = ''
- Glance package to use.
- '';
- };
-
- enable = mkOption {
- default = false;
- type = types.bool;
- description = ''
- This option enables Glance as a single-machine
- installation. That is, all of Glance's components are
- enabled on this machine. This is useful for evaluating and
- experimenting with Glance. Note we are currently not
- providing any configurations for a multi-node setup.
- '';
- };
-
- authUrl = mkOption {
- type = types.str;
- default = http://localhost:5000;
- description = ''
- Complete public Identity (Keystone) API endpoint. Note this is
- unversionned.
- '';
- };
-
- serviceUsername = mkOption {
- type = types.str;
- default = "glance";
- description = ''
- The Glance service username. This user is created if bootstrap
- is enable, otherwise it has to be manually created before
- starting this service.
- '';
- };
-
- servicePassword = mkSecretOption {
- name = "glanceAdminPassword";
- description = ''
- The Glance service user's password.
- '';
- };
-
- database = databaseOption "glance";
-
- bootstrap = {
- enable = mkOption {
- default = false;
- type = types.bool;
- description = ''
- Bootstrap the Glance service by creating the service tenant,
- an admin account and a public endpoint. This option provides
- a ready-to-use glance service. This is only done at the
- first Glance execution by the systemd post start section.
- The keystone admin account is used to create required
- Keystone resource for the Glance service.
-
- This option is a helper for setting up
- development or testing environments.
- '';
- };
-
- endpointPublic = mkOption {
- type = types.str;
- default = "http://localhost:9292";
- description = ''
- The public image endpoint. The link
- create endpoint provides more informations
- about that.
- '';
- };
-
- keystoneAdminUsername = mkOption {
- type = types.str;
- default = "admin";
- description = ''
- The keystone admin user name used to create the Glance account.
- '';
- };
-
- keystoneAdminPassword = mkSecretOption {
- name = "keystoneAdminPassword";
- description = ''
- The keystone admin user's password.
- '';
- };
-
- keystoneAdminTenant = mkOption {
- type = types.str;
- default = "admin";
- description = ''
- The keystone admin tenant used to create the Glance account.
- '';
- };
- keystoneAuthUrl = mkOption {
- type = types.str;
- default = "http://localhost:5000/v2.0";
- description = ''
- The keystone auth url used to create the Glance account.
- '';
- };
- };
- };
-
- config = mkIf cfg.enable {
- users.extraUsers = [{
- name = "glance";
- group = "glance";
- uid = config.ids.gids.glance;
-
- }];
- users.extraGroups = [{
- name = "glance";
- gid = config.ids.gids.glance;
- }];
-
- systemd.services.glance-registry = {
- description = "OpenStack Glance Registry Daemon";
- after = [ "network.target"];
- path = [ pkgs.curl pkgs.pythonPackages.keystoneclient pkgs.gawk ];
- wantedBy = [ "multi-user.target" ];
- preStart = ''
- mkdir -m 775 -p /var/lib/glance/{images,scrubber,image_cache}
- chown glance:glance /var/lib/glance/{images,scrubber,image_cache}
-
- # Secret file managment
- cp ${glanceRegistryConfTpl} ${glanceRegistryConf};
- chown glance:glance ${glanceRegistryConf};
- chmod 640 ${glanceRegistryConf}
- ${replaceSecret cfg.database.password glanceRegistryConf}
- ${replaceSecret cfg.servicePassword glanceRegistryConf}
-
- cp ${glanceApiConfTpl} ${glanceApiConf};
- chown glance:glance ${glanceApiConf};
- chmod 640 ${glanceApiConf}
- ${replaceSecret cfg.database.password glanceApiConf}
- ${replaceSecret cfg.servicePassword glanceApiConf}
-
- # Initialise the database
- ${cfg.package}/bin/glance-manage --config-file=${glanceApiConf} --config-file=${glanceRegistryConf} db_sync
- '';
- postStart = ''
- set -eu
- export OS_AUTH_URL=${cfg.bootstrap.keystoneAuthUrl}
- export OS_USERNAME=${cfg.bootstrap.keystoneAdminUsername}
- export OS_PASSWORD=${getSecret cfg.bootstrap.keystoneAdminPassword}
- export OS_TENANT_NAME=${cfg.bootstrap.keystoneAdminTenant}
-
- # Wait until the keystone is available for use
- count=0
- while ! keystone user-get ${cfg.bootstrap.keystoneAdminUsername} > /dev/null
- do
- if [ $count -eq 30 ]
- then
- echo "Tried 30 times, giving up..."
- exit 1
- fi
-
- echo "Keystone not yet started. Waiting for 1 second..."
- count=$((count++))
- sleep 1
- done
-
- # If the service glance doesn't exist, we consider glance is
- # not initialized
- if ! keystone service-get glance
- then
- keystone service-create --type image --name glance
- ID=$(keystone service-get glance | awk '/ id / { print $4 }')
- keystone endpoint-create --region RegionOne --service $ID --internalurl http://localhost:9292 --adminurl http://localhost:9292 --publicurl ${cfg.bootstrap.endpointPublic}
-
- keystone user-create --name ${cfg.serviceUsername} --tenant service --pass ${getSecret cfg.servicePassword}
- keystone user-role-add --tenant service --user ${cfg.serviceUsername} --role admin
- fi
- '';
- serviceConfig = {
- PermissionsStartOnly = true; # preStart must be run as root
- TimeoutStartSec = "600"; # 10min for initial db migrations
- User = "glance";
- Group = "glance";
- ExecStart = "${cfg.package}/bin/glance-registry --config-file=${glanceRegistryConf}";
- };
- };
- systemd.services.glance-api = {
- description = "OpenStack Glance API Daemon";
- after = [ "glance-registry.service" "network.target"];
- requires = [ "glance-registry.service" "network.target"];
- wantedBy = [ "multi-user.target" ];
- serviceConfig = {
- PermissionsStartOnly = true; # preStart must be run as root
- User = "glance";
- Group = "glance";
- ExecStart = "${cfg.package}/bin/glance-api --config-file=${glanceApiConf}";
- };
- };
- };
-
-}
diff --git a/nixos/modules/virtualisation/openstack/keystone.nix b/nixos/modules/virtualisation/openstack/keystone.nix
deleted file mode 100644
index e32c5a4cae1b693dde4c4418e382056a724705ab..0000000000000000000000000000000000000000
--- a/nixos/modules/virtualisation/openstack/keystone.nix
+++ /dev/null
@@ -1,220 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib; with import ./common.nix {inherit lib;};
-
-let
- cfg = config.virtualisation.openstack.keystone;
- keystoneConfTpl = pkgs.writeText "keystone.conf" ''
- [DEFAULT]
- admin_token = ${cfg.adminToken.pattern}
- policy_file=${cfg.package}/etc/policy.json
-
- [database]
-
- connection = "mysql://${cfg.database.user}:${cfg.database.password.pattern}@${cfg.database.host}/${cfg.database.name}"
-
- [paste_deploy]
- config_file = ${cfg.package}/etc/keystone-paste.ini
-
- ${cfg.extraConfig}
- '';
- keystoneConf = "/var/lib/keystone/keystone.conf";
-
-in {
- options.virtualisation.openstack.keystone = {
- package = mkOption {
- type = types.package;
- example = literalExample "pkgs.keystone";
- description = ''
- Keystone package to use.
- '';
- };
-
- enable = mkOption {
- default = false;
- type = types.bool;
- description = ''
- Enable Keystone, the OpenStack Identity Service
- '';
- };
-
- extraConfig = mkOption {
- default = "";
- type = types.lines;
- description = ''
- Additional text appended to keystone.conf,
- the main Keystone configuration file.
- '';
- };
-
- adminToken = mkSecretOption {
- name = "adminToken";
- description = ''
- This is the admin token used to boostrap keystone,
- ie. to provision first resources.
- '';
- };
-
- bootstrap = {
- enable = mkOption {
- default = false;
- type = types.bool;
- description = ''
- Bootstrap the Keystone service by creating the service
- tenant, an admin account and a public endpoint. This options
- provides a ready-to-use admin account. This is only done at
- the first Keystone execution by the systemd post start.
-
- Note this option is a helper for setting up development or
- testing environments.
- '';
- };
-
- endpointPublic = mkOption {
- type = types.str;
- default = "http://localhost:5000/v2.0";
- description = ''
- The public identity endpoint. The link
- create keystone endpoint provides more informations
- about that.
- '';
- };
-
- adminUsername = mkOption {
- type = types.str;
- default = "admin";
- description = ''
- A keystone admin username.
- '';
- };
-
- adminPassword = mkSecretOption {
- name = "keystoneAdminPassword";
- description = ''
- The keystone admin user's password.
- '';
- };
-
- adminTenant = mkOption {
- type = types.str;
- default = "admin";
- description = ''
- A keystone admin tenant name.
- '';
- };
- };
-
- database = {
- host = mkOption {
- type = types.str;
- default = "localhost";
- description = ''
- Host of the database.
- '';
- };
-
- name = mkOption {
- type = types.str;
- default = "keystone";
- description = ''
- Name of the existing database.
- '';
- };
-
- user = mkOption {
- type = types.str;
- default = "keystone";
- description = ''
- The database user. The user must exist and has access to
- the specified database.
- '';
- };
- password = mkSecretOption {
- name = "mysqlPassword";
- description = "The database user's password";};
- };
- };
-
- config = mkIf cfg.enable {
- # Note: when changing the default, make it conditional on
- # ‘system.stateVersion’ to maintain compatibility with existing
- # systems!
- virtualisation.openstack.keystone.package = mkDefault pkgs.keystone;
-
- users.extraUsers = [{
- name = "keystone";
- group = "keystone";
- uid = config.ids.uids.keystone;
- }];
- users.extraGroups = [{
- name = "keystone";
- gid = config.ids.gids.keystone;
- }];
-
- systemd.services.keystone-all = {
- description = "OpenStack Keystone Daemon";
- after = [ "network.target"];
- path = [ cfg.package pkgs.mysql pkgs.curl pkgs.pythonPackages.keystoneclient pkgs.gawk ];
- wantedBy = [ "multi-user.target" ];
- preStart = ''
- mkdir -m 755 -p /var/lib/keystone
-
- cp ${keystoneConfTpl} ${keystoneConf};
- chown keystone:keystone ${keystoneConf};
- chmod 640 ${keystoneConf}
-
- ${replaceSecret cfg.database.password keystoneConf}
- ${replaceSecret cfg.adminToken keystoneConf}
-
- # Initialise the database
- ${cfg.package}/bin/keystone-manage --config-file=${keystoneConf} db_sync
- # Set up the keystone's PKI infrastructure
- ${cfg.package}/bin/keystone-manage --config-file=${keystoneConf} pki_setup --keystone-user keystone --keystone-group keystone
- '';
- postStart = optionalString cfg.bootstrap.enable ''
- set -eu
- # Wait until the keystone is available for use
- count=0
- while ! curl --fail -s http://localhost:35357/v2.0 > /dev/null
- do
- if [ $count -eq 30 ]
- then
- echo "Tried 30 times, giving up..."
- exit 1
- fi
-
- echo "Keystone not yet started. Waiting for 1 second..."
- count=$((count++))
- sleep 1
- done
-
- # We use the service token to create a first admin user
- export OS_SERVICE_ENDPOINT=http://localhost:35357/v2.0
- export OS_SERVICE_TOKEN=${getSecret cfg.adminToken}
-
- # If the tenant service doesn't exist, we consider
- # keystone is not initialized
- if ! keystone tenant-get service
- then
- keystone tenant-create --name service
- keystone tenant-create --name ${cfg.bootstrap.adminTenant}
- keystone user-create --name ${cfg.bootstrap.adminUsername} --tenant ${cfg.bootstrap.adminTenant} --pass ${getSecret cfg.bootstrap.adminPassword}
- keystone role-create --name admin
- keystone role-create --name Member
- keystone user-role-add --tenant ${cfg.bootstrap.adminTenant} --user ${cfg.bootstrap.adminUsername} --role admin
- keystone service-create --type identity --name keystone
- ID=$(keystone service-get keystone | awk '/ id / { print $4 }')
- keystone endpoint-create --region RegionOne --service $ID --publicurl ${cfg.bootstrap.endpointPublic} --adminurl http://localhost:35357/v2.0 --internalurl http://localhost:5000/v2.0
- fi
- '';
- serviceConfig = {
- PermissionsStartOnly = true; # preStart must be run as root
- TimeoutStartSec = "600"; # 10min for initial db migrations
- User = "keystone";
- Group = "keystone";
- ExecStart = "${cfg.package}/bin/keystone-all --config-file=${keystoneConf}";
- };
- };
- };
-}
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 770e5fb848a9777affccf40490f9d1ce7cbe3b23..26f7945a4eda04c674d87866b21096886b931e60 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -18,7 +18,7 @@ let
"i686-linux" = "${qemu}/bin/qemu-kvm";
"x86_64-linux" = "${qemu}/bin/qemu-kvm -cpu kvm64";
"armv7l-linux" = "${qemu}/bin/qemu-system-arm -enable-kvm -machine virt -cpu host";
- "aarch64-linux" = "${qemu}/bin/qemu-system-aarch64 -enable-kvm -machine virt -cpu host";
+ "aarch64-linux" = "${qemu}/bin/qemu-system-aarch64 -enable-kvm -machine virt,gic-version=host -cpu host";
}.${pkgs.stdenv.system};
# FIXME: figure out a common place for this instead of copy pasting
diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix
index d68b3bb73904fdb4e1f6b1281c74cd5b4eda739e..00381c426d23f4d9451b527d3e9ad75dff75ba6f 100644
--- a/nixos/modules/virtualisation/virtualbox-image.nix
+++ b/nixos/modules/virtualisation/virtualbox-image.nix
@@ -8,8 +8,6 @@ let
in {
- imports = [ ./grow-partition.nix ];
-
options = {
virtualbox = {
baseImageSize = mkOption {
@@ -23,7 +21,6 @@ in {
};
config = {
-
system.build.virtualBoxOVA = import ../../lib/make-disk-image.nix {
name = "nixos-ova-${config.system.nixosLabel}-${pkgs.stdenv.system}";
@@ -71,6 +68,7 @@ in {
autoResize = true;
};
+ boot.growPartition = true;
boot.loader.grub.device = "/dev/sda";
virtualisation.virtualbox.guest.enable = true;
diff --git a/nixos/release.nix b/nixos/release.nix
index bb6a73eb68ece783c916d9c732ef19b1db7f29e6..3dd670c30bade258317161c29d76ee2c41101783 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -1,6 +1,6 @@
{ nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; }
, stableBranch ? false
-, supportedSystems ? [ "x86_64-linux" ]
+, supportedSystems ? [ "x86_64-linux" "aarch64-linux" ]
}:
with import ../lib;
@@ -89,6 +89,27 @@ let
});
}).config));
+ makeNetboot = config:
+ let
+ config_evaled = import lib/eval-config.nix config;
+ build = config_evaled.config.system.build;
+ kernelTarget = config_evaled.pkgs.stdenv.platform.kernelTarget;
+ in
+ pkgs.symlinkJoin {
+ name="netboot";
+ paths=[
+ build.netbootRamdisk
+ build.kernel
+ build.netbootIpxeScript
+ ];
+ postBuild = ''
+ mkdir -p $out/nix-support
+ echo "file ${kernelTarget} $out/${kernelTarget}" >> $out/nix-support/hydra-build-products
+ echo "file initrd $out/initrd" >> $out/nix-support/hydra-build-products
+ echo "file ipxe $out/netboot.ipxe" >> $out/nix-support/hydra-build-products
+ '';
+ };
+
in rec {
@@ -103,28 +124,22 @@ in rec {
# Build the initial ramdisk so Hydra can keep track of its size over time.
initialRamdisk = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.initialRamdisk);
- netboot.x86_64-linux = let build = (import lib/eval-config.nix {
+ netboot = {
+ x86_64-linux = makeNetboot {
system = "x86_64-linux";
modules = [
./modules/installer/netboot/netboot-minimal.nix
versionModule
];
- }).config.system.build;
- in
- pkgs.symlinkJoin {
- name="netboot";
- paths=[
- build.netbootRamdisk
- build.kernel
- build.netbootIpxeScript
- ];
- postBuild = ''
- mkdir -p $out/nix-support
- echo "file bzImage $out/bzImage" >> $out/nix-support/hydra-build-products
- echo "file initrd $out/initrd" >> $out/nix-support/hydra-build-products
- echo "file ipxe $out/netboot.ipxe" >> $out/nix-support/hydra-build-products
- '';
};
+ } // (optionalAttrs (elem "aarch64-linux" supportedSystems) {
+ aarch64-linux = makeNetboot {
+ system = "aarch64-linux";
+ modules = [
+ ./modules/installer/netboot/netboot-minimal.nix
+ versionModule
+ ];
+ };});
iso_minimal = forAllSystems (system: makeIso {
module = ./modules/installer/cd-dvd/installation-cd-minimal.nix;
@@ -217,6 +232,7 @@ in rec {
tests.atd = callTest tests/atd.nix {};
tests.acme = callTest tests/acme.nix {};
tests.avahi = callTest tests/avahi.nix {};
+ tests.beegfs = callTest tests/beegfs.nix {};
tests.bittorrent = callTest tests/bittorrent.nix {};
tests.blivet = callTest tests/blivet.nix {};
tests.boot = callSubTests tests/boot.nix {};
@@ -252,7 +268,6 @@ in rec {
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 {};
@@ -279,7 +294,6 @@ in rec {
tests.kernel-copperhead = callTest tests/kernel-copperhead.nix {};
tests.kernel-latest = callTest tests/kernel-latest.nix {};
tests.kernel-lts = callTest tests/kernel-lts.nix {};
- tests.keystone = callTest tests/keystone.nix {};
tests.kubernetes = hydraJob (import tests/kubernetes/default.nix { system = "x86_64-linux"; });
tests.latestKernel.login = callTest tests/login.nix { latestKernel = true; };
tests.ldap = callTest tests/ldap.nix {};
@@ -333,10 +347,12 @@ in rec {
tests.slim = callTest tests/slim.nix {};
tests.smokeping = callTest tests/smokeping.nix {};
tests.snapper = callTest tests/snapper.nix {};
+ tests.statsd = callTest tests/statsd.nix {};
tests.switchTest = callTest tests/switch-test.nix {};
tests.taskserver = callTest tests/taskserver.nix {};
tests.tomcat = callTest tests/tomcat.nix {};
tests.udisks2 = callTest tests/udisks2.nix {};
+ tests.vault = callTest tests/vault.nix {};
tests.virtualbox = callSubTests tests/virtualbox.nix { system = "x86_64-linux"; };
tests.wordpress = callTest tests/wordpress.nix {};
tests.xfce = callTest tests/xfce.nix {};
diff --git a/nixos/tests/beegfs.nix b/nixos/tests/beegfs.nix
new file mode 100644
index 0000000000000000000000000000000000000000..433910feafe306475cc68702ecd9b5177680bd26
--- /dev/null
+++ b/nixos/tests/beegfs.nix
@@ -0,0 +1,115 @@
+import ./make-test.nix ({ pkgs, ... } :
+
+let
+ connAuthFile="beegfs/auth-def.key";
+
+ client = { config, pkgs, lib, ... } : {
+ networking.firewall.enable = false;
+ services.beegfsEnable = true;
+ services.beegfs.default = {
+ mgmtdHost = "mgmt";
+ connAuthFile = "/etc/${connAuthFile}";
+ client = {
+ mount = false;
+ enable = true;
+ };
+ };
+
+ fileSystems = pkgs.lib.mkVMOverride # FIXME: this should be creatd by the module
+ [ { mountPoint = "/beegfs";
+ device = "default";
+ fsType = "beegfs";
+ options = [ "cfgFile=/etc/beegfs/client-default.conf" "_netdev" ];
+ }
+ ];
+
+ environment.etc."${connAuthFile}" = {
+ enable = true;
+ text = "ThisIsALousySecret";
+ mode = "0600";
+ };
+ };
+
+
+ server = service : { config, pkgs, lib, ... } : {
+ networking.firewall.enable = false;
+ boot.initrd.postDeviceCommands = ''
+ ${pkgs.e2fsprogs}/bin/mkfs.ext4 -L data /dev/vdb
+ '';
+
+ virtualisation.emptyDiskImages = [ 4096 ];
+
+ fileSystems = pkgs.lib.mkVMOverride
+ [ { mountPoint = "/data";
+ device = "/dev/disk/by-label/data";
+ fsType = "ext4";
+ }
+ ];
+
+ environment.systemPackages = with pkgs; [ beegfs ];
+ environment.etc."${connAuthFile}" = {
+ enable = true;
+ text = "ThisIsALousySecret";
+ mode = "0600";
+ };
+
+ services.beegfsEnable = true;
+ services.beegfs.default = {
+ mgmtdHost = "mgmt";
+ connAuthFile = "/etc/${connAuthFile}";
+ "${service}" = {
+ enable = true;
+ storeDir = "/data";
+ };
+ };
+ };
+
+in
+{
+ name = "beegfs";
+
+ nodes = {
+ meta = server "meta";
+ mgmt = server "mgmtd";
+ storage1 = server "storage";
+ storage2 = server "storage";
+ client1 = client;
+ client2 = client;
+ };
+
+ testScript = ''
+ # Initalize the data directories
+ $mgmt->waitForUnit("default.target");
+ $mgmt->succeed("beegfs-setup-mgmtd -C -f -p /data");
+ $mgmt->succeed("systemctl start beegfs-mgmtd-default");
+
+ $meta->waitForUnit("default.target");
+ $meta->succeed("beegfs-setup-meta -C -f -s 1 -p /data");
+ $meta->succeed("systemctl start beegfs-meta-default");
+
+ $storage1->waitForUnit("default.target");
+ $storage1->succeed("beegfs-setup-storage -C -f -s 1 -i 1 -p /data");
+ $storage1->succeed("systemctl start beegfs-storage-default");
+
+ $storage2->waitForUnit("default.target");
+ $storage2->succeed("beegfs-setup-storage -C -f -s 2 -i 2 -p /data");
+ $storage2->succeed("systemctl start beegfs-storage-default");
+
+ #
+
+ # Basic test
+ $client1->waitForUnit("beegfs.mount");
+ $client1->succeed("beegfs-check-servers-default");
+ $client1->succeed("echo test > /beegfs/test");
+ $client2->waitForUnit("beegfs.mount");
+ $client2->succeed("test -e /beegfs/test");
+ $client2->succeed("cat /beegfs/test | grep test");
+
+ # test raid0/stripping
+ $client1->succeed("dd if=/dev/urandom bs=1M count=10 of=/beegfs/striped");
+ $client2->succeed("cat /beegfs/striped > /dev/null");
+
+ # check if fs is still healthy
+ $client1->succeed("beegfs-fsck-default --checkfs");
+ '';
+})
diff --git a/nixos/tests/glance.nix b/nixos/tests/glance.nix
deleted file mode 100644
index 992b77227a4bca1e8513b508a4c6c97e1d6629c4..0000000000000000000000000000000000000000
--- a/nixos/tests/glance.nix
+++ /dev/null
@@ -1,77 +0,0 @@
-{ system ? builtins.currentSystem }:
-
-with import ../lib/testing.nix { inherit system; };
-with pkgs.lib;
-
-let
- glanceMysqlPassword = "glanceMysqlPassword";
- glanceAdminPassword = "glanceAdminPassword";
-
- createDb = pkgs.writeText "db-provisionning.sql" ''
- create database keystone;
- GRANT ALL PRIVILEGES ON keystone.* TO 'keystone'@'localhost' IDENTIFIED BY 'keystone';
- GRANT ALL PRIVILEGES ON keystone.* TO 'keystone'@'%' IDENTIFIED BY 'keystone';
-
- create database glance;
- GRANT ALL PRIVILEGES ON glance.* TO 'glance'@'localhost' IDENTIFIED BY '${glanceMysqlPassword}';
- GRANT ALL PRIVILEGES ON glance.* TO 'glance'@'%' IDENTIFIED BY '${glanceMysqlPassword}';
- '';
-
- image =
- (import ../lib/eval-config.nix {
- inherit system;
- modules = [ ../../nixos/modules/virtualisation/nova-image.nix ];
- }).config.system.build.novaImage;
-
- # The admin keystone account
- adminOpenstackCmd = "OS_TENANT_NAME=admin OS_USERNAME=admin OS_PASSWORD=keystone OS_AUTH_URL=http://localhost:5000/v3 OS_IDENTITY_API_VERSION=3 openstack";
-
-in makeTest {
- meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ lewo ];
- };
- machine =
- { config, pkgs, ... }:
- {
- services.mysql.enable = true;
- services.mysql.package = pkgs.mysql;
- services.mysql.initialScript = createDb;
-
- virtualisation = {
- openstack.keystone = {
- enable = true;
- database.password = { value = "keystone"; storage = "fromNixStore"; };
- adminToken = { value = "adminToken"; storage = "fromNixStore"; };
- bootstrap.enable = true;
- bootstrap.adminPassword = { value = "keystone"; storage = "fromNixStore"; };
- };
-
- openstack.glance = {
- enable = true;
- database.password = { value = glanceMysqlPassword; storage = "fromNixStore"; };
- servicePassword = { value = glanceAdminPassword; storage = "fromNixStore"; };
-
- bootstrap = {
- enable = true;
- keystoneAdminPassword = { value = "keystone"; storage = "fromNixStore"; };
- };
- };
-
- memorySize = 2096;
- diskSize = 4 * 1024;
- };
-
- environment.systemPackages = with pkgs.pythonPackages; with pkgs; [
- openstackclient
- ];
- };
-
- testScript =
- ''
- $machine->waitForUnit("glance-api.service");
-
- # Since Glance api can take time to start, we retry until success
- $machine->waitUntilSucceeds("${adminOpenstackCmd} image create nixos --file ${image}/nixos.img --disk-format qcow2 --container-format bare --public");
- $machine->succeed("${adminOpenstackCmd} image list") =~ /nixos/ or die;
- '';
-}
diff --git a/nixos/tests/jenkins.nix b/nixos/tests/jenkins.nix
index a9833058f378660a43dba617aea29671fd9c675b..ed55b2ff58716d3c08dd6dd71d5098f79fd7ee99 100644
--- a/nixos/tests/jenkins.nix
+++ b/nixos/tests/jenkins.nix
@@ -36,6 +36,9 @@ import ./make-test.nix ({ pkgs, ...} : {
startAll;
$master->waitForUnit("jenkins");
+
+ $master->mustSucceed("curl http://localhost:8080 | grep 'Authentication required'");
+
print $master->execute("sudo -u jenkins groups");
$master->mustSucceed("sudo -u jenkins groups | grep jenkins | grep users");
@@ -44,4 +47,4 @@ import ./make-test.nix ({ pkgs, ...} : {
$slave->mustFail("systemctl is-enabled jenkins.service");
'';
-})
\ No newline at end of file
+})
diff --git a/nixos/tests/keystone.nix b/nixos/tests/keystone.nix
deleted file mode 100644
index 358e352f776f8f6666f607eed4457a468ad55ab6..0000000000000000000000000000000000000000
--- a/nixos/tests/keystone.nix
+++ /dev/null
@@ -1,82 +0,0 @@
-{ system ? builtins.currentSystem }:
-
-with import ../lib/testing.nix { inherit system; };
-with pkgs.lib;
-
-let
- keystoneMysqlPassword = "keystoneMysqlPassword";
- keystoneMysqlPasswordFile = "/var/run/keystoneMysqlPassword";
- keystoneAdminPassword = "keystoneAdminPassword";
-
- createKeystoneDb = pkgs.writeText "create-keystone-db.sql" ''
- create database keystone;
- GRANT ALL PRIVILEGES ON keystone.* TO 'keystone'@'localhost' IDENTIFIED BY '${keystoneMysqlPassword}';
- GRANT ALL PRIVILEGES ON keystone.* TO 'keystone'@'%' IDENTIFIED BY '${keystoneMysqlPassword}';
- '';
- # The admin keystone account
- adminOpenstackCmd = "OS_TENANT_NAME=admin OS_USERNAME=admin OS_PASSWORD=${keystoneAdminPassword} OS_AUTH_URL=http://localhost:5000/v3 OS_IDENTITY_API_VERSION=3 openstack";
- # The created demo keystone account
- demoOpenstackCmd = "OS_TENANT_NAME=demo OS_USERNAME=demo OS_PASSWORD=demo OS_AUTH_URL=http://localhost:5000/v3 OS_IDENTITY_API_VERSION=3 openstack";
-
-in makeTest {
- meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ lewo ];
- };
- machine =
- { config, pkgs, ... }:
- {
- # This is to simulate nixops deployment process.
- # https://nixos.org/nixops/manual/#opt-deployment.keys
- boot.postBootCommands = "echo ${keystoneMysqlPassword} > ${keystoneMysqlPasswordFile}";
-
- services.mysql.enable = true;
- services.mysql.initialScript = createKeystoneDb;
-
- virtualisation = {
-
- openstack.keystone = {
- enable = true;
- # Check if we can get the secret from a file
- database.password = {
- value = keystoneMysqlPasswordFile;
- storage = "fromFile";
- };
- adminToken = {
- value = "adminToken";
- storage = "fromNixStore";
- };
-
- bootstrap.enable = true;
- # Check if we can get the secret from the store
- bootstrap.adminPassword = {
- value = keystoneAdminPassword;
- storage = "fromNixStore";
- };
- };
-
- memorySize = 2096;
- diskSize = 4 * 1024;
- };
-
- environment.systemPackages = with pkgs.pythonPackages; with pkgs; [
- openstackclient
- ];
- };
-
- testScript =
- ''
- $machine->waitForUnit("keystone-all.service");
-
- # Verify that admin ccount is working
- $machine->succeed("${adminOpenstackCmd} token issue");
-
- # Try to create a new user
- $machine->succeed("${adminOpenstackCmd} project create --domain default --description 'Demo Project' demo");
- $machine->succeed("${adminOpenstackCmd} user create --domain default --password demo demo");
- $machine->succeed("${adminOpenstackCmd} role create user");
- $machine->succeed("${adminOpenstackCmd} role add --project demo --user demo user");
-
- # Verify this new account is working
- $machine->succeed("${demoOpenstackCmd} token issue");
- '';
-}
diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix
index e44e5bf11d333d33530efb1c69d58460149d9539..2d3ecaf94cfa352f605e57db3632175ce313999c 100644
--- a/nixos/tests/printing.nix
+++ b/nixos/tests/printing.nix
@@ -39,7 +39,7 @@ import ./make-test.nix ({pkgs, ... }: {
$client->waitForUnit("cups.service");
$client->sleep(10); # wait until cups is fully initialized
$client->succeed("lpstat -r") =~ /scheduler is running/ or die;
- $client->succeed("lpstat -H") =~ "/var/run/cups/cups.sock" or die;
+ $client->succeed("lpstat -H") =~ "localhost:631" or die;
$client->succeed("curl --fail http://localhost:631/");
$client->succeed("curl --fail http://server:631/");
$server->fail("curl --fail --connect-timeout 2 http://client:631/");
diff --git a/nixos/tests/radicale.nix b/nixos/tests/radicale.nix
index f694fc75ef777f3f376ac26a05f37ea836a3636d..8ac0639c6a8cebc96509cdee7b09c0466d9b980f 100644
--- a/nixos/tests/radicale.nix
+++ b/nixos/tests/radicale.nix
@@ -20,7 +20,7 @@ let
'';
};
# WARNING: DON'T DO THIS IN PRODUCTION!
- # This puts secrets (albeit hashed) directly into the Nix store for ease of testing.
+ # This puts unhashed secrets directly into the Nix store for ease of testing.
environment.etc."radicale/htpasswd".source = pkgs.runCommand "htpasswd" {} ''
${pkgs.apacheHttpd}/bin/htpasswd -bcB "$out" ${user} ${password}
'';
diff --git a/nixos/tests/statsd.nix b/nixos/tests/statsd.nix
new file mode 100644
index 0000000000000000000000000000000000000000..d6bbc3901630ab1a7646b2af41d49ccdcd934a4e
--- /dev/null
+++ b/nixos/tests/statsd.nix
@@ -0,0 +1,40 @@
+import ./make-test.nix ({ pkgs, lib }:
+
+with lib;
+
+{
+ name = "statsd";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ ma27 ];
+ };
+
+ nodes.statsd1 = {
+ services.statsd.enable = true;
+ services.statsd.backends = [ "statsd-influxdb-backend" "console" ];
+ services.statsd.extraConfig = ''
+ influxdb: {
+ username: "root",
+ password: "root",
+ database: "statsd"
+ }
+ '';
+
+ services.influxdb.enable = true;
+
+ systemd.services.influx-init = {
+ description = "Setup Influx Test Base";
+ after = [ "influxdb.service" ];
+ before = [ "statsd.service" ];
+
+ script = ''
+ echo "CREATE DATABASE statsd" | ${pkgs.influxdb}/bin/influx
+ '';
+ };
+ };
+
+ testScript = ''
+ $statsd1->start();
+ $statsd1->waitForUnit("statsd.service");
+ $statsd1->succeed("nc -z 127.0.0.1 8126");
+ '';
+})
diff --git a/nixos/tests/vault.nix b/nixos/tests/vault.nix
new file mode 100644
index 0000000000000000000000000000000000000000..2c08d06f286bd375a28f87cac160a49317429759
--- /dev/null
+++ b/nixos/tests/vault.nix
@@ -0,0 +1,23 @@
+import ./make-test.nix ({ pkgs, ... }:
+{
+ name = "vault";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ lnl7 ];
+ };
+ machine = { config, pkgs, ... }: {
+ environment.systemPackages = [ pkgs.vault ];
+ environment.variables.VAULT_ADDR = "http://127.0.0.1:8200";
+ services.vault.enable = true;
+ };
+
+ testScript =
+ ''
+ startAll;
+
+ $machine->waitForUnit('multi-user.target');
+ $machine->waitForUnit('vault.service');
+ $machine->waitForOpenPort(8200);
+ $machine->succeed('vault init');
+ $machine->succeed('vault status | grep "Sealed: true"');
+ '';
+})
diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix
index c519d7dae8beba46fb1137f5c978f00646cd5624..5574293ba3777f3ea2da7dd7e7eac8f967405f50 100644
--- a/nixos/tests/virtualbox.nix
+++ b/nixos/tests/virtualbox.nix
@@ -109,9 +109,6 @@ let
} ''
${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
-
${pkgs.e2fsprogs}/sbin/mkfs.ext4 /dev/vda1
${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda1
mkdir /mnt
diff --git a/pkgs/applications/altcoins/aeon/default.nix b/pkgs/applications/altcoins/aeon/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..cfbb1f24b19857dbbdc4d11df10fa7ee706574d5
--- /dev/null
+++ b/pkgs/applications/altcoins/aeon/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, cmake, boost, miniupnpc, openssl, pkgconfig, unbound }:
+
+let
+ version = "0.9.14.0";
+in
+stdenv.mkDerivation {
+ name = "aeon-${version}";
+
+ src = fetchFromGitHub {
+ owner = "aeonix";
+ repo = "aeon";
+ rev = "v${version}";
+ sha256 = "0pl9nfhihj0wsdgvvpv5f14k4m2ikk8s3xw6nd8ymbnpxfzyxynr";
+ };
+
+ nativeBuildInputs = [ cmake pkgconfig ];
+
+ buildInputs = [ boost miniupnpc openssl unbound ];
+
+ installPhase = ''
+ install -D src/aeond "$out/bin/aeond"
+ install src/simpleminer "$out/bin/aeon-simpleminer"
+ install src/simplewallet "$out/bin/aeon-simplewallet"
+ install src/connectivity_tool "$out/bin/aeon-connectivity-tool"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Private, secure, untraceable currency";
+ homepage = http://www.aeon.cash/;
+ license = licenses.bsd3;
+ maintainers = [ maintainers.aij ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/applications/altcoins/cryptop/default.nix b/pkgs/applications/altcoins/cryptop/default.nix
index 0136ab18ceacb4c38a913f18ee3663f32bf1148b..01c47b320de58105baa6aaf210dc239695c9b305 100644
--- a/pkgs/applications/altcoins/cryptop/default.nix
+++ b/pkgs/applications/altcoins/cryptop/default.nix
@@ -1,16 +1,15 @@
-{ lib, python2}:
+{ lib, buildPythonApplication, fetchPypi, requests, requests-cache }:
-python2.pkgs.buildPythonApplication rec {
+buildPythonApplication rec {
pname = "cryptop";
- version = "0.1.0";
- name = "${pname}-${version}";
+ version = "0.2.0";
- src = python2.pkgs.fetchPypi {
+ src = fetchPypi {
inherit pname version;
- sha256 = "00glnlyig1aajh30knc5rnfbamwfxpg29js2db6mymjmfka8lbhh";
+ sha256 = "0akrrz735vjfrm78plwyg84vabj0x3qficq9xxmy9kr40fhdkzpb";
};
- propagatedBuildInputs = [ python2.pkgs.requests ];
+ propagatedBuildInputs = [ requests requests-cache ];
# No tests in archive
doCheck = false;
diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index aeab29534691f7eee219f643426f7751cee66f5f..21c6b13411496c303a16af6338df12e4d1a7846b 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -1,7 +1,9 @@
-{ callPackage, boost155, boost162, openssl_1_1_0, haskellPackages, darwin, libsForQt5, miniupnpc_2 }:
+{ callPackage, boost155, boost162, openssl_1_1_0, haskellPackages, darwin, libsForQt5, miniupnpc_2, python3 }:
rec {
+ aeon = callPackage ./aeon { };
+
bitcoin = libsForQt5.callPackage ./bitcoin.nix { miniupnpc = miniupnpc_2; withGui = true; };
bitcoind = callPackage ./bitcoin.nix { miniupnpc = miniupnpc_2; withGui = false; };
@@ -20,6 +22,8 @@ rec {
btc1 = callPackage ./btc1.nix { withGui = true; };
btc1d = callPackage ./btc1.nix { withGui = false; };
+ cryptop = python3.pkgs.callPackage ./cryptop { };
+
dashpay = callPackage ./dashpay.nix { };
dogecoin = callPackage ./dogecoin.nix { withGui = true; };
diff --git a/pkgs/applications/altcoins/memorycoin.nix b/pkgs/applications/altcoins/memorycoin.nix
index 24b891d60eb247908f8d0467b167b78faab0cc11..a14276d4fa2ded41b252da77ce6fc9e8ea78eaaa 100644
--- a/pkgs/applications/altcoins/memorycoin.nix
+++ b/pkgs/applications/altcoins/memorycoin.nix
@@ -31,6 +31,10 @@ stdenv.mkDerivation rec{
then "install -D bitcoin-qt $out/bin/memorycoin-qt"
else "install -D bitcoind $out/bin/memorycoind";
+ # `make build/version.o`:
+ # make: *** No rule to make target 'build/build.h', needed by 'build/version.o'. Stop.
+ enableParallelBuilding = false;
+
meta = {
description = "Peer-to-peer, CPU-based electronic cash system";
longDescription= ''
diff --git a/pkgs/applications/altcoins/primecoin.nix b/pkgs/applications/altcoins/primecoin.nix
index b1e3dc2dd93d8328bf4030a1dc906cd8aecc0be9..f79d54d0ce268f1755e91df6202343bd4a190379 100644
--- a/pkgs/applications/altcoins/primecoin.nix
+++ b/pkgs/applications/altcoins/primecoin.nix
@@ -31,6 +31,10 @@ stdenv.mkDerivation rec{
then "install -D bitcoin-qt $out/bin/primecoin-qt"
else "install -D bitcoind $out/bin/primecoind";
+ # `make build/version.o`:
+ # make: *** No rule to make target 'build/build.h', needed by 'build/version.o'. Stop.
+ enableParallelBuilding = false;
+
meta = {
description = "A new type cryptocurrency which is proof-of-work based on searching for prime numbers";
longDescription= ''
diff --git a/pkgs/applications/altcoins/zcash/default.nix b/pkgs/applications/altcoins/zcash/default.nix
index e9236544ee7fce677fe86b52add240086f783ec8..6a8fba3c2bb70c8d5dd35307e67985acc99d2c90 100644
--- a/pkgs/applications/altcoins/zcash/default.nix
+++ b/pkgs/applications/altcoins/zcash/default.nix
@@ -2,20 +2,19 @@
, zlib, gtest, gmock, callPackage, gmp, qt4, utillinux, protobuf, qrencode, libevent
, withGui }:
-let libsnark = callPackage ./libsnark { inherit boost openssl; };
- librustzcash = callPackage ./librustzcash {};
+let librustzcash = callPackage ./librustzcash {};
in
with stdenv.lib;
stdenv.mkDerivation rec {
name = "zcash" + (toString (optional (!withGui) "d")) + "-" + version;
- version = "1.0.12";
+ version = "1.0.13";
src = fetchFromGitHub {
owner = "zcash";
repo = "zcash";
rev = "v${version}";
- sha256 = "19bxhdnkvgncgl9x6nbaf5nwgrdfw99icvdbi9adfh646pd5z64s";
+ sha256 = "05y7wxs66anxr5akbf05r36mmjfzqpwawn6vyh3jhpva51hzzzyz";
};
# Dependencies are underspecified: "make -C src gtest/zcash_gtest-test_merkletree.o"
@@ -23,17 +22,15 @@ stdenv.mkDerivation rec {
enableParallelBuilding = false;
nativeBuildInputs = [ autoreconfHook pkgconfig ];
- buildInputs = [ gtest gmock gmp libsnark openssl wget db62 boost zlib
+ buildInputs = [ gtest gmock gmp openssl wget db62 boost zlib
protobuf libevent libsodium librustzcash ]
++ optionals stdenv.isLinux [ utillinux ]
++ optionals withGui [ qt4 qrencode ];
- configureFlags = [ "LIBSNARK_INCDIR=${libsnark}/include/libsnark"
- "--with-boost-libdir=${boost.out}/lib"
+ configureFlags = [ "--with-boost-libdir=${boost.out}/lib"
] ++ optionals withGui [ "--with-gui=qt4" ];
patchPhase = ''
- sed -i"" '/^\[LIBSNARK_INCDIR/d' configure.ac
sed -i"" 's,-lboost_system-mt,-lboost_system,' configure.ac
sed -i"" 's,-fvisibility=hidden,,g' src/Makefile.am
'';
diff --git a/pkgs/applications/altcoins/zcash/libsnark/ate-pairing.nix b/pkgs/applications/altcoins/zcash/libsnark/ate-pairing.nix
deleted file mode 100644
index 303b3bc171ef835bb6580468dffbe5b258bd254e..0000000000000000000000000000000000000000
--- a/pkgs/applications/altcoins/zcash/libsnark/ate-pairing.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, xbyak, gmp, fetchFromGitHub }:
-
-stdenv.mkDerivation rec {
- name = "ate-pairing-unstable-${version}";
- version = "2016-05-03";
-
- src = fetchFromGitHub {
- owner = "herumi";
- repo = "ate-pairing";
- rev = "dcb9da999b1113f90b115bccb6f4b57ddf3a8452";
- sha256 = "0jr6r1cma414k8mhsyp7n8hqaqxi7zklsp6820a095sbb3zajckh";
- };
-
- buildInputs = [ gmp xbyak ];
-
- installPhase = ''
- mkdir -p $out
- cp -r lib $out
- cp -r include $out
- '';
-
- meta = with stdenv.lib; {
- description = "Optimal Ate Pairing over Barreto-Naehrig Curves";
- homepage = https://github.com/herumi/ate-pairing;
- maintainers = with maintainers; [ rht ];
- license = licenses.bsd3;
- platforms = platforms.unix;
- };
-}
diff --git a/pkgs/applications/altcoins/zcash/libsnark/default.nix b/pkgs/applications/altcoins/zcash/libsnark/default.nix
deleted file mode 100644
index be885493dcda8da161683d6c22b070fb9ca4713a..0000000000000000000000000000000000000000
--- a/pkgs/applications/altcoins/zcash/libsnark/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ stdenv, libsodium, callPackage, boost, zlib, openssl, gmp, procps, fetchFromGitHub }:
-
-let atePairing = callPackage ./ate-pairing.nix { inherit xbyak; };
- mie = callPackage ./mie.nix { };
- xbyak = callPackage ./xbyak.nix {};
-in
-stdenv.mkDerivation rec{
- name = "libsnark-unstable-${version}";
- version = "2017-02-09";
-
- src = fetchFromGitHub {
- owner = "zcash";
- repo = "libsnark";
- rev = "9ada3f84ab484c57b2247c2f41091fd6a0916573";
- sha256 = "0vhslcb9rwqab9szavyn856z4h9w1syiamfcixqmj0s908zzlaaq";
- };
-
- buildInputs = [ libsodium atePairing mie xbyak zlib openssl boost gmp ];
-
- makeFlags = [
- "PREFIX=$(out)"
- "CURVE=ALT_BN128"
- "NO_SUPERCOP=1"
- "STATIC=1"
- ];
-
- buildPhase = ''
- CXXFLAGS="-fPIC -DBINARY_OUTPUT -DNO_PT_COMPRESSION=1" \
- make lib \
- CURVE=ALT_BN128 \
- MULTICORE=1 \
- STATIC=1 \
- NO_PROCPS=1 \
- NO_GTEST=1 \
- FEATUREFLAGS=-DMONTGOMERY_OUTPUT \
- '';
-
- meta = with stdenv.lib; {
- description = "a C++ library for zkSNARK proofs";
- homepage = https://github.com/zcash/libsnark;
- maintainers = with maintainers; [ rht ];
- license = licenses.mit;
- platforms = platforms.unix;
- };
-}
diff --git a/pkgs/applications/altcoins/zcash/libsnark/mie.nix b/pkgs/applications/altcoins/zcash/libsnark/mie.nix
deleted file mode 100644
index a66ff128293ea130a5c9a964015e1ab5afb93504..0000000000000000000000000000000000000000
--- a/pkgs/applications/altcoins/zcash/libsnark/mie.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchFromGitHub }:
-
-stdenv.mkDerivation rec {
- name = "mie-unstable-${version}";
- version = "2016-05-10";
-
- src = fetchFromGitHub {
- owner = "herumi";
- repo = "mie";
- rev = "704b625b7770a8e1eab26ac65d1fed14c2fcf090";
- sha256 = "144bpmgfs2m4qqv7a2mccgi1aq5jmlr25gnk78ryq09z8cyv88y2";
- };
-
- phases = ["unpackPhase" "installPhase"];
-
- installPhase = ''
- mkdir -p $out
- cp -r include $out
- '';
-
- meta = with stdenv.lib; {
- homepage = https://github.com/herumi/mie;
- maintainers = with maintainers; [ rht ];
- license = licenses.bsd3;
- platforms = platforms.unix;
- };
-}
diff --git a/pkgs/applications/altcoins/zcash/libsnark/xbyak.nix b/pkgs/applications/altcoins/zcash/libsnark/xbyak.nix
deleted file mode 100644
index 88d432fd1637d52a3ce6afef7236e91bae9625ba..0000000000000000000000000000000000000000
--- a/pkgs/applications/altcoins/zcash/libsnark/xbyak.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchFromGitHub }:
-
-stdenv.mkDerivation rec {
- name = "xbyak-unstable-${version}";
- version = "2016-05-03";
-
- src = fetchFromGitHub {
- owner = "herumi";
- repo = "xbyak";
- rev = "b6133a02dd6b7116bea31d0e6b7142bf97f071aa";
- sha256 = "1rc2nx8kj2lj13whxb9chhh79f4hmjjj4j1hpqsd0lbdb60jikrn";
- };
-
- dontBuild = true;
-
- installPhase = ''
- mkdir -p $out/include
- cp -r xbyak $out/include
- '';
-
- meta = with stdenv.lib; {
- description = "JIT assembler for x86, x64";
- homepage = https://github.com/herumi/xbyak;
- maintainers = with maintainers; [ rht ];
- license = licenses.bsd3;
- platforms = platforms.unix;
- };
-}
diff --git a/pkgs/applications/audio/MMA/default.nix b/pkgs/applications/audio/MMA/default.nix
index 224ae9f6f6f84979ea7f7355f7be6b879cbd725f..dfa27aa9f2ebe036713c359b65372d7bf89ac460 100644
--- a/pkgs/applications/audio/MMA/default.nix
+++ b/pkgs/applications/audio/MMA/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, makeWrapper, python, alsaUtils, timidity }:
stdenv.mkDerivation rec {
- version = "15.12";
+ version = "16.06";
name = "mma-${version}";
src = fetchurl {
url = "http://www.mellowood.ca/mma/mma-bin-${version}.tar.gz";
- sha256 = "0k37kcrfaxmwjb8xb1cbqinrkx3g50dbvwqbvwl3l762j4vr8jgx";
+ sha256 = "1g4gvc0nr0qjc0fyqrnx037zpaasgymgmrm5s7cdxqnld9wqw8ww";
};
buildInputs = [ makeWrapper python alsaUtils timidity ];
diff --git a/pkgs/applications/audio/airwave/default.nix b/pkgs/applications/audio/airwave/default.nix
index 4f010213b6535a676d09eded8bcf6415f55e3a60..c37963c77f3eff5030b608fd7d363d79b68979eb 100644
--- a/pkgs/applications/audio/airwave/default.nix
+++ b/pkgs/applications/audio/airwave/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, fetchFromGitHub, file, gcc_multi, libX11, makeWrapper
+{ stdenv, multiStdenv, cmake, fetchFromGitHub, file, libX11, makeWrapper
, overrideCC, qt5, requireFile, unzip, wine
}:
@@ -13,8 +13,6 @@ let
sha256 = "1ban59skw422mak3cp57lj27hgq5d3a4f6y79ysjnamf8rpz9x4s";
};
- stdenv_multi = overrideCC stdenv gcc_multi;
-
vst-sdk = stdenv.mkDerivation rec {
name = "vstsdk368_08_11_2017_build_121";
src = requireFile {
@@ -38,7 +36,7 @@ let
in
-stdenv_multi.mkDerivation {
+multiStdenv.mkDerivation {
name = "airwave-${version}";
src = airwave-src;
@@ -54,7 +52,7 @@ stdenv_multi.mkDerivation {
# For airwave-host-32.exe.so, point wineg++ to 32-bit versions of
# these libraries, as $NIX_LDFLAGS contains only 64-bit ones.
substituteInPlace src/host/CMakeLists.txt --replace '-m32' \
- '-m32 -L${wine-xembed}/lib -L${wine-xembed}/lib/wine -L${stdenv_multi.cc.libc.out}/lib/32'
+ '-m32 -L${wine-xembed}/lib -L${wine-xembed}/lib/wine -L${multiStdenv.cc.libc.out}/lib/32'
'';
# libstdc++.so link gets lost in 64-bit executables during
diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix
deleted file mode 100644
index 022e33991f989b0448b95e7358ce90bba70251ee..0000000000000000000000000000000000000000
--- a/pkgs/applications/audio/amarok/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ stdenv, fetchurl, lib, automoc4, cmake, perl, pkgconfig
-, qtscriptgenerator, gettext, curl , libxml2, mysql, taglib
-, taglib_extras, loudmouth , kdelibs4, qca2, libmtp, liblastfm, libgpod
-, phonon , strigi, soprano, qjson, ffmpeg, libofa, nepomuk_core ? null
-, lz4, lzo, snappy, libaio, pcre
-}:
-
-stdenv.mkDerivation rec {
- name = "${pname}-${version}";
-
- pname = "amarok";
- version = "2.8.0";
-
- src = fetchurl {
- url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2";
- sha256 = "1ilf9wdp3wna5pmvxill8x08rb9gw86qkc2zwm3xk9hpy8l9pf7l";
- };
-
- QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins";
-
- nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
-
- buildInputs = [
- qtscriptgenerator stdenv.cc.libc gettext curl libxml2 mysql.server/*libmysqld*/
- taglib taglib_extras loudmouth kdelibs4 phonon strigi soprano qca2
- libmtp liblastfm libgpod qjson ffmpeg libofa nepomuk_core
- lz4 lzo snappy libaio pcre
- ];
-
- # This is already fixed upstream, will be release in 2.9
- preConfigure = ''
- sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/modules/FindTaglib.cmake
- '';
-
- cmakeFlags = "-DKDE4_BUILD_TESTS=OFF";
-
- enableParallelBuilding = true;
-
- propagatedUserEnvPkgs = [ qtscriptgenerator ];
-
- meta = {
- repositories.git = git://anongit.kde.org/amarok.git;
- description = "Popular music player for KDE";
- license = "GPL";
- homepage = https://amarok.kde.org;
- inherit (kdelibs4.meta) platforms;
- };
-}
diff --git a/pkgs/applications/audio/amarok/kf5.nix b/pkgs/applications/audio/amarok/kf5.nix
index a96aa3ed65d0e57230a063390ea95bab06654b32..a4ac2943bfbc292264a8c22ce92fc7068138542d 100644
--- a/pkgs/applications/audio/amarok/kf5.nix
+++ b/pkgs/applications/audio/amarok/kf5.nix
@@ -3,7 +3,7 @@
, qca-qt5, qjson, qtscript, qtwebkit
, kcmutils, kconfig, kdelibs4support, kdnssd, kinit, knewstuff, knotifyconfig, ktexteditor
, phonon, plasma-framework, threadweaver
-, curl, ffmpeg, gdk_pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mariadb, pcre, snappy, taglib, taglib_extras
+, curl, ffmpeg, gdk_pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras
}:
let
@@ -26,7 +26,8 @@ in mkDerivation {
qca-qt5 qjson qtscript qtwebkit
kcmutils kconfig kdelibs4support kdnssd kinit knewstuff knotifyconfig ktexteditor
phonon plasma-framework threadweaver
- curl ffmpeg gdk_pixbuf libaio libmtp loudmouth lz4 lzo mariadb pcre snappy taglib taglib_extras
+ curl ffmpeg gdk_pixbuf libaio libmtp loudmouth lz4 lzo mysql57.server mysql57.server.static
+ pcre snappy taglib taglib_extras
];
enableParallelBuilding = true;
diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix
index 8242d035e5b8e53f1b2b1bda724f4eb5a464db5c..e5e8640b4fd925ce9cfc9d085e5eeb64d23c4594 100644
--- a/pkgs/applications/audio/audacious/default.nix
+++ b/pkgs/applications/audio/audacious/default.nix
@@ -8,16 +8,16 @@
stdenv.mkDerivation rec {
name = "audacious-${version}";
- version = "3.8.2";
+ version = "3.9";
src = fetchurl {
url = "http://distfiles.audacious-media-player.org/audacious-${version}-gtk3.tar.bz2";
- sha256 = "1g08xprc9q0lyw3knq723j7xr7i15f8v1x1j3k5wvi8jv21bvijf";
+ sha256 = "0dc7fg0v2l2j4h9cz1baz7rf4n0a5jgk09qvsj806sh6jp7w6ipm";
};
pluginsSrc = fetchurl {
url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}-gtk3.tar.bz2";
- sha256 = "1vqcxwqinlwb2l0kkrarg33sw1brjzrnq5jbhzrql6z6x95h4jbq";
+ sha256 = "1gck37c5pnzxdhrnb1g75b5hi31s2dc952wifxns45pkdlayrmra";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/audio/audacious/qt-5.nix b/pkgs/applications/audio/audacious/qt-5.nix
index 803b0115fbdfb8592e00eeb49a8d3ba3c6a2d82d..353865e8ec0476d7750247ad93dd0db37ac451f6 100644
--- a/pkgs/applications/audio/audacious/qt-5.nix
+++ b/pkgs/applications/audio/audacious/qt-5.nix
@@ -1,5 +1,5 @@
{
- mkDerivation, lib, fetchurl,
+ mkDerivation, lib, fetchurl, fetchpatch,
gettext, pkgconfig,
qtbase,
alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk_pixbuf, lame, libbs2b,
@@ -10,18 +10,23 @@
}:
let
- version = "3.8.2";
+ version = "3.9";
sources = {
"audacious-${version}" = fetchurl {
url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2";
- sha256 = "14xyvmxdax0aj1gqcz8z23cjcavsysyh6b3lkiczkv4vrqf4gwdx";
+ sha256 = "0pmhrhsjhqnrq3zh4rhfys5jas53ph5ijkq010dxg1n779kl901d";
};
"audacious-plugins-${version}" = fetchurl {
url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2";
- sha256 = "1m7xln93zc4qvb1fi83icyd5x2r6azqlvs5nigjz8az3l2kzrknp";
+ sha256 = "1f17r7ar0mngcf7z41s6xh073vjafw3i7iy9ijb0cd6bi48g5xwb";
};
};
+
+ qt510_plugins_patch = fetchpatch {
+ url = "https://github.com/audacious-media-player/audacious-plugins/commit/971f7ff7c3d8a0b9b420bf4fd19ab97755607637.patch";
+ sha256 = "15fy37syj9ygl2ibkkz3g3b9wd22vk9bjfmvqhhkpxphry2zwb17";
+ };
in
mkDerivation {
@@ -33,6 +38,8 @@ mkDerivation {
nativeBuildInputs = [ gettext pkgconfig ];
+ inherit qt510_plugins_patch;
+
buildInputs = [
# Core dependencies
qtbase
@@ -55,6 +62,10 @@ mkDerivation {
for (( i=0 ; i < ''${#sourceFiles[*]} ; i++ )); do
(
+ # only patch the plugins
+ if [ "$i" -eq "1" ]; then
+ patches=( $qt510_plugins_patch )
+ fi
src=''${sourceFiles[$i]}
sourceRoot=''${sourceRoots[$i]}
source $stdenv/setup
diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix
index 4dbde82e09212aade7cdc059f480f35617e8a7b5..100bb1c54fd1e09e0afb2fea757f0e9e06809652 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.2.0";
+ version = "2.2.1";
name = "audacity-${version}";
src = fetchurl {
url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz";
- sha256 = "09xpr4bjnainz1xmc35v3qg3dadjr9wv8bmn1p4y91aqyihnhjry";
+ sha256 = "1n05r8b4rnf9fas0py0is8cm97s3h65dgvqkk040aym5d1x6wd7z";
};
preConfigure = /* we prefer system-wide libs */ ''
diff --git a/pkgs/applications/audio/bitwig-studio/default.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix
similarity index 77%
rename from pkgs/applications/audio/bitwig-studio/default.nix
rename to pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix
index c597e42eaa6dfad43a5abc0cadab9f6f10f69b96..8b26ba0959d436a509613c20de60a6e88c389e27 100644
--- a/pkgs/applications/audio/bitwig-studio/default.nix
+++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix
@@ -1,35 +1,35 @@
-{ stdenv, fetchurl, alsaLib, bzip2, cairo, dpkg, ffmpeg, freetype, gdk_pixbuf
-, glib, gtk2, harfbuzz, jdk, lib, libX11, libXau, libXcursor, libXdmcp
-, libXext, libXfixes, libXrender, libbsd, libjack2, libpng, libxcb
-, libxkbcommon, libxkbfile, makeWrapper, pixman, xcbutil, xcbutilwm
+{ stdenv, fetchurl, alsaLib, bzip2, cairo, dpkg, freetype, gdk_pixbuf
+, glib, gtk2, harfbuzz, jdk, lib, xorg
+, libbsd, libjack2, libpng
+, libxkbcommon
+, makeWrapper, pixman
, xdg_utils, zenity, zlib }:
stdenv.mkDerivation rec {
name = "bitwig-studio-${version}";
- version = "2.1.3";
+ version = "1.3.16";
src = fetchurl {
- url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb";
- sha256 = "0blfw7dayl1wzys11mdixlkbr1p1d5rnwrvim1hblfpnw2zmlslb";
+ url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb";
+ sha256 = "0n0fxh9gnmilwskjcayvjsjfcs3fz9hn00wh7b3gg0cv3qqhich8";
};
nativeBuildInputs = [ dpkg makeWrapper ];
unpackCmd = "mkdir root ; dpkg-deb -x $curSrc root";
- dontBuild = true;
+ dontBuild = true;
dontPatchELF = true;
- dontStrip = true;
+ dontStrip = true;
- libPath = lib.makeLibraryPath [
- alsaLib bzip2.out cairo freetype gdk_pixbuf glib gtk2 harfbuzz
- libX11 libXau libXcursor libXdmcp libXext libXfixes libXrender
- libbsd libjack2 libpng libxcb libxkbfile pixman xcbutil xcbutilwm
- zlib
+ libPath = with xorg; lib.makeLibraryPath [
+ alsaLib bzip2.out cairo freetype gdk_pixbuf glib gtk2 harfbuzz libX11 libXau
+ libXcursor libXdmcp libXext libXfixes libXrender libbsd libjack2 libpng libxcb
+ libxkbfile pixman xcbutil xcbutilwm zlib
];
binPath = lib.makeBinPath [
- ffmpeg xdg_utils zenity
+ xdg_utils zenity
];
installPhase = ''
@@ -95,6 +95,6 @@ stdenv.mkDerivation rec {
homepage = http://www.bitwig.com/;
license = licenses.unfree;
platforms = [ "x86_64-linux" ];
- maintainers = with maintainers; [ michalrus ];
+ maintainers = with maintainers; [ michalrus mrVanDalo ];
};
}
diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix
new file mode 100644
index 0000000000000000000000000000000000000000..e5a5cc7c9c6acdb6b6f1384da54f71f5618e3351
--- /dev/null
+++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, bitwig-studio1,
+ xdg_utils, zenity, ffmpeg }:
+
+bitwig-studio1.overrideAttrs (oldAttrs: rec {
+ name = "bitwig-studio-${version}";
+ version = "2.2.2";
+
+ src = fetchurl {
+ url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb";
+ sha256 = "1x4wka32xlygmhdh9rb15s37zh5qjrgap2qk35y34c52lf5aak22";
+ };
+
+ buildInputs = bitwig-studio1.buildInputs ++ [ ffmpeg ];
+
+ binPath = stdenv.lib.makeBinPath [
+ ffmpeg xdg_utils zenity
+ ];
+})
diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix
index 15fca59deee3cff77123fd04fb23f9718ad235f9..82c32903bd86502746600d117677095b03fc4eb4 100644
--- a/pkgs/applications/audio/calf/default.nix
+++ b/pkgs/applications/audio/calf/default.nix
@@ -3,14 +3,14 @@
stdenv.mkDerivation rec {
name = "calf-${version}";
- version = "0.0.60";
+ version = "0.90.0";
src = fetchurl {
url = "http://calf-studio-gear.org/files/${name}.tar.gz";
- sha256 = "019fwg00jv217a5r767z7szh7vdrarybac0pr2sk26xp81kibrx9";
+ sha256 = "0dijv2j7vlp76l10s4v8gbav26ibaqk8s24ci74vrc398xy00cib";
};
- buildInputs = [
+ buildInputs = [
cairo expat fftwSinglePrec fluidsynth glib gtk2 libjack2 ladspaH
libglade lv2 pkgconfig
];
diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix
index 35fe510cbb2b5dceb3a95ab13b8b67ec8a69db84..57d8b554c4f2353a25416bac77344d394a919ad8 100644
--- a/pkgs/applications/audio/cantata/default.nix
+++ b/pkgs/applications/audio/cantata/default.nix
@@ -1,6 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, vlc
-, withQt4 ? false, qt4
-, withQt5 ? true, qtbase, qtmultimedia, qtsvg, qttools
+, qtbase, qtmultimedia, qtsvg, qttools
# Cantata doesn't build with cdparanoia enabled so we disable that
# default for now until I (or someone else) figure it out.
@@ -19,11 +18,6 @@
, withStreams ? true
}:
-# One and only one front-end.
-assert withQt5 -> withQt4 == false;
-assert withQt4 -> withQt5 == false;
-assert withQt4 || withQt5;
-
# Inter-dependencies.
assert withCddb -> withCdda && withTaglib;
assert withCdda -> withCddb && withMusicbrainz;
@@ -51,9 +45,7 @@ in stdenv.mkDerivation rec {
sha256 = "1b633chgfs8rya78bzzck5zijna15d1y4nmrz4dcjp862ks5y5q6";
};
- buildInputs = [ vlc ]
- ++ stdenv.lib.optional withQt4 qt4
- ++ stdenv.lib.optionals withQt5 [ qtbase qtmultimedia qtsvg qttools ]
+ buildInputs = [ vlc qtbase qtmultimedia qtsvg ]
++ stdenv.lib.optionals withTaglib [ taglib taglib_extras ]
++ stdenv.lib.optionals withReplaygain [ ffmpeg speex mpg123 ]
++ stdenv.lib.optional withCdda cdparanoia
@@ -63,12 +55,11 @@ in stdenv.mkDerivation rec {
++ stdenv.lib.optional withMusicbrainz libmusicbrainz5
++ stdenv.lib.optional withUdisks udisks2;
- nativeBuildInputs = [ cmake pkgconfig ];
+ nativeBuildInputs = [ cmake pkgconfig qttools ];
enableParallelBuilding = true;
cmakeFlags = stdenv.lib.flatten [
- (fstat withQt5 "QT5")
(fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ])
(fstats withReplaygain [ "FFMPEG" "MPG123" "SPEEXDSP" ])
(fstat withCdda "CDPARANOIA")
diff --git a/pkgs/applications/audio/denemo/default.nix b/pkgs/applications/audio/denemo/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..be941bc3db292fb845b6eaab3c7721fcb81b73b9
--- /dev/null
+++ b/pkgs/applications/audio/denemo/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, pkgconfig
+, libjack2, gettext, intltool, guile_2_0, lilypond
+, glib, libxml2, librsvg, libsndfile, aubio
+, gtk3, gtksourceview, evince, fluidsynth, rubberband
+, portaudio, portmidi, fftw, makeWrapper }:
+
+stdenv.mkDerivation rec {
+ name = "denemo-${version}";
+ version = "2.2.0";
+
+ src = fetchurl {
+ url = "http://ftp.gnu.org/gnu/denemo/denemo-${version}.tar.gz";
+ sha256 = "18zcs4xmfj4vpzi15dj7k5bjzzzlr3sjf9xhrrgy4samrrdpqzfh";
+ };
+
+ buildInputs = [
+ libjack2 gettext guile_2_0 lilypond pkgconfig glib libxml2 librsvg libsndfile
+ aubio gtk3 gtksourceview evince fluidsynth rubberband portaudio fftw portmidi
+ makeWrapper
+ ];
+
+ postInstall = ''
+ wrapProgram $out/bin/denemo --prefix PATH : ${lilypond}/bin
+ '';
+
+ nativeBuildInputs = [
+ intltool
+ ];
+
+ meta = with stdenv.lib; {
+ description = "Music notation and composition software used with lilypond";
+ homepage = http://denemo.org;
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.olynch ];
+ };
+}
diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix
index 918accb4e167f6f5cb68936ee05d8d08e8988d5f..125df237dfe501a7ce22be49a7b007861764a10a 100644
--- a/pkgs/applications/audio/dfasma/default.nix
+++ b/pkgs/applications/audio/dfasma/default.nix
@@ -6,7 +6,7 @@ let
src = fetchFromGitHub {
sha256 = "07m2wf2gqyya95b65gawrnr4pvc9jyzmg6h8sinzgxlpskz93wwc";
rev = "39053e8896eedd7b3e8a9e9a9ffd80f1fc6ceb16";
- repo = "reaper";
+ repo = "REAPER";
owner = "gillesdegottex";
};
meta = with stdenv.lib; {
@@ -16,8 +16,8 @@ let
libqaudioextra = {
src = fetchFromGitHub {
- sha256 = "17pvlij8cc4lwzf6f1cnygj3m3ci6xfa3lv5bgcr5i1gzyjxqpq1";
- rev = "b7d187cd9a1fd76ea94151e2e02453508d0151d3";
+ sha256 = "0m6x1qm7lbjplqasr2jhnd2ndi0y6z9ybbiiixnlwfm23sp15wci";
+ rev = "9ae051989a8fed0b2f8194b1501151909a821a89";
repo = "libqaudioextra";
owner = "gillesdegottex";
};
@@ -28,10 +28,10 @@ let
in stdenv.mkDerivation rec {
name = "dfasma-${version}";
- version = "1.2.5";
+ version = "1.4.5";
src = fetchFromGitHub {
- sha256 = "0mgy2bkmyp7lvaqsr7hkndwdgjf26mlpsj6smrmn1vp0cqyrw72d";
+ sha256 = "09fcyjm0hg3y51fnjax88m93im39nbynxj79ffdknsazmqw9ac0h";
rev = "v${version}";
repo = "dfasma";
owner = "gillesdegottex";
@@ -42,13 +42,9 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ qmake ];
postPatch = ''
- substituteInPlace dfasma.pro --replace '$$DFASMAVERSIONGITPRO' '${version}'
cp -Rv "${reaperFork.src}"/* external/REAPER
cp -Rv "${libqaudioextra.src}"/* external/libqaudioextra
- '';
-
- preConfigure = ''
- qmakeFlags="$qmakeFlags PREFIXSHORTCUT=$out"
+ substituteInPlace dfasma.pro --replace "CONFIG += file_sdif" "";
'';
enableParallelBuilding = true;
diff --git a/pkgs/applications/audio/dirt/default.nix b/pkgs/applications/audio/dirt/default.nix
index 740d6d8d7e0a7b8199c9cc03013ada0349504a25..6d56f53bd16f8072f470dde1a1f4811c4c8818da 100644
--- a/pkgs/applications/audio/dirt/default.nix
+++ b/pkgs/applications/audio/dirt/default.nix
@@ -1,20 +1,19 @@
{ stdenv, fetchFromGitHub, libsndfile, libsamplerate, liblo, libjack2 }:
stdenv.mkDerivation rec {
- name = "dirt-2015-04-28";
+ name = "dirt-2018-01-01";
src = fetchFromGitHub {
repo = "Dirt";
owner = "tidalcycles";
- rev = "cfc5e85318defda7462192b5159103c823ce61f7";
- sha256 = "1shbyp54q64g6bsl6hhch58k3z1dyyy9ph6cq2xvdf8syy00sisz";
+ rev = "b09604c7d8e581bc7799d7e2ad293e7cdd254bda";
+ sha256 = "13adglk2d31d7mswfvi02b0rjdhzmsv11cc8smhidmrns3f9s96n";
+ fetchSubmodules = true;
};
buildInputs = [ libsndfile libsamplerate liblo libjack2 ];
postPatch = ''
- sed -i "s|./samples|$out/share/dirt/samples|" file.h
- '';
- configurePhase = ''
- export DESTDIR=$out
+ sed -i "s|./samples|$out/share/dirt/samples|" dirt.c
'';
+ makeFlags = ["PREFIX=$(out)"];
postInstall = ''
mkdir -p $out/share/dirt/
cp -r samples $out/share/dirt/
diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix
index a80cc36b216408c55c43e689920a150b69d25ebc..a6a7ad22fa1a106d43eaa89f4c9d3cee797d0dda 100644
--- a/pkgs/applications/audio/distrho/default.nix
+++ b/pkgs/applications/audio/distrho/default.nix
@@ -2,12 +2,12 @@
, libxslt, lv2, pkgconfig, premake3, xorg, ladspa-sdk }:
stdenv.mkDerivation rec {
- name = "distrho-ports-unstable-2017-08-04";
+ name = "distrho-ports-unstable-2017-10-10";
src = fetchgit {
url = "https://github.com/DISTRHO/DISTRHO-Ports.git";
- rev = "f591a1066cd3929536699bb516caa4b5efd9d025";
- sha256 = "1qjnmpmwbq2zpwn8v1dmqn3bjp2ykj5p89fkjax7idgpx1cg7pp9";
+ rev = "e11e2b204c14b8e370a0bf5beafa5f162fedb8e9";
+ sha256 = "1nd542iian9kr2ldaf7fkkgf900ryzqigks999d1jhms6p0amvfv";
};
patchPhase = ''
@@ -37,12 +37,12 @@ stdenv.mkDerivation rec {
description = "A collection of cross-platform audio effects and plugins";
longDescription = ''
Includes:
- Dexed drowaudio-distortion drowaudio-distortionshaper drowaudio-flanger
- drowaudio-reverb drowaudio-tremolo drumsynt EasySSP eqinox
- JuceDemoPlugin klangfalter LUFSMeter luftikus obxd pitchedDelay
- stereosourceseparation TAL-Dub-3 TAL-Filter TAL-Filter-2 TAL-NoiseMaker
- TAL-Reverb TAL-Reverb-2 TAL-Reverb-3 TAL-Vocoder-2 TheFunction
- ThePilgrim Vex Wolpertinger
+ Dexed drowaudio-distortion drowaudio-distortionshaper drowaudio-flanger
+ drowaudio-reverb drowaudio-tremolo drumsynth EasySSP eqinox HiReSam
+ JuceDemoPlugin KlangFalter LUFSMeter LUFSMeterMulti Luftikus Obxd
+ PitchedDelay ReFine StereoSourceSeparation TAL-Dub-3 TAL-Filter
+ TAL-Filter-2 TAL-NoiseMaker TAL-Reverb TAL-Reverb-2 TAL-Reverb-3
+ TAL-Vocoder-2 TheFunction ThePilgrim Vex Wolpertinger
'';
maintainers = [ maintainers.goibhniu ];
platforms = platforms.linux;
diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix
index fb62b6ea3de6b4620593720accb792eb3cd509d2..6ed6d1ee86a08df19a3b8558126b9b1933bb3399 100644
--- a/pkgs/applications/audio/drumkv1/default.nix
+++ b/pkgs/applications/audio/drumkv1/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "drumkv1-${version}";
- version = "0.8.4";
+ version = "0.8.5";
src = fetchurl {
url = "mirror://sourceforge/drumkv1/${name}.tar.gz";
- sha256 = "0qqpklzy4wgw9jy0v2810j06712q90bwc69fp7da82536ba058a9";
+ sha256 = "06xqqm1ylmpp2s7xk7xav325gc50kxlvh9vf1343b0n3i8xkgjfg";
};
buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ];
diff --git a/pkgs/applications/audio/espeak-ng/default.nix b/pkgs/applications/audio/espeak-ng/default.nix
index 889506deb76868b6b4e4d1ecccabc199e6d1e506..f4160ff6f8081e4f65003b7bd9a2c396ea4ce8c7 100644
--- a/pkgs/applications/audio/espeak-ng/default.nix
+++ b/pkgs/applications/audio/espeak-ng/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
name = "espeak-ng-${version}";
- version = "2016-08-28";
+ version = "1.49.2";
src = fetchFromGitHub {
owner = "espeak-ng";
repo = "espeak-ng";
- rev = "b784e77c5708b61feed780d8f1113c4c8eb92200";
- sha256 = "1whix4mv0qvsvifgpwwbdzhv621as3rxpn9ijqc2683h6k8pvcfk";
+ rev = version;
+ sha256 = "17bbl3zi8214iaaj8kjnancjvmvizwybg3sg17qjq4mf5c6xfg2c";
};
nativeBuildInputs = [ autoconf automake which libtool pkgconfig ronn ];
diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix
index a8bf05187e3367cf5174eea6e7bb573bc1a1ed59..50689886fdd2e557ee947055df196d1f75c6a692 100644
--- a/pkgs/applications/audio/fluidsynth/default.nix
+++ b/pkgs/applications/audio/fluidsynth/default.nix
@@ -1,34 +1,31 @@
-{ stdenv, fetchurl, alsaLib, glib, libjack2, libsndfile, pkgconfig
-, libpulseaudio, CoreServices, CoreAudio, AudioUnit }:
+{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake
+, alsaLib, glib, libjack2, libsndfile, libpulseaudio
+, AudioUnit, CoreAudio, CoreMIDI, CoreServices
+}:
stdenv.mkDerivation rec {
name = "fluidsynth-${version}";
- version = "1.1.6";
+ version = "1.1.8";
- src = fetchurl {
- url = "mirror://sourceforge/fluidsynth/${name}.tar.bz2";
- sha256 = "00gn93bx4cz9bfwf3a8xyj2by7w23nca4zxf09ll53kzpzglg2yj";
+ src = fetchFromGitHub {
+ owner = "FluidSynth";
+ repo = "fluidsynth";
+ rev = "v${version}";
+ sha256 = "12q7hv0zvgylsdj1ipssv5zr7ap2y410dxsd63dz22y05fa2hwwd";
};
- preBuild = stdenv.lib.optionalString stdenv.isDarwin ''
- sed -i '40 i\
- #include \
- #include ' \
- src/drivers/fluid_coreaudio.c
- '';
+ nativeBuildInputs = [ pkgconfig cmake ];
- NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin
- "-framework CoreAudio -framework CoreServices";
-
- nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glib libsndfile ]
- ++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib libpulseaudio libjack2 ]
- ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices CoreAudio AudioUnit ];
+ ++ lib.optionals (!stdenv.isDarwin) [ alsaLib libpulseaudio libjack2 ]
+ ++ lib.optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreMIDI CoreServices ];
+
+ cmakeFlags = lib.optional stdenv.isDarwin "-Denable-framework=off";
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Real-time software synthesizer based on the SoundFont 2 specifications";
homepage = http://www.fluidsynth.org;
- license = licenses.lgpl2;
+ license = licenses.lgpl21Plus;
maintainers = with maintainers; [ goibhniu lovek323 ];
platforms = platforms.unix;
};
diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix
index e4c6c658efd763868a6c5bbf07032419f42595e9..66f82226b507f81ec1d0156356d8173296922122 100644
--- a/pkgs/applications/audio/fmit/default.nix
+++ b/pkgs/applications/audio/fmit/default.nix
@@ -11,10 +11,10 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "fmit-${version}";
- version = "1.1.11";
+ version = "1.1.13";
src = fetchFromGitHub {
- sha256 = "1w492lf8n2sjkr53z8cvkgywzn0w53cf78hz93zaw6dwwv36lwdp";
+ sha256 = "1p374gf7iksrlyvddm3w4qk3l0rxsiyymz5s8dmc447yvin8ykfq";
rev = "v${version}";
repo = "fmit";
owner = "gillesdegottex";
diff --git a/pkgs/applications/audio/gigedit/default.nix b/pkgs/applications/audio/gigedit/default.nix
index e53b498fb6eefd8b976ff841e439b0c97a0c1e44..b92d4f6eb1e8a52941044581db50a1a9bfa186da 100644
--- a/pkgs/applications/audio/gigedit/default.nix
+++ b/pkgs/applications/audio/gigedit/default.nix
@@ -1,25 +1,25 @@
-{ stdenv, fetchsvn, autoconf, automake, docbook_xml_dtd_45
-, docbook_xsl, gtkmm2, intltool, libgig, libsndfile, libtool, libxslt
-, pkgconfig }:
+{ stdenv, fetchurl, autoconf, automake, intltool, libtool, pkgconfig, which
+, docbook_xml_dtd_45, docbook_xsl, gtkmm2, libgig, libsndfile, libxslt
+}:
stdenv.mkDerivation rec {
- name = "gigedit-svn-${version}";
- version = "2342";
+ name = "gigedit-${version}";
+ version = "1.1.0";
- src = fetchsvn {
- url = "https://svn.linuxsampler.org/svn/gigedit/trunk";
- rev = "${version}";
- sha256 = "0wi94gymj0ns5ck9lq1d970gb4gnzrq4b57j5j7k3d6185yg2gjs";
+ src = fetchurl {
+ url = "http://download.linuxsampler.org/packages/${name}.tar.bz2";
+ sha256 = "087pc919q28r1vw31c7w4m14bqnp4md1i2wbmk8w0vmwv2cbx2ni";
};
- patchPhase = "sed -e 's/which/type -P/g' -i Makefile.cvs";
+ patches = [ ./gigedit-1.1.0-pangomm-2.40.1.patch ];
- preConfigure = "make -f Makefile.cvs";
+ preConfigure = "make -f Makefile.svn";
- buildInputs = [
- autoconf automake docbook_xml_dtd_45 docbook_xsl gtkmm2 intltool
- libgig libsndfile libtool libxslt pkgconfig
- ];
+ nativeBuildInputs = [ autoconf automake intltool libtool pkgconfig which ];
+
+ buildInputs = [ docbook_xml_dtd_45 docbook_xsl gtkmm2 libgig libsndfile libxslt ];
+
+ enableParallelBuilding = true;
meta = with stdenv.lib; {
homepage = http://www.linuxsampler.org;
diff --git a/pkgs/applications/audio/gigedit/gigedit-1.1.0-pangomm-2.40.1.patch b/pkgs/applications/audio/gigedit/gigedit-1.1.0-pangomm-2.40.1.patch
new file mode 100644
index 0000000000000000000000000000000000000000..eb00fcc87a24e59b7d81e6e9a3f5deb130dce97b
--- /dev/null
+++ b/pkgs/applications/audio/gigedit/gigedit-1.1.0-pangomm-2.40.1.patch
@@ -0,0 +1,15 @@
+--- a/src/gigedit/wrapLabel.cc
++++ b/src/gigedit/wrapLabel.cc
+@@ -64,12 +64,7 @@ WrapLabel::WrapLabel(const Glib::ustring &text) // IN: The label text
+ : mWrapWidth(0),
+ mWrapHeight(0)
+ {
+- // pangomm >= 2.35.1
+-#if PANGOMM_MAJOR_VERSION > 2 || (PANGOMM_MAJOR_VERSION == 2 && (PANGOMM_MINOR_VERSION > 35 || (PANGOMM_MINOR_VERSION == 35 && PANGOMM_MICRO_VERSION >= 1)))
+- get_layout()->set_wrap(Pango::WrapMode::WORD_CHAR);
+-#else
+ get_layout()->set_wrap(Pango::WRAP_WORD_CHAR);
+-#endif
+ set_alignment(0.0, 0.0);
+ set_text(text);
+ }
diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix
index 50b1bcde58f3ef0e81de8607a4df6b8236c54a39..4bd57e15fe5fd1cf24a13f15a9870cc235c72013 100644
--- a/pkgs/applications/audio/gmpc/default.nix
+++ b/pkgs/applications/audio/gmpc/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, libtool, intltool, pkgconfig, glib
-, gtk2, curl, mpd_clientlib, libsoup, gob2, vala_0_23, libunique
+, gtk2, curl, mpd_clientlib, libsoup, gob2, vala, libunique
, libSM, libICE, sqlite, hicolor_icon_theme, wrapGAppsHook
}:
@@ -24,11 +24,10 @@ stdenv.mkDerivation rec {
sha256 = "0b3bnxf98i5lhjyljvgxgx9xmb6p46cn3a9cccrng14nagri9556";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig libtool intltool gob2 vala wrapGAppsHook ];
buildInputs = [
- libtool intltool glib gtk2 curl mpd_clientlib libsoup
- libunique libmpd gob2 vala_0_23 libSM libICE sqlite hicolor_icon_theme
- wrapGAppsHook
+ glib gtk2 curl mpd_clientlib libsoup
+ libunique libmpd libSM libICE sqlite hicolor_icon_theme
];
meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/pkgs/applications/audio/google-play-music-desktop-player/default.nix
index 9d9af63118320c9b2fde6e65074d37d07a820c2e..83df4b33940c97b302cdf7500e05548263d8d473 100644
--- a/pkgs/applications/audio/google-play-music-desktop-player/default.nix
+++ b/pkgs/applications/audio/google-play-music-desktop-player/default.nix
@@ -74,6 +74,6 @@ stdenv.mkDerivation {
description = "A beautiful cross platform Desktop Player for Google Play Music";
license = stdenv.lib.licenses.mit;
platforms = [ "x86_64-linux" ];
- maintainers = stdenv.lib.maintainers.SuprDewd;
+ maintainers = [ stdenv.lib.maintainers.SuprDewd ];
};
}
diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix
index 3d074bf1e19ed88f57b7ada3002432ba3281cce4..fb1ed728030857924d6e001c3ae4554a0d99a1b4 100644
--- a/pkgs/applications/audio/gpodder/default.nix
+++ b/pkgs/applications/audio/gpodder/default.nix
@@ -1,65 +1,66 @@
-{ stdenv, fetchurl, fetchpatch, python2Packages, mygpoclient, intltool
+{ stdenv, fetchFromGitHub, python3, python3Packages, intltool
+, glibcLocales, gnome3, gtk3, wrapGAppsHook
, ipodSupport ? false, libgpod
-, gnome3
}:
-python2Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
name = "gpodder-${version}";
+ version = "3.10.0";
- version = "3.9.3";
+ format = "other";
- src = fetchurl {
- url = "http://gpodder.org/src/${name}.tar.gz";
- sha256 = "1s83m90dic2zphwwv6wrvqx950y12v5sakm7q5nj5bnh5k9l2hgl";
+ src = fetchFromGitHub {
+ owner = "gpodder";
+ repo = "gpodder";
+ rev = version;
+ sha256 = "0f3m1kcj641xiwsxan66k81lvslkl3aziakn5z17y4mmdci79jv0";
};
- patches = [
- (fetchpatch {
- sha256 = "1xkl1wnp46546jrzsnb9p0yj23776byg3nvsqwbblhqbsfipl48w";
- name = "Fix-soundcloud-feeds.patch";
- url = "https://github.com/gpodder/gpodder/commit/e7f34ad090cd276d75c0cd8d92ed97243d75db38.patch";
- })
- (fetchpatch {
- sha256 = "1jlldbinlxis1pi9p2lyczgbcv8nmdj66fxll6ph0klln0w8gvg4";
- name = "use-https-urls-for-soundcloud.patch";
- url = "https://github.com/gpodder/gpodder/commit/ef915dd3b6828174bf4f6f0911da410d9aca1b67.patch";
- })
- (fetchpatch {
- sha256 = "1l37ihzk7gfqcl5nnphv0sv80psm6fsg4qkxn6abc6v476axyj9b";
- name = "updates-soundcloud-support-to-recognize-https";
- url = "https://github.com/gpodder/gpodder/commit/5c1507671d93096ad0118f908c20dd1f182a72e0.patch";
- })
- ];
-
postPatch = with stdenv.lib; ''
sed -i -re 's,^( *gpodder_dir *= *).*,\1"'"$out"'",' bin/gpodder
-
- makeWrapperArgs="--suffix XDG_DATA_DIRS : '${concatStringsSep ":" [
- "${gnome3.gnome_themes_standard}/share"
- "$XDG_ICON_DIRS"
- "$GSETTINGS_SCHEMAS_PATH"
- ]}'"
'';
+ nativeBuildInputs = [
+ intltool
+ python3Packages.wrapPython
+ wrapGAppsHook
+ glibcLocales
+ ];
+
buildInputs = [
- intltool python2Packages.coverage python2Packages.minimock
- gnome3.gnome_themes_standard gnome3.defaultIconTheme
- gnome3.gsettings_desktop_schemas
+ python3
];
- propagatedBuildInputs = with python2Packages; [
- feedparser dbus-python mygpoclient pygtk eyeD3 podcastparser html5lib
+ checkInputs = with python3Packages; [
+ coverage minimock
+ ];
+
+ doCheck = true;
+
+ propagatedBuildInputs = with python3Packages; [
+ feedparser
+ dbus-python
+ mygpoclient
+ pygobject3
+ eyeD3
+ podcastparser
+ html5lib
+ gtk3
] ++ stdenv.lib.optional ipodSupport libgpod;
+ makeFlags = [
+ "PREFIX=$(out)"
+ "share/applications/gpodder-url-handler.desktop"
+ "share/applications/gpodder.desktop"
+ "share/dbus-1/services/org.gpodder.service"
+ ];
+
preBuild = ''
- make PREFIX="$out" \
- share/applications/gpodder-url-handler.desktop \
- share/applications/gpodder.desktop \
- share/dbus-1/services/org.gpodder.service
+ export LC_ALL="en_US.UTF-8"
'';
- checkPhase = ''
- LC_ALL=C python -m gpodder.unittests
+ installCheckPhase = ''
+ LC_ALL=C PYTHONPATH=./src:$PYTHONPATH python3 -m gpodder.unittests
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/gradio/default.nix b/pkgs/applications/audio/gradio/default.nix
index 2f4bde92167b461b66fa1baadd873d2ee6fe00b2..4b552301dd3d0f896f71c47e9c8f0e81199e37fe 100644
--- a/pkgs/applications/audio/gradio/default.nix
+++ b/pkgs/applications/audio/gradio/default.nix
@@ -17,7 +17,7 @@
, gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ]
}:
let
- version = "6.0.2";
+ version = "7.0";
in stdenv.mkDerivation rec {
name = "gradio-${version}";
@@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
owner = "haecker-felix";
repo = "gradio";
rev = "v${version}";
- sha256 = "05hg26yr7splgpkl8wjxcsdks9sm1is3hcnp7f5mjnp2ch0nn57s";
+ sha256 = "0kn08k5dv7yh29ksywcpl6ifrp3p8zzk3p3hkbhzc8fpx84jn7r9";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix
index b149aab06e10fa5c40cb653df6ba5ebd4d6d2700..dcb61119ae76a04324508257937036e363a57da0 100644
--- a/pkgs/applications/audio/guitarix/default.nix
+++ b/pkgs/applications/audio/guitarix/default.nix
@@ -12,11 +12,11 @@ in
stdenv.mkDerivation rec {
name = "guitarix-${version}";
- version = "0.35.6";
+ version = "0.36.1";
src = fetchurl {
url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.xz";
- sha256 = "0ffvfnvhj6vz73zsrpi88hs69ys4zskm847zf825dl2r39n9nn41";
+ sha256 = "1g5949jwh2n755xjs3kcbdb8a1wxr5mn0m115wdnk27dxcdn93b0";
};
nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python2 ];
diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix
index ca806aad02feae984640ad9cc2d59fb67e3cfa8f..d9109dd1c0e7155b66bfe4bace0ab791f718fa32 100644
--- a/pkgs/applications/audio/ingen/default.nix
+++ b/pkgs/applications/audio/ingen/default.nix
@@ -1,21 +1,23 @@
{ stdenv, fetchgit, boost, ganv, glibmm, gtkmm2, libjack2, lilv
-, lv2, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord, sratom
+, lv2Unstable, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord, sratom
+
, suil
}:
stdenv.mkDerivation rec {
name = "ingen-unstable-${rev}";
- rev = "2017-01-18";
+ rev = "2017-07-22";
src = fetchgit {
- url = "http://git.drobilla.net/cgit.cgi/ingen.git";
- rev = "02ae3e9d8bf3f6a5e844706721aad8c0ac9f4340";
- sha256 = "15s8nrzn68hc2s6iw0zshbz3lfnsq0mr6gflq05xm911b7xbp74k";
+ url = "https://git.drobilla.net/cgit.cgi/ingen.git";
+ rev = "cc4a4db33f4d126a07a4a498e053c5fb9a883be3";
+ sha256 = "1gmwmml486r9zq4w65v91mfaz36af9zzyjkmi74m8qmh67ffqn3w";
+ deepClone = true;
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- boost ganv glibmm gtkmm2 libjack2 lilv lv2 makeWrapper
+ boost ganv glibmm gtkmm2 libjack2 lilv lv2Unstable 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 f1e00e876730ff4b46b1ce4ddfdde786ee54a626..e4d20db78682ae88f121b3c5e4108d4dc1a69fee 100644
--- a/pkgs/applications/audio/jack-capture/default.nix
+++ b/pkgs/applications/audio/jack-capture/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "jack_capture-${version}";
- version = "0.9.69";
+ version = "0.9.73";
src = fetchurl {
url = "http://archive.notam02.no/arkiv/src/${name}.tar.gz";
- sha256 = "0sk7b92my1v1g7rhkpl1c608rb0rdb28m9zqfll95kflxajd16zv";
+ sha256 = "1pji0zdwm3kxjrkbzj7fnxhr8ncrc8pyqnwyrh47fhypgqjv1br1";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/audio/jackmeter/default.nix b/pkgs/applications/audio/jackmeter/default.nix
index 060b7f703a31503aa0147f88fa4dd2875bf753f2..e44dfddd37b7c1564428eea5bb6048e1b91fe145 100644
--- a/pkgs/applications/audio/jackmeter/default.nix
+++ b/pkgs/applications/audio/jackmeter/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "jackmeter-0.4";
src = fetchurl {
- url = "http://www.aelius.com/njh/jackmeter/${name}.tar.gz";
+ url = "https://www.aelius.com/njh/jackmeter/${name}.tar.gz";
sha256 = "1cnvgx3jv0yvxlqy0l9k285zgvazmh5k8m4l7lxckjfm5bn6hm1r";
};
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Console jack loudness meter";
- homepage = http://www.aelius.com/njh/jackmeter/;
+ homepage = https://www.aelius.com/njh/jackmeter/;
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.marcweber ];
platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/audio/ladspa-sdk/default.nix b/pkgs/applications/audio/ladspa-sdk/default.nix
index 2038f898e3eccc1f46d88ce29af50541a0cdda2a..d0ffbf29bcb222c1b86ebf37d1718231d3d806e8 100644
--- a/pkgs/applications/audio/ladspa-sdk/default.nix
+++ b/pkgs/applications/audio/ladspa-sdk/default.nix
@@ -3,7 +3,7 @@ stdenv.mkDerivation rec {
name = "ladspa-sdk-${version}";
version = "1.13";
src = fetchurl {
- url = "http://http.debian.net/debian/pool/main/l/ladspa-sdk/ladspa-sdk_${version}.orig.tar.gz";
+ url = "http://www.ladspa.org/download/ladspa_sdk_${version}.tgz";
sha256 = "0srh5n2l63354bc0srcrv58rzjkn4gv8qjqzg8dnq3rs4m7kzvdm";
};
diff --git a/pkgs/applications/audio/ladspa-sdk/ladspah.nix b/pkgs/applications/audio/ladspa-sdk/ladspah.nix
index aa0a191bdd1a796c0f4c39a61f200141d46e2114..e41d2ba96750b7a8870e7c34baa895a94fa2a4eb 100644
--- a/pkgs/applications/audio/ladspa-sdk/ladspah.nix
+++ b/pkgs/applications/audio/ladspa-sdk/ladspah.nix
@@ -3,7 +3,7 @@ stdenv.mkDerivation rec {
name = "ladspa.h-${version}";
version = "1.13";
src = fetchurl {
- url = "http://http.debian.net/debian/pool/main/l/ladspa-sdk/ladspa-sdk_${version}.orig.tar.gz";
+ url = "http://www.ladspa.org/download/ladspa_sdk_${version}.tgz";
sha256 = "0srh5n2l63354bc0srcrv58rzjkn4gv8qjqzg8dnq3rs4m7kzvdm";
};
diff --git a/pkgs/applications/audio/linuxsampler/default.nix b/pkgs/applications/audio/linuxsampler/default.nix
index 4dad6e58fee91a6f7a7982909b43cf0117589f55..7f368fe6c2815b129c2c799644b5a5f07331aa73 100644
--- a/pkgs/applications/audio/linuxsampler/default.nix
+++ b/pkgs/applications/audio/linuxsampler/default.nix
@@ -1,31 +1,24 @@
-{ stdenv, fetchsvn, alsaLib, asio, autoconf, automake, bison
-, libjack2, libgig, libsndfile, libtool, lv2, pkgconfig }:
+{ stdenv, fetchurl, autoconf, automake, bison, libtool, pkgconfig, which
+, alsaLib, asio, libjack2, libgig, libsndfile, lv2 }:
stdenv.mkDerivation rec {
- name = "linuxsampler-svn-${version}";
- version = "2340";
+ name = "linuxsampler-${version}";
+ version = "2.1.0";
- src = fetchsvn {
- url = "https://svn.linuxsampler.org/svn/linuxsampler/trunk";
- rev = "${version}";
- sha256 = "0zsrvs9dwwhjx733m45vfi11yjkqv33z8qxn2i9qriq5zs1f0kd7";
+ src = fetchurl {
+ url = "http://download.linuxsampler.org/packages/${name}.tar.bz2";
+ sha256 = "0fdxpw7jjfi058l95131d6d8538h05z7n94l60i6mhp9xbplj2jf";
};
- patches = ./linuxsampler_lv2_sfz_fix.diff;
-
- # It fails to compile without this option. I'm not sure what the bug
- # is, but everything works OK for me (goibhniu).
- configureFlags = [ "--disable-nptl-bug-check" ];
-
preConfigure = ''
- sed -e 's/which/type -P/g' -i scripts/generate_parser.sh
- make -f Makefile.cvs
+ make -f Makefile.svn
'';
- buildInputs = [
- alsaLib asio autoconf automake bison libjack2 libgig libsndfile
- libtool lv2 pkgconfig
- ];
+ nativeBuildInputs = [ autoconf automake bison libtool pkgconfig which ];
+
+ buildInputs = [ alsaLib asio libjack2 libgig libsndfile lv2 ];
+
+ enableParallelBuilding = true;
meta = with stdenv.lib; {
homepage = http://www.linuxsampler.org;
@@ -40,7 +33,7 @@ stdenv.mkDerivation rec {
prior written permission by the LinuxSampler authors. If you
have questions on the subject, that are not yet covered by the
FAQ, please contact us.
- '';
+ '';
license = licenses.unfree;
maintainers = [ maintainers.goibhniu ];
platforms = platforms.linux;
diff --git a/pkgs/applications/audio/linuxsampler/linuxsampler_lv2_sfz_fix.diff b/pkgs/applications/audio/linuxsampler/linuxsampler_lv2_sfz_fix.diff
deleted file mode 100644
index 114726db19d63540d7274f802bd58b6914a7d9b6..0000000000000000000000000000000000000000
--- a/pkgs/applications/audio/linuxsampler/linuxsampler_lv2_sfz_fix.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-Index: linuxsampler-r2359/src/hostplugins/lv2/PluginLv2.cpp
-===================================================================
---- linuxsampler-r2359/src/hostplugins/lv2/PluginLv2.cpp (revision 2359)
-+++ linuxsampler-r2359/src/hostplugins/lv2/PluginLv2.cpp (working copy)
-@@ -18,6 +18,8 @@
- * MA 02110-1301 USA *
- ***************************************************************************/
-
-+#define _BSD_SOURCE 1 /* for realpath() */
-+
- #include
- #include
- #include
-@@ -118,6 +120,23 @@
- dmsg(2, ("linuxsampler: Deactivate\n"));
- }
-
-+ static String RealPath(const String& path)
-+ {
-+ String out = path;
-+ char* cpath = NULL;
-+#ifdef _WIN32
-+ cpath = (char*)malloc(MAX_PATH);
-+ GetFullPathName(path.c_str(), MAX_PATH, cpath, NULL);
-+#else
-+ cpath = realpath(path.c_str(), NULL);
-+#endif
-+ if (cpath) {
-+ out = cpath;
-+ free(cpath);
-+ }
-+ return out;
-+ }
-+
- String PluginLv2::PathToState(const String& path) {
- if (MapPath) {
- char* cstr = MapPath->abstract_path(MapPath->handle, path.c_str());
-@@ -131,9 +150,10 @@
- String PluginLv2::PathFromState(const String& path) {
- if (MapPath) {
- char* cstr = MapPath->absolute_path(MapPath->handle, path.c_str());
-- const String abstract_path(cstr);
-+ // Resolve symbolic links so SFZ sample paths load correctly
-+ const String absolute_path(RealPath(cstr));
- free(cstr);
-- return abstract_path;
-+ return absolute_path;
- }
- return path;
- }
diff --git a/pkgs/applications/audio/minimodem/default.nix b/pkgs/applications/audio/minimodem/default.nix
index 2e293ee4552dc1ce0db0ade056335d81b3efcd4e..8d179e8eed118d36f89fd31358ff743fddfc4a08 100644
--- a/pkgs/applications/audio/minimodem/default.nix
+++ b/pkgs/applications/audio/minimodem/default.nix
@@ -1,18 +1,29 @@
-{ stdenv, fetchurl, pkgconfig, fftw, fftwSinglePrec, alsaLib, libsndfile, libpulseaudio }:
+{ stdenv, fetchFromGitHub, pkgconfig, autoconf, automake, libtool
+, fftw, fftwSinglePrec, alsaLib, libsndfile, libpulseaudio
+}:
stdenv.mkDerivation rec {
- version = "0.19";
+ version = "0.24-1";
pname = "minimodem";
name = "${pname}-${version}";
- src = fetchurl {
- url = "http://www.whence.com/${pname}/${name}.tar.gz";
- sha256 = "003xyqjq59wcjafrdv1b8w34xsn4nvzz51wwd7mqddajh0g4dz4g";
+ src = fetchFromGitHub {
+ owner = "kamalmostafa";
+ repo = "minimodem";
+ rev = "${pname}-${version}";
+ sha256 = "1b5xy36fjcp7vkp115dpx4mlmqg2fc7xvxdy648fb8im953bw7ql";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig autoconf automake libtool ];
buildInputs = [ fftw fftwSinglePrec alsaLib libsndfile libpulseaudio ];
+ preConfigure = ''
+ aclocal \
+ && autoheader \
+ && automake --gnu --add-missing \
+ && autoconf
+ '';
+
meta = {
description = "General-purpose software audio FSK modem";
longDescription = ''
@@ -28,3 +39,4 @@ stdenv.mkDerivation rec {
maintainers = with stdenv.lib.maintainers; [ relrod ];
};
}
+
diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix
index 6d353344b07fb25b6c54857b18aa5bd44faad3d4..f511fa65914997a5cdce40069ca86f2bcbfcb8fb 100644
--- a/pkgs/applications/audio/mixxx/default.nix
+++ b/pkgs/applications/audio/mixxx/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, chromaprint, fetchpatch, fftw, flac, libid3tag, libmad
-, libopus, libshout, libsndfile, libusb1, libvorbis, pkgconfig
-, portaudio, portmidi, protobuf, qt4, rubberband, scons, sqlite
+{ stdenv, fetchurl, chromaprint, fetchpatch, fftw, flac, faad2, mp4v2
+, libid3tag, libmad, libopus, libshout, libsndfile, libusb1, libvorbis
+, pkgconfig, portaudio, portmidi, protobuf, qt4, rubberband, scons, sqlite
, taglib, vampSDK
}:
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- chromaprint fftw flac libid3tag libmad libopus libshout libsndfile
+ chromaprint fftw flac faad2 mp4v2 libid3tag libmad libopus libshout libsndfile
libusb1 libvorbis pkgconfig portaudio portmidi protobuf qt4
rubberband scons sqlite taglib vampSDK
];
@@ -34,6 +34,7 @@ stdenv.mkDerivation rec {
sconsFlags = [
"build=release"
"qtdir=${qt4}"
+ "faad=1"
];
buildPhase = ''
diff --git a/pkgs/applications/audio/mod-distortion/default.nix b/pkgs/applications/audio/mod-distortion/default.nix
index a1837287079580ba3f0d8f0dc5d1393fd78ad771..c66f78373228cf5edb5ac01b379c901a8728f6f4 100644
--- a/pkgs/applications/audio/mod-distortion/default.nix
+++ b/pkgs/applications/audio/mod-distortion/default.nix
@@ -1,19 +1,19 @@
{ stdenv, fetchFromGitHub, lv2 }:
stdenv.mkDerivation rec {
- name = "mod-distortion-${version}";
- version = "git-2015-05-18";
+ name = "mod-distortion-git-${version}";
+ version = "2016-08-19";
src = fetchFromGitHub {
owner = "portalmod";
repo = "mod-distortion";
- rev = "0cdf186abc2a9275890b57057faf5c3f6d86d84a";
- sha256 = "1wmxgpcdcy9m7j78yq85824if0wz49wv7mw13bj3sw2s87dcmw19";
+ rev = "e672d5feb9d631798e3d56eb96e8958c3d2c6821";
+ sha256 = "005wdkbhn9dgjqv019cwnziqg86yryc5vh7j5qayrzh9v446dw34";
};
buildInputs = [ lv2 ];
- installFlags = [ "LV2_PATH=$(out)/lib/lv2" ];
+ installFlags = [ "INSTALL_PATH=$(out)/lib/lv2" ];
meta = with stdenv.lib; {
homepage = https://github.com/portalmod/mod-distortion;
diff --git a/pkgs/applications/audio/mopidy-iris/default.nix b/pkgs/applications/audio/mopidy-iris/default.nix
index c486ff3de6056bbeb6a8b5b8b01bd99012e5c5fb..1f309c4503bfec084892c162768592e0dcdb4fe3 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.8.2";
+ version = "3.11.0";
src = pythonPackages.fetchPypi {
inherit version;
pname = "Mopidy-Iris";
- sha256 = "051bzs8p2zz960mi9cmv51q1fmmm15nnb9apph9icicr0p8g7lif";
+ sha256 = "1a9pn35vv1b9v0s30ajjg7gjjvcfjwgfyp7z61m567nv6cr37vhq";
};
propagatedBuildInputs = [
diff --git a/pkgs/applications/audio/mopidy-local-images/default.nix b/pkgs/applications/audio/mopidy-local-images/default.nix
index b09db88bbcb0fce5989822516ab71992f43d4ddd..063821544aed48f2ae44e18e17a9bffa9647023f 100644
--- a/pkgs/applications/audio/mopidy-local-images/default.nix
+++ b/pkgs/applications/audio/mopidy-local-images/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pythonPackages, mopidy }:
+{ stdenv, fetchFromGitHub, pythonPackages, mopidy, gobjectIntrospection }:
pythonPackages.buildPythonApplication rec {
name = "mopidy-local-images-${version}";
@@ -12,6 +12,12 @@ pythonPackages.buildPythonApplication rec {
sha256 = "0gdqxws0jish50mmi57mlqcs659wrllzv00czl18niz94vzvyc0d";
};
+ buildInputs = [ gobjectIntrospection ];
+
+ checkInputs = [
+ pythonPackages.mock
+ ];
+
propagatedBuildInputs = [
mopidy
pythonPackages.pykka
diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix
index 7de8f6941c2b8fbc2b186ea3b315c9267389b478..8541ec6e272766e3ed62f89998d58f5d0c269a14 100644
--- a/pkgs/applications/audio/mopidy/default.nix
+++ b/pkgs/applications/audio/mopidy/default.nix
@@ -33,7 +33,7 @@ pythonPackages.buildPythonApplication rec {
'';
meta = with stdenv.lib; {
- homepage = http://www.mopidy.com/;
+ homepage = https://www.mopidy.com/;
description = ''
An extensible music server that plays music from local disk, Spotify,
SoundCloud, Google Play Music, and more
diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix
index 73352b65092144d7342cc04b188829a76f6c992b..220e72b568afa736444ca72d9c76e12d1d9adbdb 100644
--- a/pkgs/applications/audio/mpc/default.nix
+++ b/pkgs/applications/audio/mpc/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A minimalist command line interface to MPD";
- homepage = http://www.musicpd.org/clients/mpc/;
+ homepage = https://www.musicpd.org/clients/mpc/;
license = licenses.gpl2;
maintainers = with maintainers; [ algorith ];
platforms = with platforms; linux ++ darwin;
diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix
index 9d6f2fc9c8f9b53674dc5732cd9e696d4ce81e48..f56ca009f1e081fd8b3be386d10836034739b975 100644
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/applications/audio/musescore/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Music notation and composition software";
- homepage = http://musescore.org/;
+ homepage = https://musescore.org/;
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = [ maintainers.vandenoever ];
diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix
index 09c718c63e92bd22faa892ad3f9c2355465157c0..ca147ffc7352414870f274185dfb2982d30458dc 100644
--- a/pkgs/applications/audio/ncmpc/default.nix
+++ b/pkgs/applications/audio/ncmpc/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Curses-based interface for MPD (music player daemon)";
- homepage = http://www.musicpd.org/clients/ncmpc/;
+ homepage = https://www.musicpd.org/clients/ncmpc/;
license = licenses.gpl2Plus;
platforms = platforms.all;
maintainers = with maintainers; [ fpletz ];
diff --git a/pkgs/applications/audio/padthv1/default.nix b/pkgs/applications/audio/padthv1/default.nix
index 820ff385c107f627d3d7a6f2ee67da28b6768dc6..3561deb1c73666d2ee4cadf4591aa414cb503562 100644
--- a/pkgs/applications/audio/padthv1/default.nix
+++ b/pkgs/applications/audio/padthv1/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "padthv1-${version}";
- version = "0.8.4";
+ version = "0.8.5";
src = fetchurl {
url = "mirror://sourceforge/padthv1/${name}.tar.gz";
- sha256 = "1p6wfgh90h7gj1j3hlvwik3zj07xamkxbya85va2lsj6fkkkk20r";
+ sha256 = "0dyrllxgd74nknixjcz6n7m4gw70v246s8z1qss7zfl5yllhb712";
};
buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ];
diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix
index daa017d1ccbdc943f58afee8e58cb988828d4967..73f50e45d3df8ed2c8c7259e84bd57d7f5391b6d 100644
--- a/pkgs/applications/audio/puredata/default.nix
+++ b/pkgs/applications/audio/puredata/default.nix
@@ -1,30 +1,31 @@
{ stdenv, fetchurl, autoreconfHook, gettext, makeWrapper
-, alsaLib, libjack2, tk
+, alsaLib, libjack2, tk, fftw
}:
stdenv.mkDerivation rec {
name = "puredata-${version}";
- version = "0.47-1";
+ version = "0.48-0";
src = fetchurl {
url = "http://msp.ucsd.edu/Software/pd-${version}.src.tar.gz";
- sha256 = "0k5s949kqd7yw97h3m8z81bjz32bis9m4ih8df1z0ymipnafca67";
+ sha256 = "0wy9kl2v00fl27x4mfzhbca415hpaisp6ls8a6mkl01qbw20krny";
};
- patchPhase = ''
- rm portaudio/configure.in
- '';
-
nativeBuildInputs = [ autoreconfHook gettext makeWrapper ];
- buildInputs = [ alsaLib libjack2 ];
+ buildInputs = [ alsaLib libjack2 fftw ];
configureFlags = ''
--enable-alsa
--enable-jack
+ --enable-fftw
--disable-portaudio
+
'';
+ # https://github.com/pure-data/pure-data/issues/188
+ # --disable-oss
+
postInstall = ''
wrapProgram $out/bin/pd --prefix PATH : ${tk}/bin
'';
diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix
index c5a977d741a7a4918c98bffc9b6b34329e2317c7..925078fb3a157bc21ec99f1023ac927cdb7d8a05 100644
--- a/pkgs/applications/audio/qjackctl/default.nix
+++ b/pkgs/applications/audio/qjackctl/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, pkgconfig, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }:
stdenv.mkDerivation rec {
- version = "0.4.5";
+ version = "0.5.0";
name = "qjackctl-${version}";
# some dependencies such as killall have to be installed additionally
src = fetchurl {
url = "mirror://sourceforge/qjackctl/${name}.tar.gz";
- sha256 = "1dsavjfzz5bpzc80mvfs940w9f9f47cf4r9cqxnaqrl4xilsa3f5";
+ sha256 = "0lx81dfwanc10vrny1vzi0wx73ph82dlz99ffjzsigj3cqzz6x4s";
};
buildInputs = [
diff --git a/pkgs/applications/audio/qmidinet/default.nix b/pkgs/applications/audio/qmidinet/default.nix
index 132e4a0fca289486afa6081253e73e31d67d0e25..831a30bc4fe2ee359b84eb16fda67f8fa2c8211b 100644
--- a/pkgs/applications/audio/qmidinet/default.nix
+++ b/pkgs/applications/audio/qmidinet/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, qt5, alsaLib, libjack2 }:
stdenv.mkDerivation rec {
- version = "0.4.3";
+ version = "0.5.0";
name = "qmidinet-${version}";
src = fetchurl {
url = "mirror://sourceforge/qmidinet/${name}.tar.gz";
- sha256 = "1qhxhlvi6bj2a06i48pw81zf5vd36idxbq04g30794yhqcimh6vw";
+ sha256 = "0nxbvjgx11ljy1nxqknyq7pla55ky2ybi1jbisvq2cqxa34jsxf6";
};
hardeningDisable = [ "format" ];
diff --git a/pkgs/applications/audio/qsampler/default.nix b/pkgs/applications/audio/qsampler/default.nix
index 1211570f9bc53bcb5cc5a4927f1256654c4906c8..518fef0c4f5e9feb49506fcb0a5ff5e8424c1bcd 100644
--- a/pkgs/applications/audio/qsampler/default.nix
+++ b/pkgs/applications/audio/qsampler/default.nix
@@ -1,21 +1,22 @@
-{ stdenv, fetchsvn, autoconf, automake, liblscp, libtool, pkgconfig
-, qt4 }:
+{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, qttools
+, liblscp, libgig, qtbase }:
stdenv.mkDerivation rec {
- name = "qsampler-svn-${version}";
- version = "2342";
+ name = "qsampler-${version}";
+ version = "0.5.0";
- src = fetchsvn {
- url = "https://svn.linuxsampler.org/svn/qsampler/trunk";
- rev = "${version}";
- sha256 = "17w3vgpgfmvl11wsd5ndk9zdggl3gbzv3wbd45dyf2al4i0miqnx";
+ src = fetchurl {
+ url = "mirror://sourceforge/qsampler/${name}.tar.gz";
+ sha256 = "0kn1mv31ygjjsric03pkbv7r8kg3bri9ldx2ajc9pyx0p8ggnbmc";
};
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ autoconf automake liblscp libtool qt4 ];
+ nativeBuildInputs = [ autoconf automake libtool pkgconfig qttools ];
+ buildInputs = [ liblscp libgig qtbase ];
preConfigure = "make -f Makefile.svn";
+ enableParallelBuilding = true;
+
meta = with stdenv.lib; {
homepage = http://www.linuxsampler.org;
description = "Graphical frontend to LinuxSampler";
diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix
index 49d9e80be11785baad38b5dcec5026ee09d9dfc0..71f41f87009e65c0d73da0db5eaa7ae1c2938ca9 100644
--- a/pkgs/applications/audio/qsynth/default.nix
+++ b/pkgs/applications/audio/qsynth/default.nix
@@ -1,21 +1,31 @@
-{ stdenv, fetchurl, alsaLib, fluidsynth, libjack2, qt4 }:
+{ stdenv, fetchurl, alsaLib, fluidsynth, libjack2, qtbase, qttools, qtx11extras, cmake, pkgconfig }:
stdenv.mkDerivation rec {
name = "qsynth-${version}";
- version = "0.3.9";
+ version = "0.5.0";
src = fetchurl {
url = "mirror://sourceforge/qsynth/${name}.tar.gz";
- sha256 = "08kyn6cl755l9i1grzjx8yi3f8mgiz4gx0hgqad1n0d8yz85087b";
+ sha256 = "1sr6vrz8z9r99j9xcix86lgcqldragb2ajmq1bnhr58d99sda584";
};
- buildInputs = [ alsaLib fluidsynth libjack2 qt4 ];
+ # cmake is looking for qsynth.desktop.in and fails if it doesn't find it
+ # seems like a bug and can presumable go in the next version after 0.5.0
+ postPatch = ''
+ mv src/qsynth.desktop src/qsynth.desktop.in
+ '';
+
+ nativeBuildInputs = [ cmake pkgconfig ];
+
+ buildInputs = [ alsaLib fluidsynth libjack2 qtbase qttools qtx11extras ];
+
+ enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Fluidsynth GUI";
homepage = https://sourceforge.net/projects/qsynth;
license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ goibhniu ];
platforms = platforms.linux;
- maintainers = [ maintainers.goibhniu ];
};
}
diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix
index 4bc9371dd17b36f81b7e41b7e67591bc51e272a0..e075d68cd285e604fd7195622fea05bff33362af 100644
--- a/pkgs/applications/audio/radiotray-ng/default.nix
+++ b/pkgs/applications/audio/radiotray-ng/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch
+{ stdenv, fetchFromGitHub
, cmake, pkgconfig
# Transport
, curl
@@ -15,6 +15,7 @@
, libappindicator-gtk3
, libnotify
, libxdg_basedir
+, wxGTK
# GStreamer
, gst_all_1
# User-agent info
@@ -39,13 +40,13 @@ let
in
stdenv.mkDerivation rec {
name = "radiotray-ng-${version}";
- version = "0.1.7";
+ version = "0.2.0";
src = fetchFromGitHub {
owner = "ebruck";
repo = "radiotray-ng";
rev = "v${version}";
- sha256 = "1m853gzh9r249crn0xyrq22x154r005j58b0kq3nsrgi5cps2zdv";
+ sha256 = "12mhi0q137cjdpmpczvrcr7szq1ja1r8bm0gh03b925y8xyrqp5z";
};
nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook makeWrapper ];
@@ -56,6 +57,7 @@ stdenv.mkDerivation rec {
glibmm hicolor_icon_theme gnome3.gsettings_desktop_schemas libappindicator-gtk3 libnotify
libxdg_basedir
lsb-release
+ wxGTK
] ++ stdenv.lib.optional doCheck gmock
++ gstInputs
++ pythonInputs;
@@ -65,15 +67,13 @@ stdenv.mkDerivation rec {
--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";
- })
- ];
+ # We don't find the radiotray-ng-notification icon otherwise
+ substituteInPlace data/radiotray-ng.desktop \
+ --replace radiotray-ng-notification radiotray-ng-on
+ substituteInPlace data/rtng-bookmark-editor.desktop \
+ --replace radiotray-ng-notification radiotray-ng-on
+ '';
enableParallelBuilding = true;
diff --git a/pkgs/applications/audio/rkrlv2/default.nix b/pkgs/applications/audio/rkrlv2/default.nix
index 3ebdce2b4820fb8292874bc5b9e98c59a977f818..28a69d5a3b76d51d4971e4716b3174c6d52e69dd 100644
--- a/pkgs/applications/audio/rkrlv2/default.nix
+++ b/pkgs/applications/audio/rkrlv2/default.nix
@@ -4,13 +4,13 @@ automake, pkgconfig, lv2, fftw, cmake, xorg, libjack2, libsamplerate, libsndfile
stdenv.mkDerivation rec {
repo = "rkrlv2";
- name = "${repo}-b1.0";
+ name = "${repo}-b2.0";
src = fetchFromGitHub {
owner = "ssj71";
inherit repo;
- rev = "a315f5aefe63be7e34663596b8b050410a9b7e72";
- sha256 = "0kr3rvq7n1bh47qryyarcpiibms601qd8l1vypmm61969l4d4bn8";
+ rev = "beta_2";
+ sha256 = "128jcilbrd1l65c01w2bazsb21x78mng0jjkhi3x9crf1n9qbh2m";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix
index 1eb366d6bbd9530ee6982ea18632c8d4a4b07bbd..a8a368054966fb16397a948db777a85aaccf47d9 100644
--- a/pkgs/applications/audio/samplv1/default.nix
+++ b/pkgs/applications/audio/samplv1/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "samplv1-${version}";
- version = "0.8.4";
+ version = "0.8.5";
src = fetchurl {
url = "mirror://sourceforge/samplv1/${name}.tar.gz";
- sha256 = "107p2xsj066q2bil0xcgqrrn7lawp02wzf7qmlajcbnd79jhsi6i";
+ sha256 = "1gscwybsbaqbnylmgf2baf71cm2g7a0pd11rqmk3cz9hi3lyjric";
};
buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools];
diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/applications/audio/setbfree/default.nix
index 0eaa9bde14f68ddff3704b88a2f88bf80cac72fc..63705d40c3f6080cb0ab8f0ece2e251af7873bbd 100644
--- a/pkgs/applications/audio/setbfree/default.nix
+++ b/pkgs/applications/audio/setbfree/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "setbfree-${version}";
- version = "0.8.0";
+ version = "0.8.5";
src = fetchurl {
url = "https://github.com/pantherb/setBfree/archive/v${version}.tar.gz";
- sha256 = "1lfylai4gyk512dknj16w2aq9ka8hvqca46nmq5b4rfjmi6dkxf6";
+ sha256 = "0qfccny0hh9lq54272mzmxvfz2jmzcgigjkjwn6v9h6n00gi5bw4";
};
patchPhase = ''
diff --git a/pkgs/applications/audio/soundscape-renderer/default.nix b/pkgs/applications/audio/soundscape-renderer/default.nix
index 7daae31a468b20475fbae6bce5136819e1a97e3f..44c3bd70d3dc5fa4c0cf5b022713be9b93056294 100644
--- a/pkgs/applications/audio/soundscape-renderer/default.nix
+++ b/pkgs/applications/audio/soundscape-renderer/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
homepage = http://spatialaudio.net/ssr/;
description = "The SoundScape Renderer (SSR) is a tool for real-time spatial audio reproduction";
license = stdenv.lib.licenses.gpl3;
- maintainer = stdenv.lib.maintainers.fridh;
+ maintainers = [ stdenv.lib.maintainers.fridh ];
};
}
diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 249bbe0d8fb7036118823bbc605aa22acc08a92d..9ac0c49ebc319eea377cecdffd15216f8c40d0eb 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.64.407.g9bd02c2d-26";
+ version = "1.0.69.336.g7edcc575-39";
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 = "0zc8vclf1wx60yllc1jgzhqyv5lkwz95qmmy5f79zkj6vrdak5wc";
+ sha256 = "0bh2q7g478g7wj661fypxcbhrbq87zingfyigg7rz1shgsgwc3gd";
};
buildInputs = [ dpkg makeWrapper ];
diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix
index 2f5a4ebb43f2eea3f48041d62ab67637b1cf3505..8385e1cc5a4d3ee01a3a613d8d8608e0aec410eb 100644
--- a/pkgs/applications/audio/synthv1/default.nix
+++ b/pkgs/applications/audio/synthv1/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "synthv1-${version}";
- version = "0.8.4";
+ version = "0.8.5";
src = fetchurl {
url = "mirror://sourceforge/synthv1/${name}.tar.gz";
- sha256 = "0awk2zx0xa6vl6ah24zz0k2mwsx50hh5g1rh32mp790fp4x7l5s8";
+ sha256 = "0mvrqk6jy7h2wg442ixwm49w7x15rs4066c2ljrz4kvxlzp5z69i";
};
buildInputs = [ qt5.qtbase qt5.qttools libjack2 alsaLib liblo lv2 ];
diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix
index 2b79718809ff239680abbcec18aed0881f8a01b1..27d82942d343ae5738d563e24109c0280c215033 100644
--- a/pkgs/applications/audio/yoshimi/default.nix
+++ b/pkgs/applications/audio/yoshimi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk
+{ stdenv, fetchurl, alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk, pcre
, libjack2, libsndfile, libXdmcp, readline, lv2, mesa, minixml, pkgconfig, zlib, xorg
}:
@@ -6,22 +6,23 @@ assert stdenv ? glibc;
stdenv.mkDerivation rec {
name = "yoshimi-${version}";
- version = "1.5.3";
+ version = "1.5.6";
src = fetchurl {
url = "mirror://sourceforge/yoshimi/${name}.tar.bz2";
- sha256 = "0sns35pyw2f74xrv1fxiyf9g9415kvh2rrbdjd60hsiv584nlari";
+ sha256 = "0bjfhfslpa2hjrc9h38m7dlr62953w9n4cvkgvfy495cbym12dak";
};
buildInputs = [
alsaLib boost cairo fftwSinglePrec fltk libjack2 libsndfile libXdmcp readline lv2 mesa
- minixml zlib xorg.libpthreadstubs
+ minixml zlib xorg.libpthreadstubs pcre
];
nativeBuildInputs = [ cmake pkgconfig ];
patchPhase = ''
- sed -i -e 's,/usr/share,'$out/share,g src/Misc/Config.cpp src/Misc/Bank.cpp
+ substituteInPlace src/Misc/Config.cpp --replace /usr $out
+ substituteInPlace src/Misc/Bank.cpp --replace /usr $out
'';
preConfigure = "cd src";
diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix
index 52b9a57c00b27ff02d792d78fb63cbf359230358..1b3429f39d7f8743f973ccc145449c6f99e6acd0 100644
--- a/pkgs/applications/audio/zynaddsubfx/default.nix
+++ b/pkgs/applications/audio/zynaddsubfx/default.nix
@@ -4,16 +4,20 @@
stdenv.mkDerivation rec {
name = "zynaddsubfx-${version}";
- version = "3.0.2";
+ version = "3.0.3";
src = fetchurl {
url = "mirror://sourceforge/zynaddsubfx/zynaddsubfx-${version}.tar.bz2";
- sha256 = "09mr23lqc51r7gskry5b7hk84pghdpgn1s4vnrzvx7xpa21gvplm";
+ sha256 = "1hfpiqdm337gl4ynkmmp2qss2m5z8mzqzjrbiyg6w1v4js7l9phi";
};
buildInputs = [ alsaLib cairo libjack2 fftw fltk13 lash libjpeg libXpm minixml ntk zlib liblo ];
nativeBuildInputs = [ cmake pkgconfig ];
+ patchPhase = ''
+ substituteInPlace src/Misc/Config.cpp --replace /usr $out
+ '';
+
hardeningDisable = [ "format" ];
meta = with stdenv.lib; {
diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
index 9dd7eb2a29941330ed7b186c0c712af5f6c44787..13740dd9dfdb22ed1478f18be4e34a6470906333 100644
--- a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
+++ b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
@@ -1,6 +1,7 @@
{ stdenv, fetchurl, lightdm, pkgconfig, intltool
, hicolor_icon_theme, makeWrapper
, useGTK2 ? false, gtk2, gtk3 # gtk3 seems better supported
+, exo
}:
#ToDo: bad icons with gtk2;
@@ -8,26 +9,18 @@
let
ver_branch = "2.0";
- version = "2.0.1";
+ version = "2.0.3";
in
stdenv.mkDerivation rec {
name = "lightdm-gtk-greeter-${version}";
src = fetchurl {
url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.gz";
- sha256 = "031iv7zrpv27zsvahvfyrm75zdrh7591db56q89k8cjiiy600r1j";
+ sha256 = "0c6v2myzqj8nzpcqyvbab7c66kwgcshw2chn5r6dhm7xrx19bcrx";
};
- patches = [
- (fetchurl {
- name = "lightdm-gtk-greeter-2.0.1-lightdm-1.19.patch";
- url = "https://588764.bugs.gentoo.org/attachment.cgi?id=442616";
- sha256 = "0r383kjkvq9yanjc1lk878xc5g8993pjgxylqhhjb5rkpi1mbfsv";
- })
- ];
-
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ lightdm intltool makeWrapper ]
+ buildInputs = [ lightdm exo intltool makeWrapper ]
++ (if useGTK2 then [ gtk2 ] else [ gtk3 ]);
configureFlags = [
@@ -48,7 +41,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- homepage = http://launchpad.net/lightdm-gtk-greeter;
+ homepage = https://launchpad.net/lightdm-gtk-greeter;
platforms = platforms.linux;
license = licenses.gpl3;
maintainers = with maintainers; [ ocharles wkennington ];
diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix
index e82d4c69def6801cd82f16d2ce3f8652b6fe29cf..6765c5f9dfd00b9fc2973b87f95f555994927ae7 100644
--- a/pkgs/applications/display-managers/lightdm/default.nix
+++ b/pkgs/applications/display-managers/lightdm/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2
-, intltool, xlibsWrapper, libxklavier, libgcrypt, libaudit
+, intltool, xlibsWrapper, libxklavier, libgcrypt, libaudit, coreutils
, qt4 ? null
, withQt5 ? false, qtbase
}:
@@ -36,6 +36,11 @@ stdenv.mkDerivation rec {
"localstatedir=\${TMPDIR}"
];
+ prePatch = ''
+ substituteInPlace src/shared-data-manager.c \
+ --replace /bin/rm ${coreutils}/bin/rm
+ '';
+
meta = {
homepage = https://launchpad.net/lightdm;
platforms = platforms.linux;
diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
index 86a963bdac48c314d71041ed9c60c25e102ff6bd..a7e8799c9c1cf9d97bdf2671fd1f24cbc9266503 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -4,8 +4,7 @@
}:
let
-
- version = "0.16.0";
+ version = "0.17.0";
in mkDerivation rec {
name = "sddm-${version}";
@@ -14,7 +13,7 @@ in mkDerivation rec {
owner = "sddm";
repo = "sddm";
rev = "v${version}";
- sha256 = "1j0rc8nk8bz7sxa0bc6lx9v7r3zlcfyicngfjqb894ni9k71kzsb";
+ sha256 = "1m35ly6miwy8ivsln3j1bfv0nxbc4gyqnj7f847zzp53jsqrm3mq";
};
patches = [ ./sddm-ignore-config-mtime.patch ];
diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index b9e096c69279316a4253627f71640c0fa90b2c4f..acab0be4258f3145a99e28ea987e91825504778b 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -8,9 +8,9 @@ let
in rec {
stable = mkStudio {
pname = "android-studio";
- version = "3.0.0.18"; # "Android Studio 3.0"
- build = "171.4408382";
- sha256Hash = "18npm7ckdybj6vc2vndr0wd50da19m9z2j7wld2mdidnl5ggk4br";
+ version = "3.0.1.0"; # "Android Studio 3.0.1"
+ build = "171.4443003";
+ sha256Hash = "1krahlqr70nq3csqiinq2m4fgs68j11hd9gg2dx2nrpw5zni0wdd";
meta = with stdenv.lib; {
description = "The Official IDE for Android (stable version)";
@@ -27,9 +27,9 @@ in rec {
preview = mkStudio {
pname = "android-studio-preview";
- version = "3.1.0.3"; # "Android Studio 3.1 Canary 4"
- build = "171.4444016";
- sha256Hash = "0qgd0hd3i3p1adv0xqa0409r5injw3ygs50lajzi99s33j6vdc6s";
+ version = "3.1.0.6"; # "Android Studio 3.1 Canary 7"
+ build = "173.4524538";
+ sha256Hash = "0rj7swychriznylrr09g0rnj12rymms925xbry85ba72hj1jjf6w";
meta = stable.meta // {
description = "The Official IDE for Android (preview version)";
diff --git a/pkgs/applications/editors/atom/beta.nix b/pkgs/applications/editors/atom/beta.nix
index bc39d3466765fc56bbf21381c27ac72d66aab7bb..46c9625bc986ec3be756931246f809eb16377742 100644
--- a/pkgs/applications/editors/atom/beta.nix
+++ b/pkgs/applications/editors/atom/beta.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "atom-beta-${version}";
- version = "1.23.0-beta0";
+ version = "1.24.0-beta2";
src = fetchurl {
url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
- sha256 = "1vfc8jin07kivdmyw88vbzinbjsb6py9n2ggpvy4cccagnvxwj2y";
+ sha256 = "1s5zfccpiyg3nqq3a93dg5sr6pk8gvwf8assq9g78l7qkryqr4ac";
name = "${name}.deb";
};
diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index f5763ea787f3996dfdb2a55797cc48a7f8d86fc8..50c3d182afb8ba87e12b1335e00813f1d8bfc006 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.22.0";
+ version = "1.23.2";
src = fetchurl {
url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
- sha256 = "1jxw0m1hfaisf1f875wr28f0mr3h0wjml6pjhfxbybvcblpnd27k";
+ sha256 = "04shnmy80ixjrc8d57i5w23xfxw1dmxj7kbygsal9l8kxgd76k7h";
name = "${name}.deb";
};
diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/applications/editors/atom/env.nix
index 8f6c5f5c2906fb4a43967485250a28d10c4d2ae2..1c9c5bc78ef2579f84a532872f82845857cab91f 100644
--- a/pkgs/applications/editors/atom/env.nix
+++ b/pkgs/applications/editors/atom/env.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig
, libgnome_keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr
-, gconf, nss, xorg, libcap, systemd, libnotify
+, gconf, nss, xorg, libcap, systemd, libnotify, libsecret
}:
let
@@ -10,7 +10,7 @@ let
xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify
- xorg.libxcb
+ xorg.libxcb libsecret
];
libPathNative = lib.makeLibraryPath packages;
diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 5ef29081cf0122e0bf3fe419497828ea562bfd7d..fef508bdf1e50719f439534e4e3e914bf05606ff 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -114,16 +114,16 @@ rec {
};
eclipse-platform-47 = buildEclipse {
- name = "eclipse-platform-4.7.1a";
+ name = "eclipse-platform-4.7.2";
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.1a-201710090410/eclipse-platform-4.7.1a-linux-gtk-x86_64.tar.gz;
- sha256 = "13gyrnhyhdpsrbi5nl0fhpwrqz3gdyqq3r0m1f2z3y6yr75sgw33";
+ url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.2-201711300510/eclipse-platform-4.7.2-linux-gtk-x86_64.tar.gz;
+ sha256 = "1zl406brvhh25dkd2pi1kvz5386gzkybpwik03aadpzmjrbm9730";
};
"i686-linux" = fetchurl {
- 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";
+ url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.2-201711300510/eclipse-platform-4.7.2-linux-gtk.tar.gz;
+ sha256 = "0v0i13ah8d8zmcv0ip1ia5ifnfnl76aibiqpv4q4lih5d1qsa79d";
};
};
};
@@ -168,16 +168,16 @@ rec {
};
eclipse-sdk-47 = buildEclipse {
- name = "eclipse-sdk-4.7.1a";
+ name = "eclipse-sdk-4.7.2";
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.1a-201710090410/eclipse-SDK-4.7.1a-linux-gtk-x86_64.tar.gz;
- sha256 = "05xpdbig170rw7k5dx33dlyz187wv62mma8s5wxrqi7f4117sx4y";
+ url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.2-201711300510/eclipse-SDK-4.7.2-linux-gtk-x86_64.tar.gz;
+ sha256 = "1j5d72rkl3lq3rpnvq1spsa0zlzbmbkgadfhbz868sqqbavrwbzv";
};
"i686-linux" = fetchurl {
- 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";
+ url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.2-201711300510/eclipse-SDK-4.7.2-linux-gtk.tar.gz;
+ sha256 = "117436ni79v1kiync8b3wkfkb8a5rv3sbqp6qnwbmanwkvnyvfvc";
};
};
};
diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 8d96a79b3c3d7f32c87295308729acd5b154ad4c..769891423d7e6748902324a04dfe9b6ffaeb392a 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -192,12 +192,12 @@ rec {
checkstyle = buildEclipseUpdateSite rec {
name = "checkstyle-${version}";
- version = "8.0.0.201707161819";
+ version = "8.5.1.201712211522";
src = fetchzip {
stripRoot = false;
- url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/8.0.0/net.sf.eclipsecs-updatesite_${version}.zip";
- sha256 = "1p07xcf71qc99sh73vqm9xxxgi819m58frv0cpvsn06y6ljr0aj2";
+ url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/8.5.1/net.sf.eclipsecs-updatesite_${version}.zip";
+ sha256 = "0nid4a4qib9vx34ddry7sylj20p2d47dd0vn4zqqmj5dgqx1a1ab";
};
meta = with stdenv.lib; {
@@ -362,12 +362,12 @@ rec {
jdt = buildEclipseUpdateSite rec {
name = "jdt-${version}";
- version = "4.7.1a";
+ version = "4.7.2";
src = fetchzip {
stripRoot = false;
- 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";
+ url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.2-201711300510/org.eclipse.jdt-4.7.2.zip;
+ sha256 = "1yzqnjs88cdyyqv8f1g8fbfyccci29f3pzxxvaz7szxicwzn59mz";
};
meta = with stdenv.lib; {
@@ -424,16 +424,16 @@ rec {
spotbugs = buildEclipsePlugin rec {
name = "spotbugs-${version}";
- version = "3.1.0.r201710241414-11c9895";
+ version = "3.1.1.r201712011030-903b7a0";
srcFeature = fetchurl {
url = "https://spotbugs.github.io/eclipse/features/com.github.spotbugs.plugin.eclipse_${version}.jar";
- sha256 = "084dj2bid5issh28j32hi5w9vx5xs829h7d5lbz5hqj1fyn9h6bs";
+ sha256 = "12z5dbs10h5k567wbmwz1w4pnidmqsls52qcfdb3zlgr0rqvz072";
};
srcPlugin = fetchurl {
url = "https://spotbugs.github.io/eclipse/plugins/com.github.spotbugs.plugin.eclipse_${version}.jar";
- sha256 = "1mqpl3gx06f54w13jm01qd8fbniab3x989mi3lysx078vrp23jas";
+ sha256 = "0dnkp2alymvyyql7g8w79i27b3c64inhdvpxx1v014ng9liv54xb";
};
meta = with stdenv.lib; {
diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix
index ee5afe500efe17160f0861fdf6aa7c0fdc270500..832dc3c0e799734a203e3db513baaf03f5085027 100644
--- a/pkgs/applications/editors/ed/default.nix
+++ b/pkgs/applications/editors/ed/default.nix
@@ -2,7 +2,7 @@
, buildPlatform, hostPlatform
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (rec {
name = "ed-${version}";
version = "1.14.2";
@@ -11,27 +11,9 @@ stdenv.mkDerivation rec {
sha256 = "1nqhk3n1s1p77g2bjnj55acicsrlyb2yasqxqwpx0w0djfx64ygm";
};
- unpackCmd = "tar --lzip -xf";
-
nativeBuildInputs = [ lzip ];
- /* FIXME: Tests currently fail on Darwin:
-
- building test scripts for ed-1.5...
- testing ed-1.5...
- *** Output e1.o of script e1.ed is incorrect ***
- *** Output r3.o of script r3.ed is incorrect ***
- make: *** [check] Error 127
-
- */
- doCheck = !(hostPlatform.isDarwin || hostPlatform != buildPlatform);
-
- installFlags = [ "DESTDIR=$(out)" ];
-
- configureFlags = [
- "--exec-prefix=${stdenv.cc.targetPrefix}"
- "CC=${stdenv.cc.targetPrefix}cc"
- ];
+ doCheck = true; # not cross;
meta = {
description = "An implementation of the standard Unix editor";
@@ -54,4 +36,9 @@ stdenv.mkDerivation rec {
maintainers = [ ];
platforms = stdenv.lib.platforms.unix;
};
-}
+} // stdenv.lib.optionalAttrs (hostPlatform != buildPlatform) {
+ # This may be moved above during a stdenv rebuild.
+ preConfigure = ''
+ configureFlagsArray+=("CC=$CC")
+ '';
+})
diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index aa8252453921537d3302de3e8cdf8afa52e3fc61..6a438672601b119dd073392902bb5addfe073444 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -135,10 +135,10 @@
arbitools = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "arbitools";
- version = "0.71";
+ version = "0.93";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/arbitools-0.71.el";
- sha256 = "1ghf5yla126n7xpn2sc2vg7q8arp7iv2z5f9r9l38vxm6dvnxp50";
+ url = "https://elpa.gnu.org/packages/arbitools-0.93.el";
+ sha256 = "0z3lqp8dqfkams5h4sw569p48d2rvpd3d8lb4xaw0z8l49y2mvg8";
};
packageRequires = [ cl-lib ];
meta = {
@@ -175,10 +175,10 @@
}) {};
auctex = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "auctex";
- version = "11.91.0";
+ version = "12.1.0";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/auctex-11.91.0.tar";
- sha256 = "1yh182mxgngjmwpkyv2n9km3vyq95bqfq8mnly3dbv78nwk7f2l3";
+ url = "https://elpa.gnu.org/packages/auctex-12.1.0.tar";
+ sha256 = "0iy5x61xqkxaph2hq64sg50l1c6yp6qhzppwadayxkdz00b46sas";
};
packageRequires = [];
meta = {
@@ -239,6 +239,19 @@
license = lib.licenses.free;
};
}) {};
+ bbdb = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+ pname = "bbdb";
+ version = "3.2";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/bbdb-3.2.tar";
+ sha256 = "1p56dg0mja2b2figy7yhdx714zd5j6njzn0k07zjka3jc06izvjx";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/bbdb.html";
+ license = lib.licenses.free;
+ };
+ }) {};
beacon = callPackage ({ elpaBuild, fetchurl, lib, seq }: elpaBuild {
pname = "beacon";
version = "1.3.3";
@@ -483,10 +496,10 @@
}) {};
csv-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "csv-mode";
- version = "1.6";
+ version = "1.7";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/csv-mode-1.6.el";
- sha256 = "1v86qna1ypnr55spf6kjiqybplfbb8ak5gnnifh9vghsgb5jkb6a";
+ url = "https://elpa.gnu.org/packages/csv-mode-1.7.el";
+ sha256 = "0r4bip0w3h55i8h6sxh06czf294mrhavybz0zypzrjw91m1bi7z6";
};
packageRequires = [];
meta = {
@@ -755,10 +768,10 @@
el-search = callPackage ({ elpaBuild, emacs, fetchurl, lib, stream }:
elpaBuild {
pname = "el-search";
- version = "1.4.0.4";
+ version = "1.4.0.14";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/el-search-1.4.0.4.tar";
- sha256 = "1l3wb0g6ipyi8yimxah0z6r83376l22pb2s9ba6kxfmhsq5wyc8a";
+ url = "https://elpa.gnu.org/packages/el-search-1.4.0.14.tar";
+ sha256 = "1qc30dia59i2bklhivfhmsghirnpgz5mvcjdc78n0r8nizb68jfp";
};
packageRequires = [ emacs stream ];
meta = {
@@ -959,10 +972,10 @@
gnorb = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "gnorb";
- version = "1.3.2";
+ version = "1.4.2";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/gnorb-1.3.2.tar";
- sha256 = "054z6bnfkf7qkgc9xynhzy9xrz780x4csj1r206jhslygjrlf1sj";
+ url = "https://elpa.gnu.org/packages/gnorb-1.4.2.tar";
+ sha256 = "1892j8gdbcny6b9psxa1lwxsb1gkj9z9z00rfc62kdw8bffmx38y";
};
packageRequires = [ cl-lib ];
meta = {
@@ -1106,10 +1119,10 @@
}) {};
ivy = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
pname = "ivy";
- version = "0.9.1";
+ version = "0.10.0";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/ivy-0.9.1.tar";
- sha256 = "1jfc3zf6ln7i8pp5j0fpsai2w847v5g77b5fzlxbgvj80g3v5887";
+ url = "https://elpa.gnu.org/packages/ivy-0.10.0.tar";
+ sha256 = "01m58inpd8jbfvzqsrwigzjfld9a66nf36cbya26dmdy7vwdm8xm";
};
packageRequires = [ emacs ];
meta = {
@@ -1582,19 +1595,6 @@
license = lib.licenses.free;
};
}) {};
- org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
- pname = "org";
- version = "20171127";
- src = fetchurl {
- url = "https://elpa.gnu.org/packages/org-20171127.tar";
- sha256 = "18a77yzfkx7x1pckc9c274b2fpswrcqz19nansvbqdr1harzvd20";
- };
- packageRequires = [];
- meta = {
- homepage = "https://elpa.gnu.org/packages/org.html";
- license = lib.licenses.free;
- };
- }) {};
osc = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "osc";
version = "0.1";
@@ -1635,6 +1635,19 @@
license = lib.licenses.free;
};
}) {};
+ paced = callPackage ({ async, elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+ pname = "paced";
+ version = "1.0";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/paced-1.0.tar";
+ sha256 = "0ld7cnlk6pn41hx2yfga5w7vfgg4ql6k25ffnf400nsn7y6wcapd";
+ };
+ packageRequires = [ async emacs ];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/paced.html";
+ license = lib.licenses.free;
+ };
+ }) {};
parsec = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "parsec";
@@ -1922,10 +1935,10 @@
sml-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "sml-mode";
- version = "6.7";
+ version = "6.8";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/sml-mode-6.7.el";
- sha256 = "041dmxx7imiy99si9pscwjh5y4h02y3lirzhv1cfxqr3ghxngf9x";
+ url = "https://elpa.gnu.org/packages/sml-mode-6.8.el";
+ sha256 = "105fcrz5qp95f2n3fdm3awr6z58sbrjihjss6qnrg4lz2ggbc328";
};
packageRequires = [ cl-lib emacs ];
meta = {
@@ -1986,6 +1999,19 @@
license = lib.licenses.free;
};
}) {};
+ sql-indent = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+ pname = "sql-indent";
+ version = "1.0";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/sql-indent-1.0.tar";
+ sha256 = "02cmi96mqk3bfmdh0xv5s0qx310cirs6kq0jqwk1ga41rpp596vl";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/sql-indent.html";
+ license = lib.licenses.free;
+ };
+ }) {};
stream = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
pname = "stream";
version = "2.2.4";
@@ -2215,10 +2241,10 @@
}) {};
vlf = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "vlf";
- version = "1.7";
+ version = "1.7.1";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/vlf-1.7.tar";
- sha256 = "007zdr5szimr6nwwrqz9s338s0qq82r006pdwgcm8nc41jsmsx7r";
+ url = "https://elpa.gnu.org/packages/vlf-1.7.1.tar";
+ sha256 = "0cnwxk20573iqkwk0c0h7pyjk0rkr8l2qd0xmyqj8mvdxjb8nnkz";
};
packageRequires = [];
meta = {
diff --git a/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix b/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix
index 7b7004b72f306611bfb32d768a544e2b58c2d921..733393307d3ff3e0f2714a2f289b857c18de7d9c 100644
--- a/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix
+++ b/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix
@@ -2,11 +2,11 @@
melpaBuild {
pname = "font-lock-plus";
- version = "20170222.1755";
+ version = "20180101.25";
src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/font-lock+.el";
- sha256 = "0iajkgh0n3pbrwwxx9rmrrwz8dw2m7jsp4mggnhq7zsb20ighs30";
+ url = "https://www.emacswiki.org/emacs/download/font-lock%2b.el?revision=25";
+ sha256 = "0197yzn4hbjmw5h3m08264b7zymw63pdafph5f3yzfm50q8p7kp4";
name = "font-lock+.el";
};
diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 4f36b01ae06fb0470efd726a95311999c30aefb9..a2b9564faa50cbcfe71b63a871ac9f524dbfb65e 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -358,12 +358,12 @@
ac-clang = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, yasnippet }:
melpaBuild {
pname = "ac-clang";
- version = "20170615.838";
+ version = "20171209.240";
src = fetchFromGitHub {
owner = "yaruopooner";
repo = "ac-clang";
- rev = "ee692f7cde535f317e440a132b8e60b7c5e34dfd";
- sha256 = "0zg39brrpgdakb6hbylala6ajja09nhbzqf4xl9nzwc7gzpgfl57";
+ rev = "f11f17382646e13a0c794821ed5efe1692f96652";
+ sha256 = "0ynl5fvsamij5ji2cnxp4vbqwbw09c8x8fxx3s80v02yi3xi5fr0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ffe0485048b85825f5e8ba95917d8c9dc64fe5de/recipes/ac-clang";
@@ -757,12 +757,12 @@
ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "ac-php";
- version = "20170110.2036";
+ version = "20171201.134";
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
- rev = "b3727c766daf383ffbc781e48211d37009056191";
- sha256 = "02cdzi1qxmcyj4m26r5ajgavkizh45m0djqz0n8xszrn6j0zm5rf";
+ rev = "519b5cd886f484693fd69b226e307d56137b321b";
+ sha256 = "1pig5kang3yvzzahgn8rfpy3gvpfz7myvf7ic0yc6rivvbl03k18";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
@@ -778,12 +778,12 @@
ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }:
melpaBuild {
pname = "ac-php-core";
- version = "20171127.626";
+ version = "20171209.2145";
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
- rev = "b3727c766daf383ffbc781e48211d37009056191";
- sha256 = "02cdzi1qxmcyj4m26r5ajgavkizh45m0djqz0n8xszrn6j0zm5rf";
+ rev = "519b5cd886f484693fd69b226e307d56137b321b";
+ sha256 = "1pig5kang3yvzzahgn8rfpy3gvpfz7myvf7ic0yc6rivvbl03k18";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@@ -824,8 +824,8 @@
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "8ef7554852541eced514c56d5e39d6073f7a2ef9";
- sha256 = "0hh9m0ykw3r9h4gv4a99px00py1h5hs86043mp1m0nmkjibf6w56";
+ rev = "db5ad3a48c579b3522411bd2411c09dbb27af578";
+ sha256 = "1ihv65hfq22yk4wx4njkm73q4s04fr84ib3mjjk8l18xpzl6alal";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags";
@@ -1030,12 +1030,12 @@
ace-link = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ace-link";
- version = "20171109.1250";
+ version = "20180101.1328";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "ace-link";
- rev = "3bc7a61a9d7923bb71066906e17cb8a0db415c24";
- sha256 = "0dalspw44ra9ik7f1lflmck76ar0v6qig700qczlml52lr9vf045";
+ rev = "43d224546a2a557857294a8e3d13c4fe63508e03";
+ sha256 = "0cw4br2nx4fa9jsal6b9gavffqjrhq2xgf87szi61dkgi2gacf7y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/68032f40c0ce4170a22db535be4bfa7099f61f85/recipes/ace-link";
@@ -1093,12 +1093,12 @@
ace-popup-menu = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ace-popup-menu";
- version = "20170518.2244";
+ version = "20171231.2215";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "ace-popup-menu";
- rev = "eae1b0ea1a56cc1da2543e95570867a1a026669d";
- sha256 = "1w1q0r104v9fngzi3q8l6gwzb0c9gdq2jmbjb372j7969py73ywc";
+ rev = "7b8ad628a058d32c420f7615927a34a5d51a7ad3";
+ sha256 = "183gc5lidxahfzik9ima2vph2sdi2rd9805kfnghsmwhck275i2r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/53742e2242101c4b3b3901f5c74e24facf62c7d6/recipes/ace-popup-menu";
@@ -1114,12 +1114,12 @@
ace-window = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ace-window";
- version = "20171125.30";
+ version = "20171228.1109";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "ace-window";
- rev = "9bec357bd3eeee1ef27822ae034e1ee3bd270f0c";
- sha256 = "1shn1j28jmwyzakj2cj5d0iihps41086y17pb0hnzcgfsh7q8sij";
+ rev = "c0fbdd51be8fdd43fd7a89140ebd4b4c311d45fc";
+ sha256 = "0jiq2d2bgp6f26d5hjmd56cv68l2x6rlbpsvp6ig42nydv2yjjkz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe131d3c2ea498e4df30ba539a6b91c00f5b07/recipes/ace-window";
@@ -1197,12 +1197,12 @@
adafruit-wisdom = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "adafruit-wisdom";
- version = "20171115.1228";
+ version = "20180107.1521";
src = fetchFromGitHub {
owner = "gonewest818";
repo = "adafruit-wisdom.el";
- rev = "ce6a354f6d32e9700615ce3879936d05cc2c8c33";
- sha256 = "1d5jng3kk08q8xhg4ajd5nq9q37ycq24ph70hhrls3p3nd1lgrd5";
+ rev = "f637f1b7cb397d4b993a20e94687663f6f09c615";
+ sha256 = "0b5k8526p0c3xp2x5xbb5w0qgljasa1lywbbj5jqgnn64i7l5y2h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/18483af52c26f719fbfde626db84a67750bf4754/recipes/adafruit-wisdom";
@@ -1218,12 +1218,12 @@
add-hooks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "add-hooks";
- version = "20170705.2205";
+ version = "20171216.1723";
src = fetchFromGitHub {
owner = "nickmccurdy";
repo = "add-hooks";
- rev = "5e18cc3887477aeec41a34f608d9aa55bfa92d0e";
- sha256 = "05a0ayqjldl53s3zmfgmdqq8jf1qw1m2a2sj4qzn2bci0dgsakcp";
+ rev = "1845137703461fc44bd77cf24014ba58f19c369d";
+ sha256 = "02s9mv26ycypn4qfshrh17v1hsys2q9vffxj3g4lgq0lykplvkkm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/901f846aef46d512dc0a1770bab7f07c0ae330cd/recipes/add-hooks";
@@ -1344,12 +1344,12 @@
ag = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "ag";
- version = "20170915.1249";
+ version = "20180102.1441";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "ag.el";
- rev = "3b567902ccbec4ed9b8c5f5cd369be833e485e79";
- sha256 = "1ihhmz4ww6iqbjbv1cvssixn01bkd2cl8pij7p32dxyyd8jdwlkq";
+ rev = "d00aa65ec2da6944f1ed81da440ad7a9024cfbf0";
+ sha256 = "1cjchz7dq42ha6wrn21jqbmf333rg73bz4ppsnd9kz6vqnkgnya0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/67f410ac3a58a038e194bcf174bc0a8ceceafb9a/recipes/ag";
@@ -1552,12 +1552,12 @@
alect-themes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "alect-themes";
- version = "20170825.1009";
+ version = "20180107.1311";
src = fetchFromGitHub {
owner = "alezost";
repo = "alect-themes";
- rev = "ded94ab1421994aa863a4d7538ec7453768ec235";
- sha256 = "1616vkjgn5g4xf40p15847pkqyrlfzp9d143a4cyk7za50a175ll";
+ rev = "418e23d9ab85deeaa4818f8dc72e27061687b3e3";
+ sha256 = "1b1rsnm85haq04p4189vg2hxff8ncrjv8xmmiwr527ipq7wmd4wf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/84c25a290ae4bcc4674434c83c66ae128e4c4282/recipes/alect-themes";
@@ -1573,12 +1573,12 @@
alert = callPackage ({ fetchFromGitHub, fetchurl, gntp, lib, log4e, melpaBuild }:
melpaBuild {
pname = "alert";
- version = "20171129.845";
+ version = "20180105.2127";
src = fetchFromGitHub {
owner = "jwiegley";
repo = "alert";
- rev = "5cb351b8c21607b68687c9f6b378fd4461239d13";
- sha256 = "0z7h058p3g6a55x00x4p8dlb80iw0sib1lx6ilwm80kkg6zi17wm";
+ rev = "c85a9dcc5d6cdb253b12967573884cc7858c6581";
+ sha256 = "1qfwwrivrjsxdlmb0fxwf92aadlzawjy661rg64cyqckilcdah0d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/113953825ac4ff98d90a5375eb48d8b7bfa224e7/recipes/alert";
@@ -1678,12 +1678,12 @@
all-the-icons-gnus = callPackage ({ all-the-icons, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "all-the-icons-gnus";
- version = "20170726.619";
+ version = "20180108.153";
src = fetchFromGitHub {
owner = "nlamirault";
repo = "all-the-icons-gnus";
- rev = "45560293e42d02c17c332894f3764dd624d25444";
- sha256 = "1j0s3m54gyrl50bqss6xaijja1hdbm5285py750dn4ykrj5m3d3r";
+ rev = "61830f1da0f8ad8e9235133f5470daeb50d2de41";
+ sha256 = "19hjy14yalw736cjqbgm3dv4cly545k57ac16vj6c6jalb7wi0l5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f8ed74d39d165343c81c2a21aa47e3d3895d8119/recipes/all-the-icons-gnus";
@@ -1834,12 +1834,12 @@
anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }:
melpaBuild {
pname = "anaconda-mode";
- version = "20170924.704";
+ version = "20171223.1118";
src = fetchFromGitHub {
owner = "proofit404";
repo = "anaconda-mode";
- rev = "89fc16d50b889a17521084347b28f3011b84e113";
- sha256 = "08wdci57vig88iy5kk57k5qjkzphbbzy8g7b87hxakfgdmcwpg3g";
+ rev = "e72e9beeb8c80acfee4d85748464d1c5147946ad";
+ sha256 = "01p83h7a40v89xp4ar587xg97y86h8p641znlbd0sqckxkn087cs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode";
@@ -2379,12 +2379,12 @@
anything-tramp = callPackage ({ anything, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "anything-tramp";
- version = "20171120.359";
+ version = "20171224.601";
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-anything-tramp";
- rev = "86b198afd03f2baffb1efe24c7a89e71100356ea";
- sha256 = "1320zdv6q1cnnvl8s25ymjvd3kz2an98bicansq5bhf413n7fhgb";
+ rev = "3082945ca2d9cf6482bc845cadd42e7b1802242e";
+ sha256 = "0d7hkxrrxpnzw3lsf648n5sgdc85qfk1r4z3z5cnisr088azh263";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/anything-tramp";
@@ -2505,12 +2505,12 @@
apiwrap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "apiwrap";
- version = "20171022.2203";
+ version = "20171202.1653";
src = fetchFromGitHub {
owner = "vermiculus";
repo = "apiwrap.el";
- rev = "79422b610f2c3d9f52fb35449485a2fc541bc5a0";
- sha256 = "0i2k975szdgzmrbwkvcnhrk73ndvk0q215fn68sb5m4zf43ifwxz";
+ rev = "5363671b6a8fe8ecd4674497664974e089b2b035";
+ sha256 = "04a4v6vpzmhj3g4mqr2fsq47k8spi8c7v4pbzkdz9si097dskvrg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap";
@@ -2882,12 +2882,12 @@
async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "async";
- version = "20171015.2239";
+ version = "20180103.2312";
src = fetchFromGitHub {
owner = "jwiegley";
repo = "emacs-async";
- rev = "424ecd8a28cd59fe7d2de3cb4b37a4224e34c123";
- sha256 = "0zmbg3r6sykmchy8hhbw8glzl8xvki030rzg9r55v4g61k8qy13r";
+ rev = "324549ba1dcf610c3766c272f86bae9d2c49fc70";
+ sha256 = "087wkd06v9blxnzhpr5fzv75l1m6vbr82s3v4vg4ny8kjq61af0p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/async";
@@ -2966,12 +2966,12 @@
atom-one-dark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "atom-one-dark-theme";
- version = "20170803.916";
+ version = "20171217.2049";
src = fetchFromGitHub {
owner = "jonathanchu";
repo = "atom-one-dark-theme";
- rev = "6ad96e25f8b46942380afbc33e3659a5e9fa09b1";
- sha256 = "06gf26r00yq1whrws9ilra8l2xfg2x89vxbgx3vgbwlvwx9wcsm6";
+ rev = "d5b785ba6118110a9404a7f65429a954ae820d69";
+ sha256 = "1a0ayw7jhbw3im5frs0rycl1ya18lbfslcr4xqsgs4kvczar4rzx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3ba1c4625c9603372746a6c2edb69d65f0ef79f5/recipes/atom-one-dark-theme";
@@ -3096,8 +3096,8 @@
src = fetchFromGitHub {
owner = "DamienCassou";
repo = "auth-password-store";
- rev = "c1dc6f3716d75e1a25953b093af0d760f446ed2f";
- sha256 = "1k0gj5v211r2pkpicn1d2b04vbxz574q11mzyvyr3lb8ic2ql9ii";
+ rev = "57c4bb749eb0fad9188c870098a61b03af346b75";
+ sha256 = "0hmi8q59spjqchc7zkpfsyi5mplkb8npxfa00f4rxfspwd2il5wc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0f4d2a28373ba93da5b280ebf40c5a3fa758ea11/recipes/auth-password-store";
@@ -3155,12 +3155,12 @@
auto-compile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }:
melpaBuild {
pname = "auto-compile";
- version = "20170817.1437";
+ version = "20171213.756";
src = fetchFromGitHub {
owner = "emacscollective";
repo = "auto-compile";
- rev = "a31819a1b75a2320edb0f7f25d6c6faf528bf41a";
- sha256 = "17hzl03livgj49zb0knlfn6r020nvj41pjjz3acy82zwrjydsvxa";
+ rev = "694b92ea58feb30a0104ccf2424fd921235ba517";
+ sha256 = "1im7z4sf4zxv97dcwviv7rzlc8ff5ibx8lhqmvhm8kxc0jf84iid";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/auto-compile";
@@ -3491,12 +3491,12 @@
auto-indent-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "auto-indent-mode";
- version = "20161118.1458";
+ version = "20171221.2106";
src = fetchFromGitHub {
owner = "mattfidler";
repo = "auto-indent-mode.el";
- rev = "7e939f3a7b092c6c32c97d63fd88aef6cc355cdb";
- sha256 = "18c9469b53kwydhrpd8kivwvs0w0ndfbwkyxixjz9wijp0wmpri1";
+ rev = "28069360a7f89ad0286fd6a53db550752ec58488";
+ sha256 = "14sqmv320ryfljpxbjw9xphj6bz1ccjk3ih4cm1r8aryyhxiacii";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/49af78177278e7072c70fde0eaa5bb82490ebe9d/recipes/auto-indent-mode";
@@ -3656,6 +3656,27 @@
license = lib.licenses.free;
};
}) {};
+ auto-sudoedit = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "auto-sudoedit";
+ version = "20171227.156";
+ src = fetchFromGitHub {
+ owner = "ncaq";
+ repo = "auto-sudoedit";
+ rev = "5a6f7da018fbb880c4c51032b39d7628a478989c";
+ sha256 = "190izcami97h2yzw267crs0xny494b9b58dmmb7bqslv38ayl396";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/7cf6bc8bb7b618d74427622b9b2812daa79a3767/recipes/auto-sudoedit";
+ sha256 = "1clp52fqxsilyi62p1cabhan55lbwax6fqlhccyjbl36yrdig3fh";
+ name = "auto-sudoedit";
+ };
+ packageRequires = [ emacs f ];
+ meta = {
+ homepage = "https://melpa.org/#/auto-sudoedit";
+ license = lib.licenses.free;
+ };
+ }) {};
auto-virtualenv = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, pyvenv, s }:
melpaBuild {
pname = "auto-virtualenv";
@@ -3932,12 +3953,12 @@
avk-emacs-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "avk-emacs-themes";
- version = "20171001.235";
+ version = "20171219.710";
src = fetchFromGitHub {
owner = "avkoval";
repo = "avk-emacs-themes";
- rev = "bf781eec7d46cce829ac5bdb114e728a110366e7";
- sha256 = "0bj51ii8vsd2gwyykxp1hvkp4r9kbc0b7ajskf8i5vb8qvpvkali";
+ rev = "108b99d779b94678395f9240e3417bb69ea5501e";
+ sha256 = "1acgfmhbgswp7acyzap95xxpd95425lsh0qa48vlc641hvlikahm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ef362a76a3881c7596dcc2639df588227b3713c0/recipes/avk-emacs-themes";
@@ -3953,12 +3974,12 @@
avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "avy";
- version = "20171126.815";
+ version = "20171230.220";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "avy";
- rev = "c08fc7c1c6997f7e843175e632d3d812e9f5a5b5";
- sha256 = "1nfrdhai123y17sbs405wsrq6bspmmamjshaws8qbjwal12p4s5q";
+ rev = "34d3531a3cd35ae6b9e8dbc37343c027504fdcb0";
+ sha256 = "0rgwbm5jcbv132xldbz2kcp09c7hs96329mwfa019v99qdbb5k32";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/77fac7a702d4086fb860514e377037acedc60412/recipes/avy";
@@ -3995,12 +4016,12 @@
avy-menu = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "avy-menu";
- version = "20170518.2245";
+ version = "20171231.2220";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "avy-menu";
- rev = "c36e28cabbcea8fdd2ada723b9a28ecc35a2d6c0";
- sha256 = "14ci1saksmhnnk5a7dy2v9dbsw7c030524vwb3y1wpw0vv863zjh";
+ rev = "990cc94d708c923f761be083b3a57f6f844566c8";
+ sha256 = "0kjxfg8wx5c8cixazih24s0mv4crk648v9bb6pd1i6lmh266rc6g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2f0b4cfb30c405d44803b36ebcaccef0cf87fe2d/recipes/avy-menu";
@@ -4016,12 +4037,12 @@
avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }:
melpaBuild {
pname = "avy-migemo";
- version = "20171031.915";
+ version = "20180104.624";
src = fetchFromGitHub {
owner = "momomo5717";
repo = "avy-migemo";
- rev = "5598fd25e483d8521e6d5f691802fa125947d7cf";
- sha256 = "1gkn1qbywv8as3csp5s1fwmrp89bmbqgyl7av0c1v9ggx7gkhd5f";
+ rev = "526494a2ae86b66a22848e5dc274480e3b4d04ca";
+ sha256 = "04fkgiixfd0xgb2m0b48ngv2fmvz2vnjajfl1b59paczz8pnw96l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6a02db29eb3e4b76b4a9cdbc966df5a1bd35dec0/recipes/avy-migemo";
@@ -4274,12 +4295,12 @@
base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "base16-theme";
- version = "20171111.1245";
+ version = "20171212.1621";
src = fetchFromGitHub {
owner = "belak";
repo = "base16-emacs";
- rev = "cb75b17eeab07a79147fc3e600170e6c35c4b18d";
- sha256 = "0igwdq41y5bd2jd7x3rmaxjqrjfyxwp5xyl5zx8rp0gql8jbn6qb";
+ rev = "3b0bb640572825873754276f699b18765c7e5172";
+ sha256 = "14pyf9aw8qbc1367j32yl8hn9lxs9027cxsxw510x9qa8ffrmi7n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme";
@@ -4337,12 +4358,12 @@
basic-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
melpaBuild {
pname = "basic-mode";
- version = "20171125.652";
+ version = "20171204.1217";
src = fetchFromGitHub {
owner = "dykstrom";
repo = "basic-mode";
- rev = "92cf455677164d251b69eae379a56eda0d881b72";
- sha256 = "18bdrs21vcmfx0hvxjzr1ng91hqa37nvqlgnx8wr0w4p9x0vak9z";
+ rev = "b7e851f844e9a5264e44936d1675133b4c3ed39c";
+ sha256 = "0q29inrdk9i4rgx3a0km62lzn796hh24365cc3kzylx74g53a3qf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/71801bdc0720f150edeab6796487c753c6e7c3f5/recipes/basic-mode";
@@ -4397,6 +4418,27 @@
license = lib.licenses.free;
};
}) {};
+ bazel-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "bazel-mode";
+ version = "20171226.1551";
+ src = fetchFromGitHub {
+ owner = "codesuki";
+ repo = "bazel-mode";
+ rev = "6103da2dd9c9461e35a45fc0544ddf33410baa25";
+ sha256 = "0lbiih6lj7qf2h1l2nxcwfkhdzccrs01lcdqsyhp5hysp0zdcr66";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3945f7eba7d5f248cace11a7946262ac2500b01a/recipes/bazel-mode";
+ sha256 = "10590pbpg6mwkcwlm01nxf0ypw694h1b57frvn5rnc53al87i586";
+ name = "bazel-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/bazel-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
bbcode-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bbcode-mode";
@@ -4420,11 +4462,11 @@
}) {};
bbdb = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "bbdb";
- version = "20171017.817";
+ version = "20180106.910";
src = fetchgit {
url = "https://git.savannah.nongnu.org/git/bbdb.git";
- rev = "339aa15f20e1f542db97a3f3d2d65a61ce5c0e93";
- sha256 = "00782y1vas8rd9g30jqhnc24bsqsy5c31qn85ipi1vc8lrbyfcg1";
+ rev = "f18720ff5cd963a0bf6fc0e41293e50c0172b8ae";
+ sha256 = "1s5qi8njiqdpgnzlik36islzh13zfhybnynqisr61p602pn4ghk7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/bbdb";
@@ -4545,12 +4587,12 @@
bbyac = callPackage ({ browse-kill-ring, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bbyac";
- version = "20171007.722";
+ version = "20171214.2054";
src = fetchFromGitHub {
owner = "baohaojun";
repo = "bbyac";
- rev = "584af0efa4809252bb37cf165df029410198327e";
- sha256 = "17cmlc49y26j2salkmcsck9618s1p7y49phiy7hvzkipa13qmj9w";
+ rev = "b355c87723746dc61da464afba2adf9d4ece1db0";
+ sha256 = "18l6423s23w3vri49ncs7lpnfamgzc7xm0lqv3x1020030m0lzp2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/92c10c13a1bd19c8bdbca128852d1c91b76f7002/recipes/bbyac";
@@ -4944,16 +4986,16 @@
bind-chord = callPackage ({ bind-key, fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild }:
melpaBuild {
pname = "bind-chord";
- version = "20170717.1152";
+ version = "20171204.1210";
src = fetchFromGitHub {
- owner = "waymondo";
- repo = "use-package-chords";
- rev = "f47b2dc8d79f02e5fe39de1f63c78a6c09be2026";
- sha256 = "0nwcs3akf1cy7dv36n5s5hsr67djfcn7w499vamn0yh16bs7r5ds";
+ owner = "jwiegley";
+ repo = "use-package";
+ rev = "5a50f6703140992723a434b9a733644bfab15306";
+ sha256 = "1495kkmfkl56kg8kbc21rqibrmdyg12mfsww79gm8v5q4nn6xq5f";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/92fbae4e0bcc1d5ad9f3f42d01f08ab4c3450f1f/recipes/bind-chord";
- sha256 = "01a3c298kq8cfsxsscpic0shkjm77adiamgbgk8laqkbrlsrrcsb";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6240afa625290187785e4b7535ee7b0d7aad8969/recipes/bind-chord";
+ sha256 = "1hyhs3iypyg5730a20axcfzrrglm4nbgdz8x1ifkaa0iy5zc9hb0";
name = "bind-chord";
};
packageRequires = [ bind-key key-chord ];
@@ -4965,12 +5007,12 @@
bind-key = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bind-key";
- version = "20171128.2058";
+ version = "20171210.2125";
src = fetchFromGitHub {
owner = "jwiegley";
repo = "use-package";
- rev = "5726c93730eb96c1f298cade2ab8b8772de06e3b";
- sha256 = "19zjnbq1zw5q0s2kml3d3j40g5c8h1417hrp016cs7dnj348220x";
+ rev = "5a50f6703140992723a434b9a733644bfab15306";
+ sha256 = "1495kkmfkl56kg8kbc21rqibrmdyg12mfsww79gm8v5q4nn6xq5f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key";
@@ -5448,12 +5490,12 @@
boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }:
melpaBuild {
pname = "boon";
- version = "20170825.416";
+ version = "20180108.41";
src = fetchFromGitHub {
owner = "jyp";
repo = "boon";
- rev = "13fca1929639e2239e9b4be060cbd4befd7921b4";
- sha256 = "0nbwmb4l2f6y58gx8bm42688y6sqc33l5sf0gh1vmn2ki2mq7jvh";
+ rev = "836f25c5baa363691a8d31712d07248c0d9a49a7";
+ sha256 = "1jh6c6i1jy1f8hskqbpqj2babk9yvqyjxyxy0x11686riasc5vps";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon";
@@ -5658,12 +5700,12 @@
browse-kill-ring = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "browse-kill-ring";
- version = "20171016.1312";
+ version = "20171219.1108";
src = fetchFromGitHub {
owner = "browse-kill-ring";
repo = "browse-kill-ring";
- rev = "b746d01c888262e81d76f8949869cf9e02759b6a";
- sha256 = "177vbziv65jb3xla713iblng04m0f7hdq5d4hf0jaxn7pzm61n0d";
+ rev = "8debc43e41d7e51532698331c6f283905890b904";
+ sha256 = "18yg35raks0kbzg5wjay6liingdcv4glyzl9n14sgr9vzc7h96f9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/294dc32a672e6b6b0ebfc46cdf0ff9ceacf73e89/recipes/browse-kill-ring";
@@ -5802,6 +5844,27 @@
license = lib.licenses.free;
};
}) {};
+ buckwalter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "buckwalter";
+ version = "20180107.843";
+ src = fetchFromGitHub {
+ owner = "joehakimrahme";
+ repo = "buckwalter.el";
+ rev = "2aa5451c3682c268adebc6b1191a796466732f53";
+ sha256 = "0g270jyf2fd3x8p0jcd86j751spfphgsmwjxl61rk1x1kiql4icd";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/7dd38487731cc978e104afa39f8954cfc33ba27f/recipes/buckwalter";
+ sha256 = "08pnmfy910n5l00kmkn4533x48m3scsxzyra0nl6iry2n39y2kr1";
+ name = "buckwalter";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/buckwalter";
+ license = lib.licenses.free;
+ };
+ }) {};
buffer-buttons = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "buffer-buttons";
@@ -5993,12 +6056,12 @@
bui = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bui";
- version = "20170125.14";
+ version = "20171215.930";
src = fetchFromGitHub {
owner = "alezost";
repo = "bui.el";
- rev = "2742bd1cd9e232cac68d5843e05c043827a2669f";
- sha256 = "00v0v00izzy749h0l22z0g0df96g3s4rbn06dvdara7h01599v00";
+ rev = "af1a237b4d1ed31780dd37bcbef51fc8ca9b0603";
+ sha256 = "1ccw90a68dahcrkr94xi9apnxjmvzjvd33w78bsr2jyfd82ggsw1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/38b7c9345de75a707b4a73e8bb8e2f213e4fd739/recipes/bui";
@@ -6623,12 +6686,12 @@
caml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "caml";
- version = "20171120.824";
+ version = "20171209.1232";
src = fetchFromGitHub {
owner = "ocaml";
repo = "ocaml";
- rev = "ebc47aed76525382375e12edd21c250b4306bc50";
- sha256 = "164dbjipqx27jhsgj58dzk6ngszl5gdjpg1bbqgj7a8s83h5gxaq";
+ rev = "cc539b70ff27afa241936aacc88983d63474e770";
+ sha256 = "0nwmbsa9gy5qpmy45qn4ihawrbg6avbancbg0va5dcfbjavp1wz2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml";
@@ -6665,12 +6728,12 @@
cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }:
melpaBuild {
pname = "cargo";
- version = "20171118.132";
+ version = "20171218.855";
src = fetchFromGitHub {
owner = "kwrooijen";
repo = "cargo.el";
- rev = "ae6b0523a9f3ca035da642913cb72858cb3926e9";
- sha256 = "0clcjla75jwl4650h1k51b6dgn2ckj6jk2r5ycqi0p25qvspzj29";
+ rev = "ba652e464ccdd0860fbc5d932c2ae86c9a31a200";
+ sha256 = "1wyk40c61hlkmx3v82hn89chvrx7fyyyc1j2wlhizi7x5cv3c497";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo";
@@ -6728,12 +6791,12 @@
cask = callPackage ({ cl-lib ? null, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build, s, shut-up }:
melpaBuild {
pname = "cask";
- version = "20170917.1107";
+ version = "20171230.452";
src = fetchFromGitHub {
owner = "cask";
repo = "cask";
- rev = "eea660b78c05d70159067f5be8cd3bddb55df4c5";
- sha256 = "0i4f964nqyd260cgy9s9jnpyzwmpmypznwmpvnkijd9pl34yfl04";
+ rev = "4c3c8890f72456f3ae4bc2213978f675c39c7a66";
+ sha256 = "02jvmrr8xr77lqdr5jsmqr1w7ix48yfkvr1vi7nsc7gzmx8vp28z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/cask";
@@ -6997,6 +7060,48 @@
license = lib.licenses.free;
};
}) {};
+ celestial-mode-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "celestial-mode-line";
+ version = "20171210.1045";
+ src = fetchFromGitHub {
+ owner = "ecraven";
+ repo = "celestial-mode-line";
+ rev = "018b5eb215be58fbae971d9013599966eaa569dc";
+ sha256 = "0d92k706qhv1bz11wvnkb5iaanxf2wraxwgzkx8kijpxl771zdqj";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/cdb1d057f76166ba32d5028f18eec7d09857f990/recipes/celestial-mode-line";
+ sha256 = "1s6vn71mxfvvafjs25j12z1gnmxnkvnw716zy5ifx1bs8s5960kq";
+ name = "celestial-mode-line";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/celestial-mode-line";
+ license = lib.licenses.free;
+ };
+ }) {};
+ centered-cursor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "centered-cursor-mode";
+ version = "20170830.948";
+ src = fetchFromGitHub {
+ owner = "andre-r";
+ repo = "centered-cursor-mode.el";
+ rev = "670af669b6871d4447e11710d1d39a4d5fcd4b17";
+ sha256 = "1vihsd0kp6skad7j5y5is5c7qiisz9myspsxsi86i7x8vrhmsvc3";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/9a7a28caba49a20413dec3c3d0cc9c36b859834d/recipes/centered-cursor-mode";
+ sha256 = "1yy50p3xprkqiak3vfly5s5kpbbdmxmw6fhgz13fw97553hr3w5x";
+ name = "centered-cursor-mode";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/centered-cursor-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
centered-window-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "centered-window-mode";
@@ -7088,8 +7193,8 @@
src = fetchFromGitHub {
owner = "cfengine";
repo = "core";
- rev = "800c1939c7a15b413a4945b7f193cade23aa3e82";
- sha256 = "0ih5vfwrl8bxnyv8ca3f7g31c3iczzvp5lzldq0f9rls3yvhn1b3";
+ rev = "388f399536b757722886b777084e22ddad4eb451";
+ sha256 = "0qaxgqrgj9dpgv1d9k9a66lqpclrs22pcyppgl2m71fkqzm09ip4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
@@ -7210,12 +7315,12 @@
challenger-deep-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "challenger-deep-theme";
- version = "20171118.437";
+ version = "20171229.435";
src = fetchFromGitHub {
owner = "MaxSt";
repo = "challenger-deep";
- rev = "08985cc17302f0e90a532fd5d67cfe2429b22444";
- sha256 = "1qn1l48fwhqw3lkag4322r16cq2ms9spg42jf0w1fc0y6w691p54";
+ rev = "e0462b42218c94288f5c8a62f2b217bb8037995a";
+ sha256 = "1v64yx8pr3aqds3grh79y27qg8x5ad3hwxv96pw0hlhvqc62s4ai";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7942f539d025c1e2b059d49e1984716cbbc90a67/recipes/challenger-deep-theme";
@@ -7273,12 +7378,12 @@
char-menu = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "char-menu";
- version = "20170518.2247";
+ version = "20171231.2218";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "char-menu";
- rev = "b4542123e8c9bc40de1328f9a8078a0704a9a98d";
- sha256 = "101r6gryj5ic3mbv400klcjw8zfpn1rwi8ayyki93a53pali5g96";
+ rev = "3235f8e3c88848ce10d25f84a5da39061fd35c0d";
+ sha256 = "05pjfj6g4gdbdj4z63283j5qzkvhvrzsx1jhbc5iih0nsffwapc3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f6676747e853045b3b19e7fc9524c793c6a08303/recipes/char-menu";
@@ -7672,12 +7777,12 @@
cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
melpaBuild {
pname = "cider";
- version = "20171126.150";
+ version = "20180107.2236";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "cider";
- rev = "2fe60860161a1541d74fc94138d3094b10a05e4b";
- sha256 = "0i6vz4cmcav1ibzm49c8jsqr0zi4diy1n692j12smznh5kfgrr8k";
+ rev = "4fe3a30cf45ee8af911a80b78e6d4d05c42d0f32";
+ sha256 = "0z6q2h9nis72sydj1ky37v6g1klchzd04w7ykin0rpm2c0mvbigr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
@@ -7861,12 +7966,12 @@
circadian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "circadian";
- version = "20171022.724";
+ version = "20171215.1403";
src = fetchFromGitHub {
owner = "GuidoSchmidt";
repo = "circadian.el";
- rev = "feec308591b43e7869d7a018d5c6fc7e943d53ee";
- sha256 = "0j8an9ny3jk9nmlpi360n064m20nhah9p8rj6wb9xbvnfrri5zjk";
+ rev = "bb49da54b2fb57524066e54ffee27cb9549ec925";
+ sha256 = "0ra9cs407mz5243ymf4qsr92sly0k5gfl24xgdmxczg35w8hn31l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3440905a20bc91bb2637a87c04ff8410379f150d/recipes/circadian";
@@ -7882,12 +7987,12 @@
circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "circe";
- version = "20170929.1635";
+ version = "20180105.1158";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "circe";
- rev = "6b110d4c2c6447c4ed65cfa5b7e8676620081ee2";
- sha256 = "01llr34y9mvgpbz3y10l7gmp40qvislwhm6jb2fvcb7vdn9k9gmz";
+ rev = "9835ecb758c09400082eb8f1c0336eedbfed0134";
+ sha256 = "0vhzqcqmhl3rzxrhfyy6r2yp5d07wd8y820cf0hfby6j5i4j247p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe";
@@ -7903,12 +8008,12 @@
circe-notifications = callPackage ({ alert, circe, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "circe-notifications";
- version = "20171001.2258";
+ version = "20180102.1518";
src = fetchFromGitHub {
owner = "eqyiel";
repo = "circe-notifications";
- rev = "4b93112b715714fc7b0ac2637df93adb90f35b40";
- sha256 = "1hfic3qrlskcf0zmd3w76sl1qgrd6myf6mwg06mnc9jy76backqk";
+ rev = "291149ac12877bbd062da993479d3533a26862b0";
+ sha256 = "18mva5nn919c86sgk6kdh437vdnlh9bk7fg10xqcpics1yv3viaw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/76c0408423c4e0728789de7b356b2971d6c446c7/recipes/circe-notifications";
@@ -7966,12 +8071,12 @@
clang-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "clang-format";
- version = "20170120.137";
+ version = "20171202.1318";
src = fetchFromGitHub {
owner = "emacsorphanage";
repo = "clang-format";
- rev = "7e22204dc5afe0859fb8853ff47942574541eaff";
- sha256 = "148wkr770ch6czn8s8mypbq6r0vnqqi026kqxshvzsql79i9l687";
+ rev = "dee259662042ea4f7f339fd95970bb504e440cca";
+ sha256 = "1a02yz62xlaz1acqpvrlmwv5syflyfrdpwlmi26ih3kd2hl6p5sl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/clang-format";
@@ -8437,22 +8542,22 @@
license = lib.licenses.free;
};
}) {};
- clomacs = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+ clomacs = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, simple-httpd }:
melpaBuild {
pname = "clomacs";
- version = "20170726.436";
+ version = "20180101.1354";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "clomacs";
- rev = "8d3e12a2f73e81499fa18f30adaea8c861e4a9b1";
- sha256 = "01wpzbv4vjad0nvbydc0rwb3jdqbncwajs5xrng88n1xxhrajh1x";
+ rev = "20706c65f218dd0671b0331f35bd8965e443062a";
+ sha256 = "1mkn5y2mgdxv6njhy1njbpigzhx3x2hb618fzcd54yxn59mb5r47";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/345f9797e87e3f5f957c167a5e3d33d1e31b50a3/recipes/clomacs";
sha256 = "1vfjzrzp58ap75i0dh5bwnlkb8qbpfmrd3fg9n6aaibvvd2m3hyh";
name = "clomacs";
};
- packageRequires = [ cider emacs s ];
+ packageRequires = [ cider emacs s simple-httpd ];
meta = {
homepage = "https://melpa.org/#/clomacs";
license = lib.licenses.free;
@@ -8461,12 +8566,12 @@
closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "closql";
- version = "20171015.822";
+ version = "20171219.524";
src = fetchFromGitHub {
owner = "emacscollective";
repo = "closql";
- rev = "49862bfdd1540d443d278fadef16a83388b360cb";
- sha256 = "0phpfsl00d39gp26mbf1n7r2210gk2407pqj3bng50sbip568jmp";
+ rev = "01cb892f6a457fbff857d924cebfdc77f69bd45d";
+ sha256 = "0c5b6w67qjy2kvk3daljjg01xsv91c03n6kxvg5bswqq1j7n66si";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/closql";
@@ -8587,12 +8692,12 @@
cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, s, seq }:
melpaBuild {
pname = "cmake-ide";
- version = "20171101.236";
+ version = "20171221.1616";
src = fetchFromGitHub {
owner = "atilaneves";
repo = "cmake-ide";
- rev = "114e2df27f79816f023a07e3e8024c7ab73603f0";
- sha256 = "1n7zv325kjvmz694r11sbz6650b8y22kv2mbx4yrdha9r6y2m1f7";
+ rev = "dc32d518fdfcb3f6cd014c8235b61562482dfd09";
+ sha256 = "0plyqbvb99nplw15bvp246kmn1hyh1l6q2sjnpkdjxc4rrjxhrwg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide";
@@ -8608,12 +8713,12 @@
cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cmake-mode";
- version = "20160928.505";
+ version = "20180104.1137";
src = fetchFromGitHub {
owner = "Kitware";
repo = "CMake";
- rev = "5def40891fc1ad0a7d7ba7a16bd11b2d26fa66ab";
- sha256 = "0rbdbr07650wwx7isx2a6hx7bpz0ga1a2lki9xjjawn4z8ccc1yd";
+ rev = "2c089d80de3945e4f08f13557d59e04cbc942a60";
+ sha256 = "01164wd8p0wwabnynsqv34pz53ji1s3k7nb0ff51i616q6095rdx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -8692,12 +8797,12 @@
cnfonts = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cnfonts";
- version = "20171127.1706";
+ version = "20171205.111";
src = fetchFromGitHub {
owner = "tumashu";
repo = "cnfonts";
- rev = "b68eca2c793f36cf57a9b4ec586e7415439fc90a";
- sha256 = "0xwxxkgkhplqcxz8r59px0dxs9bvk51q6r93cqi4h0q6k61j63x8";
+ rev = "4583e30d5058773606b830072df38a038d40203a";
+ sha256 = "04vc3p4320h3ncxm8s21ijv524w5m0j5gx1f5pyw91k3avvz9hbx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0d5787ffeeee68ffa41f3e777071815084e0ed7a/recipes/cnfonts";
@@ -9070,12 +9175,12 @@
color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "color-theme-sanityinc-tomorrow";
- version = "20171118.1605";
+ version = "20171202.1759";
src = fetchFromGitHub {
owner = "purcell";
repo = "color-theme-sanityinc-tomorrow";
- rev = "e7fbdb22bf8c6164cb128750985d10e3eae48cd3";
- sha256 = "1qz1yiyzki3idva80yf2pac3h371m9lhcarh9nvymw0l0h9qciyr";
+ rev = "e3e051f88734593d4b7b92f157e618ebfe63693b";
+ sha256 = "1nh26v8vk7g5rkqbklan2ai4i4lx3bdn03pch84xyn3drpq40rb3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow";
@@ -9364,12 +9469,12 @@
company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "company";
- version = "20171122.716";
+ version = "20180101.1101";
src = fetchFromGitHub {
owner = "company-mode";
repo = "company-mode";
- rev = "8dea61206c67951cc83e14d41cea33ba33aea173";
- sha256 = "14fwk2k98yayfm1az1xbyx7y2lqahccj6fx2ksk33dsihp42gm9z";
+ rev = "4a8289dc257c3991c3953b64671fc25c887b2ca4";
+ sha256 = "178wf0n1mdfx6yqwdqlw7drbr5fy7gf6x6p4094s9br7slk9kssk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company";
@@ -9385,12 +9490,12 @@
company-anaconda = callPackage ({ anaconda-mode, cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "company-anaconda";
- version = "20160809.705";
+ version = "20171222.342";
src = fetchFromGitHub {
owner = "proofit404";
repo = "company-anaconda";
- rev = "b268a00821c79d7e4c5da0d7035356afb389b3a7";
- sha256 = "0pjiiqads9xawcwldic4m7mfi533s3wmqafz4day92v9135xwczj";
+ rev = "4519b1c9888b0d9665f0805e08362280a4945081";
+ sha256 = "1vsh9m1q6jc4c9xy9xri1764n8fkpz8mz6np6gcmn86jfw5dk0fk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0eb23a75c8b57b4af1737c0508f03e66430e6076/recipes/company-anaconda";
@@ -9560,12 +9665,12 @@
company-coq = callPackage ({ cl-lib ? null, company, company-math, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "company-coq";
- version = "20170615.1842";
+ version = "20171202.1243";
src = fetchFromGitHub {
owner = "cpitclaudel";
repo = "company-coq";
- rev = "642c0b5b539692242c476eb00af7bacc91d7fcc0";
- sha256 = "0mykqf03c7fbdb851fqdczb97cq6wq1lkinnjc2jaim5j4hc3gig";
+ rev = "dcad9c07ecbd90d261520ac09251eaa3480ea98a";
+ sha256 = "132dw17d8k8sk3g0vbs0qqb359rw33ck4pqx3w2p8kb2zmzam597";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7f89e3097c654774981953ef125679fec0b5b7c9/recipes/company-coq";
@@ -9732,27 +9837,6 @@
license = lib.licenses.free;
};
}) {};
- company-eshell-autosuggest = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "company-eshell-autosuggest";
- version = "20171119.2115";
- src = fetchFromGitHub {
- owner = "dieggsy";
- repo = "company-eshell-autosuggest";
- rev = "bde166652d37b40b3ec5126c263fd2fc01799094";
- sha256 = "05rpqmspyalrl295xpypn8bc7bh27y5cr1g6sz3yxsgcrgd54vjc";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/b5beec83bd43b3f1f81feb3ef554ece846e327c2/recipes/company-eshell-autosuggest";
- sha256 = "1bpjyr01rwl58fypfhzzml69wx7h2a044s4l58cxl3fw8lbjb13f";
- name = "company-eshell-autosuggest";
- };
- packageRequires = [ company emacs ];
- meta = {
- homepage = "https://melpa.org/#/company-eshell-autosuggest";
- license = lib.licenses.free;
- };
- }) {};
company-flow = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "company-flow";
@@ -9777,12 +9861,12 @@
company-flx = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flx, lib, melpaBuild }:
melpaBuild {
pname = "company-flx";
- version = "20161228.1736";
+ version = "20180102.2118";
src = fetchFromGitHub {
owner = "PythonNut";
repo = "company-flx";
- rev = "0c9fddf7c11c918ed42bd6a5108f8969b37704d5";
- sha256 = "1nv2hlmjdd7y9d25n22gwl0qzrsc0qpfwyhf44g0xq6dg5lgbpkj";
+ rev = "05efcafb488f587bb6e60923078d97227462eb68";
+ sha256 = "12cg8amyk1pg1d2n8fb0mmls14jzwx08hq6s6g7wyd9s7y96hkhb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f27d718ee67f8c91b208a35adbbcdac67bbb89ce/recipes/company-flx";
@@ -9865,8 +9949,8 @@
src = fetchFromGitHub {
owner = "nsf";
repo = "gocode";
- rev = "e990796e68a2ebfc099afed20b99e26d6b64061a";
- sha256 = "1s2jpqy599fr5qzfvba5njrwx1n48vqjg20vibssn2kyyc3l42d3";
+ rev = "416643789f088aa5077f667cecde7f966131f6be";
+ sha256 = "1vggwjpcssxp075l8aippgr318m0nkfjyakq7j24ml48g4gc48rm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go";
@@ -9970,8 +10054,8 @@
src = fetchFromGitHub {
owner = "leanprover";
repo = "lean-mode";
- rev = "c0af876c967fc969d67c467bc6767210d19c5d87";
- sha256 = "04qzck156wb2bvrb8adbn7rx2v0bsjcirlbx4ajajjsqy858ayn9";
+ rev = "3403179a38693a221bfa86def0c99f6342c5eb73";
+ sha256 = "0w6zc1w7kic3ds5hf30i3mj9wxbq2c8wdywbslfprwwi1hxyzmsq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde/recipes/company-lean";
@@ -9987,12 +10071,12 @@
company-lsp = callPackage ({ company, dash, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }:
melpaBuild {
pname = "company-lsp";
- version = "20171117.1117";
+ version = "20180102.1535";
src = fetchFromGitHub {
owner = "tigersoldier";
repo = "company-lsp";
- rev = "b1639de23f3e739f9f7fd1b3005a45dae08bf084";
- sha256 = "0dk278abmycxanigb1mq8bhgbcbpsbxgkkwxj8058qdkpnr077a2";
+ rev = "678d5e8f1ad76e7bd9e5bf93ed6813f54e769773";
+ sha256 = "1yqcikpgnnqg986zyy23jifq40pspdhrhhz825vp92g1k724gj86";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5125f53307c1af3d9ccf2bae3c25e7d23dfe1932/recipes/company-lsp";
@@ -10050,12 +10134,12 @@
company-nand2tetris = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild, nand2tetris }:
melpaBuild {
pname = "company-nand2tetris";
- version = "20161011.1748";
+ version = "20171201.1013";
src = fetchFromGitHub {
owner = "CestDiego";
repo = "nand2tetris.el";
- rev = "9f7c605a1d030aed933e86b45c9f7232dbbcfb6e";
- sha256 = "15myf8nbr6pf5qiwwz7xq8d7ys4mddxjb8b8yl7ci2pw7d03cr5z";
+ rev = "33acee34d24b1c6a87db833b7d23449cf858f64f";
+ sha256 = "0sfa674g1qm280s0pc3n6qiiphj5i9ibknckx5capkrkxb5cwpkw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/90421372b3f60b59762279ac805c61a984606d11/recipes/company-nand2tetris";
@@ -10113,12 +10197,12 @@
company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "company-php";
- version = "20171111.757";
+ version = "20171226.1924";
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
- rev = "b3727c766daf383ffbc781e48211d37009056191";
- sha256 = "02cdzi1qxmcyj4m26r5ajgavkizh45m0djqz0n8xszrn6j0zm5rf";
+ rev = "519b5cd886f484693fd69b226e307d56137b321b";
+ sha256 = "1pig5kang3yvzzahgn8rfpy3gvpfz7myvf7ic0yc6rivvbl03k18";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@@ -10215,22 +10299,22 @@
license = lib.licenses.free;
};
}) {};
- company-racer = callPackage ({ cl-lib ? null, company, dash, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ company-racer = callPackage ({ cl-lib ? null, company, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "company-racer";
- version = "20160722.1658";
+ version = "20171204.1910";
src = fetchFromGitHub {
owner = "emacs-pe";
repo = "company-racer";
- rev = "c2afd3d989ec2bca7dac094b684063a1922905f6";
- sha256 = "0339p8ymyx8yjgv9lp8lrfzc5mp1mh71rg4m325ia084n81p773a";
+ rev = "a00381c9d416f375f783fcb6ae8d40669ce1f567";
+ sha256 = "13m3yzn4xbyl13z7h1cl6vqjbzikjycy7wydpy4a44yhr466zjr5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c4671a674dbc1620a41e0ff99508892a25eec2ad/recipes/company-racer";
sha256 = "0zc8dzvsjz5qsrwhv7x9f7djzvb9awacc3pgjirsv8f8sp7p3am4";
name = "company-racer";
};
- packageRequires = [ cl-lib company dash deferred emacs ];
+ packageRequires = [ cl-lib company deferred emacs ];
meta = {
homepage = "https://melpa.org/#/company-racer";
license = lib.licenses.free;
@@ -10270,8 +10354,8 @@
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "8ef7554852541eced514c56d5e39d6073f7a2ef9";
- sha256 = "0hh9m0ykw3r9h4gv4a99px00py1h5hs86043mp1m0nmkjibf6w56";
+ rev = "db5ad3a48c579b3522411bd2411c09dbb27af578";
+ sha256 = "1ihv65hfq22yk4wx4njkm73q4s04fr84ib3mjjk8l18xpzl6alal";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags";
@@ -10312,8 +10396,8 @@
src = fetchFromGitHub {
owner = "nathankot";
repo = "company-sourcekit";
- rev = "8ba62ac25bf533b7f148f333bcb5c1db799f749b";
- sha256 = "01dh0wdaydiai4v13r8g05rpiwqr5qqi34wif8vbk2mrr25wc7i9";
+ rev = "abf9bc5a0102eb666d3aa6d6bf22f6efcc852781";
+ sha256 = "1g8a4fgy2c5nqk8gysbnzn5jvfw6ynmfhc6j3hkrbswgf9188v5n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/45969cd5cd936ea61fbef4722843b0b0092d7b72/recipes/company-sourcekit";
@@ -10371,12 +10455,12 @@
company-terraform = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, terraform-mode }:
melpaBuild {
pname = "company-terraform";
- version = "20170812.722";
+ version = "20171215.546";
src = fetchFromGitHub {
owner = "rafalcieslak";
repo = "emacs-company-terraform";
- rev = "bd97342fa1b3b77bd19a3ff202a5ce5cbead36d4";
- sha256 = "0yv0hiskdxx2653g5crmb9yq6c8azrvdja56wnhm8i9kvhnhkggh";
+ rev = "1730e03aec5e67b751f50469c978e83326eae7f3";
+ sha256 = "0ha98424vzb4sx03l88mc1mspjl9h5aypkj3jqyla7sxga8a3ifa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1d9732da975dcf59d3b311b19e20abbb29c33656/recipes/company-terraform";
@@ -10494,22 +10578,22 @@
license = lib.licenses.free;
};
}) {};
- composer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, seq }:
+ composer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-runtime, request, s, seq }:
melpaBuild {
pname = "composer";
- version = "20170304.1647";
+ version = "20171227.421";
src = fetchFromGitHub {
owner = "emacs-php";
repo = "composer.el";
- rev = "43e50a5e626bedb3c46c875ac765daf615f18ce9";
- sha256 = "0vfr9v60dgynjfz1kpx4c17mhsfbyi9g68jzvjkw7y95pwqv8f0y";
+ rev = "e6ef820c7f7f221881d185e59943a7ec4fbc484a";
+ sha256 = "0cdx17gpcyx8azannk8wiy62fzyf9r9niavr83axsapdidcyrl8i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/composer";
sha256 = "01w9cywhfngkrl9az8kfpzm12nc0zwmax01pyxlbi2l2icmvp5s1";
name = "composer";
};
- packageRequires = [ emacs f request s seq ];
+ packageRequires = [ emacs f php-runtime request s seq ];
meta = {
homepage = "https://melpa.org/#/composer";
license = lib.licenses.free;
@@ -10749,12 +10833,12 @@
copy-as-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "copy-as-format";
- version = "20170603.945";
+ version = "20171215.1616";
src = fetchFromGitHub {
owner = "sshaw";
repo = "copy-as-format";
- rev = "fba9fe57a310a71c5aac90a26434df4c08214833";
- sha256 = "1qh3qxy8p23nz0zh8iavggjhp0mn10finq3zl3i0a3vkxxrvgh76";
+ rev = "971957166fe64d914ec4be209b4f80efeeabbb19";
+ sha256 = "0ynzy2sb75w24d2kwjpkb3vl98yyz0sbcj6nd31y2r2n2kkdna24";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format";
@@ -10770,12 +10854,12 @@
copy-file-on-save = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "copy-file-on-save";
- version = "20171019.347";
+ version = "20171211.1744";
src = fetchFromGitHub {
owner = "emacs-php";
repo = "emacs-auto-deployment";
- rev = "fe78b4c9fdc261ce22a771765702ebe4d9437c84";
- sha256 = "0vf6qp7fxqvgd02vfsbmm38vc8n2wvrfwv4wnsr15gd8y8zldlgs";
+ rev = "11c2004947e0200e88991e265a5ae971adfbd7b2";
+ sha256 = "1snlh828zq6b3znrdg4mfl4an76qbqhmld23pwl89ncp37f2lbhv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/copy-file-on-save";
@@ -10896,12 +10980,12 @@
counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
melpaBuild {
pname = "counsel";
- version = "20171129.838";
+ version = "20180106.127";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "9967b2dd205453b73e8fa5f7bdb3fde3fd9c1c02";
- sha256 = "07mwnlp96hs4627m1jqq6pkg1da2c13sf36m21620xialg9i410b";
+ rev = "e5c5037fd5f2735b11fc90363f312431619fa8c2";
+ sha256 = "0ssm6dgzzqvwwmwvnws8s0ac4f8dif5sxl9flx296df7s7xryzcv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -10917,12 +11001,12 @@
counsel-bbdb = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "counsel-bbdb";
- version = "20171016.1545";
+ version = "20171129.1737";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "counsel-bbdb";
- rev = "298b48cb9e1186347fbcaf1ba354efa5fe2d7556";
- sha256 = "137iv77j9a7mxsfrjxk4fpbaxw964pk4yj15609wijfcwgdjprwd";
+ rev = "c86f4b9ef99c9db0b2c4196a300d61300dc2d0c1";
+ sha256 = "1dchyg8cs7n0zbj6mr2z840yi06b2wja65k04idlcs6ngy1vc3sr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0ed9bcdb1f25a6dd743c1dac2bb6cda73a5a5dc2/recipes/counsel-bbdb";
@@ -10959,12 +11043,12 @@
counsel-etags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "counsel-etags";
- version = "20171121.1515";
+ version = "20171228.1836";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "counsel-etags";
- rev = "0e3169b5b476ce5c1548ecc2731c7090695b4779";
- sha256 = "1bj7n4wyz3bxlb86l5lmmg2cqcy2xp1gyf8dp6cbp5z3wfs81y52";
+ rev = "e39bb84a590ba121dcd4ca75a3a9ac20a41b7cba";
+ sha256 = "19wp4klk1kxrhx2qkdxfdxlhha0v5dz0s90m2kdhqk4s87sggg7d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags";
@@ -10998,6 +11082,27 @@
license = lib.licenses.free;
};
}) {};
+ counsel-notmuch = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, notmuch, s }:
+ melpaBuild {
+ pname = "counsel-notmuch";
+ version = "20171223.145";
+ src = fetchFromGitHub {
+ owner = "fuxialexander";
+ repo = "counsel-notmuch";
+ rev = "ac1aaead81c6860d7b8324cc1c00bcd52de5e9ca";
+ sha256 = "19frcrz6bx7d7v1hkg0xv7zmbk2sydlsdzn1s96cqzjk1illchkz";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/54fe0be4e8e8b90cd2dc3cc8b9c573694c8f773b/recipes/counsel-notmuch";
+ sha256 = "1n4jp9fa5fbv55am0w1b832ncdih8gi6xflwabpwqqj4k5mj94p1";
+ name = "counsel-notmuch";
+ };
+ packageRequires = [ emacs ivy notmuch s ];
+ meta = {
+ homepage = "https://melpa.org/#/counsel-notmuch";
+ license = lib.licenses.free;
+ };
+ }) {};
counsel-osx-app = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "counsel-osx-app";
@@ -11022,12 +11127,12 @@
counsel-projectile = callPackage ({ counsel, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
melpaBuild {
pname = "counsel-projectile";
- version = "20171127.1157";
+ version = "20180105.632";
src = fetchFromGitHub {
owner = "ericdanan";
repo = "counsel-projectile";
- rev = "e4aa44419a38771ce5c89d98881807dc66c3d310";
- sha256 = "0bb0ay6jpq12gk16yq3f9hb63l8gpc33xq46k4z6f8l69rjsim4b";
+ rev = "4d78ae8c90e8ebb903b8e70442989a69e46ff069";
+ sha256 = "0s81jrmfql3cjh0bf6vfk3gpb94xqcpbkvjah11j0d0ijgw4y1dg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/389f16f886a385b02f466540f042a16eea8ba792/recipes/counsel-projectile";
@@ -11082,6 +11187,48 @@
license = lib.licenses.free;
};
}) {};
+ counsel-tramp = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "counsel-tramp";
+ version = "20171224.321";
+ src = fetchFromGitHub {
+ owner = "masasam";
+ repo = "emacs-counsel-tramp";
+ rev = "77212268632bc55c4706e25b94b2fe34b69a30dc";
+ sha256 = "050qy8p1lywvq5nf6azn0025500dgh6sfp7lzzmzba9kl38plnnb";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e1822b735b6bd533f658bd64ddccda29e19e9a5e/recipes/counsel-tramp";
+ sha256 = "1ga57v6whnpigciw54k3hs0idq4cbl35qrysarik72f46by859v5";
+ name = "counsel-tramp";
+ };
+ packageRequires = [ counsel emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/counsel-tramp";
+ license = lib.licenses.free;
+ };
+ }) {};
+ counsel-world-clock = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, s }:
+ melpaBuild {
+ pname = "counsel-world-clock";
+ version = "20171201.2337";
+ src = fetchFromGitHub {
+ owner = "kchenphy";
+ repo = "counsel-world-clock";
+ rev = "04153fbb21e51b1cfd042bdfc6ed1e8355a1edd7";
+ sha256 = "1gmsqhc6dsq823jbg9g19x7bsz5n7ssnqjzhsd8pnnm561g60dcm";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/7d9da8c45e7d06647f9591d80e83f851a7f3af85/recipes/counsel-world-clock";
+ sha256 = "151vm7g7g0jwjlp0wrwlxrjnh9qsckc10whkfgaz9czzvvmsf4cv";
+ name = "counsel-world-clock";
+ };
+ packageRequires = [ ivy s ];
+ meta = {
+ homepage = "https://melpa.org/#/counsel-world-clock";
+ license = lib.licenses.free;
+ };
+ }) {};
cov = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "cov";
@@ -11334,22 +11481,22 @@
license = lib.licenses.free;
};
}) {};
- cricbuzz = callPackage ({ dash, enlive, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+ cricbuzz = callPackage ({ dash, enlive, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "cricbuzz";
- version = "20170726.504";
+ version = "20171227.1607";
src = fetchFromGitHub {
owner = "lepisma";
repo = "cricbuzz.el";
- rev = "62c86b1aa6e0779c4f6d8fb9d31d75bf81994f69";
- sha256 = "1k8n65scj3frafy1fk25j3kzpp0q8r98ydibryv48izndpck03h3";
+ rev = "557f75f10525e7a4d50e83010b9ed07fbf9df889";
+ sha256 = "18lc56l5vcbrw2agpgjcap5q0l1mi64khgkk00x7r9wm1zilf9wp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cricbuzz";
sha256 = "18nmr7rpbylqgfx5q3ps38wx9q1ndj06msgyjyc8lqpipbsz0pip";
name = "cricbuzz";
};
- packageRequires = [ dash enlive s ];
+ packageRequires = [ dash enlive f s ];
meta = {
homepage = "https://melpa.org/#/cricbuzz";
license = lib.licenses.free;
@@ -11379,12 +11526,12 @@
crux = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
melpaBuild {
pname = "crux";
- version = "20170801.1334";
+ version = "20171230.1100";
src = fetchFromGitHub {
owner = "bbatsov";
repo = "crux";
- rev = "4f5c8fefd5a6aa52e128c4a0401cc86410d6ac8f";
- sha256 = "1fdxvv25cs01sg6fmvmzxpzvs50i6v8n2jya60lbavxqqhi0sbxd";
+ rev = "6c02dab04fadd8ffb96dc513467e443b0549d1d3";
+ sha256 = "08yv469k3rvnxnqrj7iwywq974z9lp0szkrgxlxxfap03wv59f66";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/575e3442a925500a5806e0b900208c1e6bfd11ae/recipes/crux";
@@ -11442,12 +11589,12 @@
crystal-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "crystal-mode";
- version = "20171023.212";
+ version = "20180104.1920";
src = fetchFromGitHub {
owner = "crystal-lang-tools";
repo = "emacs-crystal-mode";
- rev = "5795e05450016d1337c1a198ae7ea76deeec40e2";
- sha256 = "0yipv79gcwp4i3y8gxjd1npgi8fx2iv8lipb14a8165y84ygkf4l";
+ rev = "0fe6815201bebe4c5ff6857bd541d95b05132b10";
+ sha256 = "0r75dvc0jqcqi1qjns8zj132dnm0s6mvqlqynkis16nigbawix8m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b9b47d7deecf0cf24a42b26d50021cb1219a69/recipes/crystal-mode";
@@ -11484,12 +11631,12 @@
csharp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "csharp-mode";
- version = "20170927.816";
+ version = "20171211.2238";
src = fetchFromGitHub {
owner = "josteink";
repo = "csharp-mode";
- rev = "331b45df9c6e84601cea323638f82ce5e4a68b03";
- sha256 = "00i53c5a85n1i48jyxg78ab2yicx8maybfc6mzxw8s12j9hbw75i";
+ rev = "ba7a81a85ee5fd234f24333ab156ce897cb20cc7";
+ sha256 = "1jb0aq0fs1l3djb0cjfk0b2igvdd06l8lz0g94f63p324jn8rl62";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/736716bbcfd9c9fb1d10ce290cb4f66fe1c68f44/recipes/csharp-mode";
@@ -11505,12 +11652,12 @@
csound-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi, shut-up }:
melpaBuild {
pname = "csound-mode";
- version = "20171025.401";
+ version = "20180106.1819";
src = fetchFromGitHub {
owner = "hlolli";
repo = "csound-mode";
- rev = "5680a266a32c62e8d7ebd987bf6e5fd40033bbeb";
- sha256 = "1zlb7bwx82rayzphf4q5f1w6yhm3r267fzgn74xmckh50jyq917y";
+ rev = "3af632652c33e733e0da598f1254f8fcc50fe5b6";
+ sha256 = "11xmc3kqn0i702lc103h49yya70fhyib8qi4b15slpnliqx2q8f4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c940d29de11e43b4abf2901c466c94d426a21818/recipes/csound-mode";
@@ -11698,8 +11845,8 @@
src = fetchFromGitHub {
owner = "mortberg";
repo = "cubicaltt";
- rev = "55af742271f56ecb22eac8b6a5739a1193ed8a7e";
- sha256 = "16fd5v206qqcj7986q8g4fsdhm71hylwsayjsn3lda14grgg532j";
+ rev = "682e9f66ce16daf166549c1a16dd3a110894a8ea";
+ sha256 = "1mz3m4cs7bm8di8lgi7clkl2fjy4663ir54l32f8l73wjic6c90a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt";
@@ -11799,12 +11946,12 @@
cwl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }:
melpaBuild {
pname = "cwl-mode";
- version = "20171126.2031";
+ version = "20171205.145";
src = fetchFromGitHub {
owner = "tom-tan";
repo = "cwl-mode";
- rev = "2b5eb3922b13b5074545ea6058e0683db864d0ee";
- sha256 = "1r99xmdi4pfaw4nxs3dk8xlrc366xkkq24xhb1v8zaby7i5vid0p";
+ rev = "2fa8c8db68a8665ed555126975edd8749bcfc009";
+ sha256 = "0zgnnvf8k5zcigykcf6slgcjmwb1l0jdfaqm19r34wp3md8wf0v1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2309764cd56d9631dd97981a78b50b9fe793a280/recipes/cwl-mode";
@@ -11904,12 +12051,12 @@
cyphejor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cyphejor";
- version = "20171127.753";
+ version = "20171231.2218";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "cyphejor";
- rev = "14838029b2d94878554308abd3a818a6536c5503";
- sha256 = "1rfhk60vwx2i3bmn98r5q0xgxr40a30z4pn4z9ms7qg2wlqi2vf4";
+ rev = "d2faf26420ac16c4056f6eda067b845d33e102cd";
+ sha256 = "0vg0n8xcqiv28i3xmnxzji77dbnyxrld4ncdzpa3hpc1j92s9a09";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ad7cacfa39d8f85e26372ef21898663aebb68e43/recipes/cyphejor";
@@ -11950,8 +12097,8 @@
src = fetchFromGitHub {
owner = "cython";
repo = "cython";
- rev = "e2a703134a763afb2fc76980806ae73333241508";
- sha256 = "0k0jkwxk6218zqmgv4fvpbnk9iczmxh7k9mx4lp6a9hj3lqc8cxg";
+ rev = "5b6497c8329c778c97f6f59f3f358304bc1ebd1e";
+ sha256 = "07wwv24zcpxbdjf3mrx2ax4ji70kz1s2llisycfkv8lpfnw96yc9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -12093,12 +12240,12 @@
danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "danneskjold-theme";
- version = "20171124.1126";
+ version = "20180104.1316";
src = fetchFromGitHub {
owner = "rails-to-cosmos";
repo = "danneskjold-theme";
- rev = "cb53f004ba30815174a4cfd3dced658b802100e1";
- sha256 = "1v8xfbb9bxy2px4ricq96zifybz0fs8xbasxwv9pm7kdxn3lgwli";
+ rev = "bbbc0a93959ac0d22bb3c37243f3d964b7892528";
+ sha256 = "0mp16yf9hklddfq220bpiad9hp059rpr0akm3gzl30qdbxqxi8q1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme";
@@ -12114,12 +12261,12 @@
dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild, s }:
melpaBuild {
pname = "dante";
- version = "20171126.1252";
+ version = "20180107.1329";
src = fetchFromGitHub {
owner = "jyp";
repo = "dante";
- rev = "1a25bf26ee8d9878ce858cfaff84b083339056d6";
- sha256 = "0kvsx9n8qm9s2w9bz167jzcb1b3d4fgc807w1miwil9dcyar6rkk";
+ rev = "f597233a765b80660c6332b5565c7d651e378acc";
+ sha256 = "1jjdr1h0hihwh3jabxyy4dq4l6z7w4lhrlmyb6xsxkqss7xsb74c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante";
@@ -12156,12 +12303,12 @@
darcula-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "darcula-theme";
- version = "20171104.425";
+ version = "20171227.1045";
src = fetchFromGitLab {
owner = "fommil";
repo = "emacs-darcula-theme";
- rev = "2ecd466ffa7a3157b9ddcd7545b6fb8ad308c976";
- sha256 = "1h5lssnc1am54hkprnp61bsj5fnm8j556q2gbhljfjgrdwnqv8ky";
+ rev = "d9b82b58ded9014985be6658f4ab17e26ed9e93e";
+ sha256 = "1y8rsc63nl4n43pvn283f1vcpqyjnv6xl60fwyscwrqaz19bsnl1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/23c8f10205187babb17e3abc3dc40eb1938e6640/recipes/darcula-theme";
@@ -12303,12 +12450,12 @@
darktooth-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "darktooth-theme";
- version = "20171010.2057";
+ version = "20171206.639";
src = fetchFromGitHub {
owner = "emacsfodder";
repo = "emacs-theme-darktooth";
- rev = "e7c13abeeb18f50658482c7df32701ae4ec375a0";
- sha256 = "09smbgql9ibgn9l729ylas747xj48ipm6as61l6a5pbch376qriw";
+ rev = "dc90fc7d526d7e65256e050e3b373908a27b6c45";
+ sha256 = "0rpg7mn8h47hqcm24avcy8r7v8k8by1wjk5xk9j24bbv77aswj9k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme";
@@ -12345,12 +12492,12 @@
dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dash";
- version = "20171028.854";
+ version = "20180107.818";
src = fetchFromGitHub {
owner = "magnars";
repo = "dash.el";
- rev = "91d8cb01e62bab0d6267d3d4dbcabd6da6fdea78";
- sha256 = "1q0nnn3j3fv6y3n14kql7gdf2vc038lbmnz542pma8q0yfksbkid";
+ rev = "528e5a51f1af668e3075f2beccd2b39785ccb2ba";
+ sha256 = "0c65wkyzqsi0jignbhl0j9hh0711069x0l54sqbfb72viy0sppck";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash";
@@ -12387,12 +12534,12 @@
dash-functional = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dash-functional";
- version = "20171028.804";
+ version = "20180107.818";
src = fetchFromGitHub {
owner = "magnars";
repo = "dash.el";
- rev = "91d8cb01e62bab0d6267d3d4dbcabd6da6fdea78";
- sha256 = "1q0nnn3j3fv6y3n14kql7gdf2vc038lbmnz542pma8q0yfksbkid";
+ rev = "528e5a51f1af668e3075f2beccd2b39785ccb2ba";
+ sha256 = "0c65wkyzqsi0jignbhl0j9hh0711069x0l54sqbfb72viy0sppck";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional";
@@ -12408,12 +12555,12 @@
dashboard = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, page-break-lines }:
melpaBuild {
pname = "dashboard";
- version = "20170923.719";
+ version = "20180101.2352";
src = fetchFromGitHub {
owner = "rakanalh";
repo = "emacs-dashboard";
- rev = "8594c4f55448148b720eda5b72d51667fb7a8a39";
- sha256 = "1hhh1kfsz87qfmh45wjf2r93rz79rq0vbyxlfrsl02092zjbl1zr";
+ rev = "7b514b2c4895034b645cb2028220a411882e3b0e";
+ sha256 = "0wrlj4nvqr6qcdap0wa6f1pjf77mnyrw820249qb2flb2j4xbd7x";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e9a79341ccaa82a8c065e71c02fe6aee22007c66/recipes/dashboard";
@@ -12681,12 +12828,12 @@
decl = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "decl";
- version = "20170314.23";
+ version = "20171212.658";
src = fetchFromGitHub {
owner = "preetpalS";
repo = "decl.el";
- rev = "b25825de88289fab5212dfd6d18874ca2748123f";
- sha256 = "1imz3w41vblw9gpw42v6hlrz2zdzd6kp5pfvb97v8dw8mc06pyvs";
+ rev = "c097d532de13cb69b0fc390afa6d806d0db97588";
+ sha256 = "1zfn4rkv9n96li0pbxn6c22ljwhg7gyih1srymrk482r2zfhkja6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8c2ecd46180643a0c493e05ec86fe50bc1e55146/recipes/decl";
@@ -12786,12 +12933,12 @@
define-word = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "define-word";
- version = "20171125.25";
+ version = "20180105.1152";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "define-word";
- rev = "1e8e537c3b5b25e770c1b2f993497298405225b2";
- sha256 = "1phbyak6m97h2md0a8id5aqb5rmkpfw5259l2a7d87gk0lgkaqa2";
+ rev = "d52e9898a2719bd5003184196aa3b889c4fcb7b3";
+ sha256 = "1is3yjk7jv3nqn7fg76pnicwkhc7bf0wklvygdw1hskwj46ii6g8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e318b30d8b2b89981f4b89d78e5a46e77d3de412/recipes/define-word";
@@ -13017,12 +13164,12 @@
dhall-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dhall-mode";
- version = "20171128.2130";
+ version = "20171204.1327";
src = fetchFromGitHub {
owner = "psibi";
repo = "dhall-mode";
- rev = "e38dde1363ee0b11f2117a53a263ff53f0704433";
- sha256 = "01q82d7njgp73v1hm9zz9ik0bfx6aivw859kr788akjvy8kkssza";
+ rev = "bc6aec777594beeac6ba4c6dbfb1c889341589c9";
+ sha256 = "0vfkdj1fyykmylh6gg9igpiylb2n7bd4iqq1gl5mdqid8gsv4sgl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c7ab435077b2f47d75ddc0ff10c64ee2b46044e2/recipes/dhall-mode";
@@ -13056,22 +13203,22 @@
license = lib.licenses.free;
};
}) {};
- dictcc = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
+ dictcc = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "dictcc";
- version = "20170318.1232";
+ version = "20171213.1334";
src = fetchFromGitHub {
owner = "cqql";
repo = "dictcc.el";
- rev = "24fb40d0822f97c3d796ae81cb6684cd97263248";
- sha256 = "1faj9c4x306s3ml430s01c9zcg9xgj9p34v630046y4lh4i25qc8";
+ rev = "a77cf1fadadcbde762466970b503c8a8916b35b2";
+ sha256 = "0aaah14nc8ajqhbjmwp7257k2n8ay6g87spb734kxfs8irzg52fa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5e867df96915a0c4f22fdccd4e2096878895bda6/recipes/dictcc";
sha256 = "0x1y742hb3dm7xmh5810dlqki38kybw68rmg9adcchm2rn86jqlm";
name = "dictcc";
};
- packageRequires = [ cl-lib dash emacs helm s ];
+ packageRequires = [ cl-lib emacs ivy ];
meta = {
homepage = "https://melpa.org/#/dictcc";
license = lib.licenses.free;
@@ -13119,6 +13266,27 @@
license = lib.licenses.free;
};
}) {};
+ difflib = callPackage ({ cl-generic, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
+ melpaBuild {
+ pname = "difflib";
+ version = "20171227.718";
+ src = fetchFromGitHub {
+ owner = "dieggsy";
+ repo = "difflib.el";
+ rev = "b08850251812d71e62fd6956081299590acdf37b";
+ sha256 = "03k5iy610f1m2nmkdk69p49fcfqfyxmy3h6fqvqsr2v1hix8i54a";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/df1924ddff6fd1b5fa32481d3b3d6fbe89a127d3/recipes/difflib";
+ sha256 = "07bm5hib3ihrrx0lhfsl6km9gfckl73qd4cb37h93zw0hc9xwhy6";
+ name = "difflib";
+ };
+ packageRequires = [ cl-generic emacs ht s ];
+ meta = {
+ homepage = "https://melpa.org/#/difflib";
+ license = lib.licenses.free;
+ };
+ }) {};
diffscuss-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "diffscuss-mode";
@@ -13265,6 +13433,27 @@
license = lib.licenses.free;
};
}) {};
+ dimmer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "dimmer";
+ version = "20180104.2127";
+ src = fetchFromGitHub {
+ owner = "gonewest818";
+ repo = "dimmer.el";
+ rev = "f2e9a383cf03597bde9bcd3fa2e7ecb4ca266041";
+ sha256 = "14nmk6kld5q6wd6z3r8v938gyi1x6875i0fbfbmfs5v1hykdm2s5";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/8ae80e9202d69ed3214325dd15c4b2f114263954/recipes/dimmer";
+ sha256 = "0w8n5svckk1jp8856pg2gkws9798prqjjkdqf8ili2hjcqnd1a3r";
+ name = "dimmer";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/dimmer";
+ license = lib.licenses.free;
+ };
+ }) {};
dionysos = callPackage ({ alert, cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, libmpdee, melpaBuild, pkg-info, s }:
melpaBuild {
pname = "dionysos";
@@ -13335,8 +13524,8 @@
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "7fbaaa2de73bd571de8eee86205f779340b13c69";
- sha256 = "0jzp7d49q1ndsd6yfs1kx49ksid9v96s4qaqhfnzfdwyw7rf4m1j";
+ rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd";
+ sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-avfs";
@@ -13356,8 +13545,8 @@
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "7fbaaa2de73bd571de8eee86205f779340b13c69";
- sha256 = "0jzp7d49q1ndsd6yfs1kx49ksid9v96s4qaqhfnzfdwyw7rf4m1j";
+ rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd";
+ sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6aab23df1451682ff18d9ad02c35cb7ec612bc38/recipes/dired-collapse";
@@ -13482,8 +13671,8 @@
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "7fbaaa2de73bd571de8eee86205f779340b13c69";
- sha256 = "0jzp7d49q1ndsd6yfs1kx49ksid9v96s4qaqhfnzfdwyw7rf4m1j";
+ rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd";
+ sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-filter";
@@ -13503,8 +13692,8 @@
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "7fbaaa2de73bd571de8eee86205f779340b13c69";
- sha256 = "0jzp7d49q1ndsd6yfs1kx49ksid9v96s4qaqhfnzfdwyw7rf4m1j";
+ rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd";
+ sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-hacks-utils";
@@ -13629,8 +13818,8 @@
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "7fbaaa2de73bd571de8eee86205f779340b13c69";
- sha256 = "0jzp7d49q1ndsd6yfs1kx49ksid9v96s4qaqhfnzfdwyw7rf4m1j";
+ rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd";
+ sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8994330f90a925df17ae425ccdc87865df8e19cd/recipes/dired-narrow";
@@ -13650,8 +13839,8 @@
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "7fbaaa2de73bd571de8eee86205f779340b13c69";
- sha256 = "0jzp7d49q1ndsd6yfs1kx49ksid9v96s4qaqhfnzfdwyw7rf4m1j";
+ rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd";
+ sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-open";
@@ -13688,12 +13877,12 @@
dired-rainbow = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dired-rainbow";
- version = "20170922.817";
+ version = "20171202.1448";
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "7fbaaa2de73bd571de8eee86205f779340b13c69";
- sha256 = "0jzp7d49q1ndsd6yfs1kx49ksid9v96s4qaqhfnzfdwyw7rf4m1j";
+ rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd";
+ sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-rainbow";
@@ -13709,12 +13898,12 @@
dired-ranger = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dired-ranger";
- version = "20160924.335";
+ version = "20171229.753";
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "7fbaaa2de73bd571de8eee86205f779340b13c69";
- sha256 = "0jzp7d49q1ndsd6yfs1kx49ksid9v96s4qaqhfnzfdwyw7rf4m1j";
+ rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd";
+ sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c03f6f8c779c8784f52adb20b266404cb537113a/recipes/dired-ranger";
@@ -13730,12 +13919,12 @@
dired-sidebar = callPackage ({ dired-subtree, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dired-sidebar";
- version = "20171124.942";
+ version = "20180107.1247";
src = fetchFromGitHub {
owner = "jojojames";
repo = "dired-sidebar";
- rev = "815cda0301575493b71ebeb3afdb55178b6d3103";
- sha256 = "0a6zdizm2ihzxmy2cw7g8g5qxpq7iz2my6gf2ilnxsak680m43f8";
+ rev = "6b195f841bc86281e0c642999ad4fa03174e832c";
+ sha256 = "0bw28p2mcj73rbhpij2mchq7dyfl7881rwmn5qz00km5n64yshlg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/30e15c8361b01195f198197e704828fbcac0e8d6/recipes/dired-sidebar";
@@ -13776,8 +13965,8 @@
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "7fbaaa2de73bd571de8eee86205f779340b13c69";
- sha256 = "0jzp7d49q1ndsd6yfs1kx49ksid9v96s4qaqhfnzfdwyw7rf4m1j";
+ rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd";
+ sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d6a947ac9476f10b95a3c153ec784d2a8330dd4c/recipes/dired-subtree";
@@ -13877,12 +14066,12 @@
direnv = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
melpaBuild {
pname = "direnv";
- version = "20170717.1049";
+ version = "20171221.138";
src = fetchFromGitHub {
owner = "wbolster";
repo = "emacs-direnv";
- rev = "d181475192138b256e124a42660ac60ae62d11d0";
- sha256 = "09pcssxas9aqdnn2n9y61f016fip9qgxsr16nzljh66dk0lnbgrw";
+ rev = "b1c14f307652e5a039165d196a799638feb16cd8";
+ sha256 = "0vxa29z08idy74y0140c2ddxysj98d644zih9vvddjjmggj7czna";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5419809ee62b920463e359c8e1314cd0763657c1/recipes/direnv";
@@ -13982,12 +14171,12 @@
disable-mouse = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "disable-mouse";
- version = "20170929.1353";
+ version = "20171226.1715";
src = fetchFromGitHub {
owner = "purcell";
repo = "disable-mouse";
- rev = "81639930bcaeedadbcc19728e91719afcac84613";
- sha256 = "0l6mai68ns3qw3rlvjvzsnqwdy7bxqiy0vdwflq0l1plxb1vazyc";
+ rev = "541363bd6353b8b05375552bab884a6315ea545c";
+ sha256 = "1grs3cz2zdw49frvxy4vc1z3ld804kk5g2ad6ln5grprcd188bz9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dbbc396373212fdf731e135cde391f27708ff015/recipes/disable-mouse";
@@ -14296,12 +14485,12 @@
dizzee = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dizzee";
- version = "20111009.616";
+ version = "20171201.116";
src = fetchFromGitHub {
owner = "davidmiller";
repo = "dizzee";
- rev = "37629f390afb8da03ef0ce81c2b3caff660e12f6";
- sha256 = "120zgp38nz4ssid6bv0zy5rnf2claa5s880incgljqyl0vmj9nq5";
+ rev = "e3cf1c2ea5d0fc00747524b6f3c5b905d0a8c8e1";
+ sha256 = "1i32msin8ra963w7af6612d038gxb25m1gj97kbjymjq1r8zbdrv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dizzee";
@@ -14569,12 +14758,12 @@
docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s, tablist }:
melpaBuild {
pname = "docker";
- version = "20171121.2316";
+ version = "20180107.925";
src = fetchFromGitHub {
owner = "Silex";
repo = "docker.el";
- rev = "fc31c2b1aa8ef553050ace61beadf08ded58529c";
- sha256 = "0sx0iqwqfrkkjpx84w9cvhzgdsqd5lgc8y1akw689pc4pknl4x52";
+ rev = "5a6e407ee9c6035245749ee1f249aed16d651728";
+ sha256 = "0gl2rbx649yc4rbljmhdqsa17hnv24lpj5y8fxdh27gnjqksg2zq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker";
@@ -14665,8 +14854,8 @@
src = fetchFromGitHub {
owner = "spotify";
repo = "dockerfile-mode";
- rev = "cd102cffa11a0557b1c04651e8cbd53fe01fbb92";
- sha256 = "01nz471zmj8gxvccyjk6mmwvijk7w6dqn45nhjxnkjb85np8iql0";
+ rev = "4ab78f678e9ee40c7c5729dc8f1f5c1a847be2e7";
+ sha256 = "0dc3pfqf6nrwnqsiyn49l0pgq7rm31kciwsqagnrjnc85nnbpf9m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1406f5a24115d29e3b140c360a51b977a369e4f9/recipes/dockerfile-mode";
@@ -14682,12 +14871,12 @@
dokuwiki = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }:
melpaBuild {
pname = "dokuwiki";
- version = "20170213.122";
+ version = "20180101.1659";
src = fetchFromGitHub {
owner = "accidentalrebel";
repo = "emacs-dokuwiki";
- rev = "a78289d99068ec3dfb4945877c32751e789d099d";
- sha256 = "0hynymx3gm9nqmpb0a9j8d9g298vsl0gxa9f1yx9xp60mq6y7l3r";
+ rev = "594c4d4904dcc2796bbbd2c0845d9e7c09ccf6f7";
+ sha256 = "0vqx8npw0i02dhw2yb7s4z7njw60r3xyncw4z8l6fj99pp6pfh15";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dokuwiki";
@@ -14766,12 +14955,12 @@
doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "doom-themes";
- version = "20171114.813";
+ version = "20180105.1142";
src = fetchFromGitHub {
owner = "hlissner";
repo = "emacs-doom-themes";
- rev = "5cd9e8370220aeeff5b30142c45a58bd9aeeabbd";
- sha256 = "064cqmrlk1cdm0gf4hwagdqxsidvciq4a80vws8bbcg6ri416cbj";
+ rev = "464774515c348ad32bad4b062d768d443f44beaf";
+ sha256 = "17pszvr2i27drym63j4hkmdhra5j6ixv5i2ab5b8i8049fbrnqzf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes";
@@ -15249,12 +15438,12 @@
dumb-diff = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dumb-diff";
- version = "20171106.1659";
+ version = "20171211.1322";
src = fetchFromGitHub {
owner = "jacktasia";
repo = "dumb-diff";
- rev = "a89162a41be228f587f6d778ce2a350ee0b61792";
- sha256 = "1wznlaphsdh6bz5zppwabnmbsymz09b6aqadwr8b3l1r841s4y9v";
+ rev = "1a2331d283049b71a07c1b06b1e0627a950d55f4";
+ sha256 = "05gmpp4s9y2ql27vb5vpqn3xh35qjfxgq9gzyvg86df43qfl8wvl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cf7fa0b4235247d82569ed078f92774f10afa45c/recipes/dumb-diff";
@@ -15270,12 +15459,12 @@
dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
melpaBuild {
pname = "dumb-jump";
- version = "20171122.1614";
+ version = "20180107.2324";
src = fetchFromGitHub {
owner = "jacktasia";
repo = "dumb-jump";
- rev = "c4b3e4b77df502e229823b2f10d6440c0aa9a433";
- sha256 = "0cckw2h0n06mzcmcmj42ivgnd0why5dfb1hpyrcpqi2aalyk61x2";
+ rev = "2e87dc528cfdde9b8e13bb7dcadc12f482bf98fa";
+ sha256 = "1jl2mg3w2xj7njdvldilav0drgvr15ddx0bq8jkgxa9l0k718dl7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump";
@@ -15354,11 +15543,11 @@
dyalog-mode = callPackage ({ cl-lib ? null, emacs, fetchhg, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dyalog-mode";
- version = "20171012.1339";
+ version = "20171211.722";
src = fetchhg {
url = "https://bitbucket.com/harsman/dyalog-mode";
- rev = "9e446540a794";
- sha256 = "0gyip843fdqp6cwwaqcrnpngf5a3iqcbd9h7rl5lbvxpkqvm7shi";
+ rev = "87db00b912be";
+ sha256 = "0jg289fj4q83dwj7i0w5zq8bwqxzwzzmyhvdrk6cfw3q6rlwk5fp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode";
@@ -15710,12 +15899,12 @@
easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "easy-hugo";
- version = "20171124.503";
+ version = "20180103.1855";
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-easy-hugo";
- rev = "e4dc1057b02b6736221936e66c188cf71c01916d";
- sha256 = "0knld86pl2im9mjy4s7mxxibdyc4sq9vhxg4jrndyrmldpjya4my";
+ rev = "61a504616705feae8c3fd8b01bf315e2cb89f699";
+ sha256 = "1lr2hbz4gxcn2r5m3hx4izk8aawgy0fls0isp6cvcgs1s54s2kxi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
@@ -15728,6 +15917,27 @@
license = lib.licenses.free;
};
}) {};
+ easy-jekyll = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "easy-jekyll";
+ version = "20180103.1726";
+ src = fetchFromGitHub {
+ owner = "masasam";
+ repo = "emacs-easy-jekyll";
+ rev = "4a529ce42a720960f2594b7081359c8766fc2643";
+ sha256 = "1gr72wqs620i56cchblwgsca9wd0fxxcz750fpp594j7xcxn9scl";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/c3f281145bad12c27bdbef32ccc07b6a5f13b577/recipes/easy-jekyll";
+ sha256 = "16jj70fr23z5qsaijv4d4xfiiypny2cama8rsaci9fk9haq19lxv";
+ name = "easy-jekyll";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/easy-jekyll";
+ license = lib.licenses.free;
+ };
+ }) {};
easy-kill = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "easy-kill";
@@ -15794,12 +16004,12 @@
ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ebal";
- version = "20170810.631";
+ version = "20171231.2216";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "ebal";
- rev = "65a131b95a1e934c0cab384ef533b0ac58961f0c";
- sha256 = "1b8i7qh743lhmkrmw1ac486i8nk8fdxl0ayxjs2sfb8fk4621rfr";
+ rev = "3a7a9a66efed30416e2013da80fed2f79b91def1";
+ sha256 = "0vxxswbx8l9jcv81akw1bd7ra4k51gjmv79z11fhbzf17n7y910a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/629aa451162a0085488caad4052a56366b7ce392/recipes/ebal";
@@ -15920,12 +16130,12 @@
ecukes = callPackage ({ ansi, commander, dash, espuds, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "ecukes";
- version = "20171110.627";
+ version = "20171216.408";
src = fetchFromGitHub {
owner = "ecukes";
repo = "ecukes";
- rev = "c8092db08be5337ff3f3dd2857bfa94e360945d2";
- sha256 = "1dkinyigacb4yxqikd9za4inbh7yz7pl8bhrpihrxzabxirmvw55";
+ rev = "3a77ba9f1064c2bca47b401974c009e65727c46e";
+ sha256 = "1isscwz4h3nx62lwfrj899lp2yc27zk1ndgr441d848495ccmshn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/14cf66e6929db2a0f377612e786aaed9eb12b799/recipes/ecukes";
@@ -16298,12 +16508,12 @@
editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "editorconfig";
- version = "20171107.301";
+ version = "20171208.2036";
src = fetchFromGitHub {
owner = "editorconfig";
repo = "editorconfig-emacs";
- rev = "2ec90f13ad98481c5324eea4877de7a80d814d86";
- sha256 = "160f7ciy8yp75gja3abm4rjy61wmk2b7b0k032qimiawkvg57bx2";
+ rev = "15e26cf5a5a656735fa25bfa75164f0893f4688a";
+ sha256 = "0fyncdkxvlbsr4lv686djy2a1wm5qpcnjrkc3zdsbrr6wq8ildgh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig";
@@ -16499,8 +16709,8 @@
src = fetchFromGitHub {
owner = "egisatoshi";
repo = "egison3";
- rev = "83e835870d9d10dc3622b09157354332d1154eb7";
- sha256 = "1a4s8m4pkksq23ssisn5yfpcraa1j4qxfg8vjs5hw044y87w6lw9";
+ rev = "b7c073e0a29c9632d82b501849e270d62304e22f";
+ sha256 = "13p6nfsjnbhw0cgy1s28ww9dk4hmwmanf2j6ydhcafvbynp964zs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode";
@@ -16536,11 +16746,11 @@
}) {};
eide = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "eide";
- version = "20170906.1216";
+ version = "20171229.1435";
src = fetchgit {
url = "git://git.tuxfamily.org/gitroot/eide/emacs-ide.git";
- rev = "25f9af215781163b10d411fe2b5674033eb24165";
- sha256 = "0mwy5a67hap9bx1klk2pzfaav65drd6mfkkhnk2045z4jvzgkn70";
+ rev = "faae6f1384826d18f70b28826dc528d70e91a5c9";
+ sha256 = "02hylmgs6il59kkq59i9lpdg9gdirpb2y37xzybh7n5lqyzdafai";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eide";
@@ -16650,12 +16860,12 @@
ejc-sql = callPackage ({ auto-complete, cider, clomacs, dash, direx, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }:
melpaBuild {
pname = "ejc-sql";
- version = "20171019.1304";
+ version = "20171227.259";
src = fetchFromGitHub {
owner = "kostafey";
repo = "ejc-sql";
- rev = "bd5e3f334044c8b33e2a0a2e0d8767aa6f0e03b8";
- sha256 = "1pyvpsi4krbmdx2739nnw5g71x3y209xwjl5a7xqbczy9qqxs18n";
+ rev = "afb3e6f1e82abec5407c7a3335bf1c70fa3690d6";
+ sha256 = "0q8c35jnxgxmbbbpz4iv3x45ylckq4qi0pq05am5rf5rywlw00v1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql";
@@ -16704,8 +16914,8 @@
src = fetchFromGitHub {
owner = "dimitri";
repo = "el-get";
- rev = "4d5e51241f1863dff58fc23a815aad29f0869e3b";
- sha256 = "0rfryxvnxfzvvgfwg5vfsqf77zxzv4mq97fi9fpbjfariyrz5xga";
+ rev = "dfa944ef26802771dca0feea9ea5a17350da9232";
+ sha256 = "0qfshiriffbh6bxvghg9y0fzdqayywd4kzjwvq7cin2k99dhhrsa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get";
@@ -16991,24 +17201,24 @@
license = lib.licenses.free;
};
}) {};
- eldoc-overlay-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, inline-docs, lib, melpaBuild, quick-peek }:
+ eldoc-overlay = callPackage ({ emacs, fetchFromGitHub, fetchurl, inline-docs, lib, melpaBuild, quick-peek }:
melpaBuild {
- pname = "eldoc-overlay-mode";
- version = "20170909.651";
+ pname = "eldoc-overlay";
+ version = "20171219.140";
src = fetchFromGitHub {
owner = "stardiviner";
- repo = "eldoc-overlay-mode";
- rev = "4512e5499cd4f647ad3b5212b853f0299d6cff47";
- sha256 = "1dp7pjr89bq0fjjqvha2smw54aymy4pyjx643qp0x1dhpwa7bv5h";
+ repo = "eldoc-overlay";
+ rev = "a391396f4cdf30a2f27a4c426b58b44ab3d0f0d0";
+ sha256 = "1g1sp6ws4y28536jkf5crbkmnrl7jcbh5s3ysyys6xn8gvz0vm17";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eldoc-overlay-mode";
- sha256 = "09rhh8rj9rcdnl1jfnjlyzcdr56h9yhmfsb27i4v59g06x8qc954";
- name = "eldoc-overlay-mode";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/f865b248002d6d3ba9653c2221072a4aa54cd740/recipes/eldoc-overlay";
+ sha256 = "0nn6i89xbw8vkd5ybsnc1zpnf3ra4s8pf01jdj2i59ayjs64s28x";
+ name = "eldoc-overlay";
};
packageRequires = [ emacs inline-docs quick-peek ];
meta = {
- homepage = "https://melpa.org/#/eldoc-overlay-mode";
+ homepage = "https://melpa.org/#/eldoc-overlay";
license = lib.licenses.free;
};
}) {};
@@ -17036,12 +17246,12 @@
electric-operator = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }:
melpaBuild {
pname = "electric-operator";
- version = "20171125.148";
+ version = "20171229.304";
src = fetchFromGitHub {
owner = "davidshepherd7";
repo = "electric-operator";
- rev = "77ec424e1383b866b404b58fdd92515f9b786eac";
- sha256 = "0f188y0wm2l81sihbi2zz30kml9cpk7jhi2l07id0pd1k8h46d8i";
+ rev = "e414534bd0a4149919647beec8fe4e342d2d1219";
+ sha256 = "0ahxxjlfpr2zj3sbiz9xyb422pld8xhzzj5nkzxyfksbnbvms5hd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/906cdf8647524bb76f644373cf8b65397d9053a5/recipes/electric-operator";
@@ -17120,12 +17330,12 @@
elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "elfeed";
- version = "20171103.737";
+ version = "20180107.1156";
src = fetchFromGitHub {
owner = "skeeto";
repo = "elfeed";
- rev = "312b3bf4ca542dd84e3cc502c5297498d4c1f7ef";
- sha256 = "0633gvyk1xh5624g0lp3sriqmrzdhb8dbc6xvmnwqrcqdb3yrigv";
+ rev = "138fd5661ac07b19525de7750177b1f0d2054006";
+ sha256 = "1wknh0ns0cqbqygyn7xr1drb7zq1c02r10ap1spsazkbsq5nhdwd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed";
@@ -17190,12 +17400,12 @@
elfeed-protocol = callPackage ({ cl-lib ? null, elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "elfeed-protocol";
- version = "20171114.2252";
+ version = "20171214.2319";
src = fetchFromGitHub {
owner = "fasheng";
repo = "elfeed-protocol";
- rev = "05e17c42edd03393e862492e9fe5902e44015ad6";
- sha256 = "16gifn20vkp1079r0vy746zq7jqy50c6mmxmm3rbzy5scga1rzjr";
+ rev = "97049eb980ce1cc2b871e4c7819133f1e4936a83";
+ sha256 = "1d2i3jg5a2wd7mb4xfdy3wbx12yigqq4ykj3zbcamvx59siip591";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3f1eef8add7cd2cfefe6fad6d8e69d65696e9677/recipes/elfeed-protocol";
@@ -17215,8 +17425,8 @@
src = fetchFromGitHub {
owner = "skeeto";
repo = "elfeed";
- rev = "312b3bf4ca542dd84e3cc502c5297498d4c1f7ef";
- sha256 = "0633gvyk1xh5624g0lp3sriqmrzdhb8dbc6xvmnwqrcqdb3yrigv";
+ rev = "138fd5661ac07b19525de7750177b1f0d2054006";
+ sha256 = "1wknh0ns0cqbqygyn7xr1drb7zq1c02r10ap1spsazkbsq5nhdwd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web";
@@ -17337,12 +17547,12 @@
elisp-refs = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }:
melpaBuild {
pname = "elisp-refs";
- version = "20170831.1347";
+ version = "20171224.1532";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "refs.el";
- rev = "9ac6c1a45c620a6d7e0fae3739558fa08b3758a3";
- sha256 = "1yniapnkr3124isnfkv1j4mqwdmb1xb7xngjwprhjlg3k1zj3rfl";
+ rev = "d0a63ae9e564f082c904c02fa5123f3a557886c6";
+ sha256 = "1h1jr72nxsjpshqp725dh4wcsahr9hkj6y3zc99m8lilndm3x114";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/60891099e241ebd32d39bdcfe4953529a5a3263e/recipes/elisp-refs";
@@ -17673,12 +17883,12 @@
elpy = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }:
melpaBuild {
pname = "elpy";
- version = "20171124.720";
+ version = "20180107.1243";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "elpy";
- rev = "f1766b9bbe6d534d4f493aee1db617e764cb1e22";
- sha256 = "0y1qic21skxjd8066diy6j1frwbvra3nws599i6aqy27mprlnhyf";
+ rev = "e59e3d67b5a2053cb121d235bc51a0d6d438058a";
+ sha256 = "1l3sr011cx8sclhw720iph9r03ja7fx3qcixpc65gmxy4r3ihjz0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy";
@@ -17699,6 +17909,27 @@
license = lib.licenses.free;
};
}) {};
+ elpygen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
+ melpaBuild {
+ pname = "elpygen";
+ version = "20171225.936";
+ src = fetchFromGitHub {
+ owner = "vkazanov";
+ repo = "elpygen";
+ rev = "21929c997a05968f9eefe52b85a76ceaab3b0d81";
+ sha256 = "093ck4dkdvbgafb1bmkmszg1ba81ns5kjbk2iq2b5p9dvfcjjr3k";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e670bd79a85c4e2a9ca3355feb8aaefa709f49cb/recipes/elpygen";
+ sha256 = "01fak1dz9mna3p4c2r0scb0j10qk3lvpq270jy6rvzlcbwri4akl";
+ name = "elpygen";
+ };
+ packageRequires = [ emacs yasnippet ];
+ meta = {
+ homepage = "https://melpa.org/#/elpygen";
+ license = lib.licenses.free;
+ };
+ }) {};
elquery = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "elquery";
@@ -17993,85 +18224,85 @@
license = lib.licenses.free;
};
}) {};
- emacsql = callPackage ({ cl-generic, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, finalize, lib, melpaBuild }:
+ emacsql = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "emacsql";
- version = "20170807.1901";
+ version = "20171218.1903";
src = fetchFromGitHub {
owner = "skeeto";
repo = "emacsql";
- rev = "e3bc9b105f6f2de514dd689c8fa8f74f1d610a04";
- sha256 = "03258c2lqrl8c2jy3dvxsbbhrgsysbciq9bay4iazgcvgwg2l2my";
+ rev = "616dde37524f47246bbb161f20d3f5f090f10fbf";
+ sha256 = "14l61iq31lyz26nxxr2b5s57wra11xy87lp4d0s2fn03ac9i8nww";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql";
sha256 = "1x4rn8dmgz871dhz878i2mqci576zccf9i2xmq2ishxgqm0hp8ax";
name = "emacsql";
};
- packageRequires = [ cl-generic cl-lib emacs finalize ];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/emacsql";
license = lib.licenses.free;
};
}) {};
- emacsql-mysql = callPackage ({ cl-generic, cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ emacsql-mysql = callPackage ({ emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "emacsql-mysql";
- version = "20170410.1008";
+ version = "20171218.1827";
src = fetchFromGitHub {
owner = "skeeto";
repo = "emacsql";
- rev = "e3bc9b105f6f2de514dd689c8fa8f74f1d610a04";
- sha256 = "03258c2lqrl8c2jy3dvxsbbhrgsysbciq9bay4iazgcvgwg2l2my";
+ rev = "616dde37524f47246bbb161f20d3f5f090f10fbf";
+ sha256 = "14l61iq31lyz26nxxr2b5s57wra11xy87lp4d0s2fn03ac9i8nww";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-mysql";
sha256 = "1c20zhpdzfqjds6kcjhiq1m5ch53fsx6n1xk30i35kkg1wxaaqzy";
name = "emacsql-mysql";
};
- packageRequires = [ cl-generic cl-lib emacs emacsql ];
+ packageRequires = [ emacs emacsql ];
meta = {
homepage = "https://melpa.org/#/emacsql-mysql";
license = lib.licenses.free;
};
}) {};
- emacsql-psql = callPackage ({ cl-generic, cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild, pg }:
+ emacsql-psql = callPackage ({ emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "emacsql-psql";
- version = "20170410.1008";
+ version = "20171218.1827";
src = fetchFromGitHub {
owner = "skeeto";
repo = "emacsql";
- rev = "e3bc9b105f6f2de514dd689c8fa8f74f1d610a04";
- sha256 = "03258c2lqrl8c2jy3dvxsbbhrgsysbciq9bay4iazgcvgwg2l2my";
+ rev = "616dde37524f47246bbb161f20d3f5f090f10fbf";
+ sha256 = "14l61iq31lyz26nxxr2b5s57wra11xy87lp4d0s2fn03ac9i8nww";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-psql";
sha256 = "1aa1g9jyjmz6w0lmi2cf67926ad3xvs0qsg7lrccnllr9k0flly3";
name = "emacsql-psql";
};
- packageRequires = [ cl-generic cl-lib emacs emacsql pg ];
+ packageRequires = [ emacs emacsql ];
meta = {
homepage = "https://melpa.org/#/emacsql-psql";
license = lib.licenses.free;
};
}) {};
- emacsql-sqlite = callPackage ({ cl-generic, cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ emacsql-sqlite = callPackage ({ emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "emacsql-sqlite";
- version = "20170806.1551";
+ version = "20171218.1827";
src = fetchFromGitHub {
owner = "skeeto";
repo = "emacsql";
- rev = "e3bc9b105f6f2de514dd689c8fa8f74f1d610a04";
- sha256 = "03258c2lqrl8c2jy3dvxsbbhrgsysbciq9bay4iazgcvgwg2l2my";
+ rev = "616dde37524f47246bbb161f20d3f5f090f10fbf";
+ sha256 = "14l61iq31lyz26nxxr2b5s57wra11xy87lp4d0s2fn03ac9i8nww";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-sqlite";
sha256 = "1vywq3ypcs61s60y7x0ac8rdm9yj43iwzxh8gk9zdyrcn9qpis0i";
name = "emacsql-sqlite";
};
- packageRequires = [ cl-generic cl-lib emacs emacsql ];
+ packageRequires = [ emacs emacsql ];
meta = {
homepage = "https://melpa.org/#/emacsql-sqlite";
license = lib.licenses.free;
@@ -18164,12 +18395,12 @@
ember-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ember-mode";
- version = "20161105.855";
+ version = "20171208.559";
src = fetchFromGitHub {
owner = "madnificent";
repo = "ember-mode";
- rev = "3e45cf3e290ac422c1b9713f3e7db5c634bcdaf2";
- sha256 = "0g6xmqrjqzwl67ij05lwk72fdhm77p3b45jf7vc8xfn050nvn06l";
+ rev = "755256782478cb724edd8f111225d7c8d342f90c";
+ sha256 = "02x12b26l9qyq9cmg56ys222qxbc8zldw40scq3mfhfqqk4b43g7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9ac1eef4ad87b1b6b6d8e63d340ba03dc013425b/recipes/ember-mode";
@@ -18269,11 +18500,11 @@
emms = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "emms";
- version = "20171126.2321";
+ version = "20180103.520";
src = fetchgit {
url = "https://git.savannah.gnu.org/git/emms.git";
- rev = "0960515e644015c6d85549fa3bef3d67c0ee7116";
- sha256 = "0zsqxckwqhgfbiycx41haky4rggdrwx4vdb7awq1i7nhinfkk7jn";
+ rev = "3a8d16d91edae81ffb2bb9efa12d41712edfd4f8";
+ sha256 = "1cwsjrjasb2gi28aavy64g4sg9wwfq3wab24klssh3290qrr3gkb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms";
@@ -18373,12 +18604,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 = "20171102.811";
+ version = "20171211.609";
src = fetchFromGitHub {
owner = "momomo5717";
repo = "emms-player-mpv-jp-radios";
- rev = "57924973b9e7a3b059b6dd40decb194abc596875";
- sha256 = "0q1sfb2rgzpvxbpq0d3zl03bc8abyzq2d5pvy8z0ighwbhabkrrs";
+ rev = "686be9b27537bdc7987f1ab0525393208bfc480b";
+ sha256 = "0c53mbl53ii0h64a1vdvskm29wjr7v1ms54ax5d588bv4c67wsms";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/09ba6da5057061f055d4a3212d167f9666618d4f/recipes/emms-player-mpv-jp-radios";
@@ -18700,12 +18931,12 @@
enh-ruby-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "enh-ruby-mode";
- version = "20171101.1638";
+ version = "20171212.1249";
src = fetchFromGitHub {
owner = "zenspider";
repo = "enhanced-ruby-mode";
- rev = "9467cd7fc8b6bb3caf644b223e3046fc32013ccb";
- sha256 = "0spsgfkka6sld8ac3m2biydyp8xj84vxa0w7apqvhhmfk3klbbhf";
+ rev = "4f43eab67a9afb91b0408221d478dcb98131478f";
+ sha256 = "0ahvsazrdlwfz0imsfvnhv1f58m7cnib8fzbffdjvvwmmc9g511y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cd1ac1ce69b77b11f34c4175611a852e7ec0806c/recipes/enh-ruby-mode";
@@ -18784,12 +19015,12 @@
ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }:
melpaBuild {
pname = "ensime";
- version = "20171027.1433";
+ version = "20171217.1730";
src = fetchFromGitHub {
owner = "ensime";
repo = "ensime-emacs";
- rev = "483e94546d9b1de5841b8853882d5644cc419479";
- sha256 = "0dd6agcjpncd3vkdx405ql03rpfacwda0njcz69f1cp7z8rc5cdz";
+ rev = "3d3ab18436ad6089496b3bce1d49c64a86965431";
+ sha256 = "0p821zwpiznjh736af5avnx9abssx0zbb9xhs74yhh1mcdi1whq7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime";
@@ -18897,12 +19128,12 @@
epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "epkg";
- version = "20171024.651";
+ version = "20171220.1658";
src = fetchFromGitHub {
owner = "emacscollective";
repo = "epkg";
- rev = "6114b78b84cd8a96a117b7652d1e5138eee4b896";
- sha256 = "1fmvy8h3ng2ykfmr2n0zms2h3csq24f23ldf5zdxyg34riag4nl2";
+ rev = "71ce3ffd41bdc90c649a044ddbee0b32b329c612";
+ sha256 = "0wfhhmv92ymq43h26bn0f7vjbmp9wisl76mqaydqir33a13y3a55";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg";
@@ -19166,6 +19397,27 @@
license = lib.licenses.free;
};
}) {};
+ erc-status-sidebar = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
+ melpaBuild {
+ pname = "erc-status-sidebar";
+ version = "20171223.1324";
+ src = fetchFromGitHub {
+ owner = "drewbarbs";
+ repo = "erc-status-sidebar";
+ rev = "9e972f4e31287362020daa81dc7af26999ea6c5b";
+ sha256 = "0g7m5r5f01i73k05wny0xycrjcyhzwc314a5lb8h09kglwnmisgv";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/29631de8ec4140a8e35cc500902b58115faa3955/recipes/erc-status-sidebar";
+ sha256 = "04qh70ih74vbavq7ccwj1ixpd8s3g8rck9bxv6zhm1yv34bslw5d";
+ name = "erc-status-sidebar";
+ };
+ packageRequires = [ emacs seq ];
+ meta = {
+ homepage = "https://melpa.org/#/erc-status-sidebar";
+ license = lib.licenses.free;
+ };
+ }) {};
erc-terminal-notifier = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "erc-terminal-notifier";
@@ -19442,12 +19694,12 @@
erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "erlang";
- version = "20171117.243";
+ version = "20171219.305";
src = fetchFromGitHub {
owner = "erlang";
repo = "otp";
- rev = "36c264571369a7d9110dc77dd5043e4be3134f56";
- sha256 = "1hwvyrlhl490l7bx7ynh5jfkrzcfb60k6ip036v830q7jz2c5l4d";
+ rev = "68a0f569410f7375c44a9d806930b1172c1d92a8";
+ sha256 = "0vbrnca9rfncgyz95505mmg25wl95dab5djjw5nffd627sxgnj2q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -19609,12 +19861,12 @@
es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, spark }:
melpaBuild {
pname = "es-mode";
- version = "20170915.801";
+ version = "20171220.719";
src = fetchFromGitHub {
owner = "dakrone";
repo = "es-mode";
- rev = "511eaf59123c2dc4f900cd31d3c30c5bf98599ea";
- sha256 = "1ldyf39z7faizbg2nzh2myd5yld9iwxi9r5260sp1dv0ab2im4gy";
+ rev = "adf879cb108819fc18fea52788b3fa98a57f5177";
+ sha256 = "1zcv11vi3vs5i2i104an9nzm9jy889pqfs9xlifz7w9l81qfa2nl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9912193f73c4beae03b295822bf41cb2298756e2/recipes/es-mode";
@@ -19690,6 +19942,27 @@
license = lib.licenses.free;
};
}) {};
+ esh-autosuggest = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "esh-autosuggest";
+ version = "20171223.1855";
+ src = fetchFromGitHub {
+ owner = "dieggsy";
+ repo = "esh-autosuggest";
+ rev = "aa921f8975b0f95d1cb0044e6ad7f17529261610";
+ sha256 = "19qhpvw5y7hvkqy8jdyrnm4m90jdxxdiaabcrjiwxmkzq3wgnx8q";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/dc3776068d6928fc1661a27cccaeb8fb85577099/recipes/esh-autosuggest";
+ sha256 = "1rcng1dhy4yw95qg909ck33svpdxhv9v5k7226d29gp4y54dwyrx";
+ name = "esh-autosuggest";
+ };
+ packageRequires = [ company emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/esh-autosuggest";
+ license = lib.licenses.free;
+ };
+ }) {};
esh-buf-stack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "esh-buf-stack";
@@ -20050,12 +20323,12 @@
ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }:
melpaBuild {
pname = "ess";
- version = "20171126.2319";
+ version = "20171204.1404";
src = fetchFromGitHub {
owner = "emacs-ess";
repo = "ESS";
- rev = "d0a943d3fbbc8b554d1ccac16bb5a9ea18496e01";
- sha256 = "0krcxdxfwsp7addnsi9rkzr4jan1fw9qppd5ilj4fdrgfj97mr9q";
+ rev = "8a5cefe1bfec7c76d03332c4f6dfc224ad4bc61b";
+ sha256 = "1p0j7s1vz184l4100gri8x8g453x43k5fmfp3pkvlgifny1vf26a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess";
@@ -20215,6 +20488,27 @@
license = lib.licenses.free;
};
}) {};
+ eterm-256color = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, xterm-color }:
+ melpaBuild {
+ pname = "eterm-256color";
+ version = "20171221.1837";
+ src = fetchFromGitHub {
+ owner = "dieggsy";
+ repo = "eterm-256color";
+ rev = "a5560abfa81242dc45ab0342e41e33f6c7e6bc1e";
+ sha256 = "0md53lhpxh1yqirfjgx8fq8vsh5zbl2v2hn63nkyh60rv3sc4jkm";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e556383f7e18c0215111aa720d4653465e91eff6/recipes/eterm-256color";
+ sha256 = "1mxc2hqjcj67jq5k4621a7f089qahcqw7f0dzqpaxn7if11w333b";
+ name = "eterm-256color";
+ };
+ packageRequires = [ emacs f xterm-color ];
+ meta = {
+ homepage = "https://melpa.org/#/eterm-256color";
+ license = lib.licenses.free;
+ };
+ }) {};
ethan-wspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ethan-wspace";
@@ -20386,12 +20680,12 @@
evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
melpaBuild {
pname = "evil";
- version = "20171129.651";
+ version = "20180103.2356";
src = fetchFromGitHub {
owner = "emacs-evil";
repo = "evil";
- rev = "1bba6116f3b29488a87503693e70a0bd2b5eaebe";
- sha256 = "1mdpibvif3q9v7l5yp822ss2av4cmipi9jqywqxrw3ak0m0kb24z";
+ rev = "d5e3a83a5783fb0317efbe349bb6a03e65011506";
+ sha256 = "0bra0cp1ncnxndkc317ighm396f526hbrfzx542yfpfq74s51qj5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil";
@@ -20530,6 +20824,27 @@
license = lib.licenses.free;
};
}) {};
+ evil-collection = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "evil-collection";
+ version = "20180106.1137";
+ src = fetchFromGitHub {
+ owner = "jojojames";
+ repo = "evil-collection";
+ rev = "1e448e5a426e5c03b8da5f0a203eaa4c681833c6";
+ sha256 = "05b70vn46s05ag0s27wagpaznvas3n68hwl03sz84n8d48ix7i59";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d7538c9eb00b6826867891b037e7aa537ac5b160/recipes/evil-collection";
+ sha256 = "0wxx6x9lxlnxaa3i36gj4nad3q8c25mbw17bp4aa0agh43yk4bgn";
+ name = "evil-collection";
+ };
+ packageRequires = [ emacs evil ];
+ meta = {
+ homepage = "https://melpa.org/#/evil-collection";
+ license = lib.licenses.free;
+ };
+ }) {};
evil-commentary = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-commentary";
@@ -20575,12 +20890,12 @@
evil-easymotion = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-easymotion";
- version = "20170110.2004";
+ version = "20180102.2115";
src = fetchFromGitHub {
owner = "PythonNut";
repo = "evil-easymotion";
- rev = "f9b5aa52f238ea14c2b16982e56c3b2c8f739101";
- sha256 = "098x03vlz3gvkaa3wahi1557l9x39n1v8jclj5aqxvjdzapi6myi";
+ rev = "07e1c88b2ea9962e837f97b57dbf3c5bab22662e";
+ sha256 = "1j3z7j2g3vsylaykinvbm47c2z8gr172qc6zdfpgzz0hskklkszy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e67955ead0b9d69acab40d66d4e0b821229d635c/recipes/evil-easymotion";
@@ -20764,12 +21079,12 @@
evil-goggles = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-goggles";
- version = "20171121.2306";
+ version = "20171219.153";
src = fetchFromGitHub {
owner = "edkolev";
repo = "evil-goggles";
- rev = "79a25e4da1dbddfd45b8824bd9e1585a24838baa";
- sha256 = "11lxad2vmmbnmljv2j1282l4j834kwmp98jlv5as29mdrbjchbxv";
+ rev = "2670fdf6643a098141e3323ab862e311d917ed35";
+ sha256 = "03g6yrrcfc8f2vbiysia0gxgnsy15i9c4iqvbiwpi93y5jj40lzy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/811b1261705b4c525e165fa9ee23ae191727a623/recipes/evil-goggles";
@@ -20953,12 +21268,12 @@
evil-magit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
melpaBuild {
pname = "evil-magit";
- version = "20171018.722";
+ version = "20171213.1019";
src = fetchFromGitHub {
owner = "emacs-evil";
repo = "evil-magit";
- rev = "a24186be7cc2cdab24b56f6dcc4665eeb8349c1a";
- sha256 = "12hr2w5r2hgagb3hqbi59v73rxpjml5prc3m7dw3wzsm0rf1rwh3";
+ rev = "4cdfbcd13075869c238b2253a64668736a16880e";
+ sha256 = "148k9ssq8arlvkvacjxwpyg3g8i961ab6wcgg92jmxwl7ir853yf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/50315ec837d2951bf5b2bb75809a35dd7ffc8fe8/recipes/evil-magit";
@@ -21079,12 +21394,12 @@
evil-multiedit = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, iedit, lib, melpaBuild }:
melpaBuild {
pname = "evil-multiedit";
- version = "20170623.1135";
+ version = "20171217.2317";
src = fetchFromGitHub {
owner = "hlissner";
repo = "evil-multiedit";
- rev = "e135fd8662406807bc0d9d0f2688e7dbe89b98c8";
- sha256 = "1dw3mf3dckjhnzvwj7jcwlgzkh592njvcg2xbs2wv1456rnnqaz3";
+ rev = "adcadd09c9f628a65d73a140c37b649c3415a3cd";
+ sha256 = "1iz0hd0h4y9crqwbq7ysnkgvwqhd9vcjcca8hk2506cks8sab73q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/997f5a6999d1add57fae33ba8eb3e3bc60d7bb56/recipes/evil-multiedit";
@@ -21100,12 +21415,12 @@
evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-nerd-commenter";
- version = "20171106.1510";
+ version = "20171206.441";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "evil-nerd-commenter";
- rev = "6a05c86bdf668fa2bb8a9daf76f3d7b241d7ba3d";
- sha256 = "0nbgrg1d8g2v7lfdwnd26wm1n4qpwci4a0x3qawngcjkyj9df4q5";
+ rev = "41d43709210711c07de69497c5f7db646b7e7a96";
+ sha256 = "04xjbsgydfb3mi2jg5fkkvp0rvjpx3mdx8anxzjqzdry7nir3m14";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter";
@@ -21163,12 +21478,12 @@
evil-org = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-org";
- version = "20171128.1308";
+ version = "20171224.753";
src = fetchFromGitHub {
owner = "Somelauw";
repo = "evil-org-mode";
- rev = "dfaa09d657b6c8798c2389160b979153acee91ea";
- sha256 = "1dhaggc2ic3sl1r1bsn155nhm3hi5j9arj01bfk35vnj3nmpj064";
+ rev = "22c248deb6c74a5bcdb0268306eed878a44fe517";
+ sha256 = "01ayyd22vs5i7l7h95ia1qzmsm69x0imqcmmfwjnpwibar4s5v9r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1768558ed0a0249421437b66fe45018dd768e637/recipes/evil-org";
@@ -21244,6 +21559,27 @@
license = lib.licenses.free;
};
}) {};
+ evil-replace-with-char = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "evil-replace-with-char";
+ version = "20171223.906";
+ src = fetchFromGitHub {
+ owner = "ninrod";
+ repo = "evil-replace-with-char";
+ rev = "b08293f380ca8809ef12df572d37f977bed0ae52";
+ sha256 = "05d505scnmhplaqrcj7fpb107bfgh4zpxrrq942nn035yw07yjjx";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0ac1b487e0fe193cc46c8b489686972ed6db3973/recipes/evil-replace-with-char";
+ sha256 = "0lgazw53j44rc72czwqxs6yaz67l9i1v52wbi7l9w958fnjra84r";
+ name = "evil-replace-with-char";
+ };
+ packageRequires = [ emacs evil ];
+ meta = {
+ homepage = "https://melpa.org/#/evil-replace-with-char";
+ license = lib.licenses.free;
+ };
+ }) {};
evil-replace-with-register = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-replace-with-register";
@@ -21310,12 +21646,12 @@
evil-smartparens = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, smartparens }:
melpaBuild {
pname = "evil-smartparens";
- version = "20171103.941";
+ version = "20171210.713";
src = fetchFromGitHub {
owner = "expez";
repo = "evil-smartparens";
- rev = "9fe4eed1c6327197afe6c13bb0771e18908aff00";
- sha256 = "1di4qz5fbrlwbg16c2j0m7y8zqfxw027qd7zqmc3rwk9znbhg7wl";
+ rev = "026d4a3cfce415a4dfae1457f871b385386e61d3";
+ sha256 = "05habba44zls2d20kgzshrq2psagay16cnvcnkqgrbhvj1rxfmrk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/850898fbfc8e0aeb779e8feae56476d989110e79/recipes/evil-smartparens";
@@ -21370,15 +21706,36 @@
license = lib.licenses.free;
};
}) {};
+ evil-string-inflection = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, string-inflection }:
+ melpaBuild {
+ pname = "evil-string-inflection";
+ version = "20171225.1815";
+ src = fetchFromGitHub {
+ owner = "ninrod";
+ repo = "evil-string-inflection";
+ rev = "ac261bee68444c2cb9aaab25b58509e8f58efe35";
+ sha256 = "1b9h7qpmaqwcdj742y76hrs31l7z9aynih9mkwdcnx5fi2a649la";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0720a0f5b775fcee8d1cfa0defe80048e2dd0972/recipes/evil-string-inflection";
+ sha256 = "0w9x49c0gmv4waspa9fvbhf2adm19cixkwx7a7la9v4qy7da6akh";
+ name = "evil-string-inflection";
+ };
+ packageRequires = [ emacs evil string-inflection ];
+ meta = {
+ homepage = "https://melpa.org/#/evil-string-inflection";
+ license = lib.licenses.free;
+ };
+ }) {};
evil-surround = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-surround";
- version = "20171127.910";
+ version = "20180102.601";
src = fetchFromGitHub {
owner = "emacs-evil";
repo = "evil-surround";
- rev = "55c820083a5f28d5361baeb9cd7da92549e5b3f5";
- sha256 = "0qnv0c1byvzlclc8yaq6jjy61vza3zq2i773b30ss0rfpa03p13z";
+ rev = "5a20c9757eff64e1567d313eb254126aef2bf3b2";
+ sha256 = "094vz707iyjknmhmhdlzc8sv8x86yxgx863c23nm6fjn5n5h7jmz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2c9dc47a4c837c44429a74fd998fe468c00639f2/recipes/evil-surround";
@@ -21461,8 +21818,8 @@
src = fetchFromGitHub {
owner = "emacs-evil";
repo = "evil";
- rev = "1bba6116f3b29488a87503693e70a0bd2b5eaebe";
- sha256 = "1mdpibvif3q9v7l5yp822ss2av4cmipi9jqywqxrw3ak0m0kb24z";
+ rev = "d5e3a83a5783fb0317efbe349bb6a03e65011506";
+ sha256 = "0bra0cp1ncnxndkc317ighm396f526hbrfzx542yfpfq74s51qj5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/87da8c50f9167ad9c3844b23becb6904f809611d/recipes/evil-test-helpers";
@@ -21734,8 +22091,8 @@
src = fetchFromGitHub {
owner = "ninrod";
repo = "exato";
- rev = "ba21cd2c8d0588e1c70ba89ebad6df247605e03f";
- sha256 = "12xqysbdnkvz220qf0jz2v40809hcmdmga10ac74yhg00h25nll6";
+ rev = "5b709c128680d4dc5ac4c11253eab94a1e38bcbc";
+ sha256 = "0ins7z1a3np7h7l2n7syhj10hm01v0gxn0m8kzjim59x57l0l3wb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/939efbcb9b40a2df5ef14e653fb242a8e37c72f9/recipes/exato";
@@ -21792,12 +22149,12 @@
exotica-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "exotica-theme";
- version = "20171128.1540";
+ version = "20171227.203";
src = fetchFromGitHub {
owner = "jbharat";
repo = "exotica-theme";
- rev = "5e185fa9bcbc2c08624d8b1e3c4fce1b5b433051";
- sha256 = "0qjf6fnag1rwzvlij1n75a9g3a6w83nvzkcxb9nknqv4bcjkhrxg";
+ rev = "4324e9e888b08f8884d74458ace00da190b1cc62";
+ sha256 = "17fywa9blx5yf9gjhz1axzziz3yn3qw93bi19xaq0vgv26w5s8bx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9182f92dd62e2f1775a76699a6c8f9c3e71e9030/recipes/exotica-theme";
@@ -21834,12 +22191,12 @@
expand-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "expand-region";
- version = "20170514.1309";
+ version = "20171217.2125";
src = fetchFromGitHub {
owner = "magnars";
repo = "expand-region.el";
- rev = "2357f1d5efd9d5b9e37f3513342237fec2629291";
- sha256 = "0sggq57q8fxzd0my2kwbb2li91zq13cyhxn789bafzxq2d5fpk9h";
+ rev = "f99b7630efcdb47c9c6182489c55fba3bcaee521";
+ sha256 = "0sdk9qqxd8dkjf554p7ch2w8pd8a7c4q64c5yd8gphc8fmzc32rn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/expand-region";
@@ -21897,12 +22254,12 @@
extempore-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "extempore-mode";
- version = "20160620.1813";
+ version = "20180104.2221";
src = fetchFromGitHub {
owner = "extemporelang";
repo = "extempore-emacs-mode";
- rev = "ce052da4899ea85ee33792a344359fdd19bc653b";
- sha256 = "163in2pbvqyknsm3la5zqinlw018crx0f0cvr9caal86v5gx65cr";
+ rev = "ae5f40d4b0883a4519e460cd7720e5fcc3a68fa5";
+ sha256 = "1f888h7xv6zz6kq38ak1vpwjrjr2sqgwpfxwb9x0ldf3kkx4wf1w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7bd3e57171f5283604e9375613a7a94416ee99a7/recipes/extempore-mode";
@@ -21936,6 +22293,27 @@
license = lib.licenses.free;
};
}) {};
+ exwm-surf = callPackage ({ emacs, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "exwm-surf";
+ version = "20171204.340";
+ src = fetchFromGitHub {
+ owner = "ecraven";
+ repo = "exwm-surf";
+ rev = "6c17e2c1597fe4b7b454a1dac23b9127ac951e94";
+ sha256 = "0rb921fq3pyzv0w1s6n0zx4j7cvv68mb50hfa8nqnppz5ii1k0lb";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/4fc27fae2b58c7af87dadba9217cc05f8ab4890c/recipes/exwm-surf";
+ sha256 = "066qbn1w63irh9b03qs0fv77x71cind22kdj6wygaznrpgwr0kny";
+ name = "exwm-surf";
+ };
+ packageRequires = [ emacs exwm ];
+ meta = {
+ homepage = "https://melpa.org/#/exwm-surf";
+ license = lib.licenses.free;
+ };
+ }) {};
exwm-x = callPackage ({ bind-key, cl-lib ? null, counsel, exwm, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, swiper, switch-window }:
melpaBuild {
pname = "exwm-x";
@@ -21968,12 +22346,12 @@
eyebrowse = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eyebrowse";
- version = "20171123.6";
+ version = "20171216.944";
src = fetchFromGitHub {
owner = "wasamasa";
repo = "eyebrowse";
- rev = "7294ed5fbf5f38407b599a10a335b8c4ec15a8d5";
- sha256 = "1lhpf88042mg9q328w2d328ka9pild4ppdynbn3rsib9zgxp8waq";
+ rev = "ad94b5bed74a74769775e937e167d301f4ea70e3";
+ sha256 = "1f1b70fyq9j19i41rsishrdkslwnx0af7gzwirhs25sgkpsqz2hr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/90d052bfc0b94cf177e33b2ffc01a45d254fc1b1/recipes/eyebrowse";
@@ -22052,12 +22430,12 @@
f = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "f";
- version = "20171119.723";
+ version = "20180106.122";
src = fetchFromGitHub {
owner = "rejeep";
repo = "f.el";
- rev = "595519ea07d6ff49e5cb1cbd442eb689f9142ed1";
- sha256 = "1nxkfya6bwn0bmiwcq5q68qpyhkdsc9b4n75vav06nn7w1k5y3gv";
+ rev = "de6d4d40ddc844eee643e92d47b9d6a63fbebb48";
+ sha256 = "1a47xk3yp1rp17fqg7ldl3d3fb888h0fz3sysqfdz1bfdgs8a9bk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/f";
@@ -22073,12 +22451,12 @@
f3 = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "f3";
- version = "20170728.1120";
+ version = "20171222.138";
src = fetchFromGitHub {
owner = "cosmicexplorer";
repo = "f3";
- rev = "1ed0ac4368a9f631f6dfad7ad17e9f7434a42bd6";
- sha256 = "03crpcb1jbbc12nz912qdkipmm94xlrpzr2cgckya0cj8sdgv9fz";
+ rev = "632b2c44d6e0c8b4b069e3188a1ea42a403c1ad1";
+ sha256 = "0nxibjpjifpb6v2k1s1rbci1gjdnls94gd404jfmj4996z4q1wr2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b40de62a82d6895a37ff795d56f7d0f783461e6/recipes/f3";
@@ -22385,6 +22763,26 @@
license = lib.licenses.free;
};
}) {};
+ faustine = callPackage ({ emacs, faust-mode, fetchgit, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "faustine";
+ version = "20171122.402";
+ src = fetchgit {
+ url = "https://bitbucket.org/yphil/faustine";
+ rev = "07a38963111518f86123802f9d477be0d4689a3f";
+ sha256 = "0dj35hwkm5v8758c4ssl873vkvplba5apjsh7l23nsmnzdji99zg";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d7a6fc9f99241ff8e3a9c1fb12418d4d69d9e203/recipes/faustine";
+ sha256 = "1hyvkd4y28smdp30bkky6bwmqwlxjrq136wp7112371w963iwjsb";
+ name = "faustine";
+ };
+ packageRequires = [ emacs faust-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/faustine";
+ license = lib.licenses.free;
+ };
+ }) {};
fcitx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fcitx";
@@ -22533,12 +22931,12 @@
fill-column-indicator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fill-column-indicator";
- version = "20170905.1008";
+ version = "20171209.1124";
src = fetchFromGitHub {
owner = "alpaker";
repo = "Fill-Column-Indicator";
- rev = "23ad25f2c2fddd32a1ea12a9e0f631e243e6a779";
- sha256 = "010kf8jsly74y7m6mmkn1h6y205kz23zphs50zgy2nag2p88rz9y";
+ rev = "d2536b1c48f78679e15a2b50cd5d8c0ffde4b155";
+ sha256 = "0f8h32n8mnrwijz3lrslbx521f0fkhn24cwd16r8hcjk976l5kbp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4ea0c00a7784621fcca0391a9c8ea85e9dd43852/recipes/fill-column-indicator";
@@ -22579,8 +22977,8 @@
src = fetchFromGitHub {
owner = "skeeto";
repo = "elisp-finalize";
- rev = "0496a7b8f2f8b197010d8602b5fc529f5104704a";
- sha256 = "1canhfvqjkm0bbr9g50pi0cibhq3mf7g79k2m18d8zarc9jljrjm";
+ rev = "846731531e7d1d80451787992e07bfe7dedbe9ff";
+ sha256 = "0kqsqmfvnh0slx0hmrsw66rh62sgzyhzck7ii9zylkq72wj60fgl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1b55869b5183644de02687d2e56f9b68854ccda3/recipes/finalize";
@@ -22617,12 +23015,12 @@
find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "find-file-in-project";
- version = "20171123.1508";
+ version = "20171219.1858";
src = fetchFromGitHub {
owner = "technomancy";
repo = "find-file-in-project";
- rev = "9e308e69883cb43e136a2e9d4f0db495b457b82d";
- sha256 = "0bzbqm8wq8gbz0a18d35ksv0yf65giwcdxhrqzklsxgn9v7p73b8";
+ rev = "b9dff2881cefaf2926df35fe23366ce3bd59d157";
+ sha256 = "0f6nwbnwh06phg9560q97ksh3m50a9z73z7vrqlppfs27aqx2jbp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project";
@@ -22848,12 +23246,12 @@
fish-completion = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fish-completion";
- version = "20171104.1509";
+ version = "20171209.508";
src = fetchFromGitHub {
owner = "Ambrevar";
repo = "emacs-fish-completion";
- rev = "547fe4f61b8e311e5db17be9f6d277d08523beba";
- sha256 = "0qkq23fad7apm2q1xn3b7agkkv3pvcwv012kvma568zk4jcfw3zg";
+ rev = "12e5db70b5efe7a3cd37e8fd25eb526d08007aac";
+ sha256 = "0p06rahi66fa3i2gfkf6nzf7hnysdpz475d5dib2wps7labfh9qd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/832bae268cd08d7ebfd4b7a8d0570af8549cdbd6/recipes/fish-completion";
@@ -22890,12 +23288,12 @@
fix-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fix-input";
- version = "20170518.2311";
+ version = "20171231.2220";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "fix-input";
- rev = "a0fd233bba6206854c5d7365d7182aaae842f210";
- sha256 = "1zwbysh9fq6dbdi93cdzgrsp2azy8b3j0gz32ih0vbs9xyysbhlz";
+ rev = "e053fcc641f1f835f2fdb71143e095c1889b8233";
+ sha256 = "1w8vv2ijmsch02xsc1r97r6s3jz0dkd8kwz5wgiizq5ghx7x6x6j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7d31f907997d1d07ec794a4f09824f43818f035c/recipes/fix-input";
@@ -22932,12 +23330,12 @@
fix-word = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fix-word";
- version = "20170518.2343";
+ version = "20171231.2215";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "fix-word";
- rev = "7df98ac9f9b0e6e09d7999d83e678cb22248be77";
- sha256 = "13i604lmx30r0kk0s998dp4czzazqavyqqi3kx6lh6mj2csgkgda";
+ rev = "3e3339f5d44dd8be100cec1c88bcaefd328a2bde";
+ sha256 = "0hd5bhq57qgabs881xfrz1v1n8sp1nv2hrfs386dx7g5b3ancr0i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/22636390e8a15c09293a1506a901286dd72e565f/recipes/fix-word";
@@ -23128,12 +23526,12 @@
flex-compile = callPackage ({ buffer-manage, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "flex-compile";
- version = "20171113.929";
+ version = "20171213.1019";
src = fetchFromGitHub {
owner = "plandes";
repo = "flex-compile";
- rev = "631a5a95bcf783b8d43435d7666ccd8e205a3bd5";
- sha256 = "1jcw8qc6krsl6j5xx7fp7hancqcg9hk6q1c2qwy081yig7537bf7";
+ rev = "1952f6deee9d95196906f46fea2b24882cc614b6";
+ sha256 = "0wx0857f25k2rr5y6mikhi0czgvf6r1667fy8hjgl6gk0fyi960f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/259caeebc317e81ab9d532a371ea85656c2b1619/recipes/flex-compile";
@@ -23208,6 +23606,27 @@
license = lib.licenses.free;
};
}) {};
+ fliptext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "fliptext";
+ version = "20171124.1256";
+ src = fetchFromGitHub {
+ owner = "andre-r";
+ repo = "fliptext.el";
+ rev = "fd821f645ffebae6ae3894afa7ba7fc06f91afc6";
+ sha256 = "1jf63kp1myxihv6r13cddxgr8cchxcnnmylj5dx50y42595ia4yh";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e36776cbed8eab151f69d0edd5217a7bba7c2451/recipes/fliptext";
+ sha256 = "1wbrvqrvrpk2lx7b6y30rrshr7a25b2191bnx4v8lm3cv16gv8p7";
+ 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";
@@ -23232,12 +23651,12 @@
flow-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "flow-minor-mode";
- version = "20171124.1238";
+ version = "20180104.1348";
src = fetchFromGitHub {
owner = "an-sh";
repo = "flow-minor-mode";
- rev = "0a90e5dc9d58dd76ab08ba8ee187e52fa8a9d026";
- sha256 = "1qz3nqm76v3g6j7ps5a06via7vbghsdjz547z8gpv6ncgzj70djv";
+ rev = "50dded94ad201fdc9453656a8b15179981cd5acd";
+ sha256 = "1vaqml0ypbc14mnwycgm9slkds3bgg6x5qz99kck98acbcfijxk6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/66504f789069922ea56f268f4da90fac52b601ff/recipes/flow-minor-mode";
@@ -23316,12 +23735,12 @@
flx-isearch = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, flx, lib, melpaBuild }:
melpaBuild {
pname = "flx-isearch";
- version = "20160105.1217";
+ version = "20180102.2114";
src = fetchFromGitHub {
owner = "PythonNut";
repo = "flx-isearch";
- rev = "54ae0a5a31e6a07b68823d486ff4ec9e4c558588";
- sha256 = "1cmjw1zrb1nq9nx0d634ajli1di8x48k6s88zi2s2q0mbi28lzz1";
+ rev = "f132fd6367e369885ab3a865fbfe20eee989bc0b";
+ sha256 = "1dcvfl4fyhgw0rhfhixzlzjfr99fisa83f7lmlwzz2zs96myhhkz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2cd1438cc0821b8ae1d01e2a3bc8f07ca8a79134/recipes/flx-isearch";
@@ -23337,12 +23756,12 @@
flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
melpaBuild {
pname = "flycheck";
- version = "20171126.1339";
+ version = "20171214.1215";
src = fetchFromGitHub {
owner = "flycheck";
repo = "flycheck";
- rev = "d2b3c321d49c887f23b2342766846aee3f073c49";
- sha256 = "1nzqqgggd3g6x1kjszilm0gclk5rg4f6mpda4vyh2hha5j53cwah";
+ rev = "6bc54f00666d14197cb8685b42dbd49e19c82ec8";
+ sha256 = "0wdmwiy9fd5lbxdp2iix3krb7ia0aly8n5bwxap1pmrl2anjzik9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck";
@@ -23551,8 +23970,8 @@
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "squiggly-clojure";
- rev = "2a0e96889b128808866a1e2e98694be1b251fd37";
- sha256 = "1yw9ky7720hx6z401623bw7h6rr2b837a7x8gfw6shq4k26kirzb";
+ rev = "0fe57ab9c0d6262a3c0dbc9c28a9ca98390a6016";
+ sha256 = "1495d09vr8dlf9q6127fa46ghhgyw5bmzx22wdzzrfvc70m041a1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c9c642a234f93ed4cf5edcf27a552a8916984946/recipes/flycheck-clojure";
@@ -23628,6 +24047,27 @@
license = lib.licenses.free;
};
}) {};
+ flycheck-crystal = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+ melpaBuild {
+ pname = "flycheck-crystal";
+ version = "20171124.740";
+ src = fetchFromGitHub {
+ owner = "crystal-lang-tools";
+ repo = "emacs-crystal-mode";
+ rev = "0fe6815201bebe4c5ff6857bd541d95b05132b10";
+ sha256 = "0r75dvc0jqcqi1qjns8zj132dnm0s6mvqlqynkis16nigbawix8m";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/c718f809af30226611358f9aaed7519e52923fd3/recipes/flycheck-crystal";
+ sha256 = "04avxav2rayprm09xkphs1ni10j1kk10j7m77afcac0gnma5rwyn";
+ name = "flycheck-crystal";
+ };
+ packageRequires = [ flycheck ];
+ meta = {
+ homepage = "https://melpa.org/#/flycheck-crystal";
+ license = lib.licenses.free;
+ };
+ }) {};
flycheck-css-colorguard = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-css-colorguard";
@@ -24132,6 +24572,27 @@
license = lib.licenses.free;
};
}) {};
+ flycheck-lilypond = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+ melpaBuild {
+ pname = "flycheck-lilypond";
+ version = "20171203.532";
+ src = fetchFromGitHub {
+ owner = "hinrik";
+ repo = "flycheck-lilypond";
+ rev = "cc1b7677a932c42e5dab1661ad7b923d4aae744c";
+ sha256 = "1yfsg52z4nhbh33fbsig24c9s0mc4xm72ll36h6ibld9fvqsgv6k";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/da99de90193c9ad362afdbbae28dfba52ef3676e/recipes/flycheck-lilypond";
+ sha256 = "0yx0jbilr8z58df13wcssp3p95skcvl8mnhhr6lijak44sd7klbf";
+ name = "flycheck-lilypond";
+ };
+ packageRequires = [ emacs flycheck ];
+ meta = {
+ homepage = "https://melpa.org/#/flycheck-lilypond";
+ license = lib.licenses.free;
+ };
+ }) {};
flycheck-liquidhs = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-liquidhs";
@@ -24261,12 +24722,12 @@
flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-objc-clang";
- version = "20171014.651";
+ version = "20171231.453";
src = fetchFromGitHub {
owner = "GyazSquare";
repo = "flycheck-objc-clang";
- rev = "29a9eb320d62400564360986f7ad400b74070d8e";
- sha256 = "0b4vwbxzhds9vb4nknfdywvfpr1gkk86vsbbq6f5ds0pfk75x022";
+ rev = "07f17d1dbe878fdcabac791a8916ddf643571a68";
+ sha256 = "03624xn6g1ybcjw634c7nd5s2yllwfffk2gzn5hm70vfz06q7wb9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang";
@@ -24324,12 +24785,12 @@
flycheck-perl6 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-perl6";
- version = "20150414.1832";
+ version = "20171231.445";
src = fetchFromGitHub {
owner = "hinrik";
repo = "flycheck-perl6";
- rev = "6a9a929ffb58595bbe9fe3d7c2e78617c8e9bb5a";
- sha256 = "0ffas4alqhijvm8wl1p5nqjhnxki8gs6b5bxb4nsqwnma8qmlcx3";
+ rev = "7a69ddbb54dc0748734ace95f598c69e9882aa94";
+ sha256 = "1bsbw5pjin7m556pnphq8plgfjvbp1pl738lf5qc85jcvinv998m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2f6ecdb2ce6bc74a27dca01ab4942778e986ac8f/recipes/flycheck-perl6";
@@ -24471,12 +24932,12 @@
flycheck-pycheckers = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-pycheckers";
- version = "20171110.48";
+ version = "20171207.1754";
src = fetchFromGitHub {
owner = "msherry";
repo = "flycheck-pycheckers";
- rev = "6f7c6d7db4d3209897c4b15511bfaed4562ac5e4";
- sha256 = "0mg2165zsrkn8w7anjyrfgkr66ynhm1fv43f5p8wg6g0afss9763";
+ rev = "41e676931f37ba32652edde727e443e304e7e6ee";
+ sha256 = "118y7r06cmvas5g2nypabslfch3g5wlzl3p69ynmpfsmbrlclsz1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/af36dca316b318d25d65c9e842f15f736e19ea63/recipes/flycheck-pycheckers";
@@ -24538,8 +24999,8 @@
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "8ef7554852541eced514c56d5e39d6073f7a2ef9";
- sha256 = "0hh9m0ykw3r9h4gv4a99px00py1h5hs86043mp1m0nmkjibf6w56";
+ rev = "db5ad3a48c579b3522411bd2411c09dbb27af578";
+ sha256 = "1ihv65hfq22yk4wx4njkm73q4s04fr84ib3mjjk8l18xpzl6alal";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags";
@@ -24639,12 +25100,12 @@
flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-swift3";
- version = "20170926.317";
+ version = "20171231.452";
src = fetchFromGitHub {
owner = "GyazSquare";
repo = "flycheck-swift3";
- rev = "756833425f51baa9eb0a2fa7493df6e68612c88d";
- sha256 = "1hvrg717q0nlz4r8wby82gs3vdx8fdhf38rg4j77j3fqfmxdd3fi";
+ rev = "34973cd28ca5e63f8f6328a17fd7b78cc913b93d";
+ sha256 = "1iy6j05dzpi7pi87y6rpjzmlnl2s9izqpbzknis2kx9072qddm3q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3";
@@ -25437,12 +25898,12 @@
flyspell-correct = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "flyspell-correct";
- version = "20170213.700";
+ version = "20171205.940";
src = fetchFromGitHub {
owner = "d12frosted";
repo = "flyspell-correct";
- rev = "1e19a2b506470e8d741b521da0bd9b66214256f3";
- sha256 = "03npd8yd9l64xmla3z7q86q267z9455kbsd8752w4737cjw65avl";
+ rev = "a8ac817f7b646d8ba761b64e1b2f65d0a9ebd277";
+ sha256 = "1xqjj4ff811w205f1qs9zd68h6nsbh60pj6mhv2w4kpf3hmmj310";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fa06fbe3bc40ae5e3f6d10dee93a9d49e9288ba5/recipes/flyspell-correct";
@@ -25462,8 +25923,8 @@
src = fetchFromGitHub {
owner = "d12frosted";
repo = "flyspell-correct";
- rev = "1e19a2b506470e8d741b521da0bd9b66214256f3";
- sha256 = "03npd8yd9l64xmla3z7q86q267z9455kbsd8752w4737cjw65avl";
+ rev = "a8ac817f7b646d8ba761b64e1b2f65d0a9ebd277";
+ sha256 = "1xqjj4ff811w205f1qs9zd68h6nsbh60pj6mhv2w4kpf3hmmj310";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-helm";
@@ -25483,8 +25944,8 @@
src = fetchFromGitHub {
owner = "d12frosted";
repo = "flyspell-correct";
- rev = "1e19a2b506470e8d741b521da0bd9b66214256f3";
- sha256 = "03npd8yd9l64xmla3z7q86q267z9455kbsd8752w4737cjw65avl";
+ rev = "a8ac817f7b646d8ba761b64e1b2f65d0a9ebd277";
+ sha256 = "1xqjj4ff811w205f1qs9zd68h6nsbh60pj6mhv2w4kpf3hmmj310";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-ivy";
@@ -25504,8 +25965,8 @@
src = fetchFromGitHub {
owner = "d12frosted";
repo = "flyspell-correct";
- rev = "1e19a2b506470e8d741b521da0bd9b66214256f3";
- sha256 = "03npd8yd9l64xmla3z7q86q267z9455kbsd8752w4737cjw65avl";
+ rev = "a8ac817f7b646d8ba761b64e1b2f65d0a9ebd277";
+ sha256 = "1xqjj4ff811w205f1qs9zd68h6nsbh60pj6mhv2w4kpf3hmmj310";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-popup";
@@ -25609,8 +26070,8 @@
src = fetchFromGitHub {
owner = "troyp";
repo = "fn.el";
- rev = "2dc78b7ef9e24f9fe872d40c8fe6050f7ce819cf";
- sha256 = "0nvhis3myclgvazhiljv7fgis1x5hwr5rr8rhxx3290fgsgdp0bw";
+ rev = "f685fd0c08ec3b1d1b9974b37e62edd78a000cb8";
+ sha256 = "1k8pwlpcvlwr4pavg85ja8hdc7rrbafqs1mhhqr5gbq8cp822sja";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6d2929604b6dd21d6cf425643927a9c216801dc1/recipes/fn";
@@ -25626,12 +26087,12 @@
focus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "focus";
- version = "20170612.743";
+ version = "20171203.2103";
src = fetchFromGitHub {
owner = "larstvei";
repo = "Focus";
- rev = "a84ade00a2b57e47430d5b2df5246069f197356f";
- sha256 = "0qz52gak45nbi6pgsdl3h2a01d89gbzm0glpv1jjy5dvabr98835";
+ rev = "045ee6175e9340f873db03445c74ff9eefa35a27";
+ sha256 = "1hrx8bj4gf0dqbfxgvis62zxnkiyms6v730s55vd8711zxdl0pw4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4e8f1217224514f9b048b7101c89e3b1a305821e/recipes/focus";
@@ -25857,12 +26318,12 @@
forecast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "forecast";
- version = "20170924.1440";
+ version = "20180106.920";
src = fetchFromGitHub {
owner = "cadadr";
repo = "elisp";
- rev = "02829f582d03c149d0aace9a0bdf2bd405b2e4a2";
- sha256 = "0rvwhvmv9b6ma6jf5gbmmy9ahrsli4qflc8z2n2whl743rbcfpk6";
+ rev = "28d7339f2e70c617f2e8e3979b45d78883a27282";
+ sha256 = "1ank29f64cwdg9faqz8fknaz0cn4jma18197n6q3fhb6mfl081hn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a7ea18a56370348715dec91f75adc162c800dd10/recipes/forecast";
@@ -26046,12 +26507,12 @@
fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fountain-mode";
- version = "20171121.559";
+ version = "20180107.2123";
src = fetchFromGitHub {
owner = "rnkn";
repo = "fountain-mode";
- rev = "5c63d2f199e96bdf8fd60d375b2b6e305a5f9017";
- sha256 = "0vxizl4pr0668b1d94wrl42li2709srvnn5likn8lskv2mv0bnvn";
+ rev = "361f2a58151c9e6ab52b59cdd230a3add461a2bb";
+ sha256 = "10sgscfw70yw6khzl4nr1w1zh28g7rh4fwr3p2q4ny4z1zsxvbl9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode";
@@ -26130,12 +26591,12 @@
frames-only-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "frames-only-mode";
- version = "20170802.455";
+ version = "20180107.901";
src = fetchFromGitHub {
owner = "davidshepherd7";
repo = "frames-only-mode";
- rev = "d2e6a825e2079adb58012e9677c494d317494724";
- sha256 = "1x8w2788yaqfi5ys541kp4wi3rcfa2lvbhnxgd8dwr9h0da332xa";
+ rev = "5351741363bb9b4d44ec62ae91cbc9f102cf09f5";
+ sha256 = "1a8hz0wqxb14d3kkv91v1wawqllggz7245h4sv62291jmvvhdbb9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e628416ad9420b3ac5bbfacf930a86d98958ac8/recipes/frames-only-mode";
@@ -26339,8 +26800,8 @@
src = fetchFromGitHub {
owner = "factor";
repo = "factor";
- rev = "c95a56561999f526e6fa60bba4a6f830af46b32b";
- sha256 = "0bd3652j3f2qgh72zpl9hhwdyma0xyi2k99jahmyzh5mb5nz6gg5";
+ rev = "bf5e51b5c33d5bdd5658f7e8275850d11fc39ca8";
+ sha256 = "1sgq8nq6jzgy8akxycvcmgqjaf424v7v9r41pk7r8lw57csrnz37";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/fuel";
@@ -26465,8 +26926,8 @@
src = fetchFromGitHub {
owner = "HIPERFIT";
repo = "futhark";
- rev = "686755bbaba673c244d6f1ede30f5d2f6713a09c";
- sha256 = "0xnim4by9f5ff1l3zs36qhxj8a2qsznri5f2xd5cgl0sp00fv97z";
+ rev = "7c726dd897420c9387b3117f11fa78806b66d715";
+ sha256 = "0lrpn51ncix4f6cmzac4kymb8w2g3fr44z66xchggdflhys6bvp8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode";
@@ -26587,12 +27048,12 @@
fzf = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fzf";
- version = "20171026.554";
+ version = "20180102.1712";
src = fetchFromGitHub {
owner = "bling";
repo = "fzf.el";
- rev = "ef1dc851077913a327261a6b971fab5f5f657831";
- sha256 = "12zbvr7806xiyx2q944nfnqqfnm43v9ziaihkb9n10s2sp6ippb7";
+ rev = "b750cccae7c37a9ee4d40d928bb508cc3234bfbf";
+ sha256 = "0a1g7bv4qakzzrvvsh5m5ic3yhha57fj3d09gmr7rb5b3p2kl5cz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1671e17c99ef1932c6a2e83fc4fa2e4eb6674bc8/recipes/fzf";
@@ -26753,12 +27214,12 @@
geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "geiser";
- version = "20171127.2003";
+ version = "20171217.1353";
src = fetchFromGitHub {
owner = "jaor";
repo = "geiser";
- rev = "0947b0e724cd06c1279193633892f56cd888d319";
- sha256 = "0kl1j9jbhbzabdxk78ss07kv73ia1jmnd3ds6slqzv2d3r38pdiy";
+ rev = "0bfc6be0d25ff311d739d2f65fd343135142f6f3";
+ sha256 = "01jz9yp5g003mhwq0blxy509xcwb8whzqaf90ibdr7v39y96jmdm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser";
@@ -26774,12 +27235,12 @@
general = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "general";
- version = "20171118.1714";
+ version = "20180106.1028";
src = fetchFromGitHub {
owner = "noctuid";
repo = "general.el";
- rev = "dd2376629b03f30e5a657a248140db00f91eceeb";
- sha256 = "13iwr610v6jgh03alcprdsr6s1a0fcqx9iyjzg33p9hd0y56fmda";
+ rev = "cdcf369b4b290f5e1e4cac37e48bad21096ac72a";
+ sha256 = "1qcb8y4akdnn8j4kfmdynb94v8m0l6qi013kskhq46waf03kw5vg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d86383b443622d78f6d8ff7b8ac74c8d72879d26/recipes/general";
@@ -26879,12 +27340,12 @@
ggtags = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ggtags";
- version = "20170918.1838";
+ version = "20171203.1553";
src = fetchFromGitHub {
owner = "leoliu";
repo = "ggtags";
- rev = "6293c438a4a7aae08b8f5dd5fc0082d3da0aa530";
- sha256 = "0rb293wjnc36gjy1vvvqsy605nn0vli1b1w210vvcjbg7zgcsak1";
+ rev = "eec392d2d639030c5a51bce8431f2815ad8e7bc5";
+ sha256 = "0mlva84zbi93jrvvd3bgyndc68iib27zsjsd2f52df89198brjqs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b158bb1bc2fbe3de61a6b21174eac7b1457edda2/recipes/ggtags";
@@ -26904,8 +27365,8 @@
src = fetchFromGitHub {
owner = "sigma";
repo = "gh.el";
- rev = "458aa6e6b107a4b30b64939233c107d1378d0402";
- sha256 = "0x52v1rk94bprvg79nqr0kfy6lcy6r709g1rc72wir1da4zcmpcz";
+ rev = "b46dce307e90c3527bc9ed9532a06f29ecf3b085";
+ sha256 = "01r8pyfjb6jpa1fi2n4wplymyk0gz2b60g0ngn5hlpirbzqyvy8y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/gh";
@@ -26946,8 +27407,8 @@
src = fetchFromGitHub {
owner = "DanielG";
repo = "ghc-mod";
- rev = "06515c44830788254602af90118de07ae2effb12";
- sha256 = "1ymjq9nsqzf8vhrzniwqzszwbdlq5y2nmr8pgbwhmh3bvfbpj7ff";
+ rev = "0f281bea89edf8f11c82c5359ee2b3ce19888b99";
+ sha256 = "0f70nrlqgizsrya1x5kgxib7hxc0ip18b7nh62jclny1fq4r02vm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc";
@@ -27005,12 +27466,12 @@
gherkin-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gherkin-mode";
- version = "20140107.804";
+ version = "20171224.553";
src = fetchFromGitHub {
owner = "candera";
repo = "gherkin-mode";
- rev = "ff9e47350c5ba319feb6b87fe20695519681fa64";
- sha256 = "0dbdms3ddsfhscwy7jj0cfpn3jdxnzynrfz5jps2l91adx2g011y";
+ rev = "0313492e7da152f0aa73ddf96c0287ded8f51253";
+ sha256 = "15m9a2dcxgmbj0ni2qcxg3vpxvs50pyjvlacm3xd2xhm9wd484hr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/82d80becedead8db441eed6f7856ca64d78815e2/recipes/gherkin-mode";
@@ -27065,22 +27526,22 @@
license = lib.licenses.free;
};
}) {};
- ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
melpaBuild {
pname = "ghub";
- version = "20171116.803";
+ version = "20171223.916";
src = fetchFromGitHub {
owner = "magit";
repo = "ghub";
- rev = "d8ec78184ec82d363fb0ac5bab724f390ee71d3d";
- sha256 = "194nf5kjkxgxqjmxlr9q6r4p9kxcsm9qx8pcagxbhvmfyh6km71h";
+ rev = "1395d56496c1581dda0c70a091500e2b947b8d35";
+ sha256 = "0p5vn34jln08y4hnywf2vxdcjcqmr043if4da0s3h2cawd7liw2i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d5db83957187c9b65f697eba7e4c3320567cf4ab/recipes/ghub";
sha256 = "15kjyi8ialpr1zjqvw68w9pa5sigcwy2szq21yvcy295z7ylzy4i";
name = "ghub";
};
- packageRequires = [ emacs ];
+ packageRequires = [ emacs let-alist ];
meta = {
homepage = "https://melpa.org/#/ghub";
license = lib.licenses.free;
@@ -27089,12 +27550,12 @@
ghub-plus = callPackage ({ apiwrap, emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }:
melpaBuild {
pname = "ghub-plus";
- version = "20171019.944";
+ version = "20171203.1627";
src = fetchFromGitHub {
owner = "vermiculus";
repo = "ghub-plus";
- rev = "e04050f81106029c342deb7adbfc67b2a888ec58";
- sha256 = "0ydd6aiy8x878jlzp88gi30yslhkcin0rbdjirj2vjs88cfvcjq6";
+ rev = "4c4a1d009790a805404edf72ff55df6fce3645a7";
+ sha256 = "1m0r6g2arzh87iha1kbqb327vv7wy3m9iafw9czp3655k0sx240h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/03a412fd25218ff6f302734e078a699ff0234e36/recipes/ghub+";
@@ -27278,12 +27739,12 @@
git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
melpaBuild {
pname = "git-commit";
- version = "20171123.752";
+ version = "20180107.1020";
src = fetchFromGitHub {
owner = "magit";
repo = "magit";
- rev = "64be29ba47218a9766a2999f8bf366cc9e3256a9";
- sha256 = "15ba8zx1zsg0q8kk2r7hsx4kljdq7mwazh9a1cpzjprs5wn56jr8";
+ rev = "53eeafcdcb12f9deb74548ffa5b17c397ad7def2";
+ sha256 = "0pvwmbgmqdpy599nr6518yxzl5k8lkdi7a93v1dr7hcf3lg5ygpg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -28097,12 +28558,12 @@
gnu-apl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gnu-apl-mode";
- version = "20170406.732";
+ version = "20180107.513";
src = fetchFromGitHub {
owner = "lokedhs";
repo = "gnu-apl-mode";
- rev = "d79e519308727dec897f2574c938c6425b9a30c2";
- sha256 = "1dr9wcj697d68dxg1026ggxvyvpxjdvydilmym3fhczijdpwm33y";
+ rev = "1fce747e48290549c859de7b15e6efc351d60861";
+ sha256 = "1540qqndv17g39s143mjkk12is9hynx6x6nzpk811sv5rph986iq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/369a55301bba0c4f7ce27f6e141944a523beaa0f/recipes/gnu-apl-mode";
@@ -28223,12 +28684,12 @@
gnus-summary-ext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gnus-summary-ext";
- version = "20160704.1120";
+ version = "20171231.549";
src = fetchFromGitHub {
owner = "vapniks";
repo = "gnus-summary-ext";
- rev = "2298b0eca887a9df1e2d7c61d92176bb175ea482";
- sha256 = "1df85xwrr9wciwa83m2qfkfcbi1p623pdhqxm56005x4rmxg0rqr";
+ rev = "b2259a2501f4e0c23b51aedf056b812c8140b958";
+ sha256 = "1y4379wrd2y9jzbg2bhifwa03nbf84xzb4rhfih6xmh9h5gg4bi1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5ca4a905b5f81991074c7d3e41d4422c7e6713d5/recipes/gnus-summary-ext";
@@ -28311,8 +28772,8 @@
src = fetchFromGitHub {
owner = "nsf";
repo = "gocode";
- rev = "e990796e68a2ebfc099afed20b99e26d6b64061a";
- sha256 = "1s2jpqy599fr5qzfvba5njrwx1n48vqjg20vibssn2kyyc3l42d3";
+ rev = "416643789f088aa5077f667cecde7f966131f6be";
+ sha256 = "1vggwjpcssxp075l8aippgr318m0nkfjyakq7j24ml48g4gc48rm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete";
@@ -28430,6 +28891,27 @@
license = lib.licenses.free;
};
}) {};
+ go-fill-struct = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "go-fill-struct";
+ version = "20171224.1931";
+ src = fetchFromGitHub {
+ owner = "s-kostyaev";
+ repo = "go-fill-struct";
+ rev = "a613d0b378473eef39e8fd5724abe790aea84321";
+ sha256 = "16bgfykvqc61hlx1hj55z15y83zgpavhb853sblds75m8w7mndqg";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0c03d2382efd20e248b27b5505cdeed67d000f73/recipes/go-fill-struct";
+ sha256 = "19xxqb836saxigvwdqf4xv0y9zrl7csv97x0facgyjyiqmwhx3x7";
+ name = "go-fill-struct";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/go-fill-struct";
+ license = lib.licenses.free;
+ };
+ }) {};
go-gen-test = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "go-gen-test";
@@ -28514,6 +28996,27 @@
license = lib.licenses.free;
};
}) {};
+ go-imports = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "go-imports";
+ version = "20180107.1423";
+ src = fetchFromGitHub {
+ owner = "yasushi-saito";
+ repo = "go-imports";
+ rev = "5b3a1d520c599553f621efaf9aec71609d2b9bb6";
+ sha256 = "19v05qc9fmrbdcrjliw02hqrl29dqsg3l57qp2rn8z63n3s17rqq";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/4118ebf0db84cc047fab311c789bfbffd6eb2d92/recipes/go-imports";
+ sha256 = "0xxlh4rmyvfxiynsdqng6wd3js7h3azhb8ii0ch7n0hhqkcnda4x";
+ name = "go-imports";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/go-imports";
+ license = lib.licenses.free;
+ };
+ }) {};
go-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "go-mode";
@@ -28682,6 +29185,27 @@
license = lib.licenses.free;
};
}) {};
+ go-tag = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
+ melpaBuild {
+ pname = "go-tag";
+ version = "20180106.2125";
+ src = fetchFromGitHub {
+ owner = "brantou";
+ repo = "emacs-go-tag";
+ rev = "e7cfc490b728dad085ae3c741ef5220d5e88dacf";
+ sha256 = "1zpj88kyvsnsxzwnmb2a0nlrgviskw6q31faw8y84q08iyp7d8gc";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/fc4cd3fd8fb0707912e205b9d71789ea8126c442/recipes/go-tag";
+ sha256 = "18ff41i0gr708fl4gzzspf9cc09nv4wy21wsn609yhwlh7w0vs1f";
+ name = "go-tag";
+ };
+ packageRequires = [ emacs go-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/go-tag";
+ license = lib.licenses.free;
+ };
+ }) {};
gobgen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gobgen";
@@ -28706,12 +29230,12 @@
god-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "god-mode";
- version = "20151005.925";
+ version = "20171221.106";
src = fetchFromGitHub {
owner = "chrisdone";
repo = "god-mode";
- rev = "6cf0807b6555eb6fcf8387a4e3b667071ef38964";
- sha256 = "1am415k4xxcva6y3vbvyvknzc6bma49pq3p85zmpjsdmsp18qdix";
+ rev = "8bc22eda77af3dc04d0e92e41b0776f61a8c90fe";
+ sha256 = "1wg5hngpc16n1ds7yq6kqdf23q8r27v3ppcqcl4jdnx97h9fif99";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2dff8dc08583048f9b7b4cb6d8f05a18dd4e8b42/recipes/god-mode";
@@ -28815,8 +29339,8 @@
src = fetchFromGitHub {
owner = "golang";
repo = "lint";
- rev = "6aaf7c34af0f4c36a57e0c429bace4d706d8e931";
- sha256 = "1z1j2l0j5175xvin5v56nsq7byg5nfpfvl9xgjszparchkyr8ndz";
+ rev = "e14d9b0f1d332b1420c1ffa32562ad2dc84d645d";
+ sha256 = "15ynf78v39n71aplrhbqvzfblhndp8cd6lnknm586sdl81wama6p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/34f22d829257456abbc020c006b92da9c7a7860e/recipes/golint";
@@ -29084,12 +29608,12 @@
goto-chg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "goto-chg";
- version = "20170917.1200";
+ version = "20180105.1033";
src = fetchFromGitHub {
owner = "emacs-evil";
repo = "goto-chg";
- rev = "81fca94d2592cf32bab451c39a9cd2d9b03fbd6b";
- sha256 = "033msplvpahkva9ha09gsg9232fyz2bjihrdxaa2z9g4yzql8jkq";
+ rev = "e5b38e4e1378f6ea48fa9e8439f49c2998654aa4";
+ sha256 = "1fxdvgdafavc4sad5i8g0wvpdqzlgzmvfi07yrah1c5vwkrslbvj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cf1fc176430fe3ab55ce537a0efc59780bb812be/recipes/goto-chg";
@@ -29151,8 +29675,8 @@
src = fetchFromGitHub {
owner = "vmware";
repo = "govmomi";
- rev = "adf4530b240711895896b14c337f9b77a3143e96";
- sha256 = "19vsni685qxfi2fvf5p6mhlr9qyz741a6i6wxkp9xycb402cwypx";
+ rev = "d70eca22cace05a6ed7a5787ecd660724d65d911";
+ sha256 = "0rgvlvv8dbm47qcw9wxrdd85rxa1csysqiyrhql6gwd4a5iwrbp1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -29277,8 +29801,8 @@
src = fetchFromGitHub {
owner = "Groovy-Emacs-Modes";
repo = "groovy-emacs-modes";
- rev = "c1e4cf8378bdd7e0d8205b2bcdcb3ff3e05ad8d2";
- sha256 = "0jk0a0n43jabyn8shv2i0fzqcy2aw16hanjqcsfzmrv5881hzyy1";
+ rev = "fb024c2ace201a3d8b869802276b8e6a581e8fc1";
+ sha256 = "0iw6wwmi48b0q46pszb57s5wxfwkpgjcfbx6b7sk8n6j60sz0i87";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode";
@@ -29315,12 +29839,12 @@
grandshell-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "grandshell-theme";
- version = "20170507.104";
+ version = "20171230.440";
src = fetchFromGitHub {
owner = "steckerhalter";
repo = "grandshell-theme";
- rev = "2f7e607cde9dd38ad4a95f3f3ad6cd85eba09f7b";
- sha256 = "0mc29g3hz7fb2a91rr24z2fnlqdwnq1q3lh14qyd7i9zpy5965dl";
+ rev = "c8f1dd4ceb3b752bcb4a0122af45e3a197c4fa99";
+ sha256 = "1b0azylab54183kf9nmpx6qb8hrr91fsxladwfmiljrcpvf6pdh8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b04b0024f5a0367e2998d35ca88c2613a8e3470/recipes/grandshell-theme";
@@ -29536,12 +30060,12 @@
green-screen-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "green-screen-theme";
- version = "20170824.728";
+ version = "20171130.234";
src = fetchFromGitHub {
owner = "rbanffy";
repo = "green-screen-emacs";
- rev = "05a9641d4f7354be7ff1b8dd34cbe5ef7054348c";
- sha256 = "036l9rbp7p9bf7wb85zr4ykyxiippiwlq53vk30lvkpwbv9vc5qz";
+ rev = "c348ea0adf0e6ae99294a05be183a7b425a4bab0";
+ sha256 = "1rqhac5j06gpc9gp44g4r3zdkw1baskwrz3bw1n1haw4a1k0657q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/821744ca106f1b74941524782e4581fc93800fed/recipes/green-screen-theme";
@@ -29657,22 +30181,22 @@
license = lib.licenses.free;
};
}) {};
- groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+ groovy-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "groovy-mode";
- version = "20171024.221";
+ version = "20180105.215";
src = fetchFromGitHub {
owner = "Groovy-Emacs-Modes";
repo = "groovy-emacs-modes";
- rev = "c1e4cf8378bdd7e0d8205b2bcdcb3ff3e05ad8d2";
- sha256 = "0jk0a0n43jabyn8shv2i0fzqcy2aw16hanjqcsfzmrv5881hzyy1";
+ rev = "fb024c2ace201a3d8b869802276b8e6a581e8fc1";
+ sha256 = "0iw6wwmi48b0q46pszb57s5wxfwkpgjcfbx6b7sk8n6j60sz0i87";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode";
sha256 = "1pxw7rdn56klmr6kw21lhzh7zhp338gyf54ypsml64ibzr1x9kal";
name = "groovy-mode";
};
- packageRequires = [ s ];
+ packageRequires = [ emacs s ];
meta = {
homepage = "https://melpa.org/#/groovy-mode";
license = lib.licenses.free;
@@ -29727,8 +30251,8 @@
src = fetchFromGitHub {
owner = "Greduan";
repo = "emacs-theme-gruvbox";
- rev = "87a59d8c3a25ec8bb00dcdef0efac8ac191c4431";
- sha256 = "1n6l76izdmhyzz2niv6rrb2yfiyf42n0siy9qf1kbynwlcdkl10g";
+ rev = "fb4f0a2dd3d146678fee3bf4d7bfce1c8e7cbd00";
+ sha256 = "0n9z3m10sim28q2k760vhwczzdprla92hi0g8prpvv1g6bb8qrs7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme";
@@ -29786,12 +30310,12 @@
gtk-pomodoro-indicator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gtk-pomodoro-indicator";
- version = "20170517.900";
+ version = "20171230.840";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "gtk-pomodoro-indicator";
- rev = "0fa0e682b3bd1595f230275d73ca231e93c6d28a";
- sha256 = "1jm7kcray6qd867hacyhs5c7hhdm0fyfa1jx35sh09g5c9xa4x2f";
+ rev = "eb59b229de0dde307b20654075a9bbac69899a66";
+ sha256 = "0dmaazcscg9mdsmij26873af5jl2np4q9xf2klw1jmcl61wzggb0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b98ec72605077f3b3f587713a681eb2144f29645/recipes/gtk-pomodoro-indicator";
@@ -29870,12 +30394,12 @@
guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }:
melpaBuild {
pname = "guix";
- version = "20171114.1204";
+ version = "20180107.1303";
src = fetchFromGitHub {
owner = "alezost";
repo = "guix.el";
- rev = "80980e064a9d5f0fa19ad2ac033d104d42021ce8";
- sha256 = "18qnnl18x07399xq41fy9rpzqsvjgm2w4520q5labjl6ndc9y248";
+ rev = "b4d897f7daafb5794809760340548b96b0a89ac3";
+ sha256 = "1bl6k0vdjl9b10pz76afwnmagjjazp1pxl9rash4m1f6zry4hbj7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix";
@@ -30436,12 +30960,12 @@
hasky-extensions = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hasky-extensions";
- version = "20170830.625";
+ version = "20180107.2112";
src = fetchFromGitHub {
owner = "hasky-mode";
repo = "hasky-extensions";
- rev = "65bf7bc3967cbda23789d6c505daf73eed9a43aa";
- sha256 = "0r91hcm265xa8amdfi44pn0cqf4m9zigzqx1ldgg8qd6l9r2hbh7";
+ rev = "d75dc57f4eaeb92785bde6c26c1031710be1cf00";
+ sha256 = "135rn33ldrhz3z6fg1rcdaxs1dnahliw782qc4ffxkays186id63";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e3f73e3df8476fa231d04211866671dd74911603/recipes/hasky-extensions";
@@ -30457,12 +30981,12 @@
hasky-stack = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }:
melpaBuild {
pname = "hasky-stack";
- version = "20170928.359";
+ version = "20171231.942";
src = fetchFromGitHub {
owner = "hasky-mode";
repo = "hasky-stack";
- rev = "a3f890fb8570369898ee9718b128d4e7123a6585";
- sha256 = "0bc5i4s7aclwrsh8yrhfwwlfbcs5hdbzm31glikd487asv30jq9c";
+ rev = "7a97d039489ff23b3362b543dea1007357e2ada9";
+ sha256 = "1rqj7yypsd25h4x9lx6vkqchq70fwnjs4dpivd7n105h41pz3kiv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c3faf544872478c3bccf2fe7dc51d406031e4d80/recipes/hasky-stack";
@@ -30645,12 +31169,12 @@
helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
melpaBuild {
pname = "helm";
- version = "20171125.2152";
+ version = "20180108.414";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
- rev = "093fd8c06115dae3428d2ddfa94a1024da282185";
- sha256 = "1r6m65mfrxq7y763k3vc74ayy7nmmfqqka27xybzf0vhwyji4mf2";
+ rev = "455ef14604064296b5e382b044d4775814d89eaa";
+ sha256 = "07kplf1a4zkyczq9mv5kilbj8lf1bv1khwwnzmxn1yd9dgzyfcnf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -30813,12 +31337,12 @@
helm-aws = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
melpaBuild {
pname = "helm-aws";
- version = "20151124.133";
+ version = "20171227.132";
src = fetchFromGitHub {
owner = "istib";
repo = "helm-aws";
- rev = "512fb7edcdc6c65303b9641bfc737f836939e5e9";
- sha256 = "1bnypr906gfc1fbyrqfsfilsl6wiacrnhr8flpa0gmdjhvmrw7af";
+ rev = "d69a0241601d170c034e3b69e8df0b1fec72bff7";
+ sha256 = "0975a0nwxlnpln7vrq4hqq4xamrhp1zc4bkwnzpw06dk95s23cb9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/421182006b8af17dae8b5ad453cc11e2d990a053/recipes/helm-aws";
@@ -30834,12 +31358,12 @@
helm-backup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
melpaBuild {
pname = "helm-backup";
- version = "20170807.1239";
+ version = "20171204.2357";
src = fetchFromGitHub {
owner = "antham";
repo = "helm-backup";
- rev = "3f39d296ddc77df758b812c50e3c267dd03db8bb";
- sha256 = "05528ajhmvkc50i65wcb3bi1w4i3y1vvr56dvq6yp7cbyw9r7b8w";
+ rev = "a2c0fa16113e628500d6822c6605280b94e24038";
+ sha256 = "0j4dkz9za2zng43dx8ph688gl5973isxr89v5bw160c65n4lbc6w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5e6eba7b201e91211e43c39e501f6066f0afeb8b/recipes/helm-backup";
@@ -30876,12 +31400,12 @@
helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }:
melpaBuild {
pname = "helm-bibtex";
- version = "20171022.220";
+ version = "20171213.317";
src = fetchFromGitHub {
owner = "tmalsburg";
repo = "helm-bibtex";
- rev = "54de08577f9c19354cc303ee52836263aef486fb";
- sha256 = "0l98lmy0c9l64khnl9j87l5g9g5fiah5l64hxn97h4b438kjcjm0";
+ rev = "84863a37695b786c6c6980a589f8ea282c385ab2";
+ sha256 = "0nh0n17mnrf9qf68mxcxclci1qmqal1li827a1qia3fkjry4vqxk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex";
@@ -31212,12 +31736,12 @@
helm-codesearch = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
melpaBuild {
pname = "helm-codesearch";
- version = "20161214.548";
+ version = "20171215.26";
src = fetchFromGitHub {
owner = "youngker";
repo = "helm-codesearch.el";
- rev = "e80e76e492f626659b88dbe362b11aa0a3b0a116";
- sha256 = "16njr3xcvpzg4x6qq2pwk80pca9pxhc6vjvfy3dzy4hi9nxryrs6";
+ rev = "ccb99aee4851bc156a67835299b24099aa8ff5c1";
+ sha256 = "0yhhiax06arvimgxvh9xdflgjbkflhi1cp0g8816bwr0hdmv57dh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0a992824e46a4170e2f0915f7a507fcb8a9ef0a6/recipes/helm-codesearch";
@@ -31275,12 +31799,12 @@
helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "helm-core";
- version = "20171129.917";
+ version = "20180108.514";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
- rev = "093fd8c06115dae3428d2ddfa94a1024da282185";
- sha256 = "1r6m65mfrxq7y763k3vc74ayy7nmmfqqka27xybzf0vhwyji4mf2";
+ rev = "455ef14604064296b5e382b044d4775814d89eaa";
+ sha256 = "07kplf1a4zkyczq9mv5kilbj8lf1bv1khwwnzmxn1yd9dgzyfcnf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -31569,12 +32093,12 @@
helm-emms = callPackage ({ cl-lib ? null, emacs, emms, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-emms";
- version = "20170517.1010";
+ version = "20180104.2127";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm-emms";
- rev = "b1c7d03e80c3012e327f0d518258508acf980c1c";
- sha256 = "18fpsr6kaw2m1bvj05i5qayq6d01v54jw98489bgwshp9wmhsy9m";
+ rev = "8133c1a854c8f9e32b3b4c74638fe197535c08f1";
+ sha256 = "06111034rvh770ljzdbw7d6rkvy40bjvp4c06ss5s624pyd6qd74";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/db836b671705607f6cd9bce8229884b1f29b4a76/recipes/helm-emms";
@@ -31611,12 +32135,12 @@
helm-ext = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-ext";
- version = "20171101.1231";
+ version = "20171218.1543";
src = fetchFromGitHub {
owner = "cute-jumper";
repo = "helm-ext";
- rev = "c8ac56918b200239b3f73a4e6a031deecc2c5646";
- sha256 = "08c6n4zr6s3h7y0kk6g51xqs6hs29hkfmn55jfjw6hpimbk3vi1j";
+ rev = "bdc0d86d43d965dda5ac94ec9c3fdcaa1e71aab1";
+ sha256 = "1qfawx9k74rhm9rxcdrx9gpxqrvpgpiv3dz8qgl06mdr0hxrcrrb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee74cb0aa3445bc9ae4226c2043ee4de3ac6cd3/recipes/helm-ext";
@@ -31632,12 +32156,12 @@
helm-exwm = callPackage ({ emacs, exwm, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-exwm";
- version = "20171120.1204";
+ version = "20171218.1335";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm-exwm";
- rev = "f90ac4356d30d713927c65029345b3aa3624341d";
- sha256 = "10rbqfmxykkmynmlz885hx5bw5hm9b1hcbpz3yjyv2vfbqll9lgm";
+ rev = "26f85e253010aa4782c6d77d17d4f6067a0c5edd";
+ sha256 = "0zvgfb0ky72yxj6f13knzcp473a03s083q5la4prswchg0r3xrir";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8ecdf9e00cf19fabbeade12a66d66cd010561366/recipes/helm-exwm";
@@ -31695,12 +32219,12 @@
helm-flx = callPackage ({ emacs, fetchFromGitHub, fetchurl, flx, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-flx";
- version = "20170404.1230";
+ version = "20180102.2116";
src = fetchFromGitHub {
owner = "PythonNut";
repo = "helm-flx";
- rev = "c8650d9b34afbc236c28aee12cbee998fda8d810";
- sha256 = "0400maq605qq631a766lzmphyaxwq0lfvb6x29j6aqd6pgxxrjs5";
+ rev = "6640fac5cb16bee73c95b8ed1248a4e5e113690e";
+ sha256 = "1fh1dy6xpc476hs87mn9fwxhxi97h7clfnnm7dxb7hg43xmgsjjs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f1418d260f34d698cec611978001c7fd1d1a8a89/recipes/helm-flx";
@@ -32049,22 +32573,22 @@
license = lib.licenses.free;
};
}) {};
- helm-google = callPackage ({ fetchFromGitHub, fetchurl, google, helm, lib, melpaBuild }:
+ helm-google = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-google";
- version = "20170722.710";
+ version = "20171215.1159";
src = fetchFromGitHub {
owner = "steckerhalter";
repo = "helm-google";
- rev = "4530a375a46880d53e5d7e906028f71c040de946";
- sha256 = "1xj3q6hyjcqbr3dglcba4impsdgb707zi9w7prpn1m735xhsis01";
+ rev = "bf3b04e04db5bc99b621b90b7d58a5438db14c66";
+ sha256 = "06848hjbwj8bkdinbmmzh2sc92l9chzwbglyfl17bwxkcdbxd54i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/88ed6db7b53d1ac75c40d12c21de1dec6d717fbe/recipes/helm-google";
sha256 = "0d1y7232rm888car3h40fba1m1pna2nh1a3fcvpra74igwarfi32";
name = "helm-google";
};
- packageRequires = [ google helm ];
+ packageRequires = [ helm ];
meta = {
homepage = "https://melpa.org/#/helm-google";
license = lib.licenses.free;
@@ -32220,12 +32744,12 @@
helm-hunks = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-hunks";
- version = "20170625.1523";
+ version = "20171217.1133";
src = fetchFromGitHub {
owner = "torgeir";
repo = "helm-hunks.el";
- rev = "56731db3968a57fbb2473529227c2998b7f404b0";
- sha256 = "1kszp6jy4r39r71jjrr8p3nfpylbqyphrsfb4dghh6kl0zxic38j";
+ rev = "6392bf716f618eac23ce81140aceb0dfacb9c6d0";
+ sha256 = "1ih2pgyhshv8nl7hhchd4h0pbjgj45irp5dy1fq2gy05v4rn7wi4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d61cbe53ad42f2405a66de9f551f5b870a60709f/recipes/helm-hunks";
@@ -32455,8 +32979,8 @@
src = fetchFromGitHub {
owner = "leanprover";
repo = "lean-mode";
- rev = "c0af876c967fc969d67c467bc6767210d19c5d87";
- sha256 = "04qzck156wb2bvrb8adbn7rx2v0bsjcirlbx4ajajjsqy858ayn9";
+ rev = "3403179a38693a221bfa86def0c99f6342c5eb73";
+ sha256 = "0w6zc1w7kic3ds5hf30i3mj9wxbq2c8wdywbslfprwwi1hxyzmsq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde/recipes/helm-lean";
@@ -32745,12 +33269,12 @@
helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
melpaBuild {
pname = "helm-org-rifle";
- version = "20170807.611";
+ version = "20171202.1216";
src = fetchFromGitHub {
owner = "alphapapa";
repo = "helm-org-rifle";
- rev = "502ea1285b8ce858a3acbc39dd4f54ff1af5b7e3";
- sha256 = "1j87fd9qv7pl7s52ksj7iy023lw76qy4mkgjc4w5rljvm5bdnrgp";
+ rev = "94cb602d6373229c88126a5888f03f4b538f0771";
+ sha256 = "0jf6dc461ki21w4s5hxj5mx57y3jilxxgd2sc11cv5ilh4x0776v";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle";
@@ -32784,27 +33308,6 @@
license = lib.licenses.free;
};
}) {};
- helm-package = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
- melpaBuild {
- pname = "helm-package";
- version = "20170216.2002";
- src = fetchFromGitHub {
- owner = "syohex";
- repo = "emacs-helm-package";
- rev = "0f3ac5623cc6220a65f3c9ec0f587225101e96d5";
- sha256 = "0z45gj2rb4n26khkk9lg445s69c1jwks0hcyqww63asch6ydizgj";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/e31f4e01891b6a863a38da45eeea57ec656b5813/recipes/helm-package";
- sha256 = "1qab2abx52xcqrnxzl0m3533ngp8m1cqmm3hgpzgx7yfrkanyi4y";
- name = "helm-package";
- };
- packageRequires = [ emacs helm ];
- meta = {
- homepage = "https://melpa.org/#/helm-package";
- license = lib.licenses.free;
- };
- }) {};
helm-pages = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-pages";
@@ -32829,12 +33332,12 @@
helm-pass = callPackage ({ auth-password-store, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, password-store }:
melpaBuild {
pname = "helm-pass";
- version = "20170627.1124";
+ version = "20180103.1838";
src = fetchFromGitHub {
owner = "jabranham";
repo = "helm-pass";
- rev = "dc599627789284eea044e881e105586f9e05bc9f";
- sha256 = "143vd248kziz95mdr568qh7wg1h00dxniqr144d867ng1gybi8cb";
+ rev = "05a56bb04115153aa84d285e2068e9dd99ed6a38";
+ sha256 = "0j7rlgv71cnl0flny6hpjsa99d3mslmxzkshgj0h3zmikp39gimj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d8100599d69a760cd4548004a552cc0adcdb3bed/recipes/helm-pass";
@@ -33253,8 +33756,8 @@
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "8ef7554852541eced514c56d5e39d6073f7a2ef9";
- sha256 = "0hh9m0ykw3r9h4gv4a99px00py1h5hs86043mp1m0nmkjibf6w56";
+ rev = "db5ad3a48c579b3522411bd2411c09dbb27af578";
+ sha256 = "1ihv65hfq22yk4wx4njkm73q4s04fr84ib3mjjk8l18xpzl6alal";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags";
@@ -33351,6 +33854,27 @@
license = lib.licenses.free;
};
}) {};
+ helm-selected = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, selected }:
+ melpaBuild {
+ pname = "helm-selected";
+ version = "20171222.1810";
+ src = fetchFromGitHub {
+ owner = "takaxp";
+ repo = "helm-selected";
+ rev = "d2609cdfce14052ab2d9c23761d4fe56966a8ed1";
+ sha256 = "0nbfs5s6lshxib6kp20dzh1qbmq079hwcqwi1n61ank22qa9qw5x";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/acc087661e614d9f30c23fe4a65c020bd3656a29/recipes/helm-selected";
+ sha256 = "0ksyh0r59y4abwls6v6v519yxmcjnaryfnxlam48fqqfrsxv1j0h";
+ name = "helm-selected";
+ };
+ packageRequires = [ emacs helm selected ];
+ meta = {
+ homepage = "https://melpa.org/#/helm-selected";
+ license = lib.licenses.free;
+ };
+ }) {};
helm-sheet = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-sheet";
@@ -33438,12 +33962,12 @@
helm-spotify-plus = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, multi }:
melpaBuild {
pname = "helm-spotify-plus";
- version = "20170320.609";
+ version = "20180107.338";
src = fetchFromGitHub {
owner = "wandersoncferreira";
repo = "helm-spotify-plus";
- rev = "847dfafbb5e5d65a44464b0ec8e2b7d88864a9aa";
- sha256 = "0i1vnaiqcs220nc1mjbx0959aa0nbjxhrqkvbrj3zy7ybsya22gq";
+ rev = "895f241f1259891d5c89cd42023f119f9fa121d6";
+ sha256 = "1sjw0bapik01f3lfnsirpayn7b0169lbjhppb2mqzr3xjxm58wbs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/306aa9fd29f1495eef71476dfcba3b494223b0a9/recipes/helm-spotify-plus";
@@ -33498,6 +34022,27 @@
license = lib.licenses.free;
};
}) {};
+ helm-system-packages = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, seq }:
+ melpaBuild {
+ pname = "helm-system-packages";
+ version = "20171224.50";
+ src = fetchFromGitHub {
+ owner = "emacs-helm";
+ repo = "helm-system-packages";
+ rev = "bfc4b6f6f2f05edd6009a2295ed90e8448a52474";
+ sha256 = "0jnjgwiqfc2lr452wamdln2fhi7p4r2d9wvkha260gdbld54871q";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0c46cfb0fcda0500e15d04106150a072a1a75ccc/recipes/helm-system-packages";
+ sha256 = "01mndx2zzh7r7gmpn6gd1vy1w3l6dnhvgn7n2p39viji1r8b39s4";
+ name = "helm-system-packages";
+ };
+ packageRequires = [ emacs helm seq ];
+ meta = {
+ homepage = "https://melpa.org/#/helm-system-packages";
+ license = lib.licenses.free;
+ };
+ }) {};
helm-systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, with-editor }:
melpaBuild {
pname = "helm-systemd";
@@ -33543,12 +34088,12 @@
helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-tramp";
- version = "20171120.140";
+ version = "20171224.702";
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-helm-tramp";
- rev = "d90be189d8c2b742c9621ff28b1196be683cdb4c";
- sha256 = "1hi7zw4p3w8a14fqv6w2bc0anrjb6d4vglwhmaz50qr2w3plxq15";
+ rev = "cb2d2df7e95fc249ebe38ea843288b7194afbd9a";
+ sha256 = "0cr36kyzs2q2qbi2815m4c303cc50zcmyn2sw3x5ja3qixi0c087";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp";
@@ -33669,12 +34214,12 @@
helm-xref = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-xref";
- version = "20170822.1708";
+ version = "20171209.346";
src = fetchFromGitHub {
owner = "brotzeit";
repo = "helm-xref";
- rev = "af55df844aa65275c8f75d3a8705e13717fd3ee6";
- sha256 = "0srjmz3xm6ycx5grjl7iqrnx5qlmg7n42i9wrb3i01zrjrjbqi7x";
+ rev = "ad98c3f6e5404e44e7e87210b5827bef75e16a25";
+ sha256 = "1z1343lp9n0kn3y4z08bwnxlfvg5pchznnfqy2xhjjbm9ndlhc16";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6d1796688ed0d6957557d960ca28e450f9bcb6cf/recipes/helm-xref";
@@ -33708,6 +34253,27 @@
license = lib.licenses.free;
};
}) {};
+ helm-z = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+ melpaBuild {
+ pname = "helm-z";
+ version = "20171203.1925";
+ src = fetchFromGitHub {
+ owner = "yynozk";
+ repo = "helm-z";
+ rev = "37212220bebea8b9c238cb1bbacd8332b7f26c03";
+ sha256 = "1vz958yiva01yl1qj2pz84savcx8jgkvbywhcp4c3a8x3fikf0yl";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/48c9b83fff8fc428d9d1ecf0005d47f2adb8cb00/recipes/helm-z";
+ sha256 = "1m268zsr4z7a9l5wj0i8qpimv0kyl8glgm0yb3f08959538nlmd1";
+ name = "helm-z";
+ };
+ packageRequires = [ helm ];
+ meta = {
+ homepage = "https://melpa.org/#/helm-z";
+ license = lib.licenses.free;
+ };
+ }) {};
helm-zhihu-daily = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-zhihu-daily";
@@ -33729,22 +34295,22 @@
license = lib.licenses.free;
};
}) {};
- helpful = callPackage ({ dash, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+ helpful = callPackage ({ dash, dash-functional, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
melpaBuild {
pname = "helpful";
- version = "20171120.321";
+ version = "20180107.728";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "helpful";
- rev = "c98f271b4c164cc54c4149ab8f486e3a67b55e1c";
- sha256 = "0lcy79ih1l7v5yjg2cpf6fw999hffsa67jl9w1g5x4bkgrai5gzx";
+ rev = "04073c80f3c82fa488edcd0cffa4961ff40cf885";
+ sha256 = "1cv7ajqrb0mqqlbv1b34ccj4k2qpi3bv217fkh580l8y6g2lcdk6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful";
sha256 = "17w9j5v1r2c8ka1fpzbr295cgnsbiw8fxlslh4zbjqzaazamchn2";
name = "helpful";
};
- packageRequires = [ dash elisp-refs emacs s ];
+ packageRequires = [ dash dash-functional elisp-refs emacs s shut-up ];
meta = {
homepage = "https://melpa.org/#/helpful";
license = lib.licenses.free;
@@ -33837,12 +34403,12 @@
hexo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hexo";
- version = "20170702.1915";
+ version = "20171226.2035";
src = fetchFromGitHub {
owner = "kuanyui";
repo = "hexo.el";
- rev = "201c795ded01d96690ceadc1dd068744aceaeda8";
- sha256 = "0rj5lcmlghxm4d1vx8jxdhw53famzjxzp1bx38zgrqlhwakyghab";
+ rev = "07c2366d1bdc25e09bebf429050bc0e8a7bb7aa8";
+ sha256 = "0xj8jj2mnn2vasiaq7dhx3rd5knqll518ap23wfihnn96cba2rrh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/21de1b7db0fa4af4fc0014207d41893a0713d738/recipes/hexo";
@@ -33984,12 +34550,12 @@
hierarchy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hierarchy";
- version = "20171017.1103";
+ version = "20171221.351";
src = fetchFromGitHub {
owner = "DamienCassou";
repo = "hierarchy";
- rev = "cd65d149b8910edfa5536eeda26988aabcfd511a";
- sha256 = "0746wn62vwgnn4hg8ag0hq80hv7lwv929pjk5cccqqz4s0kp0c80";
+ rev = "06f21d3fc16c44c1fa45dc9c91d10100b4db9355";
+ sha256 = "1sp59nc82qb40n8p08hr0j4ig7ypc2icvgz74057vs1q042asqqw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7aea238a2d14e9f58c0474251984b6c617b6854d/recipes/hierarchy";
@@ -34131,12 +34697,12 @@
highlight-indentation = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "highlight-indentation";
- version = "20170502.43";
+ version = "20171218.137";
src = fetchFromGitHub {
owner = "antonj";
repo = "Highlight-Indentation-for-Emacs";
- rev = "5c7717a2224372f7113d13640515df3650388a37";
- sha256 = "13d85qbq6q9pz3yrwpn6rjlrbrjs0fnskkbb5liczyxyk8rzj924";
+ rev = "35e2c1d4f8f368685893128f77f90454cb9c2708";
+ sha256 = "1rmqi8k8p0f3aawh2l119hsfnnd060bv9hhjx13pabid8xhhvs73";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/31c443de5088410c0fe1b1c18f664b33ad259277/recipes/highlight-indentation";
@@ -34403,12 +34969,12 @@
hindent = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hindent";
- version = "20170609.126";
+ version = "20171215.848";
src = fetchFromGitHub {
owner = "chrisdone";
repo = "hindent";
- rev = "889e1655c6eb170e0d30c3c1173f7fba87041736";
- sha256 = "012h82m1x2iva2mh3q0rr5s3y8hm1kmnybngnaakzphhshdph32p";
+ rev = "cba1110ca413a41a443b8368d63d295d7d36de7a";
+ sha256 = "020dj6q483b7fabspgvnjqw0rhrgj3q1ncdcpafmyn1fgip5y0zq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent";
@@ -34487,12 +35053,12 @@
historian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "historian";
- version = "20170722.1714";
+ version = "20180102.2118";
src = fetchFromGitHub {
owner = "PythonNut";
repo = "historian.el";
- rev = "78ec5632e4f4fd005014bd762c4a5ccdeabbd33d";
- sha256 = "1ag9hpxrzg5add4nj2j08ymxrggnzdzqb8k1vcpkd8rg72138k3w";
+ rev = "ba560443a216befd4460fcf16dc6c7f23cb73d8d";
+ sha256 = "1g1p02kx50nry4vm5bcp7kyjnn9lafc9a57nirnkf0gm41m6yj8q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f16dacf64c52767c0c8aef653ac5d1a7a3bd0883/recipes/historian";
@@ -34697,12 +35263,12 @@
hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }:
melpaBuild {
pname = "hledger-mode";
- version = "20171101.1139";
+ version = "20171201.1156";
src = fetchFromGitHub {
owner = "narendraj9";
repo = "hledger-mode";
- rev = "70f4d9c44077eea13bdcb5688475e0c90578e085";
- sha256 = "0j4pk2qr93pxgg8smzhxmlpk9b0rv9w20n1dz5lw42641xx8frnf";
+ rev = "594ce27f898ba027cb7f326179ff7875072b03e0";
+ sha256 = "1jla31az52qygabd99m8ibq60f4almkbjlg1z63kz7zl98hfxnw7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hledger-mode";
@@ -34927,11 +35493,11 @@
howm = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "howm";
- version = "20160928.439";
+ version = "20171225.652";
src = fetchgit {
url = "https://scm.osdn.net/gitroot/howm/howm.git";
- rev = "e0237b07f60011a1926b36848c73340ae46cdb3e";
- sha256 = "0ljsvrpbj7y690pq6llnqqkvm9mlrhksxihv9jpx06d1g4ghknpq";
+ rev = "1329df206e5de11e78b5064050b5dc6c5b775d9d";
+ sha256 = "0k6b03ifz1d5c3055imm6hicvfryss621bcd9i39pdccazpccj67";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0099a1f9b0efb3fc3a1420cfe71a647ec6458998/recipes/howm";
@@ -34947,12 +35513,12 @@
ht = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ht";
- version = "20171112.1405";
+ version = "20171213.1334";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "ht.el";
- rev = "ce65ce5d535cc86698ad6012f60fb56d7d80d8db";
- sha256 = "07yd5fqh5y3bbr6capc3x562kl4ia39d55qvz521yxdnzmwsdpq7";
+ rev = "64af52688eb09eb42b7228a4e8e40d4a81cd983b";
+ sha256 = "1qz1zynkb1nanyi0ylllv80gzkgl2bgx9y82g07w1rfa86qgaghg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6c7589bca1c1dfcc0fe76779f6847fda946ab981/recipes/ht";
@@ -35262,12 +35828,12 @@
hy-mode = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "hy-mode";
- version = "20171114.1217";
+ version = "20171202.1141";
src = fetchFromGitHub {
owner = "hylang";
repo = "hy-mode";
- rev = "f83c11d4972658b9c687a0357bc2c06bc5461995";
- sha256 = "138dbbmwl681nzv7144wl0sb15zvwc8w6a50w2bh7ir9rcc6d4i3";
+ rev = "3220f00a9bdb24667a1c3876b4a2f889dcb77501";
+ sha256 = "06aw6l8nn8w6a7dfwh9ifs41acyq0jycszhhisv0idqrs8q5njsv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fc9ab5cf16b61bb27559cd8ec5cf665a5aab2154/recipes/hy-mode";
@@ -35350,8 +35916,8 @@
src = fetchFromGitHub {
owner = "abo-abo";
repo = "hydra";
- rev = "e228432bb64385f67f20aa525bce56ae4e8419eb";
- sha256 = "18mqmrq3xwmpzqw4chx7xkgsi4kmh8dhwidih0hhqhfzvmicls0m";
+ rev = "1deed8a00e6936903cace1dac123364b6c0cde90";
+ sha256 = "0jraj3l7w0bw2c6qkq1bfdfa2zf7xssmk9cdkdgbjjip5xvq31ns";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a4375d8ae519290fd5018626b075c226016f951d/recipes/hydra";
@@ -35404,6 +35970,27 @@
license = lib.licenses.free;
};
}) {};
+ ialign = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "ialign";
+ version = "20180107.305";
+ src = fetchFromGitHub {
+ owner = "mkcms";
+ repo = "interactive-align";
+ rev = "df591e452f9a56c69fb69de961baa75751bae3d8";
+ sha256 = "1k3c0wxbn6yrd75275ny66avp70qpd3glnmagsgq3x8mbyxh233d";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/072f1f7ce17e2972863bce10af9c52b3c6502eab/recipes/ialign";
+ sha256 = "070a0fa2vbdfvbnpbzv4z0c7311lf8sy2zw2ifn9k548n4l8k62j";
+ name = "ialign";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/ialign";
+ license = lib.licenses.free;
+ };
+ }) {};
iasm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "iasm-mode";
@@ -35449,12 +36036,12 @@
ibuffer-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
melpaBuild {
pname = "ibuffer-projectile";
- version = "20171103.2004";
+ version = "20171222.2000";
src = fetchFromGitHub {
owner = "purcell";
repo = "ibuffer-projectile";
- rev = "6f03040a93d116b73f9fd3d6b52102b57bfaf597";
- sha256 = "0jmb4s4n8yxyavvvd4msr58708jlha7jd8hm5djl91fgf87r3ys3";
+ rev = "bfa02c76dabdc02557b67fa556969bc74e255023";
+ sha256 = "0isgy5nkcbcf56p4f7xaf0shi4ja99s23gbvan6fimf6ra7qw4i2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/363a6a888945f2c8b02f5715539439ba744d737d/recipes/ibuffer-projectile";
@@ -36100,12 +36687,12 @@
idris-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, prop-menu }:
melpaBuild {
pname = "idris-mode";
- version = "20170722.1339";
+ version = "20171212.759";
src = fetchFromGitHub {
owner = "idris-hackers";
repo = "idris-mode";
- rev = "5c01039112a8c52a0275560575f1f542f3966cf5";
- sha256 = "0r3fbp2c8qhmsnpd63r9fjz1vxjsa054x69d9716pbp1jk3qsjsv";
+ rev = "2206501895668e1cd395119921bbcd2b16165600";
+ sha256 = "1s185lkkbjh2811qs4grgq916x83m58ifl85g9ji9ll4vr3p1al5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/17a86efca3bdebef7c92ba6ece2de214d283c627/recipes/idris-mode";
@@ -36396,8 +36983,8 @@
src = fetchFromGitHub {
owner = "bmag";
repo = "imenu-list";
- rev = "62de9b897f0f6168f57cc64532dbcaa1bfcbe47e";
- sha256 = "06i5ql155ik03zyk7hc4vxl6haczr6h2zgfaqinkzqs1gbrg1b8a";
+ rev = "0d3d445ce60a77a6c7bcbdbf1ae62cc20d2b5575";
+ sha256 = "0q7124qaa3kmag3p3a1wq4axj59dvcsd7ydsh6cl9np2p18illvx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/86dea881a5b2d0458449f08b82c2614ad9abd068/recipes/imenu-list";
@@ -36601,12 +37188,12 @@
indent-info = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "indent-info";
- version = "20171122.1555";
+ version = "20171216.1509";
src = fetchFromGitHub {
owner = "terlar";
repo = "indent-info.el";
- rev = "a295ed813f5c84fe202c9100dd33a46bc1184bc5";
- sha256 = "0i9197vfzn1hk6hx3siri4hfbkc7nia5vsh2k9s6afsg6gvhypzp";
+ rev = "e63a918b16d6d1986dd9123670a762e49102ce2b";
+ sha256 = "0smh7x49cl8zhhjfvcgbcnr1a4n5rck7cpg797xwi3vr00b4bzv8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1274c0d871c51e358b3de577372dae8e3a04ead0/recipes/indent-info";
@@ -36622,12 +37209,12 @@
indent-tools = callPackage ({ fetchFromGitLab, fetchurl, hydra, lib, melpaBuild, s, yafolding }:
melpaBuild {
pname = "indent-tools";
- version = "20171103.750";
+ version = "20171215.327";
src = fetchFromGitLab {
owner = "emacs-stuff";
repo = "indent-tools";
- rev = "6e8e9a8cf9efe4a8624e52f45cb5faa5fe8ec996";
- sha256 = "1hh4r4axnbmi12hk2d3pynvq3nldgbik8jf73v5ddmv06kqlsxya";
+ rev = "7d7ff66e699f28478c0d63f39ff6b1477cf0bee7";
+ sha256 = "1y2dlq2n0rn70bccjd20s44ihyq1jja7lh2h3d8syy31xc6i1i6z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/indent-tools";
@@ -36664,12 +37251,12 @@
indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }:
melpaBuild {
pname = "indium";
- version = "20171121.513";
+ version = "20171213.236";
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "Indium";
- rev = "a5f7e0b081a02ff96a85d0c96e3cffe9c42ead53";
- sha256 = "1555nr5nzp0ch5gq26i3w3za43w16fvncjqbfv0nlq1cwnsa8brh";
+ rev = "4769ab443e153a19c9d40522e5f40656b0ef4385";
+ sha256 = "13rii0vnh9d981jklb6apilx8yhqyc69fxp095f7i4n0aimfa413";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium";
@@ -36706,12 +37293,12 @@
inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "inf-clojure";
- version = "20171120.2310";
+ version = "20180102.1324";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "inf-clojure";
- rev = "12583f4aba2f4aea3879c0ca5ec1d002c0578371";
- sha256 = "1qk56md12m61nd62h0syh4kjvi2hsfx8a1p9p2rg1dbwvc1ydbdy";
+ rev = "247ca70f8ba5104be292aea20fbde6adb37e359f";
+ sha256 = "11hyva006bc4hbhzjwb4brilm6fb7qfm5h66nl0gmmyva40y6412";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure";
@@ -36748,12 +37335,12 @@
inf-ruby = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "inf-ruby";
- version = "20170615.335";
+ version = "20171211.225";
src = fetchFromGitHub {
owner = "nonsequitur";
repo = "inf-ruby";
- rev = "674a2a837fccea88ada6634e981a656b41d16d8e";
- sha256 = "09am0gq1sx0wv7bvcs7pp118brjj19qr7mis7cxjvrxbryc1mxf4";
+ rev = "5ae6149a15068d3e2f83a5bd08e9cd7605f75fa9";
+ sha256 = "0778ykgsmhry9h4n6wcszwh0gzkl9n7rx4jd60rplk38qj3p89hv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/inf-ruby";
@@ -36958,12 +37545,12 @@
inkpot-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "inkpot-theme";
- version = "20171106.640";
+ version = "20171217.144";
src = fetchFromGitHub {
owner = "ideasman42";
repo = "emacs-inkpot-theme";
- rev = "046d0bb361500e14c718b00930d31c73890929cb";
- sha256 = "02qlqh6fvk8cgf8mrl9m4bmaar45i5kpsjngkqqpl3kgxvycbsk8";
+ rev = "8d59548ff5171bf6be6acc58d111674579646124";
+ sha256 = "0r63rb99nm7fpw8yn3gkbfka12jqwzkdhv97hm89nvdrxdnbggfs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dd3e02aaf8865d8038b9c590c8545e7a1b21d620/recipes/inkpot-theme";
@@ -37167,12 +37754,12 @@
intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
melpaBuild {
pname = "intero";
- version = "20171023.1102";
+ version = "20180102.1220";
src = fetchFromGitHub {
owner = "commercialhaskell";
repo = "intero";
- rev = "5697c86fde2b6131629e8d1c69f9b2363dadc7ae";
- sha256 = "1zwvmchk8rymxfciiip78zf69p3f8jpbr7fqqj43cxv0lq9w284s";
+ rev = "322b3c017153a536ffa3559b64fc1ac16af19a69";
+ sha256 = "14gmm3l2wwm96xzijjl070mg8d48zj5hqqxs4vh56hadjd2aijlp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -37395,6 +37982,27 @@
license = lib.licenses.free;
};
}) {};
+ ipython-shell-send = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "ipython-shell-send";
+ version = "20171212.318";
+ src = fetchFromGitHub {
+ owner = "jackkamm";
+ repo = "ipython-shell-send-el";
+ rev = "36523a387c15ee1652a5b0e291d4d4838da5e912";
+ sha256 = "1iba7jpagc0n436pbylpcbwbdxk6bw7y0i7pjgxxwfm8akaj9i68";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/9d3513d38f94de4d86124b5d5a33be8d5f0bfa43/recipes/ipython-shell-send";
+ sha256 = "07im2f3890yxpcy4qz1bihi68aslam7qir4vqf05bhqlgaqzamv8";
+ name = "ipython-shell-send";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/ipython-shell-send";
+ license = lib.licenses.free;
+ };
+ }) {};
iqa = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "iqa";
@@ -37461,12 +38069,12 @@
irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
melpaBuild {
pname = "irony";
- version = "20171110.1151";
+ version = "20180104.1109";
src = fetchFromGitHub {
owner = "Sarcasm";
repo = "irony-mode";
- rev = "1d865c71fefeab952a2f61184d7f77371706954a";
- sha256 = "0xkl9wm63dxwb1s3sd3skbzvsdhva6gfbfz27m7z1j5zdc94x64x";
+ rev = "82ba45ec15c9011bbdf1d69cf25c8193d33c0028";
+ sha256 = "0iby446mpgjrs4kg0ji8435h3aamdvcxbmv1j3qg0i9p6abmi7f8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony";
@@ -37587,12 +38195,12 @@
isortify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "isortify";
- version = "20170726.1254";
+ version = "20171223.1812";
src = fetchFromGitHub {
owner = "proofit404";
repo = "isortify";
- rev = "28699f29cfc0d9d78b636d0ecadcf9139173bc6f";
- sha256 = "0r7hbvsnn590wfydwibvpdihcah5jj6ylqhqq7w1a1nljzwk6d4h";
+ rev = "2db50c1f585db8a8ec5fa28a90a8179516c16cd0";
+ sha256 = "04wzq9cf1bzbyx3jn7anrzc1r64l23s073xqsfcqb8hgh2swcpl6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9d4ad18492e7f4a56a1515873bc0b66fa49829bb/recipes/isortify";
@@ -37755,12 +38363,12 @@
ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ivy";
- version = "20171129.1005";
+ version = "20180104.1212";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "23935401b062fde5557de826814ddc55e75fe1b8";
- sha256 = "055l5rmnkczlz4nhjppa3c7m02mmv8zw7zaf60820911zx1sl32b";
+ rev = "e5c5037fd5f2735b11fc90363f312431619fa8c2";
+ sha256 = "0ssm6dgzzqvwwmwvnws8s0ac4f8dif5sxl9flx296df7s7xryzcv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -37776,12 +38384,12 @@
ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }:
melpaBuild {
pname = "ivy-bibtex";
- version = "20171022.220";
+ version = "20171213.317";
src = fetchFromGitHub {
owner = "tmalsburg";
repo = "helm-bibtex";
- rev = "54de08577f9c19354cc303ee52836263aef486fb";
- sha256 = "0l98lmy0c9l64khnl9j87l5g9g5fiah5l64hxn97h4b438kjcjm0";
+ rev = "84863a37695b786c6c6980a589f8ea282c385ab2";
+ sha256 = "0nh0n17mnrf9qf68mxcxclci1qmqal1li827a1qia3fkjry4vqxk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex";
@@ -37885,8 +38493,8 @@
src = fetchFromGitHub {
owner = "PythonNut";
repo = "historian.el";
- rev = "78ec5632e4f4fd005014bd762c4a5ccdeabbd33d";
- sha256 = "1ag9hpxrzg5add4nj2j08ymxrggnzdzqb8k1vcpkd8rg72138k3w";
+ rev = "ba560443a216befd4460fcf16dc6c7f23cb73d8d";
+ sha256 = "1g1p02kx50nry4vm5bcp7kyjnn9lafc9a57nirnkf0gm41m6yj8q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fb79cbc9af6cd443b9de97817d24bcc9050d5940/recipes/ivy-historian";
@@ -37902,12 +38510,12 @@
ivy-hydra = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, ivy, lib, melpaBuild }:
melpaBuild {
pname = "ivy-hydra";
- version = "20170703.2350";
+ version = "20171130.1143";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "23935401b062fde5557de826814ddc55e75fe1b8";
- sha256 = "055l5rmnkczlz4nhjppa3c7m02mmv8zw7zaf60820911zx1sl32b";
+ rev = "e5c5037fd5f2735b11fc90363f312431619fa8c2";
+ sha256 = "0ssm6dgzzqvwwmwvnws8s0ac4f8dif5sxl9flx296df7s7xryzcv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -37923,12 +38531,12 @@
ivy-lobsters = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "ivy-lobsters";
- version = "20170903.445";
+ version = "20171202.1241";
src = fetchFromGitHub {
owner = "julienXX";
repo = "ivy-lobsters";
- rev = "49923d6b59fc8ede5d930317f63f00577fef60b9";
- sha256 = "1z593062phsxn7y408zj82w4xc8l5y4x6kj919hm8a0d3nf28kg7";
+ rev = "4364df4b3685fd1b50865ac9360fb948c0288dd1";
+ sha256 = "1cfcy2ks0kb04crwlfp02052zcwg384cgz7xjyafwqynm77d35l0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d9774fbf133ce8db3ce996b1a40c586309a2fec6/recipes/ivy-lobsters";
@@ -38007,12 +38615,12 @@
ivy-rich = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "ivy-rich";
- version = "20171106.2334";
+ version = "20180107.1736";
src = fetchFromGitHub {
owner = "yevgnen";
repo = "ivy-rich";
- rev = "565ea4128741f68727df9d54dee40c9a89b63885";
- sha256 = "1mqg406gs8blzsay5jmdvr894l5iy4z4q2rmv5f89fvanmnl9d0h";
+ rev = "a87d37430afb4cfe1bfff8f65acf3197ca8e0fe9";
+ sha256 = "15vshxg2yv2fy1s78xh7gns3lgk50x40y7kw3qvlsdrkfrwbkfdv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0fc297f4949e8040d1b0b3271c9a70c64887b960/recipes/ivy-rich";
@@ -38032,8 +38640,8 @@
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "8ef7554852541eced514c56d5e39d6073f7a2ef9";
- sha256 = "0hh9m0ykw3r9h4gv4a99px00py1h5hs86043mp1m0nmkjibf6w56";
+ rev = "db5ad3a48c579b3522411bd2411c09dbb27af578";
+ sha256 = "1ihv65hfq22yk4wx4njkm73q4s04fr84ib3mjjk8l18xpzl6alal";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags";
@@ -38049,12 +38657,12 @@
ivy-todo = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "ivy-todo";
- version = "20171128.1444";
+ version = "20171208.809";
src = fetchFromGitHub {
owner = "Kungsgeten";
repo = "ivy-todo";
- rev = "2dd28974ead8f9e751d8d166d46447b3f87ef76b";
- sha256 = "1lsfygb3jphnn9q0pr9pi78qayk8jw2jmp1rvlkshnglbg6l116x";
+ rev = "964e347cea1a6097854d7113f5b07f6c5ef81df0";
+ sha256 = "07208qdk1a77dgh9qmpn164x5mgkzvprsdvb7y35ax12r2q541b8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/97909da7899d4187e8eb6b3284f6225ebec7fa51/recipes/ivy-todo";
@@ -38088,6 +38696,27 @@
license = lib.licenses.free;
};
}) {};
+ ivy-xref = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
+ melpaBuild {
+ pname = "ivy-xref";
+ version = "20171229.252";
+ src = fetchFromGitHub {
+ owner = "alexmurray";
+ repo = "ivy-xref";
+ rev = "aa97103ea8ce6ab8891e34deff7d43aa83fe36dd";
+ sha256 = "1j4xnr16am5hz02y1jgiz516rqmn43564394qilckmzvi9clhny8";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/a4cd8724e8a4119b61950a97b88219bf56ce3945/recipes/ivy-xref";
+ sha256 = "1p5a0x83b0bc7b654j1d207s7vifffgwmp26pya2mz0czd68ywy8";
+ name = "ivy-xref";
+ };
+ packageRequires = [ emacs ivy ];
+ meta = {
+ homepage = "https://melpa.org/#/ivy-xref";
+ license = lib.licenses.free;
+ };
+ }) {};
ivy-youtube = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, request }:
melpaBuild {
pname = "ivy-youtube";
@@ -38154,12 +38783,12 @@
j-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "j-mode";
- version = "20171103.845";
+ version = "20171224.1056";
src = fetchFromGitHub {
owner = "zellio";
repo = "j-mode";
- rev = "6f7f598eaa1a32ccf06b707631f2d539a2315fba";
- sha256 = "1qldmcawi94pxv62zb2qgr27kr8lwhsql6wi67g0f5dlihpzc8dq";
+ rev = "e8725ac8af95498faabb2ca3ab3bd809a8f148e6";
+ sha256 = "0icrwny3cif0iwgyf9i25sj9i5gy056cn9ic2wwwbzqjqb4xg6dd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/410134ab2145adad3648b1024bfe4f6801df82c9/recipes/j-mode";
@@ -38530,12 +39159,12 @@
jbeans-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "jbeans-theme";
- version = "20171108.1431";
+ version = "20171212.1053";
src = fetchFromGitHub {
owner = "synic";
repo = "jbeans-emacs";
- rev = "9a5095d65de8355c88b102831b81a525d507612a";
- sha256 = "0fm7sl6i5i65y82qsg2s7bdarc6r28qbyffdl43c55bjzxs4xk19";
+ rev = "08dbcc9d8d33ed17cfe2de279f6979692c6fcaab";
+ sha256 = "09w9rkp6vh3v632kbd38aizbl3njpwxpx3n1819sz452iqsx81c7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6dd4bd78795ec7509d8744fec1e80426ce0557ec/recipes/jbeans-theme";
@@ -38971,12 +39600,12 @@
js-auto-format-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "js-auto-format-mode";
- version = "20171031.1819";
+ version = "20180103.718";
src = fetchFromGitHub {
owner = "ybiquitous";
repo = "js-auto-format-mode";
- rev = "5ba81cd7cdd09d41a8e9c9d53d370497bf64edbd";
- sha256 = "113ppyfvly6i03j8kmyd3i6218v0r2f449wk3zbx9vf2d6plzc8v";
+ rev = "37e83641fd5eab45e813e4bc74a835fe7229c160";
+ sha256 = "0hmrhp3lijd77kl0b98nbl1p8fmgjfry2hhvh5vickx3315w7qgw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2d3be16771b5b5fde639da3ee97890620354ee7a/recipes/js-auto-format-mode";
@@ -39010,22 +39639,22 @@
license = lib.licenses.free;
};
}) {};
- js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ js-comint = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "js-comint";
- version = "20170808.527";
+ version = "20171129.2056";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "js-comint";
- rev = "eb4744122724b24e492c2171fff438e3ee2045a8";
- sha256 = "1bbzbv1dasqxkljq06qngb4l22x7gpgncz7jmn0pqixnhqj5k66y";
+ rev = "83e932e4a83d1a69098ee87e0ab911d299368e60";
+ sha256 = "1r2fwsdfkbqnm4n4dwlp7gc267ghj4vd0naj431w7pl529dmrb6x";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bc9d20b95e369e5a73c85a4a9385d3a8f9edd4ca/recipes/js-comint";
sha256 = "0jvkjb0rmh87mf20v6rjapi2j6qv8klixy0y0kmh3shylkni3an1";
name = "js-comint";
};
- packageRequires = [];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/js-comint";
license = lib.licenses.free;
@@ -39139,12 +39768,12 @@
js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "js2-mode";
- version = "20171128.1412";
+ version = "20171224.1833";
src = fetchFromGitHub {
owner = "mooz";
repo = "js2-mode";
- rev = "ba3263bb1375b5f4f9b6df7bb8d39f4d97f02688";
- sha256 = "1vsy10y0wvklryq2ic1npcw5fism85lvvksx00l3hajax4irg8q8";
+ rev = "d72ed2060337e9f4400bcec85f8daaf18cb05413";
+ sha256 = "1l3dvgac3pdirsigfkxnhfr2nrrwmn7pkjxr32yrrskfd2li8vhr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode";
@@ -39160,12 +39789,12 @@
js2-refactor = callPackage ({ dash, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, multiple-cursors, s, yasnippet }:
melpaBuild {
pname = "js2-refactor";
- version = "20171109.921";
+ version = "20171207.202";
src = fetchFromGitHub {
owner = "magnars";
repo = "js2-refactor.el";
- rev = "35db9111d49536f41e005560e8e90fd93836e8e4";
- sha256 = "059ib04l6ycar7bz515x3nkxbgvr781isba632fvz0a87vdcbqsm";
+ rev = "a86cb31b1c9f9719b4c4199a721fe2b8b58a015c";
+ sha256 = "06hv1agmwyqxgb37p9f6sazg12mk90cahvym0qpdx9daqcslx381";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8935264dfea9bacc89fef312215624d1ad9fc437/recipes/js2-refactor";
@@ -39265,12 +39894,12 @@
json-navigator = callPackage ({ emacs, fetchFromGitHub, fetchurl, hierarchy, lib, melpaBuild }:
melpaBuild {
pname = "json-navigator";
- version = "20170606.34";
+ version = "20171220.19";
src = fetchFromGitHub {
owner = "DamienCassou";
repo = "json-navigator";
- rev = "d005a253fa73ed2c6c0b3ebbc7dc41be9270c304";
- sha256 = "1dklr166p5gx5y3nzkh758wwr6jvw50c3si05m71247kirhs0f89";
+ rev = "7a1fec93500c46ccba4086d10115d8188607d0d0";
+ sha256 = "03gjvzlyf90sh2q735qfbbjyqx4z9c3yc8jjp2sjpmp5fjvdm9yf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/62d4d68bd473652b80988a68250e9190b886ad6e/recipes/json-navigator";
@@ -39307,12 +39936,12 @@
json-rpc = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "json-rpc";
- version = "20170402.955";
+ version = "20180104.728";
src = fetchFromGitHub {
owner = "skeeto";
repo = "elisp-json-rpc";
- rev = "e77a62012e4d6c946666eed3a17454d5c6f83367";
- sha256 = "1pwa1ifz0c83lwwpj75h10wj7jyghsxg6wpdlfy4dp8102wr8nhg";
+ rev = "0992ae71964055230aa5d4d934a1b93b5dfd7eb4";
+ sha256 = "0nfccwxss3dz1ig6i3dig703xpsy90m7i96bm3pysrw2jfp4by9s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/82c6b97cdfe2970f028a00146b01e5734710291b/recipes/json-rpc";
@@ -39828,12 +40457,12 @@
kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "kaolin-themes";
- version = "20171128.824";
+ version = "20180103.1058";
src = fetchFromGitHub {
owner = "ogdenwebb";
repo = "emacs-kaolin-themes";
- rev = "0aa39e9be32f6ecd1d8a3eebac6953ff7b172d3d";
- sha256 = "0f1l95wlviwbiqwi38g3yzzxmp5z6cj0x7kdsxr39saw1wkdqaam";
+ rev = "3fd999ba8940ddda2ad9db7359901d3573a58864";
+ sha256 = "1mc9x9pr51dkm1h70ijvllympk2nch52pqy1qzh4m09haqw6akxq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes";
@@ -39849,12 +40478,12 @@
kaomoji = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
melpaBuild {
pname = "kaomoji";
- version = "20170311.2151";
+ version = "20171226.2040";
src = fetchFromGitHub {
owner = "kuanyui";
repo = "kaomoji.el";
- rev = "91ab93cc7455486182d5e7f88e03d0de44c9953e";
- sha256 = "19l3r2fbp895c46cklrjfwwa5d7i959nd6jc3gk14jyi35gjypyy";
+ rev = "90a1490743b2a30762f5454c9d9309018eff83dd";
+ sha256 = "1jc796nyrck3k50x6jb1wsaawk396y4gk87gkwb8yd5qks7ci35q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/140c65cb3cdf6c197b085ccf8ba079e1efd15f38/recipes/kaomoji";
@@ -40227,12 +40856,12 @@
kill-or-bury-alive = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "kill-or-bury-alive";
- version = "20170518.2358";
+ version = "20171231.2218";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "kill-or-bury-alive";
- rev = "415de48695efd30163a015063873b03f4ca5b743";
- sha256 = "1jsgvwi3zy22wirxgzkbbjzk4q6f6mxf3223cf5pkk7x2prv6fcn";
+ rev = "d21aa7a12f1a76d47249db36eb9825242df9d512";
+ sha256 = "1m790afdrns8afh7f690slq2gcya5bp7630fxwi8fqp5vil7lswg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/25016ed09b6333bd79b989a8f6b7b03cd92e08b3/recipes/kill-or-bury-alive";
@@ -40336,8 +40965,8 @@
src = fetchFromGitHub {
owner = "kivy";
repo = "kivy";
- rev = "67f7deef07de85351648332bf644c43fa1722a24";
- sha256 = "166zj90c3dw0hv5gbq0gifr45wrpc0lvb46fhhary542ivyyk109";
+ rev = "00c161d076fc754357a133e483699146cdd81518";
+ sha256 = "14xlqqxpsp2pvcgzmqk98psff23a5s09637s0aqcij51rd7g5zsv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -40836,12 +41465,12 @@
lastpass = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
melpaBuild {
pname = "lastpass";
- version = "20170801.1214";
+ version = "20171208.216";
src = fetchFromGitHub {
owner = "storvik";
repo = "emacs-lastpass";
- rev = "264250725b3ba23412919ec10cfa7390473b534c";
- sha256 = "1qqmg59vbwb31nx3vi88d53484gy3sg8wnq45xrra45drpjka3ry";
+ rev = "a4529ce70b8187ed9ac4972997df152af58ef2eb";
+ sha256 = "1h4h7swww2is7qblqi5r1vh26a9lfl52c0yq7rgwd1pqclffgc8m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/46e5e8735baab7728bddce2693cea6bcee0e6360/recipes/lastpass";
@@ -40958,6 +41587,27 @@
license = lib.licenses.free;
};
}) {};
+ latexdiff = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "latexdiff";
+ version = "20171225.1623";
+ src = fetchFromGitHub {
+ owner = "galaunay";
+ repo = "latexdiff.el";
+ rev = "665aa65707d0e8c5778de70f38a42be4ba1def5d";
+ sha256 = "1ppxmcbkscsdsnm5vf7lmhzq1y0vkkg8dpp4gh0hmsvqvh7d67bp";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d164cf118a2c928c04e4d5cbfd47ac732e626fe0/recipes/latexdiff";
+ sha256 = "002frvk31q3plrqa6lldadchck51bch4n126y5l33fyfs0ipspfa";
+ name = "latexdiff";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/latexdiff";
+ license = lib.licenses.free;
+ };
+ }) {};
launch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "launch";
@@ -41087,12 +41737,12 @@
lean-mode = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }:
melpaBuild {
pname = "lean-mode";
- version = "20171102.754";
+ version = "20180105.1619";
src = fetchFromGitHub {
owner = "leanprover";
repo = "lean-mode";
- rev = "c0af876c967fc969d67c467bc6767210d19c5d87";
- sha256 = "04qzck156wb2bvrb8adbn7rx2v0bsjcirlbx4ajajjsqy858ayn9";
+ rev = "3403179a38693a221bfa86def0c99f6342c5eb73";
+ sha256 = "0w6zc1w7kic3ds5hf30i3mj9wxbq2c8wdywbslfprwwi1hxyzmsq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde/recipes/lean-mode";
@@ -41129,12 +41779,12 @@
ledger-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ledger-mode";
- version = "20170901.2039";
+ version = "20171227.1709";
src = fetchFromGitHub {
owner = "ledger";
repo = "ledger-mode";
- rev = "24b43e34dd34de23e54d7ddaa2a147efda6af03d";
- sha256 = "0cdcd2hpv34yhpplgqljiyncs2q0i321f4xwfkb2inqbv9q4byhk";
+ rev = "cf0c9d84a4f24c1af8059b73cf4ff40343f2b8b2";
+ sha256 = "18dlsvsk3az7z26929nx30rkxw9v7aj3x11zfr6rfbawm6xc6fql";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1549048b6f57fbe9d1f7fcda74b78a7294327b7b/recipes/ledger-mode";
@@ -41406,8 +42056,8 @@
src = fetchFromGitHub {
owner = "rvirding";
repo = "lfe";
- rev = "2880c8a2a7fe998238b6490fe3e3c484b5c5985e";
- sha256 = "1xcnh1hk815wizhp7h1mik3npm7zpbvg4554nwbj072gnbb9j1nx";
+ rev = "3878e7009e9d1d8f3fb26e1b8bdaf21e681f1b52";
+ sha256 = "0c88my6c4ycbjqwd8m5jw4ilh4bfap3202sr11z0r6wvc6kf44wk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode";
@@ -41683,12 +42333,12 @@
lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }:
melpaBuild {
pname = "lispy";
- version = "20171119.655";
+ version = "20180105.1040";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "lispy";
- rev = "be34a60a871c02dc4f292fd821b64a2f039e81fc";
- sha256 = "1c4kw676qgkhlil2c867pccj5012wv3fc4nsm3q81w1wq23f0a2a";
+ rev = "ee96631f416c410dd30077311f593bf1c58eb50e";
+ sha256 = "1hvlvyx0iarh7p8n8sgz4x75clg0i3f4chfis0zi0nxag274nl1r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
@@ -41998,12 +42648,12 @@
live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "live-py-mode";
- version = "20171109.2007";
+ version = "20180107.2134";
src = fetchFromGitHub {
owner = "donkirkby";
repo = "live-py-plugin";
- rev = "b6627fdd25fe6d866fe5a53c8bf7923ffd8ab9f9";
- sha256 = "1z17z58rp65qln6lv2l390df2bf6dpnrqdh0q352r4wqzzki8gqn";
+ rev = "00b7d06e525ef8d18064261ff125ac965ad06e8f";
+ sha256 = "03qklbvz4w0qxcw43pj9kmsj5gnl1c3x3nywirjsn0klldi5q37r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@@ -42106,8 +42756,8 @@
version = "20150910.644";
src = fetchgit {
url = "https://llvm.org/git/llvm";
- rev = "17820125d44fa9974c0fe8aa7a68e012ec80c9e5";
- sha256 = "138x5mqzdpw32wjmi876hr0jn21im43vdvayz94hlp057sxhkbcd";
+ rev = "14e29de03db7e2b075b70fdb419f7ac428381b11";
+ sha256 = "01ly5kms4w7b3jqq3d8d11cg18mlqivzk6ps9hb14wissv4mqg9f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/llvm-mode";
@@ -42629,8 +43279,8 @@
src = fetchFromGitHub {
owner = "emacs-lsp";
repo = "lsp-javascript";
- rev = "6e303c84f1edd9863cacfcfacaf52f7adb64babc";
- sha256 = "0yp608ybsz0920sg55lf01l32204lb2125ip113sl2cgmrp2ygj7";
+ rev = "456854bdee8729c21331f93ee9054f2d980fe2ab";
+ sha256 = "1vrzi12zsrrbyihin1n83adk7q0vvksalpizd5g42g8d1pnf3zfx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/999a4b0cd84e821c7e785ae4e487f32cff5c346b/recipes/lsp-javascript-typescript";
@@ -42646,12 +43296,12 @@
lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "lsp-mode";
- version = "20171129.252";
+ version = "20180105.103";
src = fetchFromGitHub {
owner = "emacs-lsp";
repo = "lsp-mode";
- rev = "a28f32744324f576c4fd349eefd4bb4106d02970";
- sha256 = "0mcl2w0ykr0hqwj4i4nyskalk11i4bribh7g52zk2ri6akl3mhxi";
+ rev = "768b07d3a76af7ba8dbe4c25aae6379da05fb306";
+ sha256 = "1lv8i9lwi1r2npab0nrxmma8ghzlj8nm06kw8iyjyh5c83vi9wab";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode";
@@ -42692,8 +43342,8 @@
src = fetchFromGitHub {
owner = "emacs-lsp";
repo = "lsp-python";
- rev = "5acea5f921dc396ea092ee253ec01b45dee3cbfd";
- sha256 = "0nz0n7k0i0h77fn8w0d49b4pkljw7l15hzvjym16jh4gr1n098ar";
+ rev = "035fed681ef18a774dcb82e361bd6b5b8778623f";
+ sha256 = "0mhs7v1mc23h0rlcyinl3pf1qavjl4s6j5vrf9vc65sggsnw0x1d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-python";
@@ -42727,15 +43377,57 @@
license = lib.licenses.free;
};
}) {};
+ lsp-ui = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, lsp-mode, markdown-mode, melpaBuild }:
+ melpaBuild {
+ pname = "lsp-ui";
+ version = "20180107.2330";
+ src = fetchFromGitHub {
+ owner = "emacs-lsp";
+ repo = "lsp-ui";
+ rev = "cc4e2035b1a7594bc0de1dd84e5bb6d7b607c39b";
+ sha256 = "1i6z4slca09rnsd0n589wxm5dazkm7dkxzp0l5v522glys0p36xk";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/1e4fa7cdf71f49f6998b26d81de9522248bc58e6/recipes/lsp-ui";
+ sha256 = "00y5i44yd79z0v00a9lvgixb4mrx9nq5vcgmib70h41ffffaq42j";
+ name = "lsp-ui";
+ };
+ packageRequires = [ emacs flycheck lsp-mode markdown-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/lsp-ui";
+ license = lib.licenses.free;
+ };
+ }) {};
+ lsp-vue = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }:
+ melpaBuild {
+ pname = "lsp-vue";
+ version = "20171202.917";
+ src = fetchFromGitHub {
+ owner = "emacs-lsp";
+ repo = "lsp-vue";
+ rev = "9085d6c7646d80728d14bf5e4ec9037dfb91e3d1";
+ sha256 = "1y9gd20rdyxih823b1x8ika7s6mwiki0dggq67r4jdgpd9f5yabg";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0d9eb7699630fd7e11f38b4ba278a497633c9733/recipes/lsp-vue";
+ sha256 = "1df3dva31livffy9bzassgqpps3bf9nbqmhngzh8bnhjvvrbj5ic";
+ name = "lsp-vue";
+ };
+ packageRequires = [ emacs lsp-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/lsp-vue";
+ license = lib.licenses.free;
+ };
+ }) {};
lua-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "lua-mode";
- version = "20170130.435";
+ version = "20180104.626";
src = fetchFromGitHub {
owner = "immerrr";
repo = "lua-mode";
- rev = "652e299cb967fccca827dda381d61a9c144d97de";
- sha256 = "1k64cjzylmfw89pyfjza8s9sxijraknwg573vh619wvnggflc7lb";
+ rev = "6c691839b7e784884ae5c390bf1927953cd2bde7";
+ sha256 = "0fm1d85302q79r4zrzmdx4v5c1vvr53g687vm5frf9sv8gg6hx0w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/lua-mode";
@@ -43042,15 +43734,15 @@
license = lib.licenses.free;
};
}) {};
- magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
+ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, ghub, git-commit, let-alist, lib, magit-popup, melpaBuild, with-editor }:
melpaBuild {
pname = "magit";
- version = "20171127.435";
+ version = "20180107.832";
src = fetchFromGitHub {
owner = "magit";
repo = "magit";
- rev = "64be29ba47218a9766a2999f8bf366cc9e3256a9";
- sha256 = "15ba8zx1zsg0q8kk2r7hsx4kljdq7mwazh9a1cpzjprs5wn56jr8";
+ rev = "53eeafcdcb12f9deb74548ffa5b17c397ad7def2";
+ sha256 = "0pvwmbgmqdpy599nr6518yxzl5k8lkdi7a93v1dr7hcf3lg5ygpg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0263ca6aea7bf6eae26a637454affbda6bd106df/recipes/magit";
@@ -43061,7 +43753,9 @@
async
dash
emacs
+ ghub
git-commit
+ let-alist
magit-popup
with-editor
];
@@ -43262,12 +43956,12 @@
magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "magit-popup";
- version = "20171121.1110";
+ version = "20171217.1235";
src = fetchFromGitHub {
owner = "magit";
repo = "magit-popup";
- rev = "70e3cdd6140ebdf477f86b88ac2bd1a8de115e88";
- sha256 = "1187ld4abbb990g0n66rnapqci047pmyanicg7ai9z45dyjf2y3f";
+ rev = "3f23e81eb0267d6578d8f1733c5e42699b0229a1";
+ sha256 = "1nv3gc3wb7r2l9hbsgx78gqbcdi6iw1l9a0nqq5vjvr3cmb014r4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0263ca6aea7bf6eae26a637454affbda6bd106df/recipes/magit-popup";
@@ -43283,12 +43977,12 @@
magit-rockstar = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
melpaBuild {
pname = "magit-rockstar";
- version = "20170703.704";
+ version = "20171213.737";
src = fetchFromGitHub {
owner = "tarsius";
repo = "magit-rockstar";
- rev = "a65042e3445008b55190f1258ae54bd78e12174b";
- sha256 = "1wbbg9jr9kl69sbq9b9dgwvnplmdzjyanwfcncamw3lfcjfnw1bn";
+ rev = "44e3bf03b0c5db914ce391c0c645267f0a5759bd";
+ sha256 = "0nqb6ipzql4jxipmh262j9q72sjk4s4cbyz5c61akwxbpr32nz3l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7a20b539cbd38ffa546c1b56b9fac78c0b9457f6/recipes/magit-rockstar";
@@ -43388,12 +44082,12 @@
magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, git-commit, lib, magit, markdown-mode, melpaBuild, s }:
melpaBuild {
pname = "magithub";
- version = "20171117.525";
+ version = "20171224.845";
src = fetchFromGitHub {
owner = "vermiculus";
repo = "magithub";
- rev = "3c17a4ca0e167b3f8da100dc40f160047ceaea78";
- sha256 = "1m96zcp7dbgafayc79iiac3q1da5vzx0khmxyd6aw0f0k2x8gxab";
+ rev = "08a1c1341d0982248ec86e1697fa1b6418cd80f5";
+ sha256 = "062xghazkm8lh207fpqp7csd3nwgkz47g831hqa94iz28n97x0pq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub";
@@ -43598,12 +44292,12 @@
malinka = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, rtags, s }:
melpaBuild {
pname = "malinka";
- version = "20170723.1635";
+ version = "20171202.221";
src = fetchFromGitHub {
owner = "LefterisJP";
repo = "malinka";
- rev = "8072d159dae04f0f1a87b117ff03f9f1eb33f6cb";
- sha256 = "0s5dcm11nw88j1n4asqpm92z0csjv3jvh06f4qqghfvcym8qv44h";
+ rev = "d4aa517c7a9022eae16c758c7efdb3a0403542d7";
+ sha256 = "1rnzvx1nc01sw9fklm36lyllqm6dizj64gnlqbs4nammx7z0spi1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/malinka";
@@ -43745,12 +44439,12 @@
mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }:
melpaBuild {
pname = "mandoku";
- version = "20171002.12";
+ version = "20171220.419";
src = fetchFromGitHub {
owner = "mandoku";
repo = "mandoku";
- rev = "77647573331c602847b06b9e21de69f72cd7bad5";
- sha256 = "0yqxsls9phvd4dgzb908xds4x437rqpm3ddy07pq3qq7ghri1cnv";
+ rev = "f993b7428c7e83efdbc6e6040d3eae9406d9b090";
+ sha256 = "0731w64jxjmphsjpz4fz21h27q4y9afbkbpczspnc90vs1ighn4y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku";
@@ -43897,36 +44591,15 @@
license = lib.licenses.free;
};
}) {};
- markdown-edit-indirect = callPackage ({ edit-indirect, emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }:
- melpaBuild {
- pname = "markdown-edit-indirect";
- version = "20171126.651";
- src = fetchFromGitHub {
- owner = "emacs-pe";
- repo = "markdown-edit-indirect.el";
- rev = "7ed6ab94fbb98394f176ab7aaab0eafe1df2d320";
- sha256 = "0ny9jj35lzpibdv9nrpzwfr7gjr477ljmr2krlf3wfsgvfxc2k76";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/fa4da9d5c63da3bd777101098168696f5c4d3fbc/recipes/markdown-edit-indirect";
- sha256 = "19038vb6ph7l9w1yv8pszyd13ac38l44vb46l9jmgyby773m7644";
- name = "markdown-edit-indirect";
- };
- packageRequires = [ edit-indirect emacs markdown-mode ];
- meta = {
- homepage = "https://melpa.org/#/markdown-edit-indirect";
- license = lib.licenses.free;
- };
- }) {};
markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "markdown-mode";
- version = "20171126.929";
+ version = "20180101.503";
src = fetchFromGitHub {
owner = "jrblevin";
repo = "markdown-mode";
- rev = "ea03dcb144e08dce83c9b0078bb03f767b836f23";
- sha256 = "1jcwpvbzfm41n1wy3dhjvgyz768808m0ga2ghvqbyl86p8k8gs3k";
+ rev = "fc4e143831f8590dc9b25da76961536eade02411";
+ sha256 = "05q7962wc8px9v2810v6z68qrqr7kvjicc53byyqbxlp4sqcz6x4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode";
@@ -44117,12 +44790,12 @@
marshal = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, ht, json ? null, lib, melpaBuild }:
melpaBuild {
pname = "marshal";
- version = "20171018.932";
+ version = "20180102.201";
src = fetchFromGitHub {
owner = "sigma";
repo = "marshal.el";
- rev = "6a31133b25addabc5ec9c87ba959d69c5122171b";
- sha256 = "1h5ilihlpqg1as6cd58z3flxzhj7izk7sz1nzwhwzvh3kfm47h9d";
+ rev = "e25b170779ca8d0cdef0bfeb6f35c264a23a44e8";
+ sha256 = "01m5cjjhi02aqpv1c9h7n4kq1b7vplb9cwncb4kx17k5xyml7yb1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/203f2061c5c7d4aefab3175de5e0538f12158ee3/recipes/marshal";
@@ -44389,12 +45062,12 @@
mbsync = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mbsync";
- version = "20171128.649";
+ version = "20171130.335";
src = fetchFromGitHub {
owner = "dimitri";
repo = "mbsync-el";
- rev = "d92928a4df79fa2c587e04df36726a34d11a65eb";
- sha256 = "1aaysvk1130x3z5dmzl3cx983v3vnh99lxlc281nggivjnjdxwvr";
+ rev = "911d9ac255e8f7fb4bd21c0e816e44abfeb59128";
+ sha256 = "05qqb7399bmjdkfr5gdkf7fpg6xziyd9345x00vz5cbq859p128p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3ef6ffa53bb0ce2ba796555e39f59534fc134aa5/recipes/mbsync";
@@ -44473,12 +45146,12 @@
meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "meghanada";
- version = "20171122.626";
+ version = "20171230.802";
src = fetchFromGitHub {
owner = "mopemope";
repo = "meghanada-emacs";
- rev = "555b8b9ea8ef56dda645ea605b38501cb4222b12";
- sha256 = "1z3vvasah4gq6byq4ibkihy5mbch5zzxnn0gy86jldapwi1z74sq";
+ rev = "98ad6a5361c725319a355522d2d1ba0e0fbb7cde";
+ sha256 = "06iryz4dbldc9vxy67g977hih8r1bfvjld53lvwnjsc7r3x9i07q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -44746,12 +45419,12 @@
metaweblog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }:
melpaBuild {
pname = "metaweblog";
- version = "20170626.750";
+ version = "20171216.1840";
src = fetchFromGitHub {
owner = "punchagan";
repo = "metaweblog";
- rev = "c039d1ffb618d19d160bde835fab389e9a7433a3";
- sha256 = "116m0v73v636xvsq46i3qhd4wy3x7zk3k8ffmsx36ksphn9kwx0k";
+ rev = "aa14380eb7e7b879a0c16c96866b20a987cd3f2a";
+ sha256 = "146w9laysdqbikpzr2gc9vnjrdsa87d8i13f2swlh1kvq2dn3rz5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/metaweblog";
@@ -45144,12 +45817,12 @@
minizinc-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "minizinc-mode";
- version = "20170708.358";
+ version = "20171208.958";
src = fetchFromGitHub {
owner = "m00nlight";
repo = "minizinc-mode";
- rev = "b621b9e106edbe094bcc8e609d9398a60c2ac8b5";
- sha256 = "15d90fsrpc7qcnblgwjcqrqyyphbfjvdnkwj6dnv79d0m4n58m1c";
+ rev = "8bb428b52e974ecea35f3f2b20ad161735085a30";
+ sha256 = "10b8y23vamj9r0dnqqcn36w4n8zz61p17njakinfadqa813s4hhv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fc86b4ba54fca6f1ebf1ae3557fe564e05c1e382/recipes/minizinc-mode";
@@ -45207,12 +45880,12 @@
mixed-pitch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mixed-pitch";
- version = "20170723.955";
+ version = "20180103.1839";
src = fetchFromGitHub {
owner = "jabranham";
repo = "mixed-pitch";
- rev = "6a4fbb9c48fc345d4d40228e8b686f6f2e585f8a";
- sha256 = "14hpcx75rb41fya8i8qk6cg388wgkhhxnj64ywar3pycngm8jwl9";
+ rev = "e6f063bdc968f8ff21418e9f3b1d501cd0e5d4bd";
+ sha256 = "1jgwg8y77gm8fkggmi64vcv855swnb0nra2b59np6k1qacqj1zkq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/20e85b11dc864500d44b25e36c5e7c4c67c1ebe2/recipes/mixed-pitch";
@@ -45290,12 +45963,12 @@
mmm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mmm-mode";
- version = "20171004.336";
+ version = "20171212.1428";
src = fetchFromGitHub {
owner = "purcell";
repo = "mmm-mode";
- rev = "7661968fa6974996e58dfa28da33bca0cbde777d";
- sha256 = "066qp884qw0bqcglncxvag89i1z5rmqjc73y7ksr7ll3309y1969";
+ rev = "3fb2964c1923fa4ae71741afbd87c76dc16af93a";
+ sha256 = "1al8n18h3pnjsaffwbfbxv68zwh7svnkrjjrvzdav1ja5qs39wa4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/mmm-mode";
@@ -45311,12 +45984,12 @@
mmt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mmt";
- version = "20170519.4";
+ version = "20171231.2219";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "mmt";
- rev = "5cc5d1ee3efe675fa49d62fe0ae6b483d7ad9392";
- sha256 = "1vkj28351si30l3szjpkdgjlmp2vfjp6jxk3dvlbxicfqd1k823p";
+ rev = "b8cc8d29e185c15a1e43ecc2a78e36a6d2f86b8f";
+ sha256 = "17v26116g05py2yd24a5rjlr2lbdacahglxar10k5291v9i4msdw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d1137bb53ecd92b1a8537abcd2635602c5ab3277/recipes/mmt";
@@ -45395,12 +46068,12 @@
mocha = callPackage ({ f, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
melpaBuild {
pname = "mocha";
- version = "20171016.903";
+ version = "20171217.835";
src = fetchFromGitHub {
owner = "scottaj";
repo = "mocha.el";
- rev = "0f74ecf500f833f7f959187a375dacdd33d4d569";
- sha256 = "03ixygw28hzn00136747mv2r3vii3n0gif1wqgg3k7ajh7c45f5b";
+ rev = "29376477b63e319875ad0969a8103f3864efb2a0";
+ sha256 = "1j36ac827llm5ch58hs3yni4jfg0x5fypv5p1i30ffvb7dhn4mmc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/39c26134ba95f277a4e9400e506433d96a695aa4/recipes/mocha";
@@ -45458,12 +46131,12 @@
modalka = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "modalka";
- version = "20170519.32";
+ version = "20171231.2213";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "modalka";
- rev = "88935a26318a574adeeb2301ae8d010f0102b1d3";
- sha256 = "1zibawwflf2wx7hzg2ld7qvmlpljfd6nb86998ckzbx75s5yb20a";
+ rev = "e69ec8fa01e86cb789f7f2b27b6d5a47e1ca3069";
+ sha256 = "10yn56vamcfblilsnfqfagssr4060gr7qbpnqa2fjqv1l8fg6jrf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fa0a02da851a603b81e183f461da55bf4c71f0e9/recipes/modalka";
@@ -45497,6 +46170,27 @@
license = lib.licenses.free;
};
}) {};
+ mode-line-bell = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "mode-line-bell";
+ version = "20171231.1939";
+ src = fetchFromGitHub {
+ owner = "purcell";
+ repo = "mode-line-bell";
+ rev = "dcfad0929a606af0e836d93e78be989a8ac16f87";
+ sha256 = "0vpi3x60izvwwcck6scdm4386bc67693nqwwll0mbzf8n9args4v";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/26f19808655b0242a1e9e5e5d41f7f794542e243/recipes/mode-line-bell";
+ sha256 = "1ri771hb91b7hd203f8zp83h5hcndh8ccc1y8shhqmak6a6l04wk";
+ name = "mode-line-bell";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/mode-line-bell";
+ license = lib.licenses.free;
+ };
+ }) {};
mode-line-debug = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mode-line-debug";
@@ -45710,12 +46404,12 @@
monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "monokai-theme";
- version = "20171013.236";
+ version = "20180104.429";
src = fetchFromGitHub {
owner = "oneKelvinSmith";
repo = "monokai-emacs";
- rev = "019e07947426f0192fc3458f3f72c19031b607de";
- sha256 = "0id35345zp0fchbcz8qk2lg71jyln91k56vfama27ss3nzy3f9kz";
+ rev = "bb5cbbd5895b8b3fbc6af572b1fd0aacd4988a8a";
+ sha256 = "1f0jl4a3b6i9skbcym0qzpszy620385m947l2ba2wxf1na7rc626";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme";
@@ -45731,12 +46425,12 @@
monroe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "monroe";
- version = "20170623.103";
+ version = "20180108.224";
src = fetchFromGitHub {
owner = "sanel";
repo = "monroe";
- rev = "2bb59ac84e030f7047e7443e2df25185b397a5d3";
- sha256 = "0jcyidk62djd47dv4m53k7wky92982pzz87n8zq1fijqic63iib9";
+ rev = "c1dd7fe6e14a0ec2dae3135e74dffa797c9df28a";
+ sha256 = "1853vvipyngv6chs10rswx5mhm9p3fgm1n3kpp4chhbc3040q97r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/590e5e784c5a1c12a241d90c9a0794d2737a61ef/recipes/monroe";
@@ -45924,8 +46618,8 @@
src = fetchFromGitHub {
owner = "emacsfodder";
repo = "move-text";
- rev = "bdaf3e3a0d33cd528cad1d10facbdf0635232e4d";
- sha256 = "06jxk5g23822gfmwrxhc34zand3dr8p2wjh1zs3j61ibz6n0nmz1";
+ rev = "7cbc941a9150468609010a93c429117da2523903";
+ sha256 = "1irrcbqi1m6pcsjkbd3nqri158qhl0bcynciwwxdfqb45i67a1m9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/82bfd0f41e42eed1d4c2361ec1d1685edebbac1b/recipes/move-text";
@@ -45945,8 +46639,8 @@
src = fetchFromGitHub {
owner = "retroj";
repo = "mowedline";
- rev = "bca452544b5e200034d0505a767090a975a21a28";
- sha256 = "07bjkcgy2qvnkrlb5ypgbf969ka0pchz305326r7vfswlvkvihdg";
+ rev = "6121b7d4aacd18f7b24da226e61dbae054e50a7c";
+ sha256 = "16j3y4hffnv2rg97p49hqz3x1icp7qkpcjxhalny5l4gysx9mfqg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/86f7df6b8df3398ef476c0ed31722b03f16b2fec/recipes/mowedline";
@@ -46004,12 +46698,12 @@
mozc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mozc";
- version = "20160102.1506";
+ version = "20180101.0";
src = fetchFromGitHub {
owner = "google";
repo = "mozc";
- rev = "4767ce2f2b6a63f1f139daea6e98bc7a564d5e4e";
- sha256 = "1azx128zsr7mlg2k538483c3qi1zmm8cc4z8sk06534wnx7wxs88";
+ rev = "6b878e31fb6ac4347dc9dfd8ccc1080fe718479f";
+ sha256 = "03gcda62xl6hfibw3y15lf6b04998kj1v95gyzs3q0bqxav74ahw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/30fef77e1d7194ee3c3c1d4775c349a4a9f6af2c/recipes/mozc";
@@ -46130,12 +46824,12 @@
msvc = callPackage ({ ac-clang, cedet ? null, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "msvc";
- version = "20170610.1044";
+ version = "20171225.738";
src = fetchFromGitHub {
owner = "yaruopooner";
repo = "msvc";
- rev = "bb9af3aee0e82d6a78a49a9af61ce47fab32d577";
- sha256 = "1vxgdc19jiamymrazikdikdrhw5vmzanzr326s3rx7sbc2nb7lrk";
+ rev = "dfc529aa6da8b46b0a0c7db9a0e5e9bc33ab1fb3";
+ sha256 = "19n9an0nznwqw3ml022i6vidqbrgxf4yff0nbvvcb91ppc1saf40";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/69939b85353a23f374cab996ede879ab315a323b/recipes/msvc";
@@ -46193,12 +46887,12 @@
mu4e-alert = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
melpaBuild {
pname = "mu4e-alert";
- version = "20170901.1027";
+ version = "20171222.2315";
src = fetchFromGitHub {
owner = "iqbalansari";
repo = "mu4e-alert";
- rev = "ef90cd0f0fb6c841f326db5cad276567eb5f96b5";
- sha256 = "0sym7mp1via65h883f5h45cbfxq58qck7ypcvcfdmnmn9jnl3j9d";
+ rev = "3095de457ec88e752f83ce086eff4aeb22399980";
+ sha256 = "04y26r7cb0sza8wp45khk8la4mvj4h4ksxfm5z7ry77xi7j2894w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mu4e-alert";
@@ -46337,21 +47031,21 @@
license = lib.licenses.free;
};
}) {};
- multi-project = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
+ multi-project = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "multi-project";
- version = "20171119.1230";
+ version = "20171217.1211";
src = fetchhg {
url = "https://bitbucket.com/ellisvelo/multi-project";
- rev = "f610b74567f3";
- sha256 = "1mwqzfisah0bgh7l2v5mlgq30nviccqmk641m84mh25n195g8dsc";
+ rev = "a6e7c1542c0b";
+ sha256 = "1wh7xlas6chdliya847092j5rkngxxg1m9a98y2r782ywgyl7xv6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/multi-project";
sha256 = "19dy2wl5ad1xldiznlw2vjvr9ja8h9wiv6igcggixq56fhngp40x";
name = "multi-project";
};
- packageRequires = [];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/multi-project";
license = lib.licenses.free;
@@ -46927,12 +47621,12 @@
nand2tetris = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "nand2tetris";
- version = "20170306.1827";
+ version = "20171201.1013";
src = fetchFromGitHub {
owner = "CestDiego";
repo = "nand2tetris.el";
- rev = "9f7c605a1d030aed933e86b45c9f7232dbbcfb6e";
- sha256 = "15myf8nbr6pf5qiwwz7xq8d7ys4mddxjb8b8yl7ci2pw7d03cr5z";
+ rev = "33acee34d24b1c6a87db833b7d23449cf858f64f";
+ sha256 = "0sfa674g1qm280s0pc3n6qiiphj5i9ibknckx5capkrkxb5cwpkw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/90421372b3f60b59762279ac805c61a984606d11/recipes/nand2tetris";
@@ -46948,12 +47642,12 @@
nand2tetris-assembler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, nand2tetris }:
melpaBuild {
pname = "nand2tetris-assembler";
- version = "20161109.1637";
+ version = "20171201.1013";
src = fetchFromGitHub {
owner = "CestDiego";
repo = "nand2tetris.el";
- rev = "9f7c605a1d030aed933e86b45c9f7232dbbcfb6e";
- sha256 = "15myf8nbr6pf5qiwwz7xq8d7ys4mddxjb8b8yl7ci2pw7d03cr5z";
+ rev = "33acee34d24b1c6a87db833b7d23449cf858f64f";
+ sha256 = "0sfa674g1qm280s0pc3n6qiiphj5i9ibknckx5capkrkxb5cwpkw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/90421372b3f60b59762279ac805c61a984606d11/recipes/nand2tetris-assembler";
@@ -47241,12 +47935,12 @@
neato-graph-bar = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "neato-graph-bar";
- version = "20170731.2341";
+ version = "20171230.1753";
src = fetchFromGitLab {
owner = "RobertCochran";
repo = "neato-graph-bar";
- rev = "3ebd5168c9b8cc56cc4163206c03864b9b802f27";
- sha256 = "133k1lwmb7ky91ij03nd4vipkivvx4bz56m4waf1pdmaynsidy6j";
+ rev = "c59f15ed9a40aecc174aa22c4bbfa7978e182705";
+ sha256 = "0bdgsxdlwpkd3hjnw1jmj30slakzmj2pinj3pyr5qqba9apxnvri";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/49c5bd4e1506a28ada9856e5f70e520890123d16/recipes/neato-graph-bar";
@@ -47266,8 +47960,8 @@
src = fetchFromGitHub {
owner = "rsdn";
repo = "nemerle";
- rev = "847d1343e63c0a2d25a43f8432c4d750e4e9e7d0";
- sha256 = "0wriamdich72h1m0rmhx1s38ph6q8ak0rfd39kyycw7v8bvwgv08";
+ rev = "59b28607968a9bee060b42eac55c69c37d1c0e69";
+ sha256 = "1anbzlm7ccgd9ss6fqfq1gyvnpnjsxi9y9q3fk6c6cwd11dyq16g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nemerle";
@@ -47576,12 +48270,12 @@
nimbus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "nimbus-theme";
- version = "20171120.1300";
+ version = "20180106.437";
src = fetchFromGitHub {
owner = "m-cat";
repo = "nimbus-theme";
- rev = "a955a210f147694b257f8e79aa0a4ad23ff4fd44";
- sha256 = "0sbcqb2fa28mb08r0sdb85825z6m5a3wkix4zm56w80mqvrv9ggz";
+ rev = "3cb301760d3ff8bb26cad325dc29001893672a46";
+ sha256 = "1h1yxn0whyb8wf13vs55a8zs66jz9svm9780sxaxcdr3gkvgqmd7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fc0e6b456b76e2379c64a86ad844362c58146dc6/recipes/nimbus-theme";
@@ -47783,15 +48477,36 @@
license = lib.licenses.free;
};
}) {};
+ no-emoji = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "no-emoji";
+ version = "20171214.2310";
+ src = fetchFromGitHub {
+ owner = "ecraven";
+ repo = "no-emoji";
+ rev = "329b4093bf38f3f4b0e4760c70270d3b45ee554e";
+ sha256 = "1799wh6qy2yaadkdvnvp37320wxkhal8vlnj47d32a1bv8l8s91q";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/af6b04c1f95468254f2cf361964df9fd25d23586/recipes/no-emoji";
+ sha256 = "1lr6bzjxwn3yzw0mq36h2k2h8bqb1ngin42swhv022yx6a022zn2";
+ name = "no-emoji";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/no-emoji";
+ license = lib.licenses.free;
+ };
+ }) {};
no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "no-littering";
- version = "20171123.1237";
+ version = "20180108.305";
src = fetchFromGitHub {
owner = "emacscollective";
repo = "no-littering";
- rev = "f200aaee54d7ed5de789b825010198cb9c189be2";
- sha256 = "1plmaws2j04nand6avcqikg3kdk53f09ly6xl72rm0nkpm5595wl";
+ rev = "e585ca177a55808a17a53e8a9020198a18175543";
+ sha256 = "197dr52a2xw3da7zaia48qndmgrs3h8nx6wan9zslpy8497c8bbn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering";
@@ -47954,12 +48669,12 @@
nord-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "nord-theme";
- version = "20171005.1039";
+ version = "20180102.1001";
src = fetchFromGitHub {
owner = "arcticicestudio";
repo = "nord-emacs";
- rev = "be32879416bbed1d6524f7c30ac53fbfa5a0e024";
- sha256 = "0q347f9bjayfl8y8vz83kjamf1lp58386nhy0iacjxsq4riwpric";
+ rev = "b5c1dc762fe3acaa88a0ce9640085d45d0109c43";
+ sha256 = "0j1cbwlh646gkjp70maqbq7izchgc23wdax50ykgkw3mxhjrlsf2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/31cb60069825abe3998c8b43bc9177b39a7f3659/recipes/nord-theme";
@@ -47993,11 +48708,11 @@
}) {};
notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "notmuch";
- version = "20170927.415";
+ version = "20180104.1635";
src = fetchgit {
url = "git://git.notmuchmail.org/git/notmuch";
- rev = "cf08295c503a2cefc4c51c5398f3fc1159521ff1";
- sha256 = "1vc49c5n5jdkhvy436avklcvpw6nhdk9kw9gybd6izjbrcjgy62c";
+ rev = "54982e520c3bee74e947e311ee5b1219396fa1a8";
+ sha256 = "00ni0vnsq4p7cka9jy9fw2rdmkm3gxii7blq1c87bpbvrlwjzrhl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -48160,12 +48875,12 @@
nu-mode = callPackage ({ ace-window, avy, fetchFromGitHub, fetchurl, lib, melpaBuild, transpose-frame, undo-tree, which-key }:
melpaBuild {
pname = "nu-mode";
- version = "20171128.1423";
+ version = "20180104.1243";
src = fetchFromGitHub {
owner = "pyluyten";
repo = "emacs-nu";
- rev = "02cdb62271545e822c2e6c7287ac21d5b2795f8f";
- sha256 = "0r07g80q9b2san61342frsn7v3k7cy32fj0v7v6gqx27l5jpqrfb";
+ rev = "91056b70667036bc78d6c8585cf0bc8fe7ba21c0";
+ sha256 = "0pf8ng0r829lrbqjz61wjdag9cb27cx0cj2idgpy92hfiy9s6saa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/230d5f8fdd965a24b8ff3cc94acf378d04815fca/recipes/nu-mode";
@@ -48313,12 +49028,12 @@
nvm = callPackage ({ dash, dash-functional, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "nvm";
- version = "20170513.1501";
+ version = "20171217.836";
src = fetchFromGitHub {
owner = "rejeep";
repo = "nvm.el";
- rev = "61590e7fdeb19b1d866d26e48aef1af4767e5709";
- sha256 = "04z8zkgp0km575ijijpvmrqs0aa2f0878c5n4rl91hs1grq93mjf";
+ rev = "bc0a33257ec16e9f575bb6914b5949199897ada9";
+ sha256 = "07fb6xxnij3nyhvf1yfv58zglawijfr0apmgx22qgaray53rp3nw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nvm";
@@ -48443,8 +49158,8 @@
src = fetchFromGitHub {
owner = "astahlman";
repo = "ob-async";
- rev = "6099e94538083e035a4152335f93eae5b13c8d3f";
- sha256 = "1ws5yngga0zi8cxwd6nzgq17d1k6g44zw2pzivc2fyljxnm70892";
+ rev = "99a6f24191cacb343d6090ecc8c1c67f768b2e22";
+ sha256 = "1cw62nsdnmllpkn4mqi80vp6s17yf6an418gvr06z8cxqndw07h1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ob-async";
@@ -48522,12 +49237,12 @@
ob-cfengine3 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ob-cfengine3";
- version = "20170915.634";
+ version = "20180102.1012";
src = fetchFromGitHub {
owner = "nickanderson";
repo = "ob-cfengine3";
- rev = "f38f87256efcb2b02f5c7042900087be941c1ddc";
- sha256 = "09xn84d2vy3kxk2xihjml8zzrhv2cz2jy20dg7w6ll9wn38gs33h";
+ rev = "93ebcfceec3734f4bd187ae123686187d66fd401";
+ sha256 = "0cyjdg8vzaf31gqsgmz5znw7v2p36jiz3sj1jvw7vhr8s4iar81i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d068233c438e76cbcc6e9a97cbec9b2550a18ed6/recipes/ob-cfengine3";
@@ -48540,6 +49255,27 @@
license = lib.licenses.free;
};
}) {};
+ ob-clojure-literate = callPackage ({ cider, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+ melpaBuild {
+ pname = "ob-clojure-literate";
+ version = "20180106.2121";
+ src = fetchFromGitHub {
+ owner = "stardiviner";
+ repo = "ob-clojure-literate";
+ rev = "e2b264f0f42467436f71aac81ca848fe9ab517d5";
+ sha256 = "1w0mga44s7lghivw0ixm8gb8ryav5myd9i4x0xbdc8512jgy6a91";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e958745861c9673248955443bcc2c76d504b32f7/recipes/ob-clojure-literate";
+ sha256 = "0jprgnslkc9m404n32rr510is823yr9kziqcw70z828fy7wl2glk";
+ name = "ob-clojure-literate";
+ };
+ packageRequires = [ cider dash emacs org ];
+ meta = {
+ homepage = "https://melpa.org/#/ob-clojure-literate";
+ license = lib.licenses.free;
+ };
+ }) {};
ob-coffee = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ob-coffee";
@@ -48568,8 +49304,8 @@
src = fetchFromGitHub {
owner = "brantou";
repo = "ob-coffeescript";
- rev = "b70f3d822c707cb02333fcb739ba4874614cad2a";
- sha256 = "0284v3km41427q7dr0wmvf3zhbsgzj0j2r9zny0g3n85qvyk0rgd";
+ rev = "d68a8335d29c947f388b4fa556de4f3ee75a19c6";
+ sha256 = "0hjyvvq089c0m9hqjlk3fb07z24vha7fmvfy8w9203jxqkazm1di";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ba1a808c77653bac1948d6c44bd1db09301ffeff/recipes/ob-coffeescript";
@@ -48778,8 +49514,8 @@
src = fetchFromGitHub {
owner = "brantou";
repo = "ob-hy";
- rev = "a3512f274709dc4ab6c18d7955d361f8715505f0";
- sha256 = "1i796041svy7njjl3aqaxzjydmm24q688vpxvqd0pj5hyajqdgqw";
+ rev = "cad6a1aaa463e8d72d37b12744be1c5732bb8cc4";
+ sha256 = "0cm238139vf356vayv3xzx5gw2hlklzgrbpzk3ixnfh4gkgnmdj0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/12a7a7dba169010a3a047f961010236a203c16c2/recipes/ob-hy";
@@ -48795,12 +49531,12 @@
ob-ipython = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "ob-ipython";
- version = "20171111.740";
+ version = "20171209.634";
src = fetchFromGitHub {
owner = "gregsexton";
repo = "ob-ipython";
- rev = "0cd6f75657df904637fbef7b540344ef5c559c3f";
- sha256 = "1rmlc6xnj6nh39rscz9963k5wlppiysibby32r314lxk6n03gj0l";
+ rev = "a3bf46dd6c9a76f4cd5058f3ab5426d90f0c073a";
+ sha256 = "0ck3r5qwp4184anpa9f9hjp3rra6yx5hkwcxg1byippp75hdc50m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/557c36e86844c211f2d2ee097ce51ee9db92ea8b/recipes/ob-ipython";
@@ -48921,12 +49657,12 @@
ob-php = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ob-php";
- version = "20171017.2206";
+ version = "20180103.441";
src = fetchFromGitHub {
owner = "stardiviner";
repo = "ob-php";
- rev = "c281c1e17f0fd7de4adb6c3e6029dc2bd76beca1";
- sha256 = "1c0967cpimmr5j7ymr4654y62f615dfrv1h3385i7n57jsvqr6bs";
+ rev = "08b41282fba31abca030a387062c3f1eb25a723f";
+ sha256 = "1anrqqd4g4pq2ngslgkqarxisgmn9i7nggj2m76ny7ga1hxi2agv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/940a22790c9e5fd2f7729c71efad907683cc392c/recipes/ob-php";
@@ -49551,12 +50287,12 @@
olivetti = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "olivetti";
- version = "20171102.1906";
+ version = "20171209.644";
src = fetchFromGitHub {
owner = "rnkn";
repo = "olivetti";
- rev = "cd2fdca25935a47a5d3b0417a206f886579f8c45";
- sha256 = "0cm630yvsdib868xl9x1ng3i64dcyzvq8pzhhaz99b7zc7wfayvh";
+ rev = "e824a21f5e284bc7e111b6f325258bba8396d9ec";
+ sha256 = "07hz7nj81pj0vwql30ln8isypqyhwv4y36gfzs475hgjim2mvdh2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti";
@@ -49698,12 +50434,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 = "20171119.1236";
+ version = "20171226.1147";
src = fetchFromGitHub {
owner = "OmniSharp";
repo = "omnisharp-emacs";
- rev = "b0c61e91d1b600875ad2eae06fe72a179a3028b6";
- sha256 = "1b0y20r9rimarfa1zgid78jh1zyzykdxd07n3vzam6ds9diygzxd";
+ rev = "95f56022edf9fcaba8402db05a6927af050b12a8";
+ sha256 = "133maq29hfjaq4vilz9wvr9vjkschkpydkw2197sscv7whfzv78j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
@@ -50232,12 +50968,12 @@
org-brain = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "org-brain";
- version = "20171116.2353";
+ version = "20180107.1655";
src = fetchFromGitHub {
owner = "Kungsgeten";
repo = "org-brain";
- rev = "e2cadeeb83060437d2b002215680f399ca3281d7";
- sha256 = "03yv1897vvj147sxs58kwq614365slkqszzxvlkarbqvxgamm30s";
+ rev = "42596a3c29e9b6b64c05b04db04d23ea282560e4";
+ sha256 = "1ca0x87i6vqs004dr6qc9hi1lqbvj82464cbfj3vr0z2n5pi7hl5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/47480fbae06e4110d50bc89db7df05fa80afc7d3/recipes/org-brain";
@@ -50484,12 +51220,12 @@
org-dashboard = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-dashboard";
- version = "20171128.301";
+ version = "20171223.1124";
src = fetchFromGitHub {
owner = "bard";
repo = "org-dashboard";
- rev = "cc9bb28da4cd029328bb3c9973be944a17289cb0";
- sha256 = "10brbq3pyx1nm0r7wigx7j1164lxmh9j6gp6pywq9w9ip62b1ma3";
+ rev = "02c0699771d199075a286e4502340ca6e7c9e831";
+ sha256 = "0zi23xgv5fq827dljhzp6m2v7ggr3pdw3fpgq8515gs9q4f12v1r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/11ce0ba772672d9cbae5713ebaf3798eec5fdb3c/recipes/org-dashboard";
@@ -50858,22 +51594,22 @@
license = lib.licenses.free;
};
}) {};
- org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
+ org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }:
melpaBuild {
pname = "org-jira";
- version = "20171126.1833";
+ version = "20180103.1813";
src = fetchFromGitHub {
owner = "ahungry";
repo = "org-jira";
- rev = "d125ade5069e0840e204142ca3d4405cac2593f7";
- sha256 = "00wqz6k72iv6mwvpg9qv35qfkk8fpq1nsww80jddafdfzlslm0bw";
+ rev = "51a1b2248ec421aecdd38aaf5c2876a036b08bb7";
+ sha256 = "0zyh5nn9hgiz0ic67ypahaah5f3vjmall7z0ffn4gl0fy22sar6h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira";
sha256 = "0dvh9k0i75jxyy3v01c4cfyws8ij6718hsivi2xyrgig7pwp16ib";
name = "org-jira";
};
- packageRequires = [ cl-lib emacs request ];
+ packageRequires = [ cl-lib emacs request s ];
meta = {
homepage = "https://melpa.org/#/org-jira";
license = lib.licenses.free;
@@ -50987,12 +51723,12 @@
org-mind-map = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "org-mind-map";
- version = "20171109.1238";
+ version = "20171206.645";
src = fetchFromGitHub {
owner = "theodorewiles";
repo = "org-mind-map";
- rev = "9d6e262bedd94daf9de269f4d56de277275677cb";
- sha256 = "0jgkkgq7g64zckrmjib0hvz0qy3ynz5vz13qbmlpf096l3bb65wn";
+ rev = "d7854dbd30d565d3087d2810d6a77cc882988eae";
+ sha256 = "0jkm6ar07m399hqanjpw6y7bxdr59j72skmi9ncgjyb81ch70g36";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3c8683ee547a6a99f8d258561c3ae157b1f427f2/recipes/org-mind-map";
@@ -51029,12 +51765,12 @@
org-mru-clock = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-mru-clock";
- version = "20171101.506";
+ version = "20171219.314";
src = fetchFromGitHub {
owner = "unhammer";
repo = "org-mru-clock";
- rev = "366cd5ad33b53940bc7b8d28b7d01f7acd19f74c";
- sha256 = "0a9jaja7xdslcjjlm3an2kri3f6sivc21hgk6hp4qvd4vmqkl111";
+ rev = "ccf477735d76c078b44bba7bff12e7e30e66bdb3";
+ sha256 = "17dxdghnh3h24584pa374pmz0a7qr13p0a4rfsndns9xv8wfzbic";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b36bf1c1faa4d7e38254416a293e56af96214136/recipes/org-mru-clock";
@@ -51075,8 +51811,8 @@
src = fetchFromGitHub {
owner = "Rahi374";
repo = "org-notebook";
- rev = "d90c4aeca2442161e6dd89de175561af85aace03";
- sha256 = "15hf0x0v4fz6gxj8qx9pfm6xic7qni33nn4ga6cxbdgpwgyr61wz";
+ rev = "86042d866bf441e2c9bb51f995e5994141b78517";
+ sha256 = "0znxn6zzc9645m3wmkryf4xwjskf7gwylrg6z2kmr1wpjlpfwb01";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/04149b1f158e857ea824fe120372ac52a000adcf/recipes/org-notebook";
@@ -51089,6 +51825,27 @@
license = lib.licenses.free;
};
}) {};
+ org-noter = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+ melpaBuild {
+ pname = "org-noter";
+ version = "20171229.1823";
+ src = fetchFromGitHub {
+ owner = "weirdNox";
+ repo = "org-noter";
+ rev = "ad3ecfc75bba19625dab07f4ff0483f043ddaf70";
+ sha256 = "09y9pamb7zld41qlvfpp5szl0lyblrjd2211qzbs8zm4mk3hlzy3";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/4a2bc0d95dc2744277d6acbba1f7483b4c14d75c/recipes/org-noter";
+ sha256 = "0vsc2b1yz9lw0zv1vnm722pl35kxpwhcdi7h6mijhnw8vv7rhixf";
+ name = "org-noter";
+ };
+ packageRequires = [ cl-lib emacs org ];
+ meta = {
+ homepage = "https://melpa.org/#/org-noter";
+ license = lib.licenses.free;
+ };
+ }) {};
org-octopress = callPackage ({ ctable, fetchFromGitHub, fetchurl, lib, melpaBuild, org, orglue }:
melpaBuild {
pname = "org-octopress";
@@ -51225,12 +51982,12 @@
org-pdfview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, pdf-tools }:
melpaBuild {
pname = "org-pdfview";
- version = "20161130.1053";
+ version = "20180102.2349";
src = fetchFromGitHub {
owner = "markus1189";
repo = "org-pdfview";
- rev = "9de96eef6f187a10cd910e3bc3eb274d38856819";
- sha256 = "0lrcj3mcdfcdrndivhj5ds386zrsy78sfg0i8126wwwc5lfh48vq";
+ rev = "645f451df82fb5ebdf42b2c208711d307781062d";
+ sha256 = "1iq90f821iycqs1qff1m2vjl1czri01c484gcnn50wnf7mdfynhk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-pdfview";
@@ -51372,12 +52129,12 @@
org-random-todo = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-random-todo";
- version = "20170404.318";
+ version = "20171219.58";
src = fetchFromGitHub {
owner = "unhammer";
repo = "org-random-todo";
- rev = "0736e8508b19fe9c3a3911f357d30e3e498e3e3b";
- sha256 = "1c7wfgs1y9jyj63dfqzw60f2qi96dcdmbn5l258nx1rk25n5iz3l";
+ rev = "24500edf303a854f09a88b07e1a16a21e164eb87";
+ sha256 = "0c2d5dbr10p1hz51ybygmwv25si6sfwy21kc9xmbjyrrlw5l5sqv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/80fad6244ea3e5bdf7f448c9f62374fae45bae78/recipes/org-random-todo";
@@ -51393,12 +52150,12 @@
org-randomnote = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-randomnote";
- version = "20171117.848";
+ version = "20171210.557";
src = fetchFromGitHub {
owner = "mwfogleman";
repo = "org-randomnote";
- rev = "552742f0574171629824c9627b4cc59ce3d73d74";
- sha256 = "0jgdn0g2jab62i2i9yw7mhbd1cikqkx8skq7zrd7l64jd8my70xp";
+ rev = "c89eb4cf625ea7e7624b6a2d3d5676ce25ab03d7";
+ sha256 = "05ap1kbq5cwak70jlm3m0pvbax75kg3281qxs5flz3qbkfsbg3h2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d92cb392b23701948176ba12516df5ae6608e950/recipes/org-randomnote";
@@ -51483,12 +52240,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 = "20171127.2044";
+ version = "20171222.818";
src = fetchFromGitHub {
owner = "jkitchin";
repo = "org-ref";
- rev = "459484e80a0c3fefbfad922b0afb97c8e0d93ce2";
- sha256 = "0limqwc4qlr68rq6gm6w72cafjmq8jns2dcgz8cjdx4mpzng7kvm";
+ rev = "66e23994c0964762b7a4bfe8662e81aa609e7a22";
+ sha256 = "15kqfp0l0dsyw7qb7yfdfxsbjqzg7kcfp43nv7xiw808616vn7m9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
@@ -51515,12 +52272,12 @@
org-repo-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-repo-todo";
- version = "20160307.1029";
+ version = "20171227.1719";
src = fetchFromGitHub {
owner = "waymondo";
repo = "org-repo-todo";
- rev = "b164bacefcd3c55dd40cd1a9e91ffefd315b400d";
- sha256 = "0as82hf81czks9fcmhy9wjwl8d4mbylrm13c02y8abp0am41r28f";
+ rev = "f73ebd91399c5760ad52c6ad9033de1066042003";
+ sha256 = "0c74zwmac8x1y8jimdx473v0falpky2kfig8pnaxavz415gb315q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d17b602004628e17dae0f46f2b33be0afb05f729/recipes/org-repo-todo";
@@ -51596,6 +52353,27 @@
license = lib.licenses.free;
};
}) {};
+ org-send-ebook = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
+ melpaBuild {
+ pname = "org-send-ebook";
+ version = "20171231.2313";
+ src = fetchFromGitHub {
+ owner = "stardiviner";
+ repo = "org-send-ebook";
+ rev = "a22d565413b82c415c4f12daab5bfcc489053ec5";
+ sha256 = "19qf3a8vagbfbdj2cd7wklran4z6w9ddlimy0r15pxs23abicwjl";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/646106cf43649544056285aef8c4035b6e5bbbdb/recipes/org-send-ebook";
+ sha256 = "0gvnrl4rfqn3zd0wmj4bhd63zkjk68lwwcgmsqrfw7af22wlfv3d";
+ name = "org-send-ebook";
+ };
+ packageRequires = [ cl-lib emacs seq ];
+ meta = {
+ homepage = "https://melpa.org/#/org-send-ebook";
+ license = lib.licenses.free;
+ };
+ }) {};
org-static-blog = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-static-blog";
@@ -51872,12 +52650,12 @@
org-tree-slide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-tree-slide";
- version = "20160513.2325";
+ version = "20171129.2238";
src = fetchFromGitHub {
owner = "takaxp";
repo = "org-tree-slide";
- rev = "fed7ec7e6df59cffcdb4c13a9345f4d828404dd8";
- sha256 = "0b97jqskn5c2cbah3qj9bi5was31sijrp01dca36g5y53lpz7n79";
+ rev = "dff8f1a4a64c8dd0a1fde0b0131e2fe186747134";
+ sha256 = "153bg0x7ypla11pq51jmsgzfjklwwnrq56xgpbfhk1j16xwz9hyf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6160c259bc4bbcf3b98c220222430f798ee6463f/recipes/org-tree-slide";
@@ -51998,12 +52776,12 @@
org2blog = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, metaweblog, org, xml-rpc }:
melpaBuild {
pname = "org2blog";
- version = "20170826.1843";
+ version = "20171218.1911";
src = fetchFromGitHub {
owner = "punchagan";
repo = "org2blog";
- rev = "62a6400746847f246e12493271f0bb52f7465a92";
- sha256 = "1xnb6yd5ny5i6hvzxfsnga5m75si5y8vc1j3vfs42r99s2ns8yid";
+ rev = "aa7a5730f4a58a53c41370dcde7bec43d5c1a2cd";
+ sha256 = "1ivf156186myr84rqbd8rn6wa8qjrip7la6sgc8k6ggg6lzvkqac";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org2blog";
@@ -52214,22 +52992,22 @@
license = lib.licenses.free;
};
}) {};
- orglue = callPackage ({ epic, fetchFromGitHub, fetchurl, lib, melpaBuild, org, org-mac-link }:
+ orglue = callPackage ({ epic, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "orglue";
- version = "20150503.114";
+ version = "20171220.426";
src = fetchFromGitHub {
owner = "yoshinari-nomura";
repo = "orglue";
- rev = "1274652d527cb6afe45d1acb79f41be5a2886ee4";
- sha256 = "0qf2k89nldfm3njcnygh8ak8fz5m9ykmpzfx1cnfffxcyi139s9f";
+ rev = "ae2a45c19b52e45db7891093a3ff17ba2e51c507";
+ sha256 = "0h3b37wz4hlk022c0sq7c9p5z3v4n6cljhy8g1qjhnxac8y7mkr0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/orglue";
sha256 = "1kj62y3cf3as2d5s207s6kg5alm09jmw0aag1z6lblrjlzbi1p2j";
name = "orglue";
};
- packageRequires = [ epic org org-mac-link ];
+ packageRequires = [ epic org ];
meta = {
homepage = "https://melpa.org/#/orglue";
license = lib.licenses.free;
@@ -52340,22 +53118,22 @@
license = lib.licenses.free;
};
}) {};
- origami = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+ origami = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "origami";
- version = "20170129.805";
+ version = "20180101.753";
src = fetchFromGitHub {
owner = "gregsexton";
repo = "origami.el";
- rev = "5630536d04613476e13b413fe05fd0bbff4107ca";
- sha256 = "1w6cyyvjw6x4x0a7mbybw37f70cdnwajv8snvmnrqd73vggm70fd";
+ rev = "1f38085c8f9af7842765ed63f7d6dfe4dab59366";
+ sha256 = "0ha1qsz2p36pqa0sa2sp83lspbgx5lr7930qxnwd585liajzdd9x";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b816be227dfc7330292a50346c4bb37394d3e998/recipes/origami";
sha256 = "0rkb55zcvsgxzp190vrnbzdfbcjd8zi6vhbhwpqxi0qmyq6a08pr";
name = "origami";
};
- packageRequires = [ dash emacs s ];
+ packageRequires = [ cl-lib dash emacs s ];
meta = {
homepage = "https://melpa.org/#/origami";
license = lib.licenses.free;
@@ -52662,8 +53440,8 @@
src = fetchFromGitHub {
owner = "articuluxe";
repo = "outrespace";
- rev = "cf2a397971f82c87dcfbe3400e3e7c2de79fa68e";
- sha256 = "1rxyyvax3f0fh3k8majkhpdrnlqg4pg7hl68q61csiccayx04213";
+ rev = "0a3b53d283fe8adb8de45766d284704ed4557e23";
+ sha256 = "0cas2divgdjai06f6jk5c808vhvg5dcwyc9nam2krvd8k5y5nd8q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2659a78181b8fe98ca4a80c75ec8c9b6dff44bb5/recipes/outrespace";
@@ -52830,8 +53608,8 @@
src = fetchFromGitHub {
owner = "ofosos";
repo = "ox-epub";
- rev = "31ed40ad3f0b3166cb3e772f8689b12d7f2cfe1b";
- sha256 = "1p9pdm3mhwf5ldl0g4c8kf8iqwzqg0f88qd0nmw33mm8mvikvv1h";
+ rev = "93bd7b42ad4a70d7008470820266546d261222d6";
+ sha256 = "078ihlpwajmzb0l4h5pqqx1y9ak7qwbrh7kfrqwd0jn114fah1yd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c3ac31dfef00e83fa6b716ea006f35afb5dc6cd5/recipes/ox-epub";
@@ -52889,12 +53667,12 @@
ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ox-hugo";
- version = "20171129.933";
+ version = "20180107.1554";
src = fetchFromGitHub {
owner = "kaushalmodi";
repo = "ox-hugo";
- rev = "95dd1ea388a9d625bec6ef4f59f09ee28a991a2e";
- sha256 = "0camyxihrjl3yxwkw806ir3pghfibh9y1kr1j1pash1zsvlpb93s";
+ rev = "44ac07fb5d3a30662dd2c4643fe9d9e3ce85465d";
+ sha256 = "1p3053kkjq1kv91jm6myp3ikjvh53c3yrnvrxfg5jndr6p1zawqz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo";
@@ -52973,12 +53751,12 @@
ox-mediawiki = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "ox-mediawiki";
- version = "20161228.850";
+ version = "20180105.1354";
src = fetchFromGitHub {
owner = "tomalexander";
repo = "orgmode-mediawiki";
- rev = "9e13392fe88817564f46a7a9f1eadebf54a2c346";
- sha256 = "1x584gbwr1jhbxgzmjr6z801lqzqcaqzypkz25zz2spmh4n8fz9f";
+ rev = "a9327150293e370e500ba55bddfe5fc435c6bf9b";
+ sha256 = "0dsq86hli24imdkgsf45asx23kriw9di3d0cf5z8axfpkcbkn770";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/24244d146306ce965df382c8958c7574c74313f2/recipes/ox-mediawiki";
@@ -53040,8 +53818,8 @@
src = fetchFromGitHub {
owner = "kawabata";
repo = "ox-pandoc";
- rev = "55861adfceeae436deeae8402f545b771ad3484b";
- sha256 = "1pvijswwx3a4bb1z32kk9x70ba07zr2wjr913ri8gp81kj84zb0x";
+ rev = "cd3c59f6c0ea49e0cac31d8392a5bbac02886d8f";
+ sha256 = "04wppfxjm43bc5c8i5l5kbpln7rhifgqrmbjbxdbqd3vl4lpcnzh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ca17de8cdd53bb32a9d3faaeb38f19f92b18ee38/recipes/ox-pandoc";
@@ -53351,12 +54129,12 @@
package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "package-lint";
- version = "20171006.1846";
+ version = "20171201.1903";
src = fetchFromGitHub {
owner = "purcell";
repo = "package-lint";
- rev = "ff64e1171e8330972c26bf547042429927aed7c7";
- sha256 = "11hsxvla2vq944zfd8kr0wynvkr7n90jv714ll6f7yhn10nrraks";
+ rev = "9abfb14d9ad903ef73895a27b9964b5e6023d752";
+ sha256 = "0brd8zhiyn9kpbc0za455vjbb5v49i2pj3hhj1lbdcghzwq39jvi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint";
@@ -53498,12 +54276,12 @@
page-break-lines = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "page-break-lines";
- version = "20171020.108";
+ version = "20171210.31";
src = fetchFromGitHub {
owner = "purcell";
repo = "page-break-lines";
- rev = "ae1c0065984429c7364a667abb9180e80134c4c0";
- sha256 = "1j2fw5p5cwyxpb3clym59jbma06r7la83n62xmz0q1z41llmwx4j";
+ rev = "fd3b7e38ad8747cd009ead7ef1bb150849ccc693";
+ sha256 = "0ik5v2kd0l5a6sznld5ncdb4lsyqbbw7axs0qwxc968b540k9zq5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/page-break-lines";
@@ -53603,12 +54381,12 @@
pamparam = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, lispy, melpaBuild, worf }:
melpaBuild {
pname = "pamparam";
- version = "20170927.1048";
+ version = "20171217.551";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "pamparam";
- rev = "c840a8f941940bb8e694c635995566faee995c7b";
- sha256 = "0wqnzgkcwhrgxdkrlk6i469gcas9477pbkv878cqq9ifsjwvf42n";
+ rev = "4e10a68314afb5087163ee09133b9032a368c85f";
+ sha256 = "11v0q3d68q9am9scjd38lw2vqx48aqzqs32316i9xsbp962snrxw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/067b5e3594641447478db8c1ffcb36d63018b1b2/recipes/pamparam";
@@ -53645,12 +54423,12 @@
pandoc-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }:
melpaBuild {
pname = "pandoc-mode";
- version = "20170720.127";
+ version = "20171216.1545";
src = fetchFromGitHub {
owner = "joostkremers";
repo = "pandoc-mode";
- rev = "58f893d54c0916ad832097a579288ef8ce405da5";
- sha256 = "03nh5ivcwknnsw9khz196n6s3pa1392jk7pm2mr4yjjs24izyz1i";
+ rev = "242bc6fb154ed02d5829644778586234e31c0710";
+ sha256 = "1ghkphkpvabmzds6pib88fpwgv83rcfqv78j59kjxhkcgpzd8bw2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/pandoc-mode";
@@ -53687,12 +54465,12 @@
paper-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, hexrgb, lib, melpaBuild }:
melpaBuild {
pname = "paper-theme";
- version = "20170924.1231";
+ version = "20180107.1613";
src = fetchFromGitHub {
owner = "cadadr";
repo = "elisp";
- rev = "02829f582d03c149d0aace9a0bdf2bd405b2e4a2";
- sha256 = "0rvwhvmv9b6ma6jf5gbmmy9ahrsli4qflc8z2n2whl743rbcfpk6";
+ rev = "28d7339f2e70c617f2e8e3979b45d78883a27282";
+ sha256 = "1ank29f64cwdg9faqz8fknaz0cn4jma18197n6q3fhb6mfl081hn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a7ea18a56370348715dec91f75adc162c800dd10/recipes/paper-theme";
@@ -53937,12 +54715,12 @@
parsec = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "parsec";
- version = "20170508.1500";
+ version = "20171202.2031";
src = fetchFromGitHub {
owner = "cute-jumper";
repo = "parsec.el";
- rev = "8755c60826efaa8603b0d4300bfba9abaa072584";
- sha256 = "03yzs4l53j4fvviqfhdn3cxc710yrg4wdbnl7r69yn69r4di9bfj";
+ rev = "72c1897a42b3b0b59505b3562e8f46c6354faec1";
+ sha256 = "0yg35fs9gr07j6x7xi4f3v11xdanmkhr5sr9lqim0m10aglv7vwf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/248aaf5ff9c98cd3e439d0a26611cdefe6b6c32a/recipes/parsec";
@@ -54088,8 +54866,8 @@
src = fetchFromGitHub {
owner = "zx2c4";
repo = "password-store";
- rev = "7252e8b3cf829e908179913daad16ff2b8bdefdd";
- sha256 = "1wmayp7wjlfxdjb0wlmjqyxqa95ssrhhxhkiy0ip3bgip77s7rbw";
+ rev = "bd1cadd5620279b5ee781434b4f0731eb9ad730d";
+ sha256 = "017na2x0hrx4837w5xky3qnzrq3a36fi3mnjpdrv92pr06hbnc4n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/207f8ec84572176749d328cb2bbc4e87c36f202c/recipes/password-store";
@@ -54336,12 +55114,12 @@
pc-bufsw = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pc-bufsw";
- version = "20150923.13";
+ version = "20180107.1040";
src = fetchFromGitHub {
owner = "ibukanov";
repo = "pc-bufsw";
- rev = "a76120bca9821c355069f135b4e6978351b66bc2";
- sha256 = "1jj5h92qakrn9d5d88dvl43b7ppw96rm11hqg3791i6k48nx1d1m";
+ rev = "b99ba484e18ebf2b88654704146746490bb7625f";
+ sha256 = "184nnkfh7n6vbbmvykvklr1dn3dcwjj3w800irdg55bbnkxxzkj4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5f2bbd34d673935846c286e73a1e2efaa00ab01a/recipes/pc-bufsw";
@@ -54459,22 +55237,22 @@
license = lib.licenses.free;
};
}) {};
- pcmpl-pip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ pcmpl-pip = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
melpaBuild {
pname = "pcmpl-pip";
- version = "20171109.1932";
+ version = "20171201.33";
src = fetchFromGitHub {
owner = "hiddenlotus";
repo = "pcmpl-pip";
- rev = "50345753df4420f1ca4d1b8cb56b0f8d29d2969c";
- sha256 = "0svl0xxh3amc52kj73m3mi732gm3907l2gk7i91iy0ynp6v3f0rz";
+ rev = "8b001b579fc015f80ee0e4f3211058b830bf7c47";
+ sha256 = "0f8s2gn82dhyrnv0j688697xy0ig2yhn5m94gwhcllxq5a3yhbdg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/pcmpl-pip";
sha256 = "19a3np5swpqvrx133yvziqnr2pvj8zi0b725j8kxhp2bj1g1c6hr";
name = "pcmpl-pip";
};
- packageRequires = [];
+ packageRequires = [ f s seq ];
meta = {
homepage = "https://melpa.org/#/pcmpl-pip";
license = lib.licenses.free;
@@ -54793,22 +55571,22 @@
license = lib.licenses.free;
};
}) {};
- persp-fr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, persp-mode }:
+ persp-fr = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, persp-mode }:
melpaBuild {
pname = "persp-fr";
- version = "20170908.44";
+ version = "20180103.642";
src = fetchFromGitHub {
owner = "rocher";
repo = "persp-fr";
- rev = "4d2d1a75019f520742da79f1aeed9c4a960677e0";
- sha256 = "1waakbmxwm0xdnl0iznyk61ccwdjvwv5g1naml31r7q0cnk0jfz8";
+ rev = "aeb3b5de6135269091bb9aa0396973766c27fc88";
+ sha256 = "0l6hlgn54iw2f6ry0gw79rsbz1r4svxf2xwffi580vi68wrcnvf2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8e09213dddf003a1275eafb767431a507ecf7639/recipes/persp-fr";
sha256 = "0p4379yr1b32l8ghq1axyb8qhp28gnq5qxxvbk3mdzgbwwj8y4b2";
name = "persp-fr";
};
- packageRequires = [ emacs persp-mode ];
+ packageRequires = [ dash emacs persp-mode ];
meta = {
homepage = "https://melpa.org/#/persp-fr";
license = lib.licenses.free;
@@ -54817,12 +55595,12 @@
persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "persp-mode";
- version = "20171014.111";
+ version = "20180104.843";
src = fetchFromGitHub {
owner = "Bad-ptr";
repo = "persp-mode.el";
- rev = "ccf87da2c230c3a91e627105b0f034a954e6842a";
- sha256 = "1dv3ghl9falw888bl1w0d5pzp0jz8qsbisd7kfd887bsyn7x7jqw";
+ rev = "eef754ce06159e220a9f3c99db3809925f41b8f1";
+ sha256 = "1x4s1nlnvab3sgzm0glkazfpc7lkh64af5nc4jjz1jzin8v0m055";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode";
@@ -54901,12 +55679,12 @@
perspeen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }:
melpaBuild {
pname = "perspeen";
- version = "20170916.404";
+ version = "20171203.221";
src = fetchFromGitHub {
owner = "seudut";
repo = "perspeen";
- rev = "525f2f25358f17c7269c3750d56bfb8a6d59b5e6";
- sha256 = "17nv33nl60jdn6cz6abbj6jxnvjcshaq4a22lkssxczp968k1qn3";
+ rev = "edb70c530bda50ff3d1756e32a703d5fef5e5480";
+ sha256 = "12h0kj96s4h8z4kqalp7hccnlnqn5lrax3df75gz16pskx2dwxqr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/perspeen";
@@ -55342,12 +56120,12 @@
php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "php-mode";
- version = "20171107.826";
+ version = "20180105.541";
src = fetchFromGitHub {
owner = "ejmr";
repo = "php-mode";
- rev = "1e9ec6411e6ad3c85225e724215c28b01232fe18";
- sha256 = "0c8gdy6hc03c9al91j1py6xg0c6qzbhkcyzn4423lnkakv33iiwp";
+ rev = "c3f3ac1665a77a0d3ee425244c77d923eadc9621";
+ sha256 = "1flhbqqg2jnlh8l8p7g130arq3fx27z5h8ki98wgd070s794x39y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode";
@@ -55867,12 +56645,12 @@
plan9-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "plan9-theme";
- version = "20170529.2212";
+ version = "20180102.1852";
src = fetchFromGitHub {
owner = "john2x";
repo = "plan9-theme.el";
- rev = "cdc50195f6579e6c3e6e8060142ce25b609f7949";
- sha256 = "17grr5rvazh448qzrksxrgp0yclp32s2rxs4h5pygky7knb5vf3v";
+ rev = "2a31fb9251922667692337c867612947d2139696";
+ sha256 = "0g01a34q3dsn23s7s94xxmrvqalmvzi3hdz2hgh4swn4hrp4bzqf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cdc4c2bafaa09e38edd485a9091db689fbda2fe6/recipes/plan9-theme";
@@ -56119,8 +56897,8 @@
version = "20170419.303";
src = fetchgit {
url = "https://git.savannah.gnu.org/git/gettext.git";
- rev = "981c523ddbd1462970335a1069573ca3bdd3df5e";
- sha256 = "1aq95scp0lg5r1fsn62r54dqamm3174wzrr0h3vxx75m3iycsxxi";
+ rev = "d4e434046121b395e8e96ac3dcb4a8f6113f4fd3";
+ sha256 = "1abk6v8afmbn1sfyjkw14zvq1xgfnpsvi6m4qaglpa460awsnq9c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/po-mode";
@@ -56178,12 +56956,12 @@
pocket-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pocket-api }:
melpaBuild {
pname = "pocket-mode";
- version = "20170327.438";
+ version = "20171201.515";
src = fetchFromGitHub {
owner = "lujun9972";
repo = "pocket-mode";
- rev = "4338e869862a057e7ad1e53953e8c4a2c0f12a46";
- sha256 = "0c23np33g9hndppyfvvh9qb8xdh2v92r8rvcsi2cbwwm4z7xsvra";
+ rev = "229de7d35b7e5605797591c46aa8200d7efc363c";
+ sha256 = "0j3axac4lp7p00a7mf7frryqg1y3jwqaw0s475gz606642vg9l45";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6aa3d04058bfc0bc1da3393d17429d517275e97c/recipes/pocket-mode";
@@ -56377,12 +57155,12 @@
pomidor = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pomidor";
- version = "20170925.2301";
+ version = "20171214.727";
src = fetchFromGitHub {
owner = "TatriX";
repo = "pomidor";
- rev = "16bed77ff933cb5f8430b6eacf27509631d22072";
- sha256 = "1w2ql67arjzzjakqm34gbs3vf6w9yzkw5kzi5vrvkcwajqq8qq56";
+ rev = "612912789b01d5d53975f0b2e64322ab79035be1";
+ sha256 = "0ia344z9gvnq37kvac534mpcl5rx84qg2cjgr6lrxa4svnq6353x";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0d4f313081594df23f357c40feb456847d8bd0/recipes/pomidor";
@@ -56629,12 +57407,12 @@
popup-switcher = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
melpaBuild {
pname = "popup-switcher";
- version = "20161130.656";
+ version = "20171205.51";
src = fetchFromGitHub {
owner = "kostafey";
repo = "popup-switcher";
- rev = "86809fbd3c3c3d566043043b6577ccf8133ac855";
- sha256 = "1r8g3wxyklkck9af1x7rg7hyj8fnf28fd34p12vv17mhnqzb4x4y";
+ rev = "f5788a31918e37bb5c04139048c667bcec9f1b62";
+ sha256 = "0gfi8dlgynciv3q5a208c7gd66g2r99b3zn0i31ibpppjqy2vcsk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7d1897c4c4a6f4b4527279e6dad976219d7b78/recipes/popup-switcher";
@@ -56860,12 +57638,12 @@
prassee-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "prassee-theme";
- version = "20170406.1953";
+ version = "20180105.1644";
src = fetchFromGitHub {
owner = "prassee";
repo = "prassee-emacs-theme";
- rev = "7ce96272a514caa8598aa3c7227ade8a21e20daa";
- sha256 = "033qmd1rfjpiz27zz34b96dyc2lil08qdf9nn13sa915gc6704ps";
+ rev = "b68d13f929364b9bb087f8f587798144218f7dc6";
+ sha256 = "08r22xsrlycl0lyqg5qi5wv5w4zhdawmi8ikdgvn5776qaixb6r7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/15425b576045af1c508912e2091daf475b80b429/recipes/prassee-theme";
@@ -57321,12 +58099,12 @@
projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
melpaBuild {
pname = "projectile";
- version = "20171126.6";
+ version = "20180107.2233";
src = fetchFromGitHub {
owner = "bbatsov";
repo = "projectile";
- rev = "184d3451c9258cfbbfa2b26a07c7daeee2e9a605";
- sha256 = "0a3h980xyqx7wx90gnfzqjs5zhakq8cygvxgc7iy0v54d6qp5v5s";
+ rev = "293849974df45b60bad572bfdc5166575fbbf0a5";
+ sha256 = "0pi1m7wzw772hvxx1iaqj33nw9mlgdp8pnir41205awl2hh7w2i0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile";
@@ -57384,12 +58162,12 @@
projectile-git-autofetch = callPackage ({ alert, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
melpaBuild {
pname = "projectile-git-autofetch";
- version = "20170612.1011";
+ version = "20171129.1447";
src = fetchFromGitHub {
owner = "andrmuel";
repo = "projectile-git-autofetch";
- rev = "51b40134000a2411c6342e865e63f74c950a9310";
- sha256 = "0g4g4sjinmigyxs1irxv0yg524iq2hy8za09ksm3wbnbfa7w35ml";
+ rev = "da02069d906e6e7f28ea1dd6a9196529315a5cba";
+ sha256 = "106kj49rxsrdh6awvql3zyr3ramdcn0aaq4rmbmd45hz9ij7x1wh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fdfdeb69fd78fc1bb2c62392f860a8c434f1762/recipes/projectile-git-autofetch";
@@ -57766,8 +58544,8 @@
src = fetchFromGitHub {
owner = "google";
repo = "protobuf";
- rev = "0289dd8f90b79ad3d2376aadec4538f9ac8b0417";
- sha256 = "0jiayas6q9miycn8b79r8366n778qzgx79xch7kx5b8wklv8li05";
+ rev = "bab843b8b96757ed2138fdc01dc5d82d47a2239c";
+ sha256 = "0b5vj227rr501fzy8y6hbg0q2y0z6hs8yk39m7crw3fwd4zqyn0h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -57804,12 +58582,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 = "20171122.347";
+ version = "20180101.1421";
src = fetchFromGitHub {
owner = "epost";
repo = "psc-ide-emacs";
- rev = "633b07b238aff51dc4b95a75c67910a18ba28da1";
- sha256 = "0myvb9dqxm5g1zf7hgx6frgkr5h5839sdnrv25xf2h1w8jmyc0cn";
+ rev = "085e9d5541ccf35e876a6135daaddaa0a58f3bb2";
+ sha256 = "0q7xqrjvllngz658w32zm9jbz1njqwpaqgiv3b377nfnay9rsh3p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/384ffc463cc6edb4806f8da68bd251e662718e65/recipes/psc-ide";
@@ -57940,12 +58718,12 @@
pug-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pug-mode";
- version = "20171018.829";
+ version = "20171208.2029";
src = fetchFromGitHub {
owner = "hlissner";
repo = "emacs-pug-mode";
- rev = "9dcebdb10c50620a3a5c6d71361d53bf482a482e";
- sha256 = "1rkbk8apd612ixksyssmmkrhswks6gbxl9kxhrbaxszfrrhqx86v";
+ rev = "894a86d0ae4e855ae6044af6d7e106f8996c97c2";
+ sha256 = "0phf9y5rcahhavbvnsh6hfm3ig7vr3fs7m503zv1sac9is5zxypi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b3710aac9f3df3a23238af1f969c462b3692f260/recipes/pug-mode";
@@ -58045,12 +58823,12 @@
puppet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
melpaBuild {
pname = "puppet-mode";
- version = "20170928.1007";
+ version = "20171220.2249";
src = fetchFromGitHub {
owner = "voxpupuli";
repo = "puppet-mode";
- rev = "e04f041386ebfe29fc67c3407e85b577b820df4f";
- sha256 = "0hcp7hmxri62qcx80zqphlhwrhzapzi0c07kk4l2cm75xfy20a2l";
+ rev = "b3ed5057166a4f49dfa9be638523a348b55a2fd2";
+ sha256 = "0sgws5cl4vc8707l66lq0zi1p6pxik0474ihg9jczh2xxnq4clsk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1de94f0ab39ab18dfd0b050e337f502d894fb3ad/recipes/puppet-mode";
@@ -58066,12 +58844,12 @@
purescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "purescript-mode";
- version = "20170926.242";
+ version = "20171203.2234";
src = fetchFromGitHub {
owner = "dysinger";
repo = "purescript-mode";
- rev = "e2d6519a9669a1443db1040cf098bc3ea30ec861";
- sha256 = "1k8q32ipa684hvk7iwpdzqwikimw8g3j6gkmz9yi5fxflq6z1swr";
+ rev = "2d1fa590a6de875ea4bd964349df0ba5e24fb1f3";
+ sha256 = "00n15i3b33glhqc2yqs3axrdyc8id20w543cx74nn5ab4ybbjm4s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/77175fa470e517fa134751fbb38e144eb5b979ff/recipes/purescript-mode";
@@ -58446,8 +59224,8 @@
src = fetchFromGitHub {
owner = "ssbb";
repo = "pyenv-mode-auto";
- rev = "714e322319ad7a8f5f2a3691aa431537b8a1b26c";
- sha256 = "1sclhzv3w9fg54dg4qhlfbc0p1z5clyr8phrckhypvlwfgbar4b4";
+ rev = "783a93488e255346f9b1b2658424ffe0d670e8cf";
+ sha256 = "090c5lnw2fz674c49szjsac3hdj5dwbnrbn921kvhw6q5lsn8z47";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f3fcb707356bd16fd0b573c176023534cd69d0d7/recipes/pyenv-mode-auto";
@@ -58488,8 +59266,8 @@
src = fetchFromGitHub {
owner = "JackCrawley";
repo = "pygen";
- rev = "430e2a059b6e2b0d76700cf79a3de55d9deefd9b";
- sha256 = "1blb9j3y1vfph0gxsslr4gw2diyqqb6xbkrkkcp8vzmx4jr06ki3";
+ rev = "9019ff44ba49d7295b1476530feab91fdadb084b";
+ sha256 = "01gmggjv36jc8660xfpfy70cydabhymd17q3z16cjqvsxapbj7nf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e761724e52de6fa4d92950751953645dd439d340/recipes/pygen";
@@ -58502,22 +59280,22 @@
license = lib.licenses.free;
};
}) {};
- pyim = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, pyim-basedict }:
+ pyim = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pyim-basedict }:
melpaBuild {
pname = "pyim";
- version = "20171125.43";
+ version = "20180108.310";
src = fetchFromGitHub {
owner = "tumashu";
repo = "pyim";
- rev = "4e43cc0786574236268238fff99c6c8c3ed340bc";
- sha256 = "0kapr0xxb31bcz052hdz9ysh544276h5xms5m8m43banxi16szmb";
+ rev = "eefbdec87ae923c91dbe33fcfc1af5a47b2e2ba5";
+ sha256 = "0y7m9446dlip4qwx7s3w2jgx5s0r1s4cjvgacby20l1vs25k5drk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim";
sha256 = "1ly4xhfr3irlrwvv20j3kyz98g7barridi9n8jppc0brh2dlv98j";
name = "pyim";
};
- packageRequires = [ async cl-lib emacs popup pos-tip pyim-basedict ];
+ packageRequires = [ async cl-lib emacs popup pyim-basedict ];
meta = {
homepage = "https://melpa.org/#/pyim";
license = lib.licenses.free;
@@ -58635,8 +59413,8 @@
src = fetchFromGitHub {
owner = "PyCQA";
repo = "pylint";
- rev = "6ef5895e7d8dd54a12f5e2a37239806ac3ef0a71";
- sha256 = "0bc4rfr230j855wka59wpaqx372xn15zhkg0gkcg135krplwmc9l";
+ rev = "f5a7e4327d2f31744d3ae84e46ac4cde1b76b2d3";
+ sha256 = "138zpjb1ckvh5bwl3l7ig7wl57b7zlr91yx2mgk71j3bbwjcjjg4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint";
@@ -58778,12 +59556,12 @@
python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "python-mode";
- version = "20171126.1618";
+ version = "20180104.1009";
src = fetchFromGitLab {
owner = "python-mode-devs";
repo = "python-mode";
- rev = "183e9d1db2855a997faeadb63dba143cbdc97062";
- sha256 = "135w7c5imzc6m2in7w3zylac3q68fahyk05ivxw9qlc9p0axbs4x";
+ rev = "ff5ca6ed9e5eabad355bfb1218bd8020a846b77f";
+ sha256 = "1na11xf6w781kifh8rp02909difn4jy66z38h0q1lhjdm82p2p25";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode";
@@ -58862,12 +59640,12 @@
pythonic = callPackage ({ cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "pythonic";
- version = "20160221.1123";
+ version = "20171219.810";
src = fetchFromGitHub {
owner = "proofit404";
repo = "pythonic";
- rev = "87475def246b84339f464e80c76c7e7fcc2e780a";
- sha256 = "1j93c4rx7llyfvfvvvcrcpsj47zb56kkdii1lnyzay4n5zakhjhf";
+ rev = "ce9c45564efa5553f6268c34f5f1ca2dfcb4d4da";
+ sha256 = "0kv9iv3d5jdrl9c5pnay6lj3if3a0l3f8gc01mms7b8xdpk37xr7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5589c55d459f15717914061d0f0f4caa32caa13c/recipes/pythonic";
@@ -58883,12 +59661,12 @@
pyvenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pyvenv";
- version = "20171005.1106";
+ version = "20171215.1329";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "pyvenv";
- rev = "9f528449dfc35516647118689a2104603f23b49c";
- sha256 = "11yznfndkbyl6cmi7blxrr5yw9b32qw01abhvsj8jz1g1wnxhn45";
+ rev = "651a624fb41898d0c68970889ef7a72bad78b10b";
+ sha256 = "0plpj3ndwvdzmnwinhpkq4z3pk6zmhjwxq0wjkkgl8vy12jkywpx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e37236b89b9705ba7a9d134b1fb2c3c003953a9b/recipes/pyvenv";
@@ -59009,12 +59787,12 @@
quelpa = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build }:
melpaBuild {
pname = "quelpa";
- version = "20170727.557";
+ version = "20171207.1139";
src = fetchFromGitHub {
owner = "quelpa";
repo = "quelpa";
- rev = "c095fa14046c1313b97df4ec102bdea5a981ff1d";
- sha256 = "159pkv7q0kz3slc34489gnfbyw07g3iphkx6mvzqkxql8k2iw0v7";
+ rev = "355d06d5364a1be62e662eec77d32ae3c7b6d739";
+ sha256 = "083qm5zpxcnf03179bkpba89m5l9l6vamnhwlp2fnaqxshh5nb9x";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7dc3ba4f3efbf66142bf946d9cd31ff0c7a0b60e/recipes/quelpa";
@@ -59237,22 +60015,22 @@
license = lib.licenses.free;
};
}) {};
- racer = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode, s }:
+ racer = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, rust-mode, s }:
melpaBuild {
pname = "racer";
- version = "20170218.516";
+ version = "20171211.1548";
src = fetchFromGitHub {
owner = "racer-rust";
repo = "emacs-racer";
- rev = "6e0d1b3ebd54497c0cc995a92f09328ff101cd33";
- sha256 = "0sz78cnx6gifsgd1r1l1p8bkjc5jwfh57yvwabc9zzgivfimhcb5";
+ rev = "cb74060bbaff8e505ba36e20e4a3a763ee7dd4c8";
+ sha256 = "1azhvwm42sracyg9vj51k72pq3mm2gfimdvrbz50p5ijmirmllja";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/97b97037c19655a3ddffee9a86359961f26c155c/recipes/racer";
sha256 = "1091y5pisbf73i6zg5d7yny2d5yckkjg0z6fpjpmz5qjs3xcm9wi";
name = "racer";
};
- packageRequires = [ dash emacs f rust-mode s ];
+ packageRequires = [ dash emacs f pos-tip rust-mode s ];
meta = {
homepage = "https://melpa.org/#/racer";
license = lib.licenses.free;
@@ -59870,12 +60648,12 @@
real-auto-save = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "real-auto-save";
- version = "20170918.730";
+ version = "20180107.1850";
src = fetchFromGitHub {
owner = "chillaranand";
repo = "real-auto-save";
- rev = "780d6c1c219e1f1efde1159a99af97b1c54c005d";
- sha256 = "1wcyvyc3nwr9a89v8i4wmqvy2fwf7x7f3kcj7a8kdnp2albkvwsa";
+ rev = "d813632c1e754539cc92953ac4c3609105f9af58";
+ sha256 = "0gz0w7zxl865shz9mf5xv8xi5mjq969600jqh4laazvhyk32skmg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/525039a3dc29190829bf50d608ef09bc4a8557af/recipes/real-auto-save";
@@ -59891,12 +60669,12 @@
realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }:
melpaBuild {
pname = "realgud";
- version = "20171006.1840";
+ version = "20180102.1645";
src = fetchFromGitHub {
owner = "rocky";
repo = "emacs-dbgr";
- rev = "081f7edc79a8e510d47e10c6ce4306b2f850df1f";
- sha256 = "0nj95w5jfck0lhnrrnrl6h31cvgnpizbhnr52k7mf360vwrsjil6";
+ rev = "2b3ffb5c375dd32a633668eec969148590b489b4";
+ sha256 = "0sbldlhji6rzxjs2hip54sn376ar6rqbyaancmg85y85349q6q3b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud";
@@ -60212,12 +60990,12 @@
redprl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "redprl";
- version = "20171124.728";
+ version = "20180102.1356";
src = fetchFromGitHub {
owner = "RedPRL";
repo = "sml-redprl";
- rev = "90a6efb6e63fbb7c14561512d35a5237aa9ca448";
- sha256 = "19kq13qh5f2jw5gxhi56d1vymf0vs46jhgfq8zqqkhbknd2lypni";
+ rev = "73a87f907871e5dcd559e2ed2ea73370021b0390";
+ sha256 = "1j1i8l81a3s5h482r7whsdl1fbgmnb2s2zijf7vbnq92dvmx6pfm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl";
@@ -60230,6 +61008,27 @@
license = lib.licenses.free;
};
}) {};
+ redshank = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }:
+ melpaBuild {
+ pname = "redshank";
+ version = "20171115.1156";
+ src = fetchFromGitHub {
+ owner = "emacsattic";
+ repo = "redshank";
+ rev = "9b64da7895973a29a32320a13c08de69befa0006";
+ sha256 = "0vzha8pn4bgdnri1j5cgmasvn9j3ny0rh0i0plhjbys26f88klnb";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/2677a5cf74ebace6510517f47eaa43b35f736683/recipes/redshank";
+ sha256 = "0p18rkn09qb4ssr6jix13kqc3jld407qr2z2k8z78i3xy4bfzr5f";
+ name = "redshank";
+ };
+ packageRequires = [ paredit ];
+ meta = {
+ homepage = "https://melpa.org/#/redshank";
+ license = lib.licenses.free;
+ };
+ }) {};
redtick = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "redtick";
@@ -60342,8 +61141,8 @@
src = fetchFromGitHub {
owner = "zonuexe";
repo = "right-click-context";
- rev = "10578576f6cb2945aed00fdcd585fc65cd2c5c31";
- sha256 = "07bhw6ll2ad5725rq6jlvp2v8aqhlrbsywjng5ypmcvds5dhgbsk";
+ rev = "a50d473c3bfb33537d12025115a14c821fa5325a";
+ sha256 = "0n3jdclyxgi579mab8ayynrrcbwpk4rhq3l5dzfpsy1lk690g7hn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ddcf4612cccb9a53425c5f0324206d70549d9d9e/recipes/region-convert";
@@ -60463,12 +61262,12 @@
remark-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }:
melpaBuild {
pname = "remark-mode";
- version = "20171128.146";
+ version = "20171217.2356";
src = fetchFromGitHub {
owner = "torgeir";
repo = "remark-mode.el";
- rev = "01a0952e1ebed01cef3904e0eac00c6b34cea1ef";
- sha256 = "1maw5g7rflhyv0k1c1l7r72sqcjnqabajdvipsx89lzhizs29axf";
+ rev = "e8a95f25d865d6165a7fdb1cadf5e6f0bb5ee73b";
+ sha256 = "01qdaby7mn5d8y95wcbqzwzcbjmf2329g6yjbvmdd1gn6s7qzs0b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/161a45835a153c6ac81b99311482f5dd36507da1/recipes/remark-mode";
@@ -60799,12 +61598,12 @@
restclient = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "restclient";
- version = "20170727.825";
+ version = "20171203.1248";
src = fetchFromGitHub {
owner = "pashky";
repo = "restclient.el";
- rev = "ef6d756e2013843f7afcbea42b69ad54aa5de518";
- sha256 = "0a44hyfi55khripys7spml7xnz8yp8v7cbj01q9q0vsips6gqpra";
+ rev = "0ce4513a6b5ff1e63c73fda30f11efdb7a296c38";
+ sha256 = "194526djlzn96b35pqgsdc5vi4nkib0jma0smp97lay8vj22mjs8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient";
@@ -60824,8 +61623,8 @@
src = fetchFromGitHub {
owner = "pashky";
repo = "restclient.el";
- rev = "ef6d756e2013843f7afcbea42b69ad54aa5de518";
- sha256 = "0a44hyfi55khripys7spml7xnz8yp8v7cbj01q9q0vsips6gqpra";
+ rev = "0ce4513a6b5ff1e63c73fda30f11efdb7a296c38";
+ sha256 = "194526djlzn96b35pqgsdc5vi4nkib0jma0smp97lay8vj22mjs8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient-helm";
@@ -60841,12 +61640,12 @@
restclient-test = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, restclient }:
melpaBuild {
pname = "restclient-test";
- version = "20160618.315";
+ version = "20180106.1246";
src = fetchFromGitHub {
owner = "simenheg";
repo = "restclient-test.el";
- rev = "a21e41b905b423e762eeb4da3a236c8b1aea8c49";
- sha256 = "1lan49723rpzg1q7w8x3iggazwl4zirq5l8nhpb8m5hmg21a4kih";
+ rev = "4518561bc9661fedacb6fb352e9677207f45c418";
+ sha256 = "0hbilpn77w0vykga9p4dkwaygipyna7mwn24y2kwfcahcr39pqjb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/82e3078fc1f96d276fd288c3d7b91df5df4717a6/recipes/restclient-test";
@@ -61408,12 +62207,12 @@
rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rtags";
- version = "20171129.36";
+ version = "20180107.2358";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "8ef7554852541eced514c56d5e39d6073f7a2ef9";
- sha256 = "0hh9m0ykw3r9h4gv4a99px00py1h5hs86043mp1m0nmkjibf6w56";
+ rev = "db5ad3a48c579b3522411bd2411c09dbb27af578";
+ sha256 = "1ihv65hfq22yk4wx4njkm73q4s04fr84ib3mjjk8l18xpzl6alal";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags";
@@ -61807,12 +62606,12 @@
rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rust-mode";
- version = "20171106.510";
+ version = "20171208.1015";
src = fetchFromGitHub {
owner = "rust-lang";
repo = "rust-mode";
- rev = "04e3078ffc5f4b95e0a62960e36866d4bf1a9537";
- sha256 = "1gj3wyb0bdz7a80bysji241pw47gy20k5f1jif3m2j186ki6f2s5";
+ rev = "27911c88b0d32b66429d61bb056ecf1b10e66598";
+ sha256 = "1p8z1s3j0cbwxkbcb1p3h4m1vmrxrpkch0xax24jmkpzjrqhl7j9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode";
@@ -61853,8 +62652,8 @@
src = fetchFromGitHub {
owner = "senny";
repo = "rvm.el";
- rev = "8e45a9bad8e317ff195f384dab14d3402497dc79";
- sha256 = "0iblk0vagjcg3c8q9hlpwk7426ms7aq0s80izgvascfmyqycv6qm";
+ rev = "134497bc460990c71ab8fa75431156e62c17da2d";
+ sha256 = "1z5psj8mfp0fw8fx6v1sibf8cxhz30yyiwjw17w80f9c24g0j4ii";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/rvm";
@@ -61870,12 +62669,12 @@
ryo-modal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ryo-modal";
- version = "20170217.1021";
+ version = "20180102.547";
src = fetchFromGitHub {
owner = "Kungsgeten";
repo = "ryo-modal";
- rev = "f6073b56c43a8bc4fc01eb27faba3335d556606a";
- sha256 = "1pq8c79qrs2zwp8q89rhm5lmcpl48axnc9mwl10gq4jy2rlzfrks";
+ rev = "fee33898b5726b3c15b6ceb2ebb051bebd4f3592";
+ sha256 = "1rpn309s7a7rgs2n9l4m409x2r5p83xkgaq1aa2dab4p594hy29g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ryo-modal";
@@ -61993,6 +62792,27 @@
license = lib.licenses.free;
};
}) {};
+ sailfish-scratchbox = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "sailfish-scratchbox";
+ version = "20171202.532";
+ src = fetchFromGitHub {
+ owner = "vityafx";
+ repo = "sailfish-scratchbox.el";
+ rev = "bb5ed0f0b0cd72f2eb1af065b7587ec81866b089";
+ sha256 = "1b53mdqgcmjay3i3fnxnycv8crqi20yvyv57ybgs2ikfl3v282h2";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e76261e7dffcb607839440843b085709c2c90b26/recipes/sailfish-scratchbox";
+ sha256 = "1s0glsi4fm6is7fv9vy1h14frq8a4bgahkc8w08vqfnpiin2r567";
+ name = "sailfish-scratchbox";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/sailfish-scratchbox";
+ license = lib.licenses.free;
+ };
+ }) {};
salesforce-utils = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "salesforce-utils";
@@ -62231,8 +63051,8 @@
src = fetchFromGitHub {
owner = "openscad";
repo = "openscad";
- rev = "3ad7670e026086a042d1962db5a599cfe2069078";
- sha256 = "0q6bhgm84ybg2ns3mqi6b2q7bs8jsca1ky0xwjdwqw6bbh7gnyfx";
+ rev = "3473eb1a568669779e3e896ededd0d0708766fe4";
+ sha256 = "0d6ky2kglqraq61k9ikk1nbrpmra8h16vhhafkail41wq36vx6x5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode";
@@ -62433,6 +63253,27 @@
license = lib.licenses.free;
};
}) {};
+ scp = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "scp";
+ version = "20171203.1851";
+ src = fetchFromGitHub {
+ owner = "tszg";
+ repo = "emacs-scp";
+ rev = "447305db246d9c9240678dd9c734ed920300463a";
+ sha256 = "0f8dv17rjknlkw32dd4xmdxbkwby5dn8mychaqwlk8vanhm74n7w";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/62f5c9284de51373a4015cf053d66977cf00d175/recipes/scp";
+ sha256 = "1q7v2cr89syw682zqxhavaggv6aqi69rl94vm8bmn745a868gliw";
+ name = "scp";
+ };
+ packageRequires = [ cl-lib emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/scp";
+ license = lib.licenses.free;
+ };
+ }) {};
scpaste = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild }:
melpaBuild {
pname = "scpaste";
@@ -62769,21 +63610,21 @@
license = lib.licenses.free;
};
}) {};
- secretaria = callPackage ({ alert, emacs, f, fetchgit, fetchurl, lib, melpaBuild, org, s }:
+ secretaria = callPackage ({ alert, emacs, f, fetchgit, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "secretaria";
- version = "20170828.945";
+ version = "20180104.720";
src = fetchgit {
url = "https://bitbucket.org/shackra/secretaria.el";
- rev = "1cd32d957864be1ba5c44a3f505f662832169a28";
- sha256 = "1xvwzmcfwfxsm9chbjnqjsipmv5pqpzk5d0ybw3rcdc47nag3jdg";
+ rev = "e9d59d264ba30f8055a1ee1576fe9296d5b41055";
+ sha256 = "10ijr9babki05j3wlhwsym85q868kirivsml7jlmi1csnn2y3c6b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7b4c9ccbf2eeaa290f3b9d1e5eaaeb5b5547b365/recipes/secretaria";
sha256 = "1a8jf91wplzazssh0s8ld0g8rp57gdfvxlsyn643w3mbp3ny8ybv";
name = "secretaria";
};
- packageRequires = [ alert emacs f org s ];
+ packageRequires = [ alert emacs f s ];
meta = {
homepage = "https://melpa.org/#/secretaria";
license = lib.licenses.free;
@@ -62981,12 +63822,12 @@
sentence-navigation = callPackage ({ ample-regexps, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sentence-navigation";
- version = "20160830.1840";
+ version = "20171215.1007";
src = fetchFromGitHub {
owner = "noctuid";
repo = "emacs-sentence-navigation";
- rev = "f9aedbfc2b8d7957f427dac87558948c80582429";
- sha256 = "13413jpk84hs5hy05rlgkcr7h8diw46xhb9zdj1p9lh145s7si8w";
+ rev = "b2fc2de3aaf1e2e7fd12d6d75a5b6c4b23614022";
+ sha256 = "0s7xqs3r9ygc6vcba8ghsd7rbrgy7dkis3y1d36ik4w5dqh9qlvi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3d097cf9b6c9c1606505d3988a2afdd7b066abc8/recipes/sentence-navigation";
@@ -63002,12 +63843,12 @@
seoul256-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "seoul256-theme";
- version = "20170320.1311";
+ version = "20171213.1209";
src = fetchFromGitHub {
owner = "anandpiyer";
repo = "seoul256-emacs";
- rev = "8afaf6aa2c63a003e2899e3e5ba8be85f6fdd350";
- sha256 = "0viwqym1vns2l3lrxv0sdrbvadn6apk8gip26a3ln4pzq1723qxh";
+ rev = "1b487722ba817347030b50df01491dbbff4b2891";
+ sha256 = "0q8nnm5b6dp9qlnjg3hw7l863xiiajdfd4nk2i5p1gfx549mcdv5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/seoul256-theme";
@@ -63191,12 +64032,12 @@
shackle = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "shackle";
- version = "20171018.1120";
+ version = "20171209.1401";
src = fetchFromGitHub {
owner = "wasamasa";
repo = "shackle";
- rev = "0cee957bc0bfbdee5ea3f3e430e94cdcd87ed0c3";
- sha256 = "18zhrn18asbpanmlgasy271gfh6qywr947fx2svxz5b1w40hhyr0";
+ rev = "4189c1c773aab533969b587f7801ffbcd1d7d613";
+ sha256 = "1gh30sryh884mpwxpkf0ngkcvixjrxxf4bgq4nqm9n969sr5bhsq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/806e7d00f763f3fc4e3b8ebd483070ac6c5d0f21/recipes/shackle";
@@ -63233,12 +64074,12 @@
shader-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "shader-mode";
- version = "20171108.916";
+ version = "20180105.1500";
src = fetchFromGitHub {
owner = "midnightSuyama";
repo = "shader-mode";
- rev = "29118fc483bd6ad3fa42cb80867fae9dbd613fff";
- sha256 = "1hybqwaicdy99wp8chaxjxyhqd8fwqvq1fh7w49wdy83lwr5g3a0";
+ rev = "c141841feeee48299cff6651ed2e201a052e0570";
+ sha256 = "177kn9zrnzsayx9n9ym9k9a1rrbn8sycv1v67knpca05wkxg53zi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4396f3c10a38f91d5f98684efbeb02812e479209/recipes/shader-mode";
@@ -63569,12 +64410,12 @@
shimbun = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "shimbun";
- version = "20171018.131";
+ version = "20171224.1958";
src = fetchFromGitHub {
owner = "emacsorphanage";
repo = "w3m";
- rev = "2666d95df942f23e7837f27206b8352701fa22dd";
- sha256 = "1y11wi0qclsab1mq65rcaml71n8qyiqp1w3baxzmby17jjn4646p";
+ rev = "948a1a0f3e96e6c09c938e060f352ec126054ab1";
+ sha256 = "1dwfw7hbcz88dvfy9hrllxhmhwdx6gfh9n457b6svcdjcn831d6d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/shimbun";
@@ -63800,12 +64641,12 @@
shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "shx";
- version = "20171108.910";
+ version = "20171230.1219";
src = fetchFromGitHub {
owner = "riscy";
repo = "shx-for-emacs";
- rev = "aa2fda2419b6e2540f1e6eb3789b6a247c319050";
- sha256 = "1imnpbc1wkx8gwac1v3ailycjxs4yxwhbhifgn20jib85nn8s66i";
+ rev = "33383bd359d795df2d7ef725b5349c953f5a6aa8";
+ sha256 = "1arwsb6as8jpah0bs3b92a3kdnbfkhnsm1jglspfh4lqpafmx5vf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx";
@@ -63989,12 +64830,12 @@
simple-call-tree = callPackage ({ anaphora, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "simple-call-tree";
- version = "20161007.1913";
+ version = "20171223.1037";
src = fetchFromGitHub {
owner = "vapniks";
repo = "simple-call-tree";
- rev = "431206e9c2b88cbab9cfe9ebf3f6cb73f5e6740f";
- sha256 = "1qwswf5i060j396gfsr60zid0lqwf5xkrq3q0c1s6nz9wxlhayjw";
+ rev = "51cbb9baac4a71c9e2759b3dbbd48829b7b0ea79";
+ sha256 = "16blbycmqgkkvx1pqyld7jbb37wpwjh1y8kcd23ckdd9pr8qccfs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/316a5ffcb3080abd623bbe3065077809e6cbfb74/recipes/simple-call-tree";
@@ -64052,12 +64893,12 @@
simple-paren = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "simple-paren";
- version = "20171121.1039";
+ version = "20180104.1016";
src = fetchFromGitHub {
owner = "andreas-roehler";
repo = "simple-paren";
- rev = "c7baee2bfdb67e35c8c000eafed88fe7389224c0";
- sha256 = "1na2dmr6gn9bfvmg0jdrff3l6g6zqns0pmb2fl05wzhlkab9xprn";
+ rev = "6a8c33443a1e8d502d272584a4a09b23a2342679";
+ sha256 = "01lr9rndk5l2ssdqvrxikwhl9sswcp3hn233bjsq9kv6i5f9r8ca";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5e8886feb4a034fddd40d7381508b09db79f608f/recipes/simple-paren";
@@ -64157,12 +64998,12 @@
simplenote2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred }:
melpaBuild {
pname = "simplenote2";
- version = "20170618.644";
+ version = "20171201.1806";
src = fetchFromGitHub {
owner = "alpha22jp";
repo = "simplenote2.el";
- rev = "78ab3d818633c0d6575cd1895c119bd690003bf6";
- sha256 = "0z9zary8apzjsx031fhy94ggqancm94mjhj335kr743s8zr3511g";
+ rev = "0fd6dbd0566af29964078e4b74baf69c2f52381a";
+ sha256 = "0qlwmxrz2kngri7ywy64bja0najq9m6asq2gr53ns0mkq1ngf0l8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1ac16abd2ce075a8bed4b7b52aed71cb12b38518/recipes/simplenote2";
@@ -64325,12 +65166,12 @@
slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }:
melpaBuild {
pname = "slack";
- version = "20171128.1956";
+ version = "20180103.1928";
src = fetchFromGitHub {
owner = "yuya373";
repo = "emacs-slack";
- rev = "9b8149fc3dce10af10d4ed2833fdb5eaafc970ca";
- sha256 = "028a3nnyins0pp33m5zjyz4v28v1vd49vaj8pppi6dks9kvajspg";
+ rev = "58b1309255563819ee8f83f625af49ac0353bed1";
+ sha256 = "1bj43ircd9djk4i58qwxvmcbhzybxb954k52l80pk441ffk8v4vx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack";
@@ -64388,12 +65229,12 @@
slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }:
melpaBuild {
pname = "slime";
- version = "20171106.1331";
+ version = "20171230.1630";
src = fetchFromGitHub {
owner = "slime";
repo = "slime";
- rev = "55fc578ed829b95a63c31cec242bd86a6e0be39e";
- sha256 = "1bgmk0kr0y15lm2cmkmzw529r2k98j4c3n8v1k4rsxw1rj8961n3";
+ rev = "179741a0616f78f4e5901fe04dea79654c504fba";
+ sha256 = "0vljhr6gkmw5jkdzhq6vsl9sa48hv1a02d9g4sfwqraz85k4x85k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime";
@@ -64409,12 +65250,12 @@
slime-company = callPackage ({ company, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }:
melpaBuild {
pname = "slime-company";
- version = "20161229.743";
+ version = "20180108.426";
src = fetchFromGitHub {
owner = "anwyn";
repo = "slime-company";
- rev = "6c244690c80387a32b0cb984843e00c8b75ad6bb";
- sha256 = "1hl1hqkc1pxga9k2k8k15d7dip7sfsmwf4wm4sh346m6nj606q8g";
+ rev = "fb54d166ca3e61e8f82020b7c5cfeafd3f4ad425";
+ sha256 = "1sqsnvgr83h6v51fmin5ng2sbdpkj4cl4p2vy2xh7fa6zh00137m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/abe5036c6de996a723bc800e0f031314e1188660/recipes/slime-company";
@@ -64556,12 +65397,12 @@
sly = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sly";
- version = "20171111.1604";
+ version = "20171220.1443";
src = fetchFromGitHub {
owner = "capitaomorte";
repo = "sly";
- rev = "83c88318bca48b1269924cd5c76b9777ecf84f11";
- sha256 = "0s6y54mi4p336cmky9kvfhwrwfkhvl8awy73knf27zfhclhjfh7c";
+ rev = "436094626698e77efa38cbf45681db7ea6b7e9f7";
+ sha256 = "08zii0vaa8w72adi2fy7v5rwvqp8kbv2wv0cws1q6wz9z95jjnmx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/79e7213183df892c5058a766b5805a1854bfbaec/recipes/sly";
@@ -64846,6 +65687,27 @@
license = lib.licenses.free;
};
}) {};
+ smart-jump = callPackage ({ dumb-jump, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "smart-jump";
+ version = "20180107.1054";
+ src = fetchFromGitHub {
+ owner = "jojojames";
+ repo = "smart-jump";
+ rev = "7042923b6edff126d59808fa718bf38c5f53464e";
+ sha256 = "1g7vbqzh03cxqk9wjrq6j9dy4ij2m4x0p7iq08nrvlqsl6xr9g9r";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/52f29e14e61b28cd1637ca5d6bd878d91a71251f/recipes/smart-jump";
+ sha256 = "14c7p6xqasd0fgn70zj1jlpwjxldzqx44bcdqdk6nmjihw0rk632";
+ name = "smart-jump";
+ };
+ packageRequires = [ dumb-jump emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/smart-jump";
+ license = lib.licenses.free;
+ };
+ }) {};
smart-mark = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "smart-mark";
@@ -65059,12 +65921,12 @@
smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "smartparens";
- version = "20171129.412";
+ version = "20171201.242";
src = fetchFromGitHub {
owner = "Fuco1";
repo = "smartparens";
- rev = "0f6cc64852282e553342fad30a4134552a97c458";
- sha256 = "1qaz2zcflfpiip95jnmk1r20q616faav1rlld0bbc7jg4lsnvzzp";
+ rev = "65fbcfc849afb89e2642f9b87f66e6a96382f88c";
+ sha256 = "0k4ar82axgxs84l2qdmrhhgf82309j2cxrv2gaxc3g7cxnj16ska";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens";
@@ -65143,12 +66005,12 @@
smbc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "smbc";
- version = "20160706.1522";
+ version = "20171229.1008";
src = fetchFromGitHub {
owner = "sakshamsharma";
repo = "emacs-smbc";
- rev = "c377b806118d82140197d9cb1095548477e00497";
- sha256 = "16cj6jsy1psmcjshxb46i44sf1zb9s4mfiagl5cr22njy01ajq1h";
+ rev = "10538e3d575ba6ef3c94d555af2744b42dfd36c7";
+ sha256 = "0b2fndvp9kzlr65b0gr0z5hmapa4y96a6zvc2nrlijffkgyk05nn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/05b4f16cd8028edc758ada842432df11c8276fd3/recipes/smbc";
@@ -65605,12 +66467,12 @@
solaire-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "solaire-mode";
- version = "20171109.1215";
+ version = "20171209.1350";
src = fetchFromGitHub {
owner = "hlissner";
repo = "emacs-solaire-mode";
- rev = "ce91b8709124738abb4a1612d4801e16f1d0faec";
- sha256 = "1aval7m02m05w9is496za6kasp071jkwj29n1jsyixjzsfpbkrzi";
+ rev = "dd93cfd6c02e4575e6c7048ecf9dac8c09864bf2";
+ sha256 = "1afbkz93xa6f0453n7n1mrm0ng5jrdi06mh0s105gkzcfxqjc0gd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/52c69070eef3003eb53e1436c538779c74670ce6/recipes/solaire-mode";
@@ -65626,12 +66488,12 @@
solarized-theme = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "solarized-theme";
- version = "20171114.1506";
+ version = "20180101.42";
src = fetchFromGitHub {
owner = "bbatsov";
repo = "solarized-emacs";
- rev = "642b2afa38cb59b9e940e5082614e36c6e6a94a3";
- sha256 = "04qcch0y4jrvi7vfnjbyfvbj8ajjrhhcqhxkk4i035vcfchnpx14";
+ rev = "2dd2699b2f315374333292b132dc0dc03719aba2";
+ sha256 = "04365kpw8a3f3963v6c3q8zka5xivx9jikvcar7fx59l4l7k5i2p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/solarized-theme";
@@ -65647,12 +66509,12 @@
solidity-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "solidity-mode";
- version = "20171113.1058";
+ version = "20171231.741";
src = fetchFromGitHub {
owner = "ethereum";
repo = "emacs-solidity";
- rev = "b8ddfd683c3335805f0a4788244bf0d224ffc6ae";
- sha256 = "0s5hb4l3x9q3vch0i314138p53aq9kb0pyn9whk7r9zwrzvi34jd";
+ rev = "b5d95ef678305ca70b17e94fc2ee4289a8328048";
+ sha256 = "04l3hvfpgqiaxdxh8s2cg2rx4cy50i7a411q81g8661fx60c6h6p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bb9df5ec0692352b6494d435d11166f4ea26c99e/recipes/solidity-mode";
@@ -65668,12 +66530,12 @@
sonic-pi = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, highlight, lib, melpaBuild, osc }:
melpaBuild {
pname = "sonic-pi";
- version = "20171117.426";
+ version = "20171205.405";
src = fetchFromGitHub {
owner = "repl-electric";
repo = "sonic-pi.el";
- rev = "dbc618db5f98ed86cd421c5646573358bdef8283";
- sha256 = "1s0r5zpv5d6sbg8fjmax641dwmlygvfpfx4j69v49pgxcwpyzpq2";
+ rev = "3cf101b3b299735ed91658c7791ea4f04164e076";
+ sha256 = "1x2w7qcx9xcvagb47hlc5vsf5aj5mr0mzvnazyd7ajjilbzn48yr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sonic-pi";
@@ -65735,8 +66597,8 @@
src = fetchFromGitHub {
owner = "omouse";
repo = "emacs-sos";
- rev = "01b5e25814b2e76db3814a967e25edf85d33bcac";
- sha256 = "1w1fdf5ppz22aq40w5wmi2619sgkvw97rr8zqigw1acva0pxysaa";
+ rev = "1573adca912b88b5010d99a25c83a5b2313bd39c";
+ sha256 = "19jwnny0v6ppakpaaxv9qhr6353mksh9kxiz61kp4h12n6sfrb7p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/36e02223b4ff9c0be4662991d734ca4a4e756f4b/recipes/sos";
@@ -65864,12 +66726,12 @@
sourcekit = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
melpaBuild {
pname = "sourcekit";
- version = "20170126.353";
+ version = "20180101.34";
src = fetchFromGitHub {
owner = "nathankot";
repo = "company-sourcekit";
- rev = "8ba62ac25bf533b7f148f333bcb5c1db799f749b";
- sha256 = "01dh0wdaydiai4v13r8g05rpiwqr5qqi34wif8vbk2mrr25wc7i9";
+ rev = "abf9bc5a0102eb666d3aa6d6bf22f6efcc852781";
+ sha256 = "1g8a4fgy2c5nqk8gysbnzn5jvfw6ynmfhc6j3hkrbswgf9188v5n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/45969cd5cd936ea61fbef4722843b0b0092d7b72/recipes/sourcekit";
@@ -66011,12 +66873,12 @@
spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "spacemacs-theme";
- version = "20171118.626";
+ version = "20180107.1039";
src = fetchFromGitHub {
owner = "nashamri";
repo = "spacemacs-theme";
- rev = "7807f341e1ef3d0700d0f7e05bb14054139c4298";
- sha256 = "1ylvd49ap41rd2csi9y8l8kwi7dkjy3khjzswrnqm1zb8q15vj16";
+ rev = "3c43532474164ff5829a7558b49173b5b565a048";
+ sha256 = "1kxqqvnkkjf2rfgc62mlqhb6ffx34hbhdcv9m7idiyf54nqxm13k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme";
@@ -66154,22 +67016,22 @@
license = lib.licenses.free;
};
}) {};
- speed-type = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ speed-type = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "speed-type";
- version = "20161230.815";
+ version = "20171230.847";
src = fetchFromGitHub {
owner = "parkouss";
repo = "speed-type";
- rev = "9940383d94688e7f130b01f9872182ab59edf00f";
- sha256 = "0gfiw3rmqyargc1prkrglmzvzxm03nszqqba1q9zd7cs0m315pmm";
+ rev = "7a67fcd7bf825eee890097bd4a1b3c4f531a1135";
+ sha256 = "0nlmqgf4rg5qmkhpsal7j18wr5h74971k6d0wzw7rmjmpnjqhzvc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d6c33b5bd15875baea0fd2f24ee8ec9414a6f7aa/recipes/speed-type";
sha256 = "0lsbi3b6v7fiwpvydgwcqx3y5i7bysfjammly22qpz3kcjmlvi06";
name = "speed-type";
};
- packageRequires = [ cl-lib ];
+ packageRequires = [ cl-lib emacs ];
meta = {
homepage = "https://melpa.org/#/speed-type";
license = lib.licenses.free;
@@ -66259,24 +67121,24 @@
license = lib.licenses.free;
};
}) {};
- spike-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ spiral = callPackage ({ a, avy, clojure-mode, emacs, fetchFromGitHub, fetchurl, highlight, lib, melpaBuild, treepy }:
melpaBuild {
- pname = "spike-theme";
- version = "20160530.733";
+ pname = "spiral";
+ version = "20180105.1253";
src = fetchFromGitHub {
- owner = "m31271n";
- repo = "spike-theme";
- rev = "7a7766be0b6197103840644bb074f864d0d91cd8";
- sha256 = "0ah19a68d6fda3g5zzvqz28cms0yiadykkx7p8hiid4s4mdl41hj";
+ owner = "unrepl";
+ repo = "spiral";
+ rev = "b25c42dd5add3192e846a5fe34be689e73f0c28c";
+ sha256 = "16ls5iy98p9y8f5q9l3wz1g187zbpli2zgcjvnsbsv480bdpzgf6";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/cd64f15c3fb7eee1bfdd0d7db5affa5c10052a6f/recipes/spike-theme";
- sha256 = "06pv0zzw0w12xlafyhakf09cl0hkyzis0g2bh2jn3pv4ac2kmwkp";
- name = "spike-theme";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/77609e10c836a26de43ddb304ecfa275e314da21/recipes/spiral";
+ sha256 = "18rww2nfy5s22czabk71wqzrb53r0p2635872vr44b6kfwlb6qcw";
+ name = "spiral";
};
- packageRequires = [];
+ packageRequires = [ a avy clojure-mode emacs highlight treepy ];
meta = {
- homepage = "https://melpa.org/#/spike-theme";
+ homepage = "https://melpa.org/#/spiral";
license = lib.licenses.free;
};
}) {};
@@ -66619,12 +67481,12 @@
ssass-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ssass-mode";
- version = "20170817.1216";
+ version = "20171201.509";
src = fetchFromGitHub {
owner = "AdamNiederer";
repo = "ssass-mode";
- rev = "d17d2de381ffc96e62e77435fb7b387bf59aceec";
- sha256 = "1vw2mzn8yczgyspgmv4f621d7h10qxa8hfzalb14bvwqn4h37spy";
+ rev = "a95c4c9f99895cc582849b35e90ae13f1587ddce";
+ sha256 = "1ldw72ggk22ih5j9fyb3bl0ngyfdkzfcyg97mp0mb40w8ly68qav";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3137f98aaa871a52f477b63d9c3b7b63f7271344/recipes/ssass-mode";
@@ -66703,12 +67565,12 @@
ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ssh-deploy";
- version = "20171122.352";
+ version = "20171211.311";
src = fetchFromGitHub {
owner = "cjohansson";
repo = "emacs-ssh-deploy";
- rev = "0d8b5deadab439d43cb9730c9d0f1a99e5e3d523";
- sha256 = "0brmxx1j4nkp242h2gsz115zvvpclpqck6f8l0aqkkv9lmicvk4k";
+ rev = "ee808acef916c7cf828923e6517a6867044caaf5";
+ sha256 = "0dv2d6rhp23ckpzzdda3w3p5l7pps8vxs7b98r6320w2a2villq5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy";
@@ -67081,12 +67943,12 @@
string-inflection = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "string-inflection";
- version = "20171117.1731";
+ version = "20180102.643";
src = fetchFromGitHub {
owner = "akicho8";
repo = "string-inflection";
- rev = "e644c8bf2a5e36ddadcfe4de657588c00fd368dd";
- sha256 = "1p5i5jkybzjb008hlq90mjrbcap67dszzmp9flarkq6p0sf1lw12";
+ rev = "d3bbc560bad160ba183778ca4628a2cce34fdd65";
+ sha256 = "1yjy11s027r7v8bzwsqfpfzh2r2ywnywx7ngajw9gy9yfchw1xxs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5c2e2b6dba8686236c2595475cfddac5fd700e60/recipes/string-inflection";
@@ -67394,12 +68256,12 @@
suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }:
melpaBuild {
pname = "suggest";
- version = "20171016.1420";
+ version = "20171229.1712";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "suggest.el";
- rev = "345e00569333095eb24e61239a80b0f0c77b2d11";
- sha256 = "0npqvhnfmrx7jq1slz489rh2l4rnfhqhbi6ybdzw5rism8r3jqwb";
+ rev = "5caf98ab49c6b3c421d8f274c0682bbb7fc662fe";
+ sha256 = "1niifkdirlwcyx5rk398dgk9lqnqr06ilhh0r89hx1xxdnbjglbi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest";
@@ -67709,12 +68571,12 @@
swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
melpaBuild {
pname = "swift-mode";
- version = "20170918.51";
+ version = "20171228.2315";
src = fetchFromGitHub {
owner = "chrisbarrett";
repo = "swift-mode";
- rev = "e8d9a5d7af59e8be25997b8b048d7c3e257cd0b0";
- sha256 = "035478shf1crb1qnhk5rmz08xgn0z2p6fsw0yii1a4q5f3h85xrc";
+ rev = "8c45f69a078c41619a7a3db6d54a732c3fad8e3f";
+ sha256 = "1isy71vkws3ywm4iwa85dk12810az3h85n6bimd36dfqbhfwdrli";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode";
@@ -67751,12 +68613,12 @@
swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "swiper";
- version = "20171129.820";
+ version = "20180102.1035";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "23935401b062fde5557de826814ddc55e75fe1b8";
- sha256 = "055l5rmnkczlz4nhjppa3c7m02mmv8zw7zaf60820911zx1sl32b";
+ rev = "e5c5037fd5f2735b11fc90363f312431619fa8c2";
+ sha256 = "0ssm6dgzzqvwwmwvnws8s0ac4f8dif5sxl9flx296df7s7xryzcv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -67877,12 +68739,12 @@
sx = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, markdown-mode, melpaBuild }:
melpaBuild {
pname = "sx";
- version = "20170521.1832";
+ version = "20171225.1159";
src = fetchFromGitHub {
owner = "vermiculus";
repo = "sx.el";
- rev = "8f1e3346286cfa5a5299ef192cc5aca3f37a7745";
- sha256 = "1ans6l0rv71w2vq0v4137jr0jhgzhkk62l7cq6b5m83v4ld9gr09";
+ rev = "9488c03726464e4bd0ed0b448d203c5c7f8c212f";
+ sha256 = "14b0cqq2qbr2nxl9pqpbb9m948bdlsjwgzmkif2hdfvrwrr2sbzd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f16958a09820233fbe2abe403561fd9a012d0046/recipes/sx";
@@ -68066,12 +68928,12 @@
syntactic-close = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "syntactic-close";
- version = "20171004.1037";
+ version = "20180105.831";
src = fetchFromGitHub {
owner = "emacs-berlin";
repo = "syntactic-close";
- rev = "e2cd1f332d111b0e90d9a72f35bc969c7638b7cf";
- sha256 = "18fq9v1kb6bx0xxd1cic2f3gfwv82y4mjs5qg7q2ra1cz5d502w9";
+ rev = "01fa7cf280d27dbb2af2261cc0e8ff2aa14742b1";
+ sha256 = "19snnxiyjkgzsrdynxdyzmqc168jdzcvk9jr5g2w9ca2f0x7m9s8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f2c15c0c8ee37a1de042a974c6daddbfa7f33f1d/recipes/syntactic-close";
@@ -68128,12 +68990,12 @@
system-packages = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "system-packages";
- version = "20171120.1205";
+ version = "20180103.1837";
src = fetchFromGitHub {
owner = "jabranham";
repo = "system-packages";
- rev = "1ec26d1d32a95de6f201571d85f4f12b9975c580";
- sha256 = "040hqfs22pdfp3s9i499148alw78q15x74kqyzj1jl30g6a846za";
+ rev = "f5576f36885f97c9c753e5f1b80318efc626210f";
+ sha256 = "1ylmqlv2n0f3qqxf60gq93fr7z9zjghivy5swml3s8r3pc8a3iyy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8c423d8c1ff251bd34df20bdb8b425c2f55ae1b1/recipes/system-packages";
@@ -68170,12 +69032,12 @@
systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "systemd";
- version = "20171006.1352";
+ version = "20180101.1803";
src = fetchFromGitHub {
owner = "holomorph";
repo = "systemd-mode";
- rev = "22f024fe8f433af7b6a6b99520cea1e766894fe5";
- sha256 = "11h1nr9gz0mw2gwlplv00i06s9ziw77a7zfcrrzd01rmanz1m4fa";
+ rev = "228f0b99ca3e1f3139ae8cacd15f9698d5b6da90";
+ sha256 = "0cdqpzkx01qm0pk66hs6yhzv5iccrzzgfv3bh5c8i91v55d66bff";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ca810e512c357d1d0130aeeb9b46b38c595e3351/recipes/systemd";
@@ -68463,12 +69325,12 @@
tao-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "tao-theme";
- version = "20171126.2321";
+ version = "20171221.1001";
src = fetchFromGitHub {
owner = "11111000000";
repo = "tao-theme-emacs";
- rev = "e4e55cf2646c0479262db013b15b6831dd2069fa";
- sha256 = "1dsix9hn5x4wc562jcmxw7802shch1qj9xjfi7ys1rbwa2awm8rx";
+ rev = "a97df8c51d77696787aaf55c67207f19c803fabe";
+ sha256 = "1djp4gbs6gr956a5hpkwh5laasc7pypqip32l7djd7405vx5ixp2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/94b70f11655944080507744fd06464607727ecef/recipes/tao-theme";
@@ -69072,12 +69934,12 @@
test-kitchen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "test-kitchen";
- version = "20171129.1021";
+ version = "20171129.1235";
src = fetchFromGitHub {
owner = "jjasghar";
repo = "test-kitchen-el";
- rev = "f8d832aae4a244fb578963a728f66ef02f8e0a5b";
- sha256 = "0a9pvr4jnz4lfap7ibs786isgnfsa5fczil3pz4mccv1zgfxlibq";
+ rev = "0fc0ca4808425f03fbeb8125246043723e2a179a";
+ sha256 = "1pip15ysya8nsk1xgz6k6gcjm6g60922r0im2anq4j2gjzdja79k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/420d18c76f593338fb28807fcbe3b884be5b1634/recipes/test-kitchen";
@@ -69132,6 +69994,27 @@
license = lib.licenses.free;
};
}) {};
+ texfrag = callPackage ({ auctex, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "texfrag";
+ version = "20171229.1913";
+ src = fetchFromGitHub {
+ owner = "TobiasZawada";
+ repo = "texfrag";
+ rev = "ba1382c073b1f73cb411fb30e618480b9a804916";
+ sha256 = "19cinynqicsfdvpa8jmrrx9xmbplw2wnykm3bcii8rs5vkwdh61b";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/756649bbe2dc6233c66c3d128a8096be12231078/recipes/texfrag";
+ sha256 = "195vdpwqzypz35v8hc7ai9xpv1flrik60lgrk5m7xypnlp7mpr2x";
+ name = "texfrag";
+ };
+ packageRequires = [ auctex emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/texfrag";
+ license = lib.licenses.free;
+ };
+ }) {};
textile-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "textile-mode";
@@ -69240,12 +70123,12 @@
theme-changer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "theme-changer";
- version = "20161130.1440";
+ version = "20171221.1127";
src = fetchFromGitHub {
owner = "hadronzoo";
repo = "theme-changer";
- rev = "60e3dd7cbd237225fef34179168006501a27b06b";
- sha256 = "06y36i3h5m85d6b47cr0hghhbkd8kv23lm6ipc9swkmq0hl3pxfg";
+ rev = "61945695a30d678e6a5d47cbe7c8aff59a8c30ea";
+ sha256 = "14xc36jfgj8896pklrkpg394fgikir051rh9vm70v132n6i9j0cn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d08b24a2aec1012751054c68f7d55bac1bd1fd11/recipes/theme-changer";
@@ -69391,8 +70274,8 @@
src = fetchFromGitHub {
owner = "apache";
repo = "thrift";
- rev = "20e16bc6a41c6faead040aed7f3c00b9d2e7f842";
- sha256 = "1dlfd9vz4vvj3pvfwjqvpc27rf26pfbsalrpymi61vgjd2v4ri3j";
+ rev = "1b855d47aab32dc89e6e4271e8ac8872b049e1ba";
+ sha256 = "1qrisw42nzbd1m09aihpigc63xm0yhhli5103aibww0pa904fr2d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -69429,12 +70312,12 @@
tickscript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "tickscript-mode";
- version = "20171127.1739";
+ version = "20171218.1803";
src = fetchFromGitHub {
owner = "msherry";
repo = "tickscript-mode";
- rev = "35b5edb1863c5b77841e2c98aca4a6760690f06e";
- sha256 = "1zy1rs1j8axa72j3562m1718gmrvrqmssvz136l5za2l2h0ls5rx";
+ rev = "f0579f38ff14954df5002ce30ae6d4a2c978d461";
+ sha256 = "0b3rbsd978ch0hiv45sqg9g4zsxhjn557j5f72vjql8cx1h5d8s4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c60ee1839f728c5041bde1fe4fa62c4d41c746ef/recipes/tickscript-mode";
@@ -69447,15 +70330,36 @@
license = lib.licenses.free;
};
}) {};
+ tidal = callPackage ({ emacs, fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }:
+ melpaBuild {
+ pname = "tidal";
+ version = "20171207.1452";
+ src = fetchFromGitHub {
+ owner = "tidalcycles";
+ repo = "Tidal";
+ rev = "b96bc7842e15f6b8973df8966307db7a1c4b7406";
+ sha256 = "0g02k411xbwqv66qi2pw7r0slkvgfgvr7q41kf1czqnrmg5k4wzg";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/16a26659a16199b5bb066be6e5c4a40419bda018/recipes/tidal";
+ sha256 = "0im0qbavpykacrwww3y0mlbhf5yfx8afcyvsq5pmjjp0aw245w6a";
+ name = "tidal";
+ };
+ packageRequires = [ emacs haskell-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/tidal";
+ license = lib.licenses.free;
+ };
+ }) {};
tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }:
melpaBuild {
pname = "tide";
- version = "20171111.1922";
+ version = "20171214.543";
src = fetchFromGitHub {
owner = "ananthakumaran";
repo = "tide";
- rev = "e7ffcdcf9f68205d1498137e84a731c7ffb86263";
- sha256 = "0lym5jb2fxv4zjhik4q5miazrsi96pljl6fw5jjh0i9p8xs0yp4x";
+ rev = "008f8f9cf44c81e230d58ed3d932e0ee43c2e09f";
+ sha256 = "0s42f66lp3mn44jq04r4ccxac0l150w9nvy3bbvx8xxza2zn7lrw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
@@ -70023,6 +70927,27 @@
license = lib.licenses.free;
};
}) {};
+ total-lines = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "total-lines";
+ version = "20171227.439";
+ src = fetchFromGitHub {
+ owner = "hinrik";
+ repo = "total-lines";
+ rev = "c762f08d039c8103f71c747e00304f209c2254f4";
+ sha256 = "0ajbqrkg3v0yn8mj7dsv12w9zzcwjkabd776fabxamhcj6zbvza3";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/1b6455dd89167a854477a00284f64737905b54d8/recipes/total-lines";
+ sha256 = "0zpli7gsb56fc3pzb3b2bs7dzr9glkixbzgl4p2kc249vz3jqajh";
+ name = "total-lines";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/total-lines";
+ license = lib.licenses.free;
+ };
+ }) {};
totd = callPackage ({ cl-lib ? null, fetchFromGitLab, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "totd";
@@ -70109,12 +71034,12 @@
traad = callPackage ({ dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, request, request-deferred, virtualenvwrapper }:
melpaBuild {
pname = "traad";
- version = "20171128.413";
+ version = "20180104.2351";
src = fetchFromGitHub {
owner = "abingham";
repo = "emacs-traad";
- rev = "8df6255ab00a94f128f057e084aa06b55b381ecf";
- sha256 = "09lqaz8jiza9s0ir8pj05dk60v2lxgza9v3fmqv34h4f4lwh98zy";
+ rev = "ad160e32f4cc9849aa570ed8e29269a0845921ae";
+ sha256 = "0rj8fg66rzrw1hv707p0dmf025c1dymp373z87ryy5sxs24vn3j5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2b3eb31c077fcaff94b74b757c1ce17650333943/recipes/traad";
@@ -70137,12 +71062,12 @@
tracking = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "tracking";
- version = "20151129.319";
+ version = "20171210.1302";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "circe";
- rev = "6b110d4c2c6447c4ed65cfa5b7e8676620081ee2";
- sha256 = "01llr34y9mvgpbz3y10l7gmp40qvislwhm6jb2fvcb7vdn9k9gmz";
+ rev = "9835ecb758c09400082eb8f1c0336eedbfed0134";
+ sha256 = "0vhzqcqmhl3rzxrhfyy6r2yp5d07wd8y820cf0hfby6j5i4j247p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking";
@@ -70242,12 +71167,12 @@
transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
melpaBuild {
pname = "transmission";
- version = "20171029.1210";
+ version = "20180101.1803";
src = fetchFromGitHub {
owner = "holomorph";
repo = "transmission";
- rev = "d78ae51fdc9292cc0b77dfb18279b38b6ccbf480";
- sha256 = "01k0nppxvkd2cy13hjcvihgh6j9c4by92yxv4jv8zvaz35fqf92n";
+ rev = "b52760e0160f99312a1773953e7725800c13bb40";
+ sha256 = "195z30yaj0qibkaci7imfhp4sr7zxhmlg4fq4bjzvawlmxi1i56p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission";
@@ -70347,12 +71272,12 @@
treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pfuture, s }:
melpaBuild {
pname = "treemacs";
- version = "20171129.938";
+ version = "20180107.1246";
src = fetchFromGitHub {
owner = "Alexander-Miller";
repo = "treemacs";
- rev = "e75bbb8de8849b9b969bf184f8bb16b43e48700a";
- sha256 = "01d9dblsc30zwcrr2n6jsqk769iqva5vsl331s6wi5yvi3lzdgpw";
+ rev = "2dabf88d5948a04d0313b0195be397761fc22b58";
+ sha256 = "0j1ampw5i3m0q69cp2nf9xr9qqxiyasjk7wmsg9nwnx7sibhfddk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs";
@@ -70368,12 +71293,12 @@
treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }:
melpaBuild {
pname = "treemacs-evil";
- version = "20170925.2232";
+ version = "20171225.951";
src = fetchFromGitHub {
owner = "Alexander-Miller";
repo = "treemacs";
- rev = "e75bbb8de8849b9b969bf184f8bb16b43e48700a";
- sha256 = "01d9dblsc30zwcrr2n6jsqk769iqva5vsl331s6wi5yvi3lzdgpw";
+ rev = "2dabf88d5948a04d0313b0195be397761fc22b58";
+ sha256 = "0j1ampw5i3m0q69cp2nf9xr9qqxiyasjk7wmsg9nwnx7sibhfddk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-evil";
@@ -70389,12 +71314,12 @@
treemacs-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, treemacs }:
melpaBuild {
pname = "treemacs-projectile";
- version = "20171114.1009";
+ version = "20171204.845";
src = fetchFromGitHub {
owner = "Alexander-Miller";
repo = "treemacs";
- rev = "e75bbb8de8849b9b969bf184f8bb16b43e48700a";
- sha256 = "01d9dblsc30zwcrr2n6jsqk769iqva5vsl331s6wi5yvi3lzdgpw";
+ rev = "2dabf88d5948a04d0313b0195be397761fc22b58";
+ sha256 = "0j1ampw5i3m0q69cp2nf9xr9qqxiyasjk7wmsg9nwnx7sibhfddk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-projectile";
@@ -70597,12 +71522,12 @@
tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "tuareg";
- version = "20171126.1319";
+ version = "20171204.1417";
src = fetchFromGitHub {
owner = "ocaml";
repo = "tuareg";
- rev = "4a88a0c6ae1af5a5457c78f9d58c9dd8958ad380";
- sha256 = "02abqy5ayfnzhm6a350bbklfn71wh8ipbx9cvlib58xj174swh7m";
+ rev = "a6d1589e256d861bfb51c59756b0aa25e88dfb89";
+ sha256 = "0i9x6cvx61djavn35v8j4ildli0s9ixalxbwc4yb7sdax7379xhb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg";
@@ -70828,12 +71753,12 @@
twittering-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "twittering-mode";
- version = "20170312.735";
+ version = "20180107.412";
src = fetchFromGitHub {
owner = "hayamiz";
repo = "twittering-mode";
- rev = "63c96fb029033b1a300b90aa922e167c7c405bcb";
- sha256 = "0kax42y0f1pa1pgybz3f57ig9g8fvmgcw8j7zl9nsw70dar4amqk";
+ rev = "c27d9b5b1dd20a1600e89909ac9c0ccd08af9bf9";
+ sha256 = "00vir1vfkprxm23if6cfjvliiwbza18n7gmh74bdnp1zkg2xy0hq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/twittering-mode";
@@ -70870,12 +71795,12 @@
typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "typescript-mode";
- version = "20171109.727";
+ version = "20171229.810";
src = fetchFromGitHub {
owner = "ananthakumaran";
repo = "typescript.el";
- rev = "5b0487aae890e7e9f7105a679deecc50428e912d";
- sha256 = "08qx9g40aws9s9cpmayc6r3bjrvx8sy32vfy0rz3jkpjyqc6485x";
+ rev = "330c887241cf585aa4e2e3f3e9d851f28b92b08e";
+ sha256 = "05bsr5drz8d5p0fx4ai2cfgmgzyi3245gpbr61iyv37an3zkcrav";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode";
@@ -70933,12 +71858,12 @@
typit = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, mmt }:
melpaBuild {
pname = "typit";
- version = "20170519.51";
+ version = "20171231.2214";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "typit";
- rev = "bf6e72d76c0f3a68d7cd53c6580e92aa15d28dc5";
- sha256 = "0qf2599x60nipmr78cmlnswid0lj552b0fjcw2lbyg7mnhxlnkmj";
+ rev = "41309d8a64a992f532753093742c15d413c446b5";
+ sha256 = "1fqaf4n236l4qzy4ac370laysb9jnj98769nri6qkirsfzk6hcgd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d17d019155e19c156f123dcd702f18cfba488701/recipes/typit";
@@ -70954,12 +71879,12 @@
typo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "typo";
- version = "20171005.1045";
+ version = "20171209.223";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "typoel";
- rev = "73c8d960e9dcbb77a4ad6166b4685122a0f208ee";
- sha256 = "1zlnfjav11842am9n043j3hk23134hp92k1pg86jvnsj5mwmp9ij";
+ rev = "9dad93b6f367f02f52c8d9bf15d446d922cec294";
+ sha256 = "1xaikwl265v67b7hilrhjgwzr6bcha9idnp82f27msqzdfdzxf0f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/typo";
@@ -71528,6 +72453,27 @@
license = lib.licenses.free;
};
}) {};
+ universal-emotions-emoticons = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "universal-emotions-emoticons";
+ version = "20171209.1820";
+ src = fetchFromGitHub {
+ owner = "grettke";
+ repo = "universal-emotions-emoticons";
+ rev = "c89063a4f8e00f8e9c4dc6c252474b6d4bfc4e01";
+ sha256 = "0wgff3bbjgskbm1c4cww6akia93hd5sqr9md5szkqm6iiqi3q95z";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/57f913112c98db2248cf69e44deb69fd09cee042/recipes/universal-emotions-emoticons";
+ sha256 = "1aj3k3yrvasn3zmfwz5si046hlyhnjdmxh7i8li6rc0v0qwl7p86";
+ name = "universal-emotions-emoticons";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/universal-emotions-emoticons";
+ license = lib.licenses.free;
+ };
+ }) {};
unkillable-scratch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "unkillable-scratch";
@@ -71636,16 +72582,16 @@
use-package = callPackage ({ bind-key, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "use-package";
- version = "20171129.840";
+ version = "20171226.1104";
src = fetchFromGitHub {
owner = "jwiegley";
repo = "use-package";
- rev = "cf0009b3016cb6c150816815160325e6137a3a68";
- sha256 = "1mylqw42cy773cwx00j8984f4ga17d4nfa5vfajj54c3aji0grsx";
+ rev = "5a50f6703140992723a434b9a733644bfab15306";
+ sha256 = "1495kkmfkl56kg8kbc21rqibrmdyg12mfsww79gm8v5q4nn6xq5f";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package";
- sha256 = "0z7k77yfvsndql719qy4vypnwvi9izal8k8vhdx0pw8msaz4xqd8";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/51a19a251c879a566d4ae451d94fcb35e38a478b/recipes/use-package";
+ sha256 = "0d0zpgxhj6crsdi9sfy30fn3is036apm1kz8fhjg1yzdapf1jdyp";
name = "use-package";
};
packageRequires = [ bind-key emacs ];
@@ -71657,16 +72603,16 @@
use-package-chords = callPackage ({ bind-chord, bind-key, fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild, use-package }:
melpaBuild {
pname = "use-package-chords";
- version = "20170717.1152";
+ version = "20171207.2240";
src = fetchFromGitHub {
- owner = "waymondo";
- repo = "use-package-chords";
- rev = "f47b2dc8d79f02e5fe39de1f63c78a6c09be2026";
- sha256 = "0nwcs3akf1cy7dv36n5s5hsr67djfcn7w499vamn0yh16bs7r5ds";
+ owner = "jwiegley";
+ repo = "use-package";
+ rev = "5a50f6703140992723a434b9a733644bfab15306";
+ sha256 = "1495kkmfkl56kg8kbc21rqibrmdyg12mfsww79gm8v5q4nn6xq5f";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/92fbae4e0bcc1d5ad9f3f42d01f08ab4c3450f1f/recipes/use-package-chords";
- sha256 = "18av8gkz3nzyqigyd88ajvylsz2nswsfywxrk2w8d0ykc3p37ass";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6240afa625290187785e4b7535ee7b0d7aad8969/recipes/use-package-chords";
+ sha256 = "1217l0gpxcp8532p0d3g1xd2015qpx2g5xm0kwsbxdmffqqdaar3";
name = "use-package-chords";
};
packageRequires = [ bind-chord bind-key key-chord use-package ];
@@ -71678,16 +72624,16 @@
use-package-ensure-system-package = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, system-packages, use-package }:
melpaBuild {
pname = "use-package-ensure-system-package";
- version = "20171105.2300";
+ version = "20171205.1029";
src = fetchFromGitHub {
- owner = "waymondo";
- repo = "use-package-ensure-system-package";
- rev = "a58682fbe3eb632a285ef23d3121e82abc225dcb";
- sha256 = "0snjimd2lcyi01cm9044kj4cxcqb3d17yv8pvf9wc4pc00v9x87p";
+ owner = "jwiegley";
+ repo = "use-package";
+ rev = "5a50f6703140992723a434b9a733644bfab15306";
+ sha256 = "1495kkmfkl56kg8kbc21rqibrmdyg12mfsww79gm8v5q4nn6xq5f";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/fe7cc204aec6f3f399a704f97b4e05c6a7cd3940/recipes/use-package-ensure-system-package";
- sha256 = "1mmrnlhjb26lk0iirsxfks74j0bbs3bj375x23w9fk7fp4bjlhby";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6240afa625290187785e4b7535ee7b0d7aad8969/recipes/use-package-ensure-system-package";
+ sha256 = "1cl61nwgsz5dh3v9rdiww8mq2k1sbx27gr6izb4ij4pnzjp7aaj6";
name = "use-package-ensure-system-package";
};
packageRequires = [ system-packages use-package ];
@@ -72350,12 +73296,12 @@
vimish-fold = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "vimish-fold";
- version = "20170730.2206";
+ version = "20171231.2212";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "vimish-fold";
- rev = "5e2875c18e2d8ef27f594e0ea1ca15a2f759be42";
- sha256 = "1a24diw5xwk10d9y8dr1bgpc78d36f3swvlll0igl5b91q4x86dn";
+ rev = "1469c953bc20d21d87ce5d92def767e551cda07c";
+ sha256 = "0nywz6nk1qanx7z9sykf28h9c2qj7xzs9w4hya4vmhwigqqbhldl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b4862b0a3d43f073e645803cbbf11d973a4b51d5/recipes/vimish-fold";
@@ -72665,12 +73611,12 @@
vue-html-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "vue-html-mode";
- version = "20170928.1057";
+ version = "20180104.1421";
src = fetchFromGitHub {
owner = "AdamNiederer";
repo = "vue-html-mode";
- rev = "9218c61ff1ab2bdc6a6711d21ad760198d3511a8";
- sha256 = "1xpbr2fajn0nk53abb2x9m0qs0ygxfl62gdxd2iqfcwj56fswj9y";
+ rev = "3fa65f8ac8a4c54f13c32fd43c9865c92c22ce07";
+ sha256 = "00mj1qmcsfndnk7vif7aa9nqy7hd3cnbmn6fhik1mmsqrazcbp0h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/48588b163ab76204b9054340071e758045480e19/recipes/vue-html-mode";
@@ -72686,12 +73632,12 @@
vue-mode = callPackage ({ edit-indirect, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode, ssass-mode, vue-html-mode }:
melpaBuild {
pname = "vue-mode";
- version = "20171029.1905";
+ version = "20180104.1611";
src = fetchFromGitHub {
owner = "CodeFalling";
repo = "vue-mode";
- rev = "a34f8a14fe6a680bb18cfa4519f7984d8071a4e3";
- sha256 = "08c3sgd80aszfpc4zbh0rsn7717nwwjhr38lfbsbxmgmlvqalxzk";
+ rev = "b489a63dabe0f2fee2730121ecabb1b4f4c11761";
+ sha256 = "09fkyyj0lg3q9q0874q0jpvx1h8rf26g96sn9a2xw0j3fl5ab1n4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode";
@@ -72728,12 +73674,12 @@
w3m = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "w3m";
- version = "20171119.1701";
+ version = "20171221.2317";
src = fetchFromGitHub {
owner = "emacsorphanage";
repo = "w3m";
- rev = "2666d95df942f23e7837f27206b8352701fa22dd";
- sha256 = "1y11wi0qclsab1mq65rcaml71n8qyiqp1w3baxzmby17jjn4646p";
+ rev = "948a1a0f3e96e6c09c938e060f352ec126054ab1";
+ sha256 = "1dwfw7hbcz88dvfy9hrllxhmhwdx6gfh9n457b6svcdjcn831d6d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/w3m";
@@ -72874,12 +73820,12 @@
wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }:
melpaBuild {
pname = "wanderlust";
- version = "20171019.550";
+ version = "20171209.227";
src = fetchFromGitHub {
owner = "wanderlust";
repo = "wanderlust";
- rev = "15a8ca7a28d086066d148ca8bfbd454e32cc5f77";
- sha256 = "1a7xm3x8zyax6crrj8fj932yicwds12774znv991yggjzw5kcwcd";
+ rev = "2a058670d9f65e7c9e5b203b31d5946bcb2bf144";
+ sha256 = "1kpw9al401x7mwzan273dz38699hirz5rdlpwihmrvccpa279r6p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust";
@@ -73483,12 +74429,12 @@
which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "which-key";
- version = "20171114.700";
+ version = "20171217.1916";
src = fetchFromGitHub {
owner = "justbur";
repo = "emacs-which-key";
- rev = "1234342878f9c9c9bc23ebe754e85d7fa155a51f";
- sha256 = "1bj8g5xw140r3zfiyyr8x8559pvy1a1p7gjpg9w8c8h3n0xnp799";
+ rev = "ef384e781e6107850c7fadc78cb0675d7fe72e69";
+ sha256 = "1xiw2blc1z2fvpz30i350gk28nfwlallnqvqmxibb84rydadx705";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key";
@@ -73676,8 +74622,8 @@
src = fetchFromGitHub {
owner = "foretagsplatsen";
repo = "emacs-js";
- rev = "b05d584a4b3e0db168c3b920ce4a270b3908d842";
- sha256 = "0shgxd08da8a7ij37k5ybmvyqbqzq4nqxdyfbbpgnh1vgw61gr6c";
+ rev = "1b09b1b2848ab21c412f2fe7a259b1dcea2c733c";
+ sha256 = "1g53id1wc6xfa3066m9c4f0f0chsnsv8mqqs5v6zx7yf4nv9v9ja";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs";
@@ -74091,12 +75037,12 @@
with-editor = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "with-editor";
- version = "20171127.635";
+ version = "20171217.1239";
src = fetchFromGitHub {
owner = "magit";
repo = "with-editor";
- rev = "73d3d1ac1470001e184a5ead88f770eeb71a5461";
- sha256 = "0a9lf5apbxsy270is6cxa2akc8nzaw1l18ppdrairlm77psm8m7h";
+ rev = "05338d893f3879391d7283324364b472e3f4f4d1";
+ sha256 = "0h5wlskfb0xpw1jjijcvyl2ivylky3y2czmfi8f0qv9vz6g495w3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor";
@@ -74700,12 +75646,12 @@
xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xah-fly-keys";
- version = "20171101.1546";
+ version = "20180107.1546";
src = fetchFromGitHub {
owner = "xahlee";
repo = "xah-fly-keys";
- rev = "c007dee9faeae7b4ef1cfd21c97952768f520f8e";
- sha256 = "1vkfff3w09h3gbwz9wqlrab29558ms03x5cgzzdxs0mjaq40pvnz";
+ rev = "c7ebabe6ccff0bce35cf7feb1cef34f4c69aee50";
+ sha256 = "1r4ld1b8dd39bggjhzj6rd3wan3yhw5sm3zi623yad7w48c4xpna";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-fly-keys";
@@ -75376,8 +76322,8 @@
src = fetchFromGitHub {
owner = "drdv";
repo = "yahtzee";
- rev = "f4deb73234ae515c69b7972d5b11f614d18f6948";
- sha256 = "07qv05jji5q5954p7y5pw1rf52f29642bsd6hnhjw9h40xbw5pvp";
+ rev = "b851eb86a8a78378ad0f734e2c56f3f5f4d052ec";
+ sha256 = "009j6b7k5dc4n2zyi86d0bnl2a77ril9phqkx29jz5lcr0ndarwj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/200169fdabce0ae3a2ecb6f4f3255c15ec3ed094/recipes/yahtzee";
@@ -75498,12 +76444,12 @@
yankpad = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yankpad";
- version = "20170607.819";
+ version = "20171221.636";
src = fetchFromGitHub {
owner = "Kungsgeten";
repo = "yankpad";
- rev = "70e755fcf58e37092de2c335355eab93d5f1fb44";
- sha256 = "1ijd3vpym573p96dh81pw9rzlmman7dvamhvnf0jqp8mmy4g4bml";
+ rev = "aa643aeaaf72fa19c4610ce47088a1fbc4e33ecb";
+ sha256 = "0815ki5fx6jr15ljjw48spxjknqwhcm6qzk8pl7hxw162r3nxh6p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e64746d10f9e0158621a7c4dc41dc2eca6ad573c/recipes/yankpad";
@@ -75519,12 +76465,12 @@
yapfify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yapfify";
- version = "20170519.115";
+ version = "20180105.1447";
src = fetchFromGitHub {
owner = "JorisE";
repo = "yapfify";
- rev = "492eb038b35f49b1012fb843d880bccc40f2260b";
- sha256 = "1jj1j525xlwhylsysay52f4rdrwz3r72ghx4iggkxqiqbv919ia4";
+ rev = "9e63a9135bd8dbfbee55819837a3aa0d119c5e6f";
+ sha256 = "1bf09hah2g8x0jbrdh4fm1v01qjymiv38yvv8a5qmfpv5k93lcrc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/060c32d8e9fdc56fe702d265a935d74d76082f86/recipes/yapfify";
@@ -75645,12 +76591,12 @@
yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yasnippet";
- version = "20170923.1646";
+ version = "20180102.1824";
src = fetchFromGitHub {
owner = "joaotavora";
repo = "yasnippet";
- rev = "4ab9cb5bac683112852f58b26557a7dc283b717b";
- sha256 = "1sjvzdzzkifw6751gplvm964b85c04jcl1sbq6pjm75alsjv6mrp";
+ rev = "04062d8b4f7391069058345e1efd673add0357f8";
+ sha256 = "11xn4h182p738apiphxvdzrnb4gc2nam039xzxfx9fsvfxph6ziw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet";
@@ -75666,12 +76612,12 @@
yasnippet-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "yasnippet-snippets";
- version = "20171127.423";
+ version = "20180107.147";
src = fetchFromGitHub {
owner = "AndreaCrotti";
repo = "yasnippet-snippets";
- rev = "72d3292f7a5df67502ae990278642f56164e1463";
- sha256 = "10r2z3fi28dj31w7qk9sjkx3wpvciqa2qa9harvgkrs1n2anxhj9";
+ rev = "3ab16fb46517d3f084ce838bb5fce71d22601a16";
+ sha256 = "1nw95nmnc4y1l3dm44yn1kb88179x5455g5sap20dm7a6zxbf94g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/25b8d4efe2e7833eb95dfdf33aa3ecc34af7a687/recipes/yasnippet-snippets";
@@ -75707,11 +76653,11 @@
}) {};
yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "yatex";
- version = "20171030.502";
+ version = "20180106.654";
src = fetchhg {
url = "https://www.yatex.org/hgrepos/yatex/";
- rev = "16763e5b7481";
- sha256 = "1mrcc9amz0kflm570bd2cprhin0z8lr668k2s56mj6shixb61dwh";
+ rev = "668632d9392e";
+ sha256 = "1d37yr7yqqg1gavi3406rv9rfvcm5ic365jhs6pispfx1kr77k6n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e28710244a1bef8f56156fe1c271520896a9c694/recipes/yatex";
@@ -75839,6 +76785,27 @@
license = lib.licenses.free;
};
}) {};
+ yoficator = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "yoficator";
+ version = "20171206.1630";
+ src = fetchFromGitLab {
+ owner = "link2xt";
+ repo = "yoficator";
+ rev = "5ad60258097147cdd8d71147722cc4203a59a0b0";
+ sha256 = "0b2xzkw0rxbxfk6rxapy82zl61k51cis9nsnw67v7h2s2423jhcr";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/5156f01564978718dd99ab3a54f19b6512de5c3c/recipes/yoficator";
+ sha256 = "0b6lv6wk5ammhb9rws9kig02wkm84i5avm7a1vd4sb7wkgm9nj9r";
+ name = "yoficator";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/yoficator";
+ license = lib.licenses.free;
+ };
+ }) {};
yoshi-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yoshi-theme";
@@ -75968,12 +76935,12 @@
zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "zenburn-theme";
- version = "20171109.926";
+ version = "20171216.1027";
src = fetchFromGitHub {
owner = "bbatsov";
repo = "zenburn-emacs";
- rev = "613f4c69513c7ffe7cb00a6c477cd5e8e6378d40";
- sha256 = "03n3ixkzfva5r2a7qdkl0b9254q56f9fh202lrkcgg135ynhkrhc";
+ rev = "62d91fd7c054b0747f1309c012976deb471d4608";
+ sha256 = "1ddr47xy86kajwwf7dnzz9a9qh7bd9wkf7x30qwlygc41mg6w6zy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/zenburn-theme";
@@ -76051,12 +77018,12 @@
zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }:
melpaBuild {
pname = "zerodark-theme";
- version = "20171128.610";
+ version = "20180103.535";
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "zerodark-theme";
- rev = "37b19b9adf633afd4adf88826e9618e5b1f09461";
- sha256 = "049ly4jg9lxdmgsckciwfdmf5xj746z3slk5y47vlv56wyjs6ksz";
+ rev = "12ca2cc6348decc964c148c36a3cde0846f4fc1a";
+ sha256 = "11vpqkgspp2abf2rgpzcpz4miaq1lgbhg5w0li1qai6ybslz212z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d00b78ead693e844e35c760fe2c39b8ed6cb0d81/recipes/zerodark-theme";
@@ -76491,12 +77458,12 @@
zzz-to-char = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "zzz-to-char";
- version = "20170519.335";
+ version = "20171231.2219";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "zzz-to-char";
- rev = "96dfe16a990474267cd290498cf9ac6dd6b3e7c0";
- sha256 = "1jvysrq9ya77x2xg0wqy1q27y0r43578d10bdhihpj2281nxng1y";
+ rev = "8ddda49de3356d8fa0308d79b5d68272baf2c57b";
+ sha256 = "17d8mmmgj2w4nm2nfg12g35i7zbp4bp47ix5ifqqm1zvwmbmzrqx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7063cbc1f1501ce81552d7ef1d42d1309f547c42/recipes/zzz-to-char";
diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index d8b548b03e49ddded1c0a48bf601926a767027bc..61257c5b57353ff1a4badb0c0f643f887ee9ae27 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -36,6 +36,9 @@ self:
});
overrides = {
+ # Expects bash to be at /bin/bash
+ ac-rtags = markBroken super.ac-rtags;
+
# upstream issue: mismatched filename
ack-menu = markBroken super.ack-menu;
@@ -46,10 +49,16 @@ self:
# upstream issue: missing file header
bufshow = markBroken super.bufshow;
+ # part of a larger package
+ caml = dontConfigure super.caml;
+
# part of a larger package
# upstream issue: missing package version
cmake-mode = markBroken (dontConfigure super.cmake-mode);
+ # Expects bash to be at /bin/bash
+ company-rtags = markBroken super.company-rtags;
+
# upstream issue: missing file header
connection = markBroken super.connection;
@@ -86,6 +95,9 @@ self:
# missing OCaml
flycheck-ocaml = markBroken super.flycheck-ocaml;
+ # Expects bash to be at /bin/bash
+ flycheck-rtags = markBroken super.flycheck-rtags;
+
# upstream issue: missing file header
fold-dwim = markBroken super.fold-dwim;
@@ -95,6 +107,9 @@ self:
# upstream issue: mismatched filename
helm-lobsters = markBroken super.helm-lobsters;
+ # Expects bash to be at /bin/bash
+ helm-rtags = markBroken super.helm-rtags;
+
# upstream issue: missing file header
helm-words = markBroken super.helm-words;
@@ -104,6 +119,9 @@ self:
# upstream issue: missing file header
initsplit = markBroken super.initsplit;
+ # Expects bash to be at /bin/bash
+ ivy-rtags = markBroken super.ivy-rtags;
+
# upstream issue: missing file header
jsfmt = markBroken super.jsfmt;
@@ -119,6 +137,12 @@ self:
# upstream issue: missing file header
maxframe = markBroken super.maxframe;
+ # version of magit-popup needs to match magit
+ # https://github.com/magit/magit/issues/3286
+ magit = super.magit.override {
+ inherit (self.melpaPackages) magit-popup;
+ };
+
# missing OCaml
merlin = markBroken super.merlin;
@@ -135,6 +159,9 @@ self:
# missing OCaml
ocp-indent = markBroken super.ocp-indent;
+ # upstream issue: missing dependency
+ org-readme = markBroken super.org-readme;
+
# upstream issue: missing file header
perl-completion = markBroken super.perl-completion;
@@ -169,6 +196,9 @@ self:
# upstream issue: missing file header
stgit = markBroken super.stgit;
+ # upstream issue: missing file header
+ tawny-mode = markBroken super.tawny-mode;
+
# upstream issue: missing file header
textmate = markBroken super.textmate;
@@ -178,6 +208,9 @@ self:
# upstream issue: missing file header
voca-builder = markBroken super.voca-builder;
+ # upstream issue: missing dependency
+ weechat-alert = markBroken super.weechat-alert;
+
# upstream issue: missing file header
window-numbering = markBroken super.window-numbering;
diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 3abf4e8955fcc14689237078bc76c70044f6a2be..dd3a30271f3970b0965c28a0f07b1589f53bf53b 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -233,12 +233,12 @@
ac-clang = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, yasnippet }:
melpaBuild {
pname = "ac-clang";
- version = "1.9.2";
+ version = "2.0.2";
src = fetchFromGitHub {
owner = "yaruopooner";
repo = "ac-clang";
- rev = "ee692f7cde535f317e440a132b8e60b7c5e34dfd";
- sha256 = "0zg39brrpgdakb6hbylala6ajja09nhbzqf4xl9nzwc7gzpgfl57";
+ rev = "d14b0898f88c9f2911ebf68c1cbaae09e28b534a";
+ sha256 = "02f8avxvcpr3ns4f0dw72jfx9c89aib5c2j54qcfz66fhka9jnvq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ffe0485048b85825f5e8ba95917d8c9dc64fe5de/recipes/ac-clang";
@@ -548,12 +548,12 @@
ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "ac-php";
- version = "1.9";
+ version = "2.0.1";
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
- rev = "16e6647115d848085a99e77a21a3db51bec4a288";
- sha256 = "1i75wm063z9wsmwqqkk6nscspy06p301zm304cd9fyy2cyjbk81a";
+ rev = "519b5cd886f484693fd69b226e307d56137b321b";
+ sha256 = "1pig5kang3yvzzahgn8rfpy3gvpfz7myvf7ic0yc6rivvbl03k18";
};
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.9";
+ version = "2.0.1";
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
- rev = "16e6647115d848085a99e77a21a3db51bec4a288";
- sha256 = "1i75wm063z9wsmwqqkk6nscspy06p301zm304cd9fyy2cyjbk81a";
+ rev = "519b5cd886f484693fd69b226e307d56137b321b";
+ sha256 = "1pig5kang3yvzzahgn8rfpy3gvpfz7myvf7ic0yc6rivvbl03k18";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@@ -758,12 +758,12 @@
ace-jump-zap = callPackage ({ ace-jump-mode, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ace-jump-zap";
- version = "0.1.1";
+ version = "0.1.2";
src = fetchFromGitHub {
owner = "waymondo";
repo = "ace-jump-zap";
- rev = "0acdd83a5abd59606495e67a4ee01f7856e5d359";
- sha256 = "0yng6qayzqadk4cdviri84ghld4can35q134hm3n3j3vprhpbmca";
+ rev = "1a9bf779d8f9225ede9ec482b840942bb58111df";
+ sha256 = "0r875w4aq3p091hcrpkpqsivn1q9hmq2ppa1rvxzdaq0rhl9kfz4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3b435db3b79333a20aa27a72f33c431f0a019ba1/recipes/ace-jump-zap";
@@ -902,15 +902,36 @@
license = lib.licenses.free;
};
}) {};
+ adafruit-wisdom = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "adafruit-wisdom";
+ version = "0.2.0";
+ src = fetchFromGitHub {
+ owner = "gonewest818";
+ repo = "adafruit-wisdom.el";
+ rev = "67e1fb17964c09514e7635dba85fb14b0926e49c";
+ sha256 = "097r31l4fpj4yd2ajv6zwgwn35fwn3c83qg9yzm2rjz1rdcwxlrw";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/18483af52c26f719fbfde626db84a67750bf4754/recipes/adafruit-wisdom";
+ sha256 = "0ckh420cirspwg2yd5q9y1az03j2l1jzd67g8dpvqjkgdp485gad";
+ name = "adafruit-wisdom";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/adafruit-wisdom";
+ license = lib.licenses.free;
+ };
+ }) {};
add-hooks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "add-hooks";
- version = "3.1.0";
+ version = "3.1.1";
src = fetchFromGitHub {
owner = "nickmccurdy";
repo = "add-hooks";
- rev = "edd4cb032a509b576d88f4cc0521ebfe66a9e6c7";
- sha256 = "1qg1ifkds84xv07ibz4sqp34ks60w4c7dvrq9dch4gvg040hal82";
+ rev = "a1043b7cdb1ea98055a2c99f8d37584a553ca362";
+ sha256 = "1jv9fpcsm572zg0j1mbpbfkqgdlqapy89xhhj19pswkhjns1y2wl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/901f846aef46d512dc0a1770bab7f07c0ae330cd/recipes/add-hooks";
@@ -1648,12 +1669,12 @@
anything-tramp = callPackage ({ anything, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "anything-tramp";
- version = "0.6.4";
+ version = "0.8.5";
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-anything-tramp";
- rev = "86b198afd03f2baffb1efe24c7a89e71100356ea";
- sha256 = "1320zdv6q1cnnvl8s25ymjvd3kz2an98bicansq5bhf413n7fhgb";
+ rev = "942affd6b7538d1e829ee257bbd829cb4e860cce";
+ sha256 = "0njynjg7p7i5li668ldpvmnpc5w7bikcs4cmkf26vf5n714fvlc1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/anything-tramp";
@@ -2575,6 +2596,27 @@
license = lib.licenses.free;
};
}) {};
+ bazel-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "bazel-mode";
+ version = "1.0.0";
+ src = fetchFromGitHub {
+ owner = "codesuki";
+ repo = "bazel-mode";
+ rev = "6103da2dd9c9461e35a45fc0544ddf33410baa25";
+ sha256 = "0lbiih6lj7qf2h1l2nxcwfkhdzccrs01lcdqsyhp5hysp0zdcr66";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3945f7eba7d5f248cace11a7946262ac2500b01a/recipes/bazel-mode";
+ sha256 = "10590pbpg6mwkcwlm01nxf0ypw694h1b57frvn5rnc53al87i586";
+ name = "bazel-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/bazel-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
bbcode-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bbcode-mode";
@@ -4214,12 +4256,12 @@
cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
melpaBuild {
pname = "cider";
- version = "0.15.1";
+ version = "0.16.0";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "cider";
- rev = "8a9eab32646abcaaf31fe83b2d897c01971b98f1";
- sha256 = "0ddkm87l9ann05a6j57r0x59qqgfavwrvlzhkc5xhak1nmk5556h";
+ rev = "74f7901b416efbd032bb4f8b5c25f57fdf731115";
+ sha256 = "0n2b6q8r2gzr3ghyvg5sawir47rk7jmsslvxx6by27bn77h4nzil";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
@@ -4277,7 +4319,7 @@
circadian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "circadian";
- version = "0.3.0";
+ version = "0.3.1";
src = fetchFromGitHub {
owner = "GuidoSchmidt";
repo = "circadian.el";
@@ -4625,12 +4667,12 @@
closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "closql";
- version = "0.5.0";
+ version = "0.5.1";
src = fetchFromGitHub {
owner = "emacscollective";
repo = "closql";
- rev = "49862bfdd1540d443d278fadef16a83388b360cb";
- sha256 = "0phpfsl00d39gp26mbf1n7r2210gk2407pqj3bng50sbip568jmp";
+ rev = "01cb892f6a457fbff857d924cebfdc77f69bd45d";
+ sha256 = "0c5b6w67qjy2kvk3daljjg01xsv91c03n6kxvg5bswqq1j7n66si";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/closql";
@@ -4709,12 +4751,12 @@
cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cmake-mode";
- version = "3.10.0";
+ version = "3.10.1";
src = fetchFromGitHub {
owner = "Kitware";
repo = "CMake";
- rev = "7746fdb2fe0177341aadeafec2ae73aa08ddfaf6";
- sha256 = "0byicha5rfcgx644hh9hvcy7z9q3kbkd0f4b33bcw8jd20pvgmk6";
+ rev = "166bf4c490b8f46eca057fc23c3f3c2e042e9cb3";
+ sha256 = "1qgny1px7afgxi7hj12fg0zk55sy9mbk0w5sigamyzxp336nfxmz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -5231,27 +5273,6 @@
license = lib.licenses.free;
};
}) {};
- company-eshell-autosuggest = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "company-eshell-autosuggest";
- version = "1.0.1";
- src = fetchFromGitHub {
- owner = "dieggsy";
- repo = "company-eshell-autosuggest";
- rev = "a1de14ae79c720fa681fafa000b2650c42cf5050";
- sha256 = "1l4fc6crkm1yhbcidrdi19dirnyhjdfdyyz67s6va1i0v3gx0w6w";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/b5beec83bd43b3f1f81feb3ef554ece846e327c2/recipes/company-eshell-autosuggest";
- sha256 = "1bpjyr01rwl58fypfhzzml69wx7h2a044s4l58cxl3fw8lbjb13f";
- name = "company-eshell-autosuggest";
- };
- packageRequires = [ company emacs ];
- meta = {
- homepage = "https://melpa.org/#/company-eshell-autosuggest";
- license = lib.licenses.free;
- };
- }) {};
company-ghc = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, ghc, lib, melpaBuild }:
melpaBuild {
pname = "company-ghc";
@@ -5444,12 +5465,12 @@
company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "company-php";
- version = "1.9";
+ version = "2.0.1";
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
- rev = "16e6647115d848085a99e77a21a3db51bec4a288";
- sha256 = "1i75wm063z9wsmwqqkk6nscspy06p301zm304cd9fyy2cyjbk81a";
+ rev = "519b5cd886f484693fd69b226e307d56137b321b";
+ sha256 = "1pig5kang3yvzzahgn8rfpy3gvpfz7myvf7ic0yc6rivvbl03k18";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@@ -5849,12 +5870,12 @@
copy-as-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "copy-as-format";
- version = "0.0.6";
+ version = "0.0.7";
src = fetchFromGitHub {
owner = "sshaw";
repo = "copy-as-format";
- rev = "fba9fe57a310a71c5aac90a26434df4c08214833";
- sha256 = "1qh3qxy8p23nz0zh8iavggjhp0mn10finq3zl3i0a3vkxxrvgh76";
+ rev = "971957166fe64d914ec4be209b4f80efeeabbb19";
+ sha256 = "0ynzy2sb75w24d2kwjpkb3vl98yyz0sbcj6nd31y2r2n2kkdna24";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format";
@@ -5870,12 +5891,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.2";
+ version = "0.0.3";
src = fetchFromGitHub {
owner = "emacs-php";
repo = "emacs-auto-deployment";
- rev = "fe78b4c9fdc261ce22a771765702ebe4d9437c84";
- sha256 = "0vf6qp7fxqvgd02vfsbmm38vc8n2wvrfwv4wnsr15gd8y8zldlgs";
+ rev = "aaa847b43af225ccb282aab2d9cddafe500d9f62";
+ sha256 = "0n2z91g7p9i724xqx2qq4s5xnxnf4vjccnvy1i706cddpjn02d6f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/copy-file-on-save";
@@ -5954,12 +5975,12 @@
counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
melpaBuild {
pname = "counsel";
- version = "0.9.1";
+ version = "0.10.0";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "f4b433436668ac09f3d1815fbfb4b71f3e0690fa";
- sha256 = "10jffa503a6jid34smh0njnhlv27r9vyhwlpf00f13c5i8nh2xjf";
+ rev = "4a2cee03519f98cf95b29905dec2566a39ff717e";
+ sha256 = "14vnigqb5c3yi4q9ysw1fiwdqyqwyklqpb9wnjf81chm7s2mshnr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -5972,22 +5993,22 @@
license = lib.licenses.free;
};
}) {};
- counsel-bbdb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ counsel-bbdb = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "counsel-bbdb";
- version = "0.0.2";
+ version = "0.0.3";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "counsel-bbdb";
- rev = "f95e4812cd17e5f8069c9209241396780d414680";
- sha256 = "08zal6wyzxqqg9650xyj2gmhb5cr34zwjgpfmkiw610ypld1xr73";
+ rev = "c86f4b9ef99c9db0b2c4196a300d61300dc2d0c1";
+ sha256 = "1dchyg8cs7n0zbj6mr2z840yi06b2wja65k04idlcs6ngy1vc3sr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0ed9bcdb1f25a6dd743c1dac2bb6cda73a5a5dc2/recipes/counsel-bbdb";
sha256 = "14d9mk44skpmyj0zkqwz97j80r630j7s5hfrrhlsafdpl5aafjxp";
name = "counsel-bbdb";
};
- packageRequires = [];
+ packageRequires = [ emacs ivy ];
meta = {
homepage = "https://melpa.org/#/counsel-bbdb";
license = lib.licenses.free;
@@ -6017,12 +6038,12 @@
counsel-etags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "counsel-etags";
- version = "1.3.5";
+ version = "1.3.7";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "counsel-etags";
- rev = "ec56d4650ad11cd0cf8c7e168d9d6a5dfd9cdae8";
- sha256 = "0xmjsa5ic4hh9lrkblf6si7q7s6xcnvs83rnpj5an23jxg7r12ma";
+ rev = "921fa5a062bda9a0f9226fdaa76530ad809ff7b9";
+ sha256 = "1qvp3ihchfwy57sfnnkk6m591s381w57ppig9c0izlbzw3n7hi7n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags";
@@ -6056,6 +6077,48 @@
license = lib.licenses.free;
};
}) {};
+ counsel-projectile = callPackage ({ counsel, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
+ melpaBuild {
+ pname = "counsel-projectile";
+ version = "0.2.0";
+ src = fetchFromGitHub {
+ owner = "ericdanan";
+ repo = "counsel-projectile";
+ rev = "536872f022f449548bdb97faa1776d1d44499d73";
+ sha256 = "0pm5sqhr24n2ffycazxgl3d3dl7gai8svwz01vc0pgx9c0x75kl8";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/389f16f886a385b02f466540f042a16eea8ba792/recipes/counsel-projectile";
+ sha256 = "1gshphxaa902kq878rnizn3k1zycakwqkciz92z3xxb3bdyy0hnl";
+ name = "counsel-projectile";
+ };
+ packageRequires = [ counsel projectile ];
+ meta = {
+ homepage = "https://melpa.org/#/counsel-projectile";
+ license = lib.licenses.free;
+ };
+ }) {};
+ counsel-tramp = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "counsel-tramp";
+ version = "0.3.1";
+ src = fetchFromGitHub {
+ owner = "masasam";
+ repo = "emacs-counsel-tramp";
+ rev = "d4c35e1aca724af6a0084362a027fdd70876d2c8";
+ sha256 = "0dflm700n9wzn2nrwlbrh1558zv0c9fzzrs43d1kqvzw98wihfz2";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e1822b735b6bd533f658bd64ddccda29e19e9a5e/recipes/counsel-tramp";
+ sha256 = "1ga57v6whnpigciw54k3hs0idq4cbl35qrysarik72f46by859v5";
+ name = "counsel-tramp";
+ };
+ packageRequires = [ counsel emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/counsel-tramp";
+ license = lib.licenses.free;
+ };
+ }) {};
coverage = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, ov }:
melpaBuild {
pname = "coverage";
@@ -6161,22 +6224,22 @@
license = lib.licenses.free;
};
}) {};
- cricbuzz = callPackage ({ dash, enlive, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+ cricbuzz = callPackage ({ dash, enlive, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "cricbuzz";
- version = "0.2.10";
+ version = "0.3.5";
src = fetchFromGitHub {
owner = "lepisma";
repo = "cricbuzz.el";
- rev = "62c86b1aa6e0779c4f6d8fb9d31d75bf81994f69";
- sha256 = "1k8n65scj3frafy1fk25j3kzpp0q8r98ydibryv48izndpck03h3";
+ rev = "557f75f10525e7a4d50e83010b9ed07fbf9df889";
+ sha256 = "18lc56l5vcbrw2agpgjcap5q0l1mi64khgkk00x7r9wm1zilf9wp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cricbuzz";
sha256 = "18nmr7rpbylqgfx5q3ps38wx9q1ndj06msgyjyc8lqpipbsz0pip";
name = "cricbuzz";
};
- packageRequires = [ dash enlive s ];
+ packageRequires = [ dash enlive f s ];
meta = {
homepage = "https://melpa.org/#/cricbuzz";
license = lib.licenses.free;
@@ -6245,6 +6308,27 @@
license = lib.licenses.free;
};
}) {};
+ crystal-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "crystal-mode";
+ version = "0.1.0";
+ src = fetchFromGitHub {
+ owner = "crystal-lang-tools";
+ repo = "emacs-crystal-mode";
+ rev = "0fe6815201bebe4c5ff6857bd541d95b05132b10";
+ sha256 = "0r75dvc0jqcqi1qjns8zj132dnm0s6mvqlqynkis16nigbawix8m";
+ };
+ 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;
+ };
+ }) {};
csharp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "csharp-mode";
@@ -7022,6 +7106,27 @@
license = lib.licenses.free;
};
}) {};
+ difflib = callPackage ({ cl-generic, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
+ melpaBuild {
+ pname = "difflib";
+ version = "0.3.8";
+ src = fetchFromGitHub {
+ owner = "dieggsy";
+ repo = "difflib.el";
+ rev = "b08850251812d71e62fd6956081299590acdf37b";
+ sha256 = "03k5iy610f1m2nmkdk69p49fcfqfyxmy3h6fqvqsr2v1hix8i54a";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/df1924ddff6fd1b5fa32481d3b3d6fbe89a127d3/recipes/difflib";
+ sha256 = "07bm5hib3ihrrx0lhfsl6km9gfckl73qd4cb37h93zw0hc9xwhy6";
+ name = "difflib";
+ };
+ packageRequires = [ cl-generic emacs ht s ];
+ meta = {
+ homepage = "https://melpa.org/#/difflib";
+ license = lib.licenses.free;
+ };
+ }) {};
diffview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "diffview";
@@ -7127,6 +7232,27 @@
license = lib.licenses.free;
};
}) {};
+ dimmer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "dimmer";
+ version = "0.2.1";
+ src = fetchFromGitHub {
+ owner = "gonewest818";
+ repo = "dimmer.el";
+ rev = "b0faaa6919e633229ced07ff8bd8b5c68b90243a";
+ sha256 = "04k7m5kg2a32ldgxfc2jkdwbmxzyc3yv66871ywv9152db2g7iml";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/8ae80e9202d69ed3214325dd15c4b2f114263954/recipes/dimmer";
+ sha256 = "0w8n5svckk1jp8856pg2gkws9798prqjjkdqf8ili2hjcqnd1a3r";
+ name = "dimmer";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/dimmer";
+ license = lib.licenses.free;
+ };
+ }) {};
dionysos = callPackage ({ alert, cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, libmpdee, melpaBuild, pkg-info, s }:
melpaBuild {
pname = "dionysos";
@@ -7746,12 +7872,12 @@
doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "doom-themes";
- version = "1.2.5";
+ version = "2.1.0";
src = fetchFromGitHub {
owner = "hlissner";
repo = "emacs-doom-themes";
- rev = "d04875c9c7ce21d5f51dfc541a5d03efddac7728";
- sha256 = "0lfldrsfldrnw9g59dnsmyyp7j3v3kqv0d39h4kzs9dhm5v9dpbr";
+ rev = "bc747b3b65baf737f99dc4ccf68558581958bbba";
+ sha256 = "0j5aywwh8cw0bb55frrpmyfmbzg6d6jv29ys61p1xf49gvki870m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes";
@@ -8001,8 +8127,8 @@
version = "0.7";
src = fetchhg {
url = "https://bitbucket.com/harsman/dyalog-mode";
- rev = "9e446540a794";
- sha256 = "0gyip843fdqp6cwwaqcrnpngf5a3iqcbd9h7rl5lbvxpkqvm7shi";
+ rev = "87db00b912be";
+ sha256 = "0jg289fj4q83dwj7i0w5zq8bwqxzwzzmyhvdrk6cfw3q6rlwk5fp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode";
@@ -8207,12 +8333,12 @@
easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "easy-hugo";
- version = "2.3.18";
+ version = "2.8.21";
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-easy-hugo";
- rev = "e4dc1057b02b6736221936e66c188cf71c01916d";
- sha256 = "0knld86pl2im9mjy4s7mxxibdyc4sq9vhxg4jrndyrmldpjya4my";
+ rev = "61a504616705feae8c3fd8b01bf315e2cb89f699";
+ sha256 = "1lr2hbz4gxcn2r5m3hx4izk8aawgy0fls0isp6cvcgs1s54s2kxi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
@@ -8225,6 +8351,27 @@
license = lib.licenses.free;
};
}) {};
+ easy-jekyll = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "easy-jekyll";
+ version = "1.5.12";
+ src = fetchFromGitHub {
+ owner = "masasam";
+ repo = "emacs-easy-jekyll";
+ rev = "9a66d5c5dddac7d5b924df0c3bb414d3f797d8a5";
+ sha256 = "0qx6lgpg2szjgy1a3a856klm7vh544braq8v2s7f81lq0ks2bjhj";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/c3f281145bad12c27bdbef32ccc07b6a5f13b577/recipes/easy-jekyll";
+ sha256 = "16jj70fr23z5qsaijv4d4xfiiypny2cama8rsaci9fk9haq19lxv";
+ name = "easy-jekyll";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/easy-jekyll";
+ license = lib.licenses.free;
+ };
+ }) {};
easy-kill = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "easy-kill";
@@ -8375,12 +8522,12 @@
ecukes = callPackage ({ ansi, commander, dash, espuds, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "ecukes";
- version = "0.6.16";
+ version = "0.6.17";
src = fetchFromGitHub {
owner = "ecukes";
repo = "ecukes";
- rev = "c8092db08be5337ff3f3dd2857bfa94e360945d2";
- sha256 = "1dkinyigacb4yxqikd9za4inbh7yz7pl8bhrpihrxzabxirmvw55";
+ rev = "3a77ba9f1064c2bca47b401974c009e65727c46e";
+ sha256 = "1isscwz4h3nx62lwfrj899lp2yc27zk1ndgr441d848495ccmshn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/14cf66e6929db2a0f377612e786aaed9eb12b799/recipes/ecukes";
@@ -8690,12 +8837,12 @@
egison-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "egison-mode";
- version = "3.7.9";
+ version = "3.7.10";
src = fetchFromGitHub {
owner = "egisatoshi";
repo = "egison3";
- rev = "82f6ee43b8e35e6d04882d9c9942a22746fde0f1";
- sha256 = "1scxkgq4ij33306fjydwcqs69x5hpfw9l52z1xcprg51s23f2hgh";
+ rev = "b7c073e0a29c9632d82b501849e270d62304e22f";
+ sha256 = "13p6nfsjnbhw0cgy1s28ww9dk4hmwmanf2j6ydhcafvbynp964zs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode";
@@ -9055,12 +9202,12 @@
elfeed-protocol = callPackage ({ cl-lib ? null, elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "elfeed-protocol";
- version = "0.4.0";
+ version = "0.5.1";
src = fetchFromGitHub {
owner = "fasheng";
repo = "elfeed-protocol";
- rev = "bc1913e4275b69ac69e93981bf575a2053ef1657";
- sha256 = "04zn1lww8zcfi2anrkyfmgg55r40wfrj9qvpzh9xl9l2qcsbs4pk";
+ rev = "97049eb980ce1cc2b871e4c7819133f1e4936a83";
+ sha256 = "1d2i3jg5a2wd7mb4xfdy3wbx12yigqq4ykj3zbcamvx59siip591";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3f1eef8add7cd2cfefe6fad6d8e69d65696e9677/recipes/elfeed-protocol";
@@ -9479,85 +9626,85 @@
license = lib.licenses.free;
};
}) {};
- emacsql = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, finalize, lib, melpaBuild }:
+ emacsql = callPackage ({ cl-generic, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, finalize, lib, melpaBuild }:
melpaBuild {
pname = "emacsql";
- version = "2.0.2";
+ version = "2.0.3";
src = fetchFromGitHub {
owner = "skeeto";
repo = "emacsql";
- rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b";
- sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674";
+ rev = "dcf0dda9391f3978896547582efb72b5632c2ffe";
+ sha256 = "07gvx0bbpf6j3g8kpk9908wf8fx1yb3075v6407wjxxighl0n5zz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql";
sha256 = "1x4rn8dmgz871dhz878i2mqci576zccf9i2xmq2ishxgqm0hp8ax";
name = "emacsql";
};
- packageRequires = [ cl-lib emacs finalize ];
+ packageRequires = [ cl-generic cl-lib emacs finalize ];
meta = {
homepage = "https://melpa.org/#/emacsql";
license = lib.licenses.free;
};
}) {};
- emacsql-mysql = callPackage ({ cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ emacsql-mysql = callPackage ({ cl-generic, cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "emacsql-mysql";
- version = "2.0.2";
+ version = "2.0.3";
src = fetchFromGitHub {
owner = "skeeto";
repo = "emacsql";
- rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b";
- sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674";
+ rev = "dcf0dda9391f3978896547582efb72b5632c2ffe";
+ sha256 = "07gvx0bbpf6j3g8kpk9908wf8fx1yb3075v6407wjxxighl0n5zz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-mysql";
sha256 = "1c20zhpdzfqjds6kcjhiq1m5ch53fsx6n1xk30i35kkg1wxaaqzy";
name = "emacsql-mysql";
};
- packageRequires = [ cl-lib emacs emacsql ];
+ packageRequires = [ cl-generic cl-lib emacs emacsql ];
meta = {
homepage = "https://melpa.org/#/emacsql-mysql";
license = lib.licenses.free;
};
}) {};
- emacsql-psql = callPackage ({ cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild, pg }:
+ emacsql-psql = callPackage ({ cl-generic, cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild, pg }:
melpaBuild {
pname = "emacsql-psql";
- version = "2.0.2";
+ version = "2.0.3";
src = fetchFromGitHub {
owner = "skeeto";
repo = "emacsql";
- rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b";
- sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674";
+ rev = "dcf0dda9391f3978896547582efb72b5632c2ffe";
+ sha256 = "07gvx0bbpf6j3g8kpk9908wf8fx1yb3075v6407wjxxighl0n5zz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-psql";
sha256 = "1aa1g9jyjmz6w0lmi2cf67926ad3xvs0qsg7lrccnllr9k0flly3";
name = "emacsql-psql";
};
- packageRequires = [ cl-lib emacs emacsql pg ];
+ packageRequires = [ cl-generic cl-lib emacs emacsql pg ];
meta = {
homepage = "https://melpa.org/#/emacsql-psql";
license = lib.licenses.free;
};
}) {};
- emacsql-sqlite = callPackage ({ cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ emacsql-sqlite = callPackage ({ cl-generic, cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "emacsql-sqlite";
- version = "2.0.2";
+ version = "2.0.3";
src = fetchFromGitHub {
owner = "skeeto";
repo = "emacsql";
- rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b";
- sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674";
+ rev = "dcf0dda9391f3978896547582efb72b5632c2ffe";
+ sha256 = "07gvx0bbpf6j3g8kpk9908wf8fx1yb3075v6407wjxxighl0n5zz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-sqlite";
sha256 = "1vywq3ypcs61s60y7x0ac8rdm9yj43iwzxh8gk9zdyrcn9qpis0i";
name = "emacsql-sqlite";
};
- packageRequires = [ cl-lib emacs emacsql ];
+ packageRequires = [ cl-generic cl-lib emacs emacsql ];
meta = {
homepage = "https://melpa.org/#/emacsql-sqlite";
license = lib.licenses.free;
@@ -9932,12 +10079,12 @@
ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }:
melpaBuild {
pname = "ensime";
- version = "2.0.1";
+ version = "2.0.2";
src = fetchFromGitHub {
owner = "ensime";
repo = "ensime-emacs";
- rev = "34c7719c9739d1e5d55c3f776e8f32a417b4eea6";
- sha256 = "1dpj31krw0vwrb1pimpbpdm3k2ivqmr6kbgaw8p2dwwwqk1s6nbg";
+ rev = "3d3ab18436ad6089496b3bce1d49c64a86965431";
+ sha256 = "0p821zwpiznjh736af5avnx9abssx0zbb9xhs74yhh1mcdi1whq7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime";
@@ -10254,12 +10401,12 @@
erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "erlang";
- version = "20.1.7";
+ version = "20.2.2";
src = fetchFromGitHub {
owner = "erlang";
repo = "otp";
- rev = "2302ea8ca97b8a9075e9234d15430c47d3a115c8";
- sha256 = "0sbxl10d76bm7awxb9s07l9815jiwfg78bps07xj2ircxdr08pls";
+ rev = "194513197e19cd592f3f5c2231510542f5193fe4";
+ sha256 = "1cns1qcmmr00nyvcvcj4p4n2gvliyjynlwfqc7qzpkjjnkb7fzl6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -10418,6 +10565,27 @@
license = lib.licenses.free;
};
}) {};
+ esh-autosuggest = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "esh-autosuggest";
+ version = "2.0.0";
+ src = fetchFromGitHub {
+ owner = "dieggsy";
+ repo = "esh-autosuggest";
+ rev = "a8a9381e76ea2e0d934bc70caa47f23209bcc155";
+ sha256 = "116pdjgpjy9b0psm5kzwkwy7dq8vn0p6dy75dl1zsy2xrjf1iqdw";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/dc3776068d6928fc1661a27cccaeb8fb85577099/recipes/esh-autosuggest";
+ sha256 = "1rcng1dhy4yw95qg909ck33svpdxhv9v5k7226d29gp4y54dwyrx";
+ name = "esh-autosuggest";
+ };
+ packageRequires = [ company emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/esh-autosuggest";
+ license = lib.licenses.free;
+ };
+ }) {};
esh-help = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "esh-help";
@@ -10754,6 +10922,27 @@
license = lib.licenses.free;
};
}) {};
+ eterm-256color = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, xterm-color }:
+ melpaBuild {
+ pname = "eterm-256color";
+ version = "0.3.12";
+ src = fetchFromGitHub {
+ owner = "dieggsy";
+ repo = "eterm-256color";
+ rev = "89b20de890bc890331abe2d5e27a7e3129cde7b8";
+ sha256 = "1bh0wqz2wkp8i1g8r8wgqzny0f5igflca5hkwq9p8ql84jkwlm69";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e556383f7e18c0215111aa720d4653465e91eff6/recipes/eterm-256color";
+ sha256 = "1mxc2hqjcj67jq5k4621a7f089qahcqw7f0dzqpaxn7if11w333b";
+ name = "eterm-256color";
+ };
+ packageRequires = [ emacs f xterm-color ];
+ meta = {
+ homepage = "https://melpa.org/#/eterm-256color";
+ license = lib.licenses.free;
+ };
+ }) {};
ethan-wspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ethan-wspace";
@@ -11156,12 +11345,12 @@
evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-nerd-commenter";
- version = "3.1.2";
+ version = "3.1.3";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "evil-nerd-commenter";
- rev = "76fd0c5692e9852a2d6fc6c0ce0e782792c28ddd";
- sha256 = "1bydqdk52q8777m234jxp03y2zz23204r1fyq39ks9h9bpglc561";
+ rev = "41d43709210711c07de69497c5f7db646b7e7a96";
+ sha256 = "04xjbsgydfb3mi2jg5fkkvp0rvjpx3mdx8anxzjqzdry7nir3m14";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter";
@@ -11258,6 +11447,27 @@
license = lib.licenses.free;
};
}) {};
+ evil-replace-with-char = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "evil-replace-with-char";
+ version = "1.0.0";
+ src = fetchFromGitHub {
+ owner = "ninrod";
+ repo = "evil-replace-with-char";
+ rev = "dddbbafdd620cc48dd0a257baf4010e1b415ebe8";
+ sha256 = "0gcmva2q1bxqp3p8cl1nf19kh4nkgfdm64havyzhnkwq18q84pxi";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0ac1b487e0fe193cc46c8b489686972ed6db3973/recipes/evil-replace-with-char";
+ sha256 = "0lgazw53j44rc72czwqxs6yaz67l9i1v52wbi7l9w958fnjra84r";
+ name = "evil-replace-with-char";
+ };
+ packageRequires = [ emacs evil ];
+ meta = {
+ homepage = "https://melpa.org/#/evil-replace-with-char";
+ license = lib.licenses.free;
+ };
+ }) {};
evil-rsi = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-rsi";
@@ -11363,15 +11573,36 @@
license = lib.licenses.free;
};
}) {};
+ evil-string-inflection = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, string-inflection }:
+ melpaBuild {
+ pname = "evil-string-inflection";
+ version = "1.0.0";
+ src = fetchFromGitHub {
+ owner = "ninrod";
+ repo = "evil-string-inflection";
+ rev = "f6a3eca0f0fa8e56e6938e1dd48537eef1fae05f";
+ sha256 = "1akk0yylwcw4f91hprrrsijhbdcmrx1nnpgfyzpl4k5d4b30y8d5";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0720a0f5b775fcee8d1cfa0defe80048e2dd0972/recipes/evil-string-inflection";
+ sha256 = "0w9x49c0gmv4waspa9fvbhf2adm19cixkwx7a7la9v4qy7da6akh";
+ name = "evil-string-inflection";
+ };
+ packageRequires = [ emacs evil string-inflection ];
+ meta = {
+ homepage = "https://melpa.org/#/evil-string-inflection";
+ license = lib.licenses.free;
+ };
+ }) {};
evil-surround = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-surround";
- version = "1.0.0";
+ version = "1.0.1";
src = fetchFromGitHub {
owner = "emacs-evil";
repo = "evil-surround";
- rev = "7a0358ce3eb9ed01744170fa8a1e12d98f8b8839";
- sha256 = "1smv7sqhm1l2bi9fmispnlmjssidblwkmiiycj1n3ag54q27z031";
+ rev = "f6162a7b5a65a297c8ebb8a81ce6e1278f958bbc";
+ sha256 = "0kqkji4yn4khfrgghwkzgbh687fs3p07lj61x4i7w1ay1416lvn9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2c9dc47a4c837c44429a74fd998fe468c00639f2/recipes/evil-surround";
@@ -11785,12 +12016,12 @@
f = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "f";
- version = "0.19.0";
+ version = "0.20.0";
src = fetchFromGitHub {
owner = "rejeep";
repo = "f.el";
- rev = "541cb518afa5010029492847292c248f88b3ea42";
- sha256 = "1j6gc2pp5w3iwyjm4h3d0ahzs0ac3pah8lzfhpg4nkibl0nc1bcg";
+ rev = "de6d4d40ddc844eee643e92d47b9d6a63fbebb48";
+ sha256 = "1a47xk3yp1rp17fqg7ldl3d3fb888h0fz3sysqfdz1bfdgs8a9bk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/f";
@@ -11950,6 +12181,26 @@
license = lib.licenses.free;
};
}) {};
+ faustine = callPackage ({ emacs, faust-mode, fetchgit, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "faustine";
+ version = "0.4";
+ src = fetchgit {
+ url = "https://bitbucket.org/yphil/faustine";
+ rev = "f186461e2bc38ec8ae38bd5ab727cc769218a168";
+ sha256 = "16p7qmljjki4svci3mxzydmvpxaprbnfq6794b3adyyixkmgr6k7";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d7a6fc9f99241ff8e3a9c1fb12418d4d69d9e203/recipes/faustine";
+ sha256 = "1hyvkd4y28smdp30bkky6bwmqwlxjrq136wp7112371w963iwjsb";
+ name = "faustine";
+ };
+ packageRequires = [ emacs faust-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/faustine";
+ license = lib.licenses.free;
+ };
+ }) {};
fcitx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fcitx";
@@ -11995,12 +12246,12 @@
fill-column-indicator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fill-column-indicator";
- version = "1.89";
+ version = "1.90";
src = fetchFromGitHub {
owner = "alpaker";
repo = "Fill-Column-Indicator";
- rev = "23ad25f2c2fddd32a1ea12a9e0f631e243e6a779";
- sha256 = "010kf8jsly74y7m6mmkn1h6y205kz23zphs50zgy2nag2p88rz9y";
+ rev = "f7b3f99b41ff017f50a21ad53eed16f8ef5ab7ee";
+ sha256 = "0snjznxdwwfdgccdcvrnk467416r244r2r5qcm2sga8l0ha9gw9z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4ea0c00a7784621fcca0391a9c8ea85e9dd43852/recipes/fill-column-indicator";
@@ -12058,12 +12309,12 @@
find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "find-file-in-project";
- version = "5.4.5";
+ version = "5.4.6";
src = fetchFromGitHub {
owner = "technomancy";
repo = "find-file-in-project";
- rev = "9e308e69883cb43e136a2e9d4f0db495b457b82d";
- sha256 = "0bzbqm8wq8gbz0a18d35ksv0yf65giwcdxhrqzklsxgn9v7p73b8";
+ rev = "31ebfd65d254904ba3e5ec96507c0b01d7768940";
+ sha256 = "1xy7a6crng5x7k0x810ijrm882gm597ljwzi4cj2i93js625cw2b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project";
@@ -12356,22 +12607,22 @@
license = lib.licenses.free;
};
}) {};
- flow-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ flow-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "flow-minor-mode";
- version = "0.1";
+ version = "0.3";
src = fetchFromGitHub {
owner = "an-sh";
repo = "flow-minor-mode";
- rev = "eb2372b0acf740ed3c5f9c048addbb8048e04458";
- sha256 = "0ajdzpjghm7iscv2c6nwwx4v1639map104ldsi978iw8hy7m1mmp";
+ rev = "50dded94ad201fdc9453656a8b15179981cd5acd";
+ sha256 = "1vaqml0ypbc14mnwycgm9slkds3bgg6x5qz99kck98acbcfijxk6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/66504f789069922ea56f268f4da90fac52b601ff/recipes/flow-minor-mode";
sha256 = "190dv225sb37jawzrasd7qkbznrmkrdnb90l44il63vrlmjv3r1s";
name = "flow-minor-mode";
};
- packageRequires = [];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/flow-minor-mode";
license = lib.licenses.free;
@@ -12566,6 +12817,27 @@
license = lib.licenses.free;
};
}) {};
+ flycheck-crystal = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+ melpaBuild {
+ pname = "flycheck-crystal";
+ version = "0.1.0";
+ src = fetchFromGitHub {
+ owner = "crystal-lang-tools";
+ repo = "emacs-crystal-mode";
+ rev = "0fe6815201bebe4c5ff6857bd541d95b05132b10";
+ sha256 = "0r75dvc0jqcqi1qjns8zj132dnm0s6mvqlqynkis16nigbawix8m";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/c718f809af30226611358f9aaed7519e52923fd3/recipes/flycheck-crystal";
+ sha256 = "04avxav2rayprm09xkphs1ni10j1kk10j7m77afcac0gnma5rwyn";
+ name = "flycheck-crystal";
+ };
+ packageRequires = [ flycheck ];
+ meta = {
+ homepage = "https://melpa.org/#/flycheck-crystal";
+ license = lib.licenses.free;
+ };
+ }) {};
flycheck-dmd-dub = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-dmd-dub";
@@ -12800,12 +13072,12 @@
flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-objc-clang";
- version = "2.0.0";
+ version = "2.0.1";
src = fetchFromGitHub {
owner = "GyazSquare";
repo = "flycheck-objc-clang";
- rev = "29a9eb320d62400564360986f7ad400b74070d8e";
- sha256 = "0b4vwbxzhds9vb4nknfdywvfpr1gkk86vsbbq6f5ds0pfk75x022";
+ rev = "07f17d1dbe878fdcabac791a8916ddf643571a68";
+ sha256 = "03624xn6g1ybcjw634c7nd5s2yllwfffk2gzn5hm70vfz06q7wb9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang";
@@ -12926,12 +13198,12 @@
flycheck-pycheckers = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-pycheckers";
- version = "0.4";
+ version = "0.5";
src = fetchFromGitHub {
owner = "msherry";
repo = "flycheck-pycheckers";
- rev = "a3d39139dbe5cdaa64dda90907bb8653f196c71e";
- sha256 = "1i1kliy0n9b7b0rby419030n35f59xb8952widaszz4z8qb7xw9k";
+ rev = "6f7c6d7db4d3209897c4b15511bfaed4562ac5e4";
+ sha256 = "0mg2165zsrkn8w7anjyrfgkr66ynhm1fv43f5p8wg6g0afss9763";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/af36dca316b318d25d65c9e842f15f736e19ea63/recipes/flycheck-pycheckers";
@@ -13031,12 +13303,12 @@
flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-swift3";
- version = "2.0.0";
+ version = "2.0.1";
src = fetchFromGitHub {
owner = "GyazSquare";
repo = "flycheck-swift3";
- rev = "756833425f51baa9eb0a2fa7493df6e68612c88d";
- sha256 = "1hvrg717q0nlz4r8wby82gs3vdx8fdhf38rg4j77j3fqfmxdd3fi";
+ rev = "34973cd28ca5e63f8f6328a17fd7b78cc913b93d";
+ sha256 = "1iy6j05dzpi7pi87y6rpjzmlnl2s9izqpbzknis2kx9072qddm3q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3";
@@ -13850,12 +14122,12 @@
fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fountain-mode";
- version = "2.3.1";
+ version = "2.4.1";
src = fetchFromGitHub {
owner = "rnkn";
repo = "fountain-mode";
- rev = "5c63d2f199e96bdf8fd60d375b2b6e305a5f9017";
- sha256 = "0vxizl4pr0668b1d94wrl42li2709srvnn5likn8lskv2mv0bnvn";
+ rev = "f1dc9dff6779c0ce6ab0a1c0ae349df1194a314f";
+ sha256 = "0j1s6qws773aq3si7pnc1xmlrh9x3v3sfdni6pnlsirv2sc7c4g9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode";
@@ -14467,12 +14739,12 @@
ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ghub";
- version = "1.2.0";
+ version = "1.3.0";
src = fetchFromGitHub {
owner = "magit";
repo = "ghub";
- rev = "da60fa2316bf829cab18676afd5a43088ac06b60";
- sha256 = "0aj0ayh4jvpxwqss5805qnklqbp9krzbh689syyz65ja6r0r2bgs";
+ rev = "d8ec78184ec82d363fb0ac5bab724f390ee71d3d";
+ sha256 = "194nf5kjkxgxqjmxlr9q6r4p9kxcsm9qx8pcagxbhvmfyh6km71h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d5db83957187c9b65f697eba7e4c3320567cf4ab/recipes/ghub";
@@ -15367,6 +15639,27 @@
license = lib.licenses.free;
};
}) {};
+ go-dlv = callPackage ({ fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
+ melpaBuild {
+ pname = "go-dlv";
+ version = "0.1.0";
+ src = fetchFromGitHub {
+ owner = "benma";
+ repo = "go-dlv.el";
+ rev = "45a9e8a047c9995eb7c802268d96b3e527569f41";
+ sha256 = "0pph99fl3bwws9vr1r8fs411frd04rfdhl87fy2a75cqcpxlhsj4";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/go-dlv";
+ sha256 = "0lb5v9pmd6m8nvk4c9gcda5dmshrf5812gg1arq5p2g0nzg32mm8";
+ name = "go-dlv";
+ };
+ packageRequires = [ go-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/go-dlv";
+ license = lib.licenses.free;
+ };
+ }) {};
go-eldoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
melpaBuild {
pname = "go-eldoc";
@@ -15409,6 +15702,27 @@
license = lib.licenses.free;
};
}) {};
+ go-fill-struct = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "go-fill-struct";
+ version = "0.1";
+ src = fetchFromGitHub {
+ owner = "s-kostyaev";
+ repo = "go-fill-struct";
+ rev = "3c97c92e78f3629a7a1069404c7c641881c16d0e";
+ sha256 = "0ara9qqv31pr7dpcby6xp24llf79m0dmwrx4yv6w0bhxi197fmlx";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0c03d2382efd20e248b27b5505cdeed67d000f73/recipes/go-fill-struct";
+ sha256 = "19xxqb836saxigvwdqf4xv0y9zrl7csv97x0facgyjyiqmwhx3x7";
+ name = "go-fill-struct";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/go-fill-struct";
+ license = lib.licenses.free;
+ };
+ }) {};
go-guru = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
melpaBuild {
pname = "go-guru";
@@ -15535,6 +15849,27 @@
license = lib.licenses.free;
};
}) {};
+ go-tag = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
+ melpaBuild {
+ pname = "go-tag";
+ version = "1.0.1";
+ src = fetchFromGitHub {
+ owner = "brantou";
+ repo = "emacs-go-tag";
+ rev = "a239f58bbef2629086d9e2cf90a64ba3d389a8a3";
+ sha256 = "1w1m05ypl94xn2qvypbgvjhq7gysi13g42pqwlmppgsdh1kphwha";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/fc4cd3fd8fb0707912e205b9d71789ea8126c442/recipes/go-tag";
+ sha256 = "18ff41i0gr708fl4gzzspf9cc09nv4wy21wsn609yhwlh7w0vs1f";
+ name = "go-tag";
+ };
+ packageRequires = [ emacs go-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/go-tag";
+ license = lib.licenses.free;
+ };
+ }) {};
godoctor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "godoctor";
@@ -15706,12 +16041,12 @@
goto-chg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "goto-chg";
- version = "1.7";
+ version = "1.7.2";
src = fetchFromGitHub {
owner = "emacs-evil";
repo = "goto-chg";
- rev = "171b1331022caf12d8c3593e9b5075f87ee958d4";
- sha256 = "1jcnrin4j1x8p63fd9r37dq1vr5a7a1nvzk6kp0bdsgn9vbjmapc";
+ rev = "e5b38e4e1378f6ea48fa9e8439f49c2998654aa4";
+ sha256 = "1fxdvgdafavc4sad5i8g0wvpdqzlgzmvfi07yrah1c5vwkrslbvj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cf1fc176430fe3ab55ce537a0efc59780bb812be/recipes/goto-chg";
@@ -15874,12 +16209,12 @@
grails-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "grails-mode";
- version = "1.0.2";
+ version = "2.0";
src = fetchFromGitHub {
owner = "Groovy-Emacs-Modes";
repo = "groovy-emacs-modes";
- rev = "f8e9628916d4d41e1816b53d02f0b5a00c499555";
- sha256 = "1myb15n207yl2cgacmn105r1xbjq076paq6anvw53smy3fhw9sh9";
+ rev = "d7b362e6186d263ec3eefc141dbb5b27a8773f24";
+ sha256 = "0c1d4cbnlny8gpcd20zr1wxx6ggf28jgh7sgd5r1skpsvjpbfqx2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode";
@@ -15916,12 +16251,12 @@
grandshell-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "grandshell-theme";
- version = "1.1";
+ version = "1.3";
src = fetchFromGitHub {
owner = "steckerhalter";
repo = "grandshell-theme";
- rev = "f9dbaa341fce72f9deaf69bfaa09282168ebaf9d";
- sha256 = "03lr4gim7yynwx0n06dd1vy6hbizxwc8hcwzz1gbvla2509njga7";
+ rev = "22c8df52c0fb8899fa748fa2980947ab38b53380";
+ sha256 = "08556ci80iycm4qkvbnrci55wyv91b4fh6sjp0im0ywndmrq3yyc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b04b0024f5a0367e2998d35ca88c2613a8e3470/recipes/grandshell-theme";
@@ -16074,12 +16409,12 @@
green-screen-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "green-screen-theme";
- version = "1.0.0.1";
+ version = "1.0.24";
src = fetchFromGitHub {
owner = "rbanffy";
repo = "green-screen-emacs";
- rev = "e47e3eb903b4d9dbcc66342d91915947b35e5e1e";
- sha256 = "0gv434aab9ar624l4r7ky4ksvkchzlgj8pyvkc73kfqcxg084pdn";
+ rev = "c348ea0adf0e6ae99294a05be183a7b425a4bab0";
+ sha256 = "1rqhac5j06gpc9gp44g4r3zdkw1baskwrz3bw1n1haw4a1k0657q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/821744ca106f1b74941524782e4581fc93800fed/recipes/green-screen-theme";
@@ -16153,22 +16488,22 @@
license = lib.licenses.free;
};
}) {};
- groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ groovy-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "groovy-mode";
- version = "1.0.2";
+ version = "2.0";
src = fetchFromGitHub {
owner = "Groovy-Emacs-Modes";
repo = "groovy-emacs-modes";
- rev = "f8e9628916d4d41e1816b53d02f0b5a00c499555";
- sha256 = "1myb15n207yl2cgacmn105r1xbjq076paq6anvw53smy3fhw9sh9";
+ rev = "d7b362e6186d263ec3eefc141dbb5b27a8773f24";
+ sha256 = "0c1d4cbnlny8gpcd20zr1wxx6ggf28jgh7sgd5r1skpsvjpbfqx2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode";
sha256 = "1pxw7rdn56klmr6kw21lhzh7zhp338gyf54ypsml64ibzr1x9kal";
name = "groovy-mode";
};
- packageRequires = [];
+ packageRequires = [ emacs s ];
meta = {
homepage = "https://melpa.org/#/groovy-mode";
license = lib.licenses.free;
@@ -16303,12 +16638,12 @@
guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }:
melpaBuild {
pname = "guix";
- version = "0.3.3";
+ version = "0.3.4";
src = fetchFromGitHub {
owner = "alezost";
repo = "guix.el";
- rev = "54bd174b514c5de11e82c4263ac2723addb0fe87";
- sha256 = "1i5kwzwlb6lx65rgixm8mbdi6x03n0hb4hbc7j76lar4j58ypwz2";
+ rev = "a43828f6e5d6dc4e623a4b78e0dfdddbf5b20185";
+ sha256 = "0c19njb5cg6g3fav9322hkbl4h9zwcbymhc5wr0k9yqi7pv8gz0v";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix";
@@ -16680,12 +17015,12 @@
hasky-stack = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }:
melpaBuild {
pname = "hasky-stack";
- version = "0.6.0";
+ version = "0.7.0";
src = fetchFromGitHub {
owner = "hasky-mode";
repo = "hasky-stack";
- rev = "a3f890fb8570369898ee9718b128d4e7123a6585";
- sha256 = "0bc5i4s7aclwrsh8yrhfwwlfbcs5hdbzm31glikd487asv30jq9c";
+ rev = "17b9facafcff8203012c037c5a589f290169fc33";
+ sha256 = "00k13sl2yjnqjjdqlmz8ril07xw5al2ysbsnpmz81sccqa1kbikr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c3faf544872478c3bccf2fe7dc51d406031e4d80/recipes/hasky-stack";
@@ -16743,12 +17078,12 @@
helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
melpaBuild {
pname = "helm";
- version = "2.8.6";
+ version = "2.8.7";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
- rev = "cec6fb275fa37715bbcbf2abc716457521065068";
- sha256 = "1n2yg03adjlknhf123d7xanhnny4v42p14xjvh1ibbgnxg083p7y";
+ rev = "5b2057c7755f6ea20e1ea011c6fb992d12650161";
+ sha256 = "0hf27j1rv3xnnari70k7p1b51pdyv6zsp1r6b8xk4qwp8y0crpx9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -17079,12 +17414,12 @@
helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "helm-core";
- version = "2.8.6";
+ version = "2.8.7";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
- rev = "cec6fb275fa37715bbcbf2abc716457521065068";
- sha256 = "1n2yg03adjlknhf123d7xanhnny4v42p14xjvh1ibbgnxg083p7y";
+ rev = "5b2057c7755f6ea20e1ea011c6fb992d12650161";
+ sha256 = "0hf27j1rv3xnnari70k7p1b51pdyv6zsp1r6b8xk4qwp8y0crpx9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -17769,27 +18104,6 @@
license = lib.licenses.free;
};
}) {};
- helm-package = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
- melpaBuild {
- pname = "helm-package";
- version = "0.3";
- src = fetchFromGitHub {
- owner = "syohex";
- repo = "emacs-helm-package";
- rev = "117f5f26c96c0854aadaf9c52aaec961195d5798";
- sha256 = "14ad0b9d07chabjclffjyvnmrasar1di9wmpzf78bw5yg99cbisw";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/e31f4e01891b6a863a38da45eeea57ec656b5813/recipes/helm-package";
- sha256 = "1qab2abx52xcqrnxzl0m3533ngp8m1cqmm3hgpzgx7yfrkanyi4y";
- name = "helm-package";
- };
- packageRequires = [ cl-lib helm ];
- meta = {
- homepage = "https://melpa.org/#/helm-package";
- license = lib.licenses.free;
- };
- }) {};
helm-pages = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-pages";
@@ -18213,12 +18527,12 @@
helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-tramp";
- version = "0.6.4";
+ version = "0.8.5";
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-helm-tramp";
- rev = "d90be189d8c2b742c9621ff28b1196be683cdb4c";
- sha256 = "1hi7zw4p3w8a14fqv6w2bc0anrjb6d4vglwhmaz50qr2w3plxq15";
+ rev = "ee7f6a2c09df5fdc28b4d910840a7c56922059c3";
+ sha256 = "0lkzi6h6wkm19mn7v6wjy50kd96k6hw7jhx7pxwgfp577816c7c2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp";
@@ -18315,22 +18629,22 @@
license = lib.licenses.free;
};
}) {};
- helpful = callPackage ({ dash, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+ helpful = callPackage ({ dash, dash-functional, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
melpaBuild {
pname = "helpful";
- version = "0.2";
+ version = "0.5";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "helpful";
- rev = "b9a06978b6ffcd7f0ea213a6f534fa39318f0050";
- sha256 = "1czqvmlca3w7n28c04dl3ljn8gbvfc565lysxlrhvgmv08iagnxm";
+ rev = "9fdbf5b24df28b046731db1c7a1cc90338d55dce";
+ sha256 = "13kw0i4vhd8fgwgchap5qxckvhs00ifr7z68whnd3xzklx3v47bj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful";
sha256 = "17w9j5v1r2c8ka1fpzbr295cgnsbiw8fxlslh4zbjqzaazamchn2";
name = "helpful";
};
- packageRequires = [ dash elisp-refs emacs s ];
+ packageRequires = [ dash dash-functional elisp-refs emacs s shut-up ];
meta = {
homepage = "https://melpa.org/#/helpful";
license = lib.licenses.free;
@@ -18570,12 +18884,12 @@
hindent = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hindent";
- version = "5.2.4";
+ version = "5.2.5";
src = fetchFromGitHub {
owner = "chrisdone";
repo = "hindent";
- rev = "e18ec3f55e288883f8042065190572e91651733d";
- sha256 = "0iq4hs2r56rnsxfjda5acd0s2wrza7jd5jsawnzbyix1vnbgp98z";
+ rev = "cba1110ca413a41a443b8368d63d295d7d36de7a";
+ sha256 = "020dj6q483b7fabspgvnjqw0rhrgj3q1ncdcpafmyn1fgip5y0zq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent";
@@ -19092,6 +19406,27 @@
license = lib.licenses.free;
};
}) {};
+ ialign = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "ialign";
+ version = "0.2.0";
+ src = fetchFromGitHub {
+ owner = "mkcms";
+ repo = "interactive-align";
+ rev = "df591e452f9a56c69fb69de961baa75751bae3d8";
+ sha256 = "1k3c0wxbn6yrd75275ny66avp70qpd3glnmagsgq3x8mbyxh233d";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/072f1f7ce17e2972863bce10af9c52b3c6502eab/recipes/ialign";
+ sha256 = "070a0fa2vbdfvbnpbzv4z0c7311lf8sy2zw2ifn9k548n4l8k62j";
+ name = "ialign";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/ialign";
+ license = lib.licenses.free;
+ };
+ }) {};
ibuffer-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
melpaBuild {
pname = "ibuffer-projectile";
@@ -19788,12 +20123,12 @@
inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "inf-clojure";
- version = "2.0.1";
+ version = "2.1.0";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "inf-clojure";
- rev = "956b22e7941d71216799ca4e8d5244e94fad9558";
- sha256 = "1wakfwmb43na3g2yqign764kwi791x7ikzmf76pkdpky70a5dkhz";
+ rev = "247ca70f8ba5104be292aea20fbde6adb37e359f";
+ sha256 = "11hyva006bc4hbhzjwb4brilm6fb7qfm5h66nl0gmmyva40y6412";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure";
@@ -20141,6 +20476,27 @@
license = lib.licenses.free;
};
}) {};
+ ipython-shell-send = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "ipython-shell-send";
+ version = "1.0.2";
+ src = fetchFromGitHub {
+ owner = "jackkamm";
+ repo = "ipython-shell-send-el";
+ rev = "36523a387c15ee1652a5b0e291d4d4838da5e912";
+ sha256 = "1iba7jpagc0n436pbylpcbwbdxk6bw7y0i7pjgxxwfm8akaj9i68";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/9d3513d38f94de4d86124b5d5a33be8d5f0bfa43/recipes/ipython-shell-send";
+ sha256 = "07im2f3890yxpcy4qz1bihi68aslam7qir4vqf05bhqlgaqzamv8";
+ name = "ipython-shell-send";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/ipython-shell-send";
+ license = lib.licenses.free;
+ };
+ }) {};
ir-black-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ir-black-theme";
@@ -20228,12 +20584,12 @@
ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ivy";
- version = "0.9.1";
+ version = "0.10.0";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "f4b433436668ac09f3d1815fbfb4b71f3e0690fa";
- sha256 = "10jffa503a6jid34smh0njnhlv27r9vyhwlpf00f13c5i8nh2xjf";
+ rev = "4a2cee03519f98cf95b29905dec2566a39ff717e";
+ sha256 = "14vnigqb5c3yi4q9ysw1fiwdqyqwyklqpb9wnjf81chm7s2mshnr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -20333,12 +20689,12 @@
ivy-hydra = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, ivy, lib, melpaBuild }:
melpaBuild {
pname = "ivy-hydra";
- version = "0.9.1";
+ version = "0.10.0";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "f4b433436668ac09f3d1815fbfb4b71f3e0690fa";
- sha256 = "10jffa503a6jid34smh0njnhlv27r9vyhwlpf00f13c5i8nh2xjf";
+ rev = "4a2cee03519f98cf95b29905dec2566a39ff717e";
+ sha256 = "14vnigqb5c3yi4q9ysw1fiwdqyqwyklqpb9wnjf81chm7s2mshnr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -20772,12 +21128,12 @@
js-auto-format-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "js-auto-format-mode";
- version = "1.0.2";
+ version = "1.0.6";
src = fetchFromGitHub {
owner = "ybiquitous";
repo = "js-auto-format-mode";
- rev = "e0b7ae9d1d70fa74abd91bb6f901bd46db5a22eb";
- sha256 = "1z5vi8681afm7jsqwifnb35sja1s4b2j123b3pn0bv1j6b8iaq9j";
+ rev = "37e83641fd5eab45e813e4bc74a835fe7229c160";
+ sha256 = "0hmrhp3lijd77kl0b98nbl1p8fmgjfry2hhvh5vickx3315w7qgw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2d3be16771b5b5fde639da3ee97890620354ee7a/recipes/js-auto-format-mode";
@@ -20790,22 +21146,22 @@
license = lib.licenses.free;
};
}) {};
- js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ js-comint = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "js-comint";
- version = "1.1.0";
+ version = "1.1.1";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "js-comint";
- rev = "2c19fafed953ea0972ff086614f86614f4d5dc13";
- sha256 = "1ljsq02g8jcv98c8zc5307g2pqvgpbgj9g0a5gzpz27m440b85sp";
+ rev = "83e932e4a83d1a69098ee87e0ab911d299368e60";
+ sha256 = "1r2fwsdfkbqnm4n4dwlp7gc267ghj4vd0naj431w7pl529dmrb6x";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bc9d20b95e369e5a73c85a4a9385d3a8f9edd4ca/recipes/js-comint";
sha256 = "0jvkjb0rmh87mf20v6rjapi2j6qv8klixy0y0kmh3shylkni3an1";
name = "js-comint";
};
- packageRequires = [];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/js-comint";
license = lib.licenses.free;
@@ -21213,12 +21569,12 @@
kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "kaolin-themes";
- version = "1.0.5";
+ version = "1.1.1";
src = fetchFromGitHub {
owner = "ogdenwebb";
repo = "emacs-kaolin-themes";
- rev = "08e13adfab07c9cf7b0df313c77eac8fb393b284";
- sha256 = "0wijf5493wmp219ypbvhp0c4q76igrxijzdalbgkyp2gf8xvq6b4";
+ rev = "d4a1cbae1fc77192e5844291821709c82c9dc455";
+ sha256 = "04k2yz3vrj1h0zf6cz0jd97fg8zah2j980l5ycsgyy0dk9ysink8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes";
@@ -22207,12 +22563,12 @@
live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "live-py-mode";
- version = "2.19.1";
+ version = "2.20.1";
src = fetchFromGitHub {
owner = "donkirkby";
repo = "live-py-plugin";
- rev = "b6627fdd25fe6d866fe5a53c8bf7923ffd8ab9f9";
- sha256 = "1z17z58rp65qln6lv2l390df2bf6dpnrqdh0q352r4wqzzki8gqn";
+ rev = "eed38dc66430802e754c48bb44aaf524d7b1596c";
+ sha256 = "1rl279h18z9fka4zdaqm2h4jxpq3wykja3x7jyhj4bnrqvkw66gh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@@ -22882,22 +23238,22 @@
license = lib.licenses.free;
};
}) {};
- magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, lib, magit, melpaBuild, s }:
+ magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, git-commit, lib, magit, markdown-mode, melpaBuild, s }:
melpaBuild {
pname = "magithub";
- version = "0.1.4";
+ version = "0.1.5";
src = fetchFromGitHub {
owner = "vermiculus";
repo = "magithub";
- rev = "2fcd5eebf3e052234950b3b07e43d26ce632a794";
- sha256 = "0k5bxxfj60vr58g7rnj562ls8ijb0ia66fdiqpyffi5sf0wan13i";
+ rev = "08a1c1341d0982248ec86e1697fa1b6418cd80f5";
+ sha256 = "062xghazkm8lh207fpqp7csd3nwgkz47g831hqa94iz28n97x0pq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub";
sha256 = "11par5rncsa866gazdw98d4902rvyjnnwbiwpndlyh06ak0lryab";
name = "magithub";
};
- packageRequires = [ emacs ghub-plus magit s ];
+ packageRequires = [ emacs ghub-plus git-commit magit markdown-mode s ];
meta = {
homepage = "https://melpa.org/#/magithub";
license = lib.licenses.free;
@@ -23228,12 +23584,12 @@
mastodon = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mastodon";
- version = "0.7.0";
+ version = "0.7.1";
src = fetchFromGitHub {
owner = "jdenen";
repo = "mastodon.el";
- rev = "a9e595142eee69fe84f0ab06f7fde76cef27cdac";
- sha256 = "1wgx8i6ww9w99f0f62p7v626bb6pvdg04hnhqyjgsmb99wzwlpk7";
+ rev = "e08bb5794762d22f90e85fd65cef7c143e6b9318";
+ sha256 = "0bil0xxava04pd4acjqm3bfqm1kjdk4g0czd4zqvacsp5c9sl2qp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/809d963b69b154325faaf61e54ca87b94c1c9a90/recipes/mastodon";
@@ -23417,12 +23773,12 @@
meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "meghanada";
- version = "0.8.3";
+ version = "0.9.0";
src = fetchFromGitHub {
owner = "mopemope";
repo = "meghanada-emacs";
- rev = "af65a0c60bbdda051e0d8ab0b7213249eb6703c5";
- sha256 = "08sxy81arypdj22bp6pdniwxxbhakay4ndvyvl7a6vjvn38ppzw8";
+ rev = "98ad6a5361c725319a355522d2d1ba0e0fbb7cde";
+ sha256 = "06iryz4dbldc9vxy67g977hih8r1bfvjld53lvwnjsc7r3x9i07q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -23564,12 +23920,12 @@
metaweblog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }:
melpaBuild {
pname = "metaweblog";
- version = "1.0.0";
+ version = "1.0.1";
src = fetchFromGitHub {
owner = "punchagan";
repo = "metaweblog";
- rev = "2200eacde17edb66bbdde9c0b6b65481f40d498b";
- sha256 = "116m0v73v636xvsq46i3qhd4wy3x7zk3k8ffmsx36ksphn9kwx0k";
+ rev = "aa14380eb7e7b879a0c16c96866b20a987cd3f2a";
+ sha256 = "146w9laysdqbikpzr2gc9vnjrdsa87d8i13f2swlh1kvq2dn3rz5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/metaweblog";
@@ -24046,12 +24402,12 @@
monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "monokai-theme";
- version = "3.4.0";
+ version = "3.5.0";
src = fetchFromGitHub {
owner = "oneKelvinSmith";
repo = "monokai-emacs";
- rev = "019e07947426f0192fc3458f3f72c19031b607de";
- sha256 = "0id35345zp0fchbcz8qk2lg71jyln91k56vfama27ss3nzy3f9kz";
+ rev = "bb5cbbd5895b8b3fbc6af572b1fd0aacd4988a8a";
+ sha256 = "1f0jl4a3b6i9skbcym0qzpszy620385m947l2ba2wxf1na7rc626";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme";
@@ -24172,12 +24528,12 @@
mowedline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mowedline";
- version = "3.2.0";
+ version = "3.3.0";
src = fetchFromGitHub {
owner = "retroj";
repo = "mowedline";
- rev = "832e81b7f90f6c2e753f89737c0b57a260544424";
- sha256 = "1ll0ywrzpc5ignddgri8xakf93q1rg8zf7h23hfv8jiiwv3240w5";
+ rev = "c17501b48ded8261d815ab60bf14cddf7040be72";
+ sha256 = "1k3b018xq2qqq30v0ik13imy9c84241kyavj5ascxhywx956v18g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/86f7df6b8df3398ef476c0ed31722b03f16b2fec/recipes/mowedline";
@@ -24277,12 +24633,12 @@
msvc = callPackage ({ ac-clang, cedet ? null, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "msvc";
- version = "1.3.5";
+ version = "1.3.7";
src = fetchFromGitHub {
owner = "yaruopooner";
repo = "msvc";
- rev = "bb9af3aee0e82d6a78a49a9af61ce47fab32d577";
- sha256 = "1vxgdc19jiamymrazikdikdrhw5vmzanzr326s3rx7sbc2nb7lrk";
+ rev = "dfc529aa6da8b46b0a0c7db9a0e5e9bc33ab1fb3";
+ sha256 = "19n9an0nznwqw3ml022i6vidqbrgxf4yff0nbvvcb91ppc1saf40";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/69939b85353a23f374cab996ede879ab315a323b/recipes/msvc";
@@ -24400,6 +24756,26 @@
license = lib.licenses.free;
};
}) {};
+ multi-project = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "multi-project";
+ version = "0.0.26";
+ src = fetchhg {
+ url = "https://bitbucket.com/ellisvelo/multi-project";
+ rev = "a6e7c1542c0b";
+ sha256 = "1wh7xlas6chdliya847092j5rkngxxg1m9a98y2r782ywgyl7xv6";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/multi-project";
+ sha256 = "19dy2wl5ad1xldiznlw2vjvr9ja8h9wiv6igcggixq56fhngp40x";
+ name = "multi-project";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/multi-project";
+ license = lib.licenses.free;
+ };
+ }) {};
multi-term = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "multi-term";
@@ -25114,11 +25490,11 @@
}) {};
notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "notmuch";
- version = "0.25.2";
+ version = "0.26pre2";
src = fetchgit {
url = "git://git.notmuchmail.org/git/notmuch";
- rev = "83f266136369452b859393429b8530efac2e09fb";
- sha256 = "0idim2yslpjzbzy5hh9qhw1gy0h9p92rs0jrr8d2l9y8nsnh6zzr";
+ rev = "4cb1eeba83416a12c616aca6469c027b8b8a303d";
+ sha256 = "0brcdwblfj3nb2ca0izvhlm3x1pf0r72wsa9f2hf0ssnh9w2z40s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -25383,6 +25759,27 @@
license = lib.licenses.free;
};
}) {};
+ ob-coffeescript = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "ob-coffeescript";
+ version = "1.0.0";
+ src = fetchFromGitHub {
+ owner = "brantou";
+ repo = "ob-coffeescript";
+ rev = "b70f3d822c707cb02333fcb739ba4874614cad2a";
+ sha256 = "0284v3km41427q7dr0wmvf3zhbsgzj0j2r9zny0g3n85qvyk0rgd";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ba1a808c77653bac1948d6c44bd1db09301ffeff/recipes/ob-coffeescript";
+ sha256 = "05q1wnabw52kd3fpcpinpxs9z6xmi4n1p19jbcz0bgjpnw05s27p";
+ name = "ob-coffeescript";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/ob-coffeescript";
+ license = lib.licenses.free;
+ };
+ }) {};
ob-http = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "ob-http";
@@ -25404,6 +25801,27 @@
license = lib.licenses.free;
};
}) {};
+ ob-hy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "ob-hy";
+ version = "1.0.0";
+ 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-prolog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ob-prolog";
@@ -25635,22 +26053,22 @@
license = lib.licenses.free;
};
}) {};
- olivetti = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ olivetti = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "olivetti";
- version = "1.5.8";
+ version = "1.5.9";
src = fetchFromGitHub {
owner = "rnkn";
repo = "olivetti";
- rev = "9bd41082a593ba90f3e9e34d3ffc29bbb276b674";
- sha256 = "0j33wn2kda5fi906h6y0zd5d0ygw0jg576kdndc3zyb4pxby96dn";
+ rev = "35d275d8bdfc5107c25db5a4995b65ba936f1d56";
+ sha256 = "00havcpsbk54xfcys9lhm9sv1d753jk3cmvssa2c52pp5frpxz3i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti";
sha256 = "0fkvw2y8r4ww2ar9505xls44j0rcrxc884p5srf1q47011v69mhd";
name = "olivetti";
};
- packageRequires = [];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/olivetti";
license = lib.licenses.free;
@@ -25768,8 +26186,8 @@
src = fetchFromGitHub {
owner = "OmniSharp";
repo = "omnisharp-emacs";
- rev = "b0c61e91d1b600875ad2eae06fe72a179a3028b6";
- sha256 = "1b0y20r9rimarfa1zgid78jh1zyzykdxd07n3vzam6ds9diygzxd";
+ rev = "95f56022edf9fcaba8402db05a6927af050b12a8";
+ sha256 = "133maq29hfjaq4vilz9wvr9vjkschkpydkw2197sscv7whfzv78j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
@@ -26297,22 +26715,22 @@
license = lib.licenses.free;
};
}) {};
- org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
+ org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }:
melpaBuild {
pname = "org-jira";
- version = "2.8.0";
+ version = "3.0.0";
src = fetchFromGitHub {
owner = "ahungry";
repo = "org-jira";
- rev = "9315d871556ebe92e766544ff5210dc85ad1ef33";
- sha256 = "03ddwdzby0s3km0a3dmn6mfdp2zsiqyrddvpp8mgj77rb039g08k";
+ rev = "51a1b2248ec421aecdd38aaf5c2876a036b08bb7";
+ sha256 = "0zyh5nn9hgiz0ic67ypahaah5f3vjmall7z0ffn4gl0fy22sar6h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira";
sha256 = "0dvh9k0i75jxyy3v01c4cfyws8ij6718hsivi2xyrgig7pwp16ib";
name = "org-jira";
};
- packageRequires = [ cl-lib emacs request ];
+ packageRequires = [ cl-lib emacs request s ];
meta = {
homepage = "https://melpa.org/#/org-jira";
license = lib.licenses.free;
@@ -26614,12 +27032,12 @@
org-random-todo = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-random-todo";
- version = "0.5";
+ version = "0.5.2";
src = fetchFromGitHub {
owner = "unhammer";
repo = "org-random-todo";
- rev = "14a065e1d376838f16a6ba32ed8710304542a4e6";
- sha256 = "07qkn59613l32j6b06ckmccl9s2rfwwivmak5v86z0fafzhxk6ir";
+ rev = "60364c18725d2f3898a9099e7e546ae406dd6578";
+ sha256 = "0k86hqmqilvkam886mb85v991ivwnglallwj4l9ghszl7awy207m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/80fad6244ea3e5bdf7f448c9f62374fae45bae78/recipes/org-random-todo";
@@ -26688,12 +27106,12 @@
org-repo-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-repo-todo";
- version = "0.0.2";
+ version = "0.0.3";
src = fetchFromGitHub {
owner = "waymondo";
repo = "org-repo-todo";
- rev = "904a26089d87db59a40421d6f857b189e70dfbe3";
- sha256 = "03c88jzwvl95dl39703mknkvnk3cmw4gss5c1y2k9py2rgh6bpr9";
+ rev = "cba6145c6821fd2bbd96a1c9ef2346c281b76ad2";
+ sha256 = "0b57qy87sa8qcki16rgh16ldziay57yd7f98cpinaq0adcrqywy0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d17b602004628e17dae0f46f2b33be0afb05f729/recipes/org-repo-todo";
@@ -26979,22 +27397,22 @@
license = lib.licenses.free;
};
}) {};
- org2blog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, metaweblog, org, xml-rpc }:
+ org2blog = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, metaweblog, org, xml-rpc }:
melpaBuild {
pname = "org2blog";
- version = "1.0.0";
+ version = "1.0.2";
src = fetchFromGitHub {
owner = "punchagan";
repo = "org2blog";
- rev = "e266ff4296661de520b73e6e18f201fb6378ba05";
- sha256 = "030fwgwn2xsi6nnnn4k32479hhmbr4n819yarr3n367b29al2461";
+ rev = "bd2028b6a79daa63fc5481deaed63c4efc681be0";
+ sha256 = "1qpw5bs5qjlpw3hphbf2jg0h8bdrcgrb8xavdsx8viwjl013d4ps";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org2blog";
sha256 = "1xa03k9z8fq74w0w3vfkigz24i6c8s4vib077l16vqik7wg4yh40";
name = "org2blog";
};
- packageRequires = [ metaweblog org xml-rpc ];
+ packageRequires = [ htmlize metaweblog org xml-rpc ];
meta = {
homepage = "https://melpa.org/#/org2blog";
license = lib.licenses.free;
@@ -27432,12 +27850,12 @@
ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ox-hugo";
- version = "0.6";
+ version = "0.7";
src = fetchFromGitHub {
owner = "kaushalmodi";
repo = "ox-hugo";
- rev = "1213df6c6d9adcd706306523a5ce0c66d118b4c7";
- sha256 = "1j4b7f5bgpc8vhmxprqriy3688i3lp3fgvxcnnnb2v0sjq1pbac8";
+ rev = "b47f6f79603adb4f505500ed83150afca7601cfc";
+ sha256 = "1xlkmiwgxsai0hsx9r1gx88bdj72vxaq0icr399ksnwba58rwmr1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo";
@@ -28604,12 +29022,12 @@
php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "php-mode";
- version = "1.18.2";
+ version = "1.18.4";
src = fetchFromGitHub {
owner = "ejmr";
repo = "php-mode";
- rev = "e41a44f39d5d78acc2bd59d2a614f5fc9ff80cd3";
- sha256 = "0ykdi8k6qj97r6nx9icd5idakksw1p10digfgl8r8z4qgwb00gcr";
+ rev = "ad7d1092e1d66602482c5b54ed0609c6171dcae1";
+ sha256 = "03yp07dxmxmhm8p5qcxsfdidhvnrpls20nr234cz6yamjl5zszh6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode";
@@ -29681,12 +30099,12 @@
protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "protobuf-mode";
- version = "3.5.0";
+ version = "3.5.1.1";
src = fetchFromGitHub {
owner = "google";
repo = "protobuf";
- rev = "2761122b810fe8861004ae785cc3ab39f384d342";
- sha256 = "01z3p947hyzi3p42fiqnx6lskz4inqw89lp2agqj9wfyfvag3369";
+ rev = "860bd12fec5c69e6529565165532b3d5108a7d97";
+ sha256 = "1h4xydr5j2zg1888ncn8a1jvqq8fgpgckrmjg6lqzy9jpkvqvfdk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -30056,22 +30474,22 @@
license = lib.licenses.free;
};
}) {};
- pyim = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, pyim-basedict }:
+ pyim = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pyim-basedict }:
melpaBuild {
pname = "pyim";
- version = "1.6.4";
+ version = "1.7";
src = fetchFromGitHub {
owner = "tumashu";
repo = "pyim";
- rev = "d44db4cb74c1c0cf6f814ff14d0be8e733f8404a";
- sha256 = "02b2aknx127xvl8amf74krvd7z33kyr049iw5h0665zkzsli4g8w";
+ rev = "3b1c5fbdf3b910f96771935785e28cf33d8d54cc";
+ sha256 = "1ijfsnjvyys941kgcq00d5dgnkbzj14gb7c9pks0x11bsdl0vr6p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim";
sha256 = "1ly4xhfr3irlrwvv20j3kyz98g7barridi9n8jppc0brh2dlv98j";
name = "pyim";
};
- packageRequires = [ async cl-lib emacs popup pos-tip pyim-basedict ];
+ packageRequires = [ async cl-lib emacs popup pyim-basedict ];
meta = {
homepage = "https://melpa.org/#/pyim";
license = lib.licenses.free;
@@ -30707,22 +31125,28 @@
license = lib.licenses.free;
};
}) {};
- realgud = callPackage ({ fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }:
+ realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }:
melpaBuild {
pname = "realgud";
- version = "1.4.3";
+ version = "1.4.4";
src = fetchFromGitHub {
owner = "rocky";
repo = "emacs-dbgr";
- rev = "6dc971269f6f9435e5159c2cfe66fc5e4b296df2";
- sha256 = "1pl758xp2gfy8h313ggpmqv7sjb8h6qdrqj68ypxch70k9vq76z8";
+ rev = "3804711863630affe79614a1527bc12c0955ec7c";
+ sha256 = "0fi48xh6rc7z146rafkabqhg6wy3zv85apn1bciw9pysazblq8pb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud";
sha256 = "0qmvd35ng1aqclwj3pskn58c0fi98kvx9666wp3smgj3n88vgy15";
name = "realgud";
};
- packageRequires = [ load-relative loc-changes test-simple ];
+ packageRequires = [
+ cl-lib
+ emacs
+ load-relative
+ loc-changes
+ test-simple
+ ];
meta = {
homepage = "https://melpa.org/#/realgud";
license = lib.licenses.free;
@@ -32325,12 +32749,12 @@
shackle = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "shackle";
- version = "1.0.0";
+ version = "1.0.1";
src = fetchFromGitHub {
owner = "wasamasa";
repo = "shackle";
- rev = "55df581cdb3cfaf9ebf9c54d8849f8f5775cf74b";
- sha256 = "1s59v6fnyzvgnbjcd1gpll4xp8316dqmdpi77382w0vjfcrsvbih";
+ rev = "4189c1c773aab533969b587f7801ffbcd1d7d613";
+ sha256 = "1gh30sryh884mpwxpkf0ngkcvixjrxxf4bgq4nqm9n969sr5bhsq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/806e7d00f763f3fc4e3b8ebd483070ac6c5d0f21/recipes/shackle";
@@ -32703,12 +33127,12 @@
shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "shx";
- version = "0.0.12";
+ version = "0.0.13";
src = fetchFromGitHub {
owner = "riscy";
repo = "shx-for-emacs";
- rev = "aa45e7b586b1215ca1af05c14984ce872571b5f7";
- sha256 = "0ya7vbp71vmvli35rwcwspbclss5ngr1ck9074i2gg1dzrqyxijn";
+ rev = "33383bd359d795df2d7ef725b5349c953f5a6aa8";
+ sha256 = "1arwsb6as8jpah0bs3b92a3kdnbfkhnsm1jglspfh4lqpafmx5vf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx";
@@ -33522,12 +33946,12 @@
solaire-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "solaire-mode";
- version = "1.0.2";
+ version = "1.0.4";
src = fetchFromGitHub {
owner = "hlissner";
repo = "emacs-solaire-mode";
- rev = "0f467e5f309e5a36280e06b40c0e6bbe90e06358";
- sha256 = "1jka6213sw3rqan6s31s1ndyd0h2gwxvl0rcfm4jqc68mfyikzma";
+ rev = "dd93cfd6c02e4575e6c7048ecf9dac8c09864bf2";
+ sha256 = "1afbkz93xa6f0453n7n1mrm0ng5jrdi06mh0s105gkzcfxqjc0gd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/52c69070eef3003eb53e1436c538779c74670ce6/recipes/solaire-mode";
@@ -33561,6 +33985,27 @@
license = lib.licenses.free;
};
}) {};
+ solidity-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "solidity-mode";
+ version = "0.1.8";
+ src = fetchFromGitHub {
+ owner = "ethereum";
+ repo = "emacs-solidity";
+ rev = "b5d95ef678305ca70b17e94fc2ee4289a8328048";
+ sha256 = "04l3hvfpgqiaxdxh8s2cg2rx4cy50i7a411q81g8661fx60c6h6p";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/bb9df5ec0692352b6494d435d11166f4ea26c99e/recipes/solidity-mode";
+ sha256 = "1qdzdivrf5yaa80p61b9r1gryw112v5l2m2jkvkc7glhkhrcvwsx";
+ name = "solidity-mode";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/solidity-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
sos = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "sos";
@@ -34047,12 +34492,12 @@
ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ssh-deploy";
- version = "1.3";
+ version = "1.4";
src = fetchFromGitHub {
owner = "cjohansson";
repo = "emacs-ssh-deploy";
- rev = "5cd1f8080fefb64e6eaa1098cc191db6abb97e23";
- sha256 = "0pn9wf4svka3rxzy09jarjp3ycz2bvm39898qaikjf0dwaydlqlw";
+ rev = "ab4b80e206163b09a021f7de157e8bd4ae66358b";
+ sha256 = "1c8hk7xwwlgkdw5xjcznpmajv904v2vs8mrcnmlay99r2qj3p2yx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy";
@@ -34487,12 +34932,12 @@
swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
melpaBuild {
pname = "swift-mode";
- version = "3.0";
+ version = "4.0.1";
src = fetchFromGitHub {
owner = "chrisbarrett";
repo = "swift-mode";
- rev = "e8d9a5d7af59e8be25997b8b048d7c3e257cd0b0";
- sha256 = "035478shf1crb1qnhk5rmz08xgn0z2p6fsw0yii1a4q5f3h85xrc";
+ rev = "8c45f69a078c41619a7a3db6d54a732c3fad8e3f";
+ sha256 = "1isy71vkws3ywm4iwa85dk12810az3h85n6bimd36dfqbhfwdrli";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode";
@@ -34529,12 +34974,12 @@
swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "swiper";
- version = "0.9.1";
+ version = "0.10.0";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "f4b433436668ac09f3d1815fbfb4b71f3e0690fa";
- sha256 = "10jffa503a6jid34smh0njnhlv27r9vyhwlpf00f13c5i8nh2xjf";
+ rev = "4a2cee03519f98cf95b29905dec2566a39ff717e";
+ sha256 = "14vnigqb5c3yi4q9ysw1fiwdqyqwyklqpb9wnjf81chm7s2mshnr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -34756,6 +35201,27 @@
license = lib.licenses.free;
};
}) {};
+ system-packages = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "system-packages";
+ version = "1.0.0";
+ src = fetchFromGitHub {
+ owner = "jabranham";
+ repo = "system-packages";
+ rev = "149c253583e8b4d56a851b1e91e456260749cdea";
+ sha256 = "1c0q9c0wq9kskg8p6mnh6mnkivlabb46aqfcs7ms21497ndlmlsv";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/8c423d8c1ff251bd34df20bdb8b425c2f55ae1b1/recipes/system-packages";
+ sha256 = "0cq1vb4m8phdmv3c0dj6m76fss5vp1a0hikn7a1q5l2mmns40wj1";
+ name = "system-packages";
+ };
+ packageRequires = [ cl-lib ];
+ meta = {
+ homepage = "https://melpa.org/#/system-packages";
+ license = lib.licenses.free;
+ };
+ }) {};
system-specific-settings = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "system-specific-settings";
@@ -35410,12 +35876,12 @@
thrift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "thrift";
- version = "0.10.0";
+ version = "0.11.0";
src = fetchFromGitHub {
owner = "apache";
repo = "thrift";
- rev = "b2a4d4ae21c789b689dd162deb819665567f481c";
- sha256 = "1b1fnzhy5qagbzhphgjxysad64kcq9ggcvp0wb7c7plrps72xfjh";
+ rev = "327ebb6c2b6df8bf075da02ef45a2a034e9b79ba";
+ sha256 = "1scv403g5a2081awg5za5d3parj1lg63llnnac11d6fn7j7ms99p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -35449,15 +35915,36 @@
license = lib.licenses.free;
};
}) {};
+ tidal = callPackage ({ emacs, fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }:
+ melpaBuild {
+ pname = "tidal";
+ version = "0.9.6";
+ src = fetchFromGitHub {
+ owner = "tidalcycles";
+ repo = "Tidal";
+ rev = "b96bc7842e15f6b8973df8966307db7a1c4b7406";
+ sha256 = "0g02k411xbwqv66qi2pw7r0slkvgfgvr7q41kf1czqnrmg5k4wzg";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/16a26659a16199b5bb066be6e5c4a40419bda018/recipes/tidal";
+ sha256 = "0im0qbavpykacrwww3y0mlbhf5yfx8afcyvsq5pmjjp0aw245w6a";
+ name = "tidal";
+ };
+ packageRequires = [ emacs haskell-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/tidal";
+ license = lib.licenses.free;
+ };
+ }) {};
tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }:
melpaBuild {
pname = "tide";
- version = "2.6.1";
+ version = "2.6.2";
src = fetchFromGitHub {
owner = "ananthakumaran";
repo = "tide";
- rev = "e7ffcdcf9f68205d1498137e84a731c7ffb86263";
- sha256 = "0lym5jb2fxv4zjhik4q5miazrsi96pljl6fw5jjh0i9p8xs0yp4x";
+ rev = "1ee2e6e5f6e22b180af08264e5654b26599f96fe";
+ sha256 = "0gd149vlf3297lm595xw3hc9jd45wisbrpbr505qhkffrj60q1lq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
@@ -35554,6 +36041,27 @@
license = lib.licenses.free;
};
}) {};
+ total-lines = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "total-lines";
+ version = "0.2.0";
+ src = fetchFromGitHub {
+ owner = "hinrik";
+ repo = "total-lines";
+ rev = "58a9fb0ffca63e3dfb3b27c7d91b4630e422903b";
+ sha256 = "0ajbqrkg3v0yn8mj7dsv12w9zzcwjkabd776fabxamhcj6zbvza3";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/1b6455dd89167a854477a00284f64737905b54d8/recipes/total-lines";
+ sha256 = "0zpli7gsb56fc3pzb3b2bs7dzr9glkixbzgl4p2kc249vz3jqajh";
+ name = "total-lines";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/total-lines";
+ license = lib.licenses.free;
+ };
+ }) {};
tox = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "tox";
@@ -35661,12 +36169,12 @@
treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pfuture, s }:
melpaBuild {
pname = "treemacs";
- version = "1.13.3";
+ version = "1.15.3";
src = fetchFromGitHub {
owner = "Alexander-Miller";
repo = "treemacs";
- rev = "9e12a68018e23ee10e8db48789f7358ed5375390";
- sha256 = "09bf60j5r7hv326lgpfndnz9yf5bzw02a2nvr01zx93g5bh99zcp";
+ rev = "2dabf88d5948a04d0313b0195be397761fc22b58";
+ sha256 = "0j1ampw5i3m0q69cp2nf9xr9qqxiyasjk7wmsg9nwnx7sibhfddk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs";
@@ -35682,12 +36190,12 @@
treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }:
melpaBuild {
pname = "treemacs-evil";
- version = "1.13.3";
+ version = "1.15.3";
src = fetchFromGitHub {
owner = "Alexander-Miller";
repo = "treemacs";
- rev = "9e12a68018e23ee10e8db48789f7358ed5375390";
- sha256 = "09bf60j5r7hv326lgpfndnz9yf5bzw02a2nvr01zx93g5bh99zcp";
+ rev = "2dabf88d5948a04d0313b0195be397761fc22b58";
+ sha256 = "0j1ampw5i3m0q69cp2nf9xr9qqxiyasjk7wmsg9nwnx7sibhfddk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-evil";
@@ -35703,12 +36211,12 @@
treemacs-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, treemacs }:
melpaBuild {
pname = "treemacs-projectile";
- version = "1.13.3";
+ version = "1.15.3";
src = fetchFromGitHub {
owner = "Alexander-Miller";
repo = "treemacs";
- rev = "9e12a68018e23ee10e8db48789f7358ed5375390";
- sha256 = "09bf60j5r7hv326lgpfndnz9yf5bzw02a2nvr01zx93g5bh99zcp";
+ rev = "2dabf88d5948a04d0313b0195be397761fc22b58";
+ sha256 = "0j1ampw5i3m0q69cp2nf9xr9qqxiyasjk7wmsg9nwnx7sibhfddk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-projectile";
@@ -36347,8 +36855,8 @@
sha256 = "14x01dg7fgj4icf8l8w90pksazc0sn6qrrd0k3xjr2zg1wzdcang";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package";
- sha256 = "0z7k77yfvsndql719qy4vypnwvi9izal8k8vhdx0pw8msaz4xqd8";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/51a19a251c879a566d4ae451d94fcb35e38a478b/recipes/use-package";
+ sha256 = "0d0zpgxhj6crsdi9sfy30fn3is036apm1kz8fhjg1yzdapf1jdyp";
name = "use-package";
};
packageRequires = [ bind-key diminish ];
@@ -36759,12 +37267,12 @@
vlf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "vlf";
- version = "1.7";
+ version = "1.7.1";
src = fetchFromGitHub {
owner = "m00natic";
repo = "vlfi";
- rev = "4eaf763cadac62d7a74f7b2d2436d7793c8f7b43";
- sha256 = "0vl0hwxzzvgna8sysf517qq08fi1zsff3dmcgwvsgzhc47sq8mng";
+ rev = "a01e9ed416cd81ccddebebbf05d4ca80060b07dc";
+ sha256 = "0ziz08ylhkqwj2rp6h1z1yi309f6791b9r91nvr255l2331481pm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9116b11eb513dd9e1dc9542d274dd60f183b24c4/recipes/vlf";
@@ -38207,12 +38715,12 @@
yang-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yang-mode";
- version = "0.9.4";
+ version = "0.9.7";
src = fetchFromGitHub {
owner = "mbj4668";
repo = "yang-mode";
- rev = "bcf698acbdb4df91f587942348739b407a8b0807";
- sha256 = "1rrmailvhxvivmdjamm2vvciym484cw0lqn1hgdw1lz999g5a5vs";
+ rev = "0d5d5df86dbb6cbb2de3c0f2d0d5f8c8f29d0695";
+ sha256 = "0ca55vjv9lz7w8mk2z731bia9vialrd4kv0igi09xs1mm0r2x5nv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bb42ab9b5f118baaf6766c478046552b686981a1/recipes/yang-mode";
@@ -38356,8 +38864,8 @@
version = "1.80";
src = fetchhg {
url = "https://www.yatex.org/hgrepos/yatex/";
- rev = "16763e5b7481";
- sha256 = "1mrcc9amz0kflm570bd2cprhin0z8lr668k2s56mj6shixb61dwh";
+ rev = "668632d9392e";
+ sha256 = "1d37yr7yqqg1gavi3406rv9rfvcm5ic365jhs6pispfx1kr77k6n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e28710244a1bef8f56156fe1c271520896a9c694/recipes/yatex";
diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
index 0550a1bbd3ffccb7540d6ecb3dc5493503ad81bb..6d23d508228ba00a950c062c70169534c2c0c304 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
@@ -38,6 +38,9 @@ self:
# upstream issue: mismatched filename
ack-menu = markBroken super.ack-menu;
+ # Expects bash to be at /bin/bash
+ ac-rtags = markBroken super.ac-rtags;
+
airline-themes = super.airline-themes.override {
inherit (self.melpaPackages) powerline;
};
@@ -45,10 +48,16 @@ self:
# upstream issue: missing file header
bufshow = markBroken super.bufshow;
+ # part of a larger package
+ caml = dontConfigure super.caml;
+
# part of a larger package
# upstream issue: missing package version
cmake-mode = markBroken (dontConfigure super.cmake-mode);
+ # Expects bash to be at /bin/bash
+ company-rtags = markBroken super.company-rtags;
+
# upstream issue: missing file header
connection = markBroken super.connection;
@@ -76,6 +85,9 @@ self:
inherit (self.melpaPackages) ess popup;
};
+ # upstream issue: doesn't build
+ eterm-256color = markBroken super.eterm-256color;
+
# upstream issue: missing dependency highlight
evil-search-highlight-persist = markBroken super.evil-search-highlight-persist;
@@ -85,6 +97,9 @@ self:
# missing OCaml
flycheck-ocaml = markBroken super.flycheck-ocaml;
+ # Expects bash to be at /bin/bash
+ flycheck-rtags = markBroken super.flycheck-rtags;
+
# upstream issue: missing file header
fold-dwim = markBroken super.fold-dwim;
@@ -94,12 +109,21 @@ self:
# upstream issue: mismatched filename
helm-lobsters = markBroken super.helm-lobsters;
+ # Expects bash to be at /bin/bash
+ helm-rtags = markBroken super.helm-rtags;
+
# upstream issue: missing file header
ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen;
# upstream issue: missing file header
initsplit = markBroken super.initsplit;
+ # upstream issue: recipe fails
+ insert-shebang = markBroken super.insert-shebang;
+
+ # Expects bash to be at /bin/bash
+ ivy-rtags = markBroken super.ivy-rtags;
+
# upstream issue: missing file header
jsfmt = markBroken super.jsfmt;
@@ -140,12 +164,18 @@ self:
# upstream issue: missing file header
qiita = markBroken super.qiita;
+ # upstream issue: missing file header
+ rcirc-menu = markBroken super.rcirc-menu;
+
# upstream issue: missing file header
speech-tagger = markBroken super.speech-tagger;
# upstream issue: missing file header
stgit = markBroken super.stgit;
+ # upstream issue: missing file header
+ tawny-mode = markBroken super.tawny-mode;
+
# upstream issue: missing file header
textmate = markBroken super.textmate;
diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix
index ff38319dbedfe74f7980ff1b0b2861d0250e40ea..b173dcff936c54519819a114fc9c796d7cabb403 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 = "20171127";
+ version = "20180108";
src = fetchurl {
- url = "http://orgmode.org/elpa/org-20171127.tar";
- sha256 = "0q9mbkyridz6zxkpcm7yk76iyliij1wy5sqqpcd8s6y5zy52zqwl";
+ url = "https://orgmode.org/elpa/org-20180108.tar";
+ sha256 = "02rs7zi3dzps0mlyfbgiywd2smnlw0pk8ps1nqk0d5hx3n6d15yv";
};
packageRequires = [];
meta = {
@@ -14,10 +14,10 @@
}) {};
org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org-plus-contrib";
- version = "20171127";
+ version = "20180108";
src = fetchurl {
- url = "http://orgmode.org/elpa/org-plus-contrib-20171127.tar";
- sha256 = "0759g1lnwm9fz130cigvq5y4gigbk3wdc5yvz34blnl57ghir2k8";
+ url = "https://orgmode.org/elpa/org-plus-contrib-20180108.tar";
+ sha256 = "10mhiqsrxxmhsy8dl88r456shx6ajm4w19pz259b960551r596iz";
};
packageRequires = [];
meta = {
diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix
index af3298a5883ea3abdb800c0fd7d021358c0689df..f87cc72f2f2b4570d6c124afcba31ca8e0ee925a 100644
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/pkgs/applications/editors/emacs/default.nix
@@ -36,9 +36,19 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- patches =
- [ ./clean-env.patch ]
- ++ lib.optional stdenv.isDarwin ./at-fdcwd.patch;
+ patches = [
+ ./clean-env.patch
+ ] ++ lib.optionals stdenv.isDarwin [
+ ./at-fdcwd.patch
+
+ # Backport of the fix to
+ # https://lists.gnu.org/archive/html/bug-gnu-emacs/2017-04/msg00201.html
+ # Should be removed when switching to Emacs 26.1
+ (fetchurl {
+ url = "https://gist.githubusercontent.com/aaronjensen/f45894ddf431ecbff78b1bcf533d3e6b/raw/6a5cd7f57341aba673234348d8b0d2e776f86719/Emacs-25-OS-X-use-vfork.patch";
+ sha256 = "1nlsxiaynswqhy99jf4mw9x0sndhwcrwy8713kq1l3xqv9dbrzgj";
+ })
+ ];
nativeBuildInputs = [ pkgconfig ]
++ lib.optionals srcRepo [ autoconf automake texinfo ]
diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix
index 10816e0a283fef44bb2c51e120905c54d7d8a045..4964de13986fa5429b166b647ba0a92d7cd3caba 100644
--- a/pkgs/applications/editors/focuswriter/default.nix
+++ b/pkgs/applications/editors/focuswriter/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "focuswriter-${version}";
- version = "1.6.7";
+ version = "1.6.8";
src = fetchurl {
url = "https://gottcode.org/focuswriter/focuswriter-${version}-src.tar.bz2";
- sha256 = "10rqzinr6yd6ca06rklg34kdc08a3xgygfzmprsfg7gdsybfay5z";
+ sha256 = "1d2q99xa7dhdpqkipapzi1r1mvynf70s7sgdczd59kn0d8sr3map";
};
nativeBuildInputs = [ pkgconfig qmake qttools ];
diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix
index 5ff5c0845d00c5bb3de8d6a9d6ddf89c4baa91da..9288d293b9166f2cd3fd2377b179398e271a2627 100644
--- a/pkgs/applications/editors/geany/default.nix
+++ b/pkgs/applications/editors/geany/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
- Simple project management
- Plugin interface
'';
- homepage = http://www.geany.org/;
+ homepage = https://www.geany.org/;
license = "GPL";
maintainers = [];
platforms = platforms.all;
diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index ec0d90115e646af206ed228f2e8d329febd57bc5..3dabbea5ea7a94289fc13ca503109b3bf65f514d 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -234,12 +234,12 @@ in
clion = buildClion rec {
name = "clion-${version}";
- version = "2017.3"; /* updated by script */
+ version = "2017.3.1"; /* 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 = "0gv9krqy4bhijx5s005qhswxnc05l1jsjlxs0h15z23bmv7rlpnf"; /* updated by script */
+ sha256 = "19pb78s5pa5ywifi1azs8gpg0a65c9n3yiqng348a7s27azkw01z"; /* updated by script */
};
wmClass = "jetbrains-clion";
update-channel = "CLion_Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
@@ -273,12 +273,12 @@ in
idea-community = buildIdea rec {
name = "idea-community-${version}";
- version = "2017.3"; /* updated by script */
+ version = "2017.3.2";
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 = "04qp37pv4z6d9gw6j56m4zfxw4v2cydk8w7jzyzrcg52jr064kwi"; /* updated by script */
+ sha256 = "70cc4f36a6517c7af980456758214414ea74c5c4f314ecf30dd2640600badd62"; /* updated by script */
};
wmClass = "jetbrains-idea-ce";
update-channel = "IDEA_Release";
@@ -286,12 +286,12 @@ in
idea-ultimate = buildIdea rec {
name = "idea-ultimate-${version}";
- version = "2017.3"; /* updated by script */
+ version = "2017.3.2"; /* 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 = "0w9ihi6vzgfiav2qia7d7vrn14k8v56npir0dyx7ii8an887s7ws"; /* updated by script */
+ sha256 = "0lygnhn2wbs1678g3jbd3c5yzxnjp106qx7v9kgvb1k6l9mqb3my"; /* updated by script */
};
wmClass = "jetbrains-idea";
update-channel = "IDEA_Release";
@@ -299,12 +299,12 @@ in
phpstorm = buildPhpStorm rec {
name = "phpstorm-${version}";
- version = "2017.3"; /* updated by script */
+ version = "2017.3.2";
description = "Professional IDE for Web and PHP developers";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
- sha256 = "1byhlm5bnp6ic4n2xg17v4g34ipygy50i9xj4292b0xw7srxh910"; /* updated by script */
+ sha256 = "1grkqvj4j33d8hmy11ipkcci20sw7jpnc5zl28a9g85f2pzvsvs0";
};
wmClass = "jetbrains-phpstorm";
update-channel = "PS2017.3";
@@ -312,12 +312,12 @@ in
pycharm-community = buildPycharm rec {
name = "pycharm-community-${version}";
- version = "2017.3"; /* updated by script */
+ version = "2017.3.2"; /* updated by script */
description = "PyCharm Community Edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
- sha256 = "1lca3g5h716l97pkqfb8i7apsnx445xzcc9j41d0y3yyncf5hwxr"; /* updated by script */
+ sha256 = "1xp4hva2wj2r3haqwmji4vpg6xm9fsx2xihslwmq89vfrbzybyq6"; /* updated by script */
};
wmClass = "jetbrains-pycharm-ce";
update-channel = "PyCharm_Release";
@@ -325,12 +325,12 @@ in
pycharm-professional = buildPycharm rec {
name = "pycharm-professional-${version}";
- version = "2017.3"; /* updated by script */
+ version = "2017.3.2"; /* updated by script */
description = "PyCharm Professional Edition";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
- sha256 = "06lh0nxmzn0lsyd6isyb6gf01h4nbksi0f03hwwm6wdfvsfw92pb"; /* updated by script */
+ sha256 = "0bqavq9f9pg82yh04bpzpb3a36980v2bn70j1ch6gsm3hdd75swv"; /* updated by script */
};
wmClass = "jetbrains-pycharm";
update-channel = "PyCharm_Release";
@@ -351,12 +351,12 @@ in
ruby-mine = buildRubyMine rec {
name = "ruby-mine-${version}";
- version = "2017.3"; /* updated by script */
+ version = "2017.3.1"; /* updated by script */
description = "The Most Intelligent Ruby and Rails IDE";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
- sha256 = "04h299mbzwrdgqxkff0vgpj2kbisb29l55mm6r45amgpqcnms6i5"; /* updated by script */
+ sha256 = "01y89blg30y41j2h254mhf7b7d7nd3bgscinn03vpkjfg7hzr689"; /* updated by script */
};
wmClass = "jetbrains-rubymine";
update-channel = "rm2017.3";
@@ -364,12 +364,12 @@ in
webstorm = buildWebStorm rec {
name = "webstorm-${version}";
- version = "2017.3"; /* updated by script */
+ version = "2017.3.2"; /* updated by script */
description = "Professional IDE for Web and JavaScript development";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
- sha256 = "0whr5zygrbi044pl48ac2w7a4rxldbaqlf76dkfqj83g2wl4n990"; /* updated by script */
+ sha256 = "1if99qjpnf9x7d3f1anpiglg9lwc3phamfd4wbyi9yjnk3rf5qcr"; /* updated by script */
};
wmClass = "jetbrains-webstorm";
update-channel = "WS_Release";
diff --git a/pkgs/applications/editors/micro/default.nix b/pkgs/applications/editors/micro/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..bea1e18e061256ba080ff1388cbcdc1abeafaf23
--- /dev/null
+++ b/pkgs/applications/editors/micro/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+ name = "micro-${version}";
+ version = "1.3.4";
+
+ goPackagePath = "github.com/zyedidia/micro";
+
+ src = fetchFromGitHub {
+ owner = "zyedidia";
+ repo = "micro";
+ rev = "v${version}";
+ sha256 = "1giyp2xk2rb6vdyfnj5wa7qb9fwbcmmwm16wdlnmq7xnp7qamdkw";
+ fetchSubmodules = true;
+ };
+
+ subPackages = [ "cmd/micro" ];
+
+ buildFlagsArray = [ "-ldflags=" "-X main.Version=${version}" ];
+
+ meta = with stdenv.lib; {
+ homepage = https://micro-editor.github.io;
+ description = "Modern and intuitive terminal-based text editor";
+ license = licenses.mit;
+ maintainers = with maintainers; [ dtzWill ];
+ };
+}
+
diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index dcb124bcb125560bf8db4506869872700ff36387..87ead669b70e87e4eab2781e516d69b512485498 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -20,15 +20,13 @@ let
in stdenv.mkDerivation rec {
name = "nano-${version}";
- version = "2.9.1";
+ version = "2.9.2";
src = fetchurl {
url = "mirror://gnu/nano/${name}.tar.xz";
- sha256 = "0z5sxji8jh8sh0g3inbzndhsrbm4qyqlvjrxl5wkxbr61lnxa5k3";
+ sha256 = "0m9xm085pi0fhmmshgppipjimr1jkxksbyg8pa5cwaap3d2vgk2f";
};
- patches = [ ./nano-2.9.1-darwin.patch ];
-
nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;
buildInputs = [ ncurses ];
diff --git a/pkgs/applications/editors/nano/nano-2.9.1-darwin.patch b/pkgs/applications/editors/nano/nano-2.9.1-darwin.patch
deleted file mode 100644
index d3a630d4486e61d97e520a5e4114580e3bca039a..0000000000000000000000000000000000000000
--- a/pkgs/applications/editors/nano/nano-2.9.1-darwin.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/lib/stat.c
-+++ b/lib/stat.c
-@@ -48,4 +48,6 @@ orig_stat (const char *filename, struct stat *buf)
- #include "sys/stat.h"
-
-+#include "stat-time.h"
-+
- #include
- #include
diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index ba3abe6a221f23b2065e10ca19008ee17d835db1..0233d63452854a8b3e6095ccd89a499d8e659f7d 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -9,6 +9,7 @@
, withPyGUI ? false
, vimAlias ? false
+, viAlias ? false
, configure ? null
}:
@@ -82,7 +83,7 @@ let
(optionalString withPython3 python3Wrapper) +
(optionalString withRuby rubyWrapper)}" --unset PYTHONPATH '' +
optionalString (withRuby)
- ''--suffix PATH : \"${rubyEnv}/bin\" --set GEM_HOME \"${rubyEnv}/${rubyEnv.ruby.gemPath}\" '';
+ ''--suffix PATH : ${rubyEnv}/bin --set GEM_HOME ${rubyEnv}/${rubyEnv.ruby.gemPath} '';
neovim = stdenv.mkDerivation rec {
name = "neovim-${version}";
@@ -174,7 +175,9 @@ let
};
};
-in if (vimAlias == false && configure == null) then neovim else stdenv.mkDerivation {
+in if (vimAlias == false && viAlias == false && configure == null)
+ then neovim
+ else stdenv.mkDerivation {
name = "neovim-${neovim.version}-configured";
inherit (neovim) version meta;
@@ -187,6 +190,8 @@ in if (vimAlias == false && configure == null) then neovim else stdenv.mkDerivat
done
'' + optionalString vimAlias ''
ln -s $out/bin/nvim $out/bin/vim
+ '' + optionalString viAlias ''
+ ln -s $out/bin/nvim $out/bin/vi
'' + optionalString (configure != null) ''
wrapProgram $out/bin/nvim --add-flags "-u ${vimUtils.vimrcFile configure}"
'';
diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix
index b508521790bf4f8662e3931c50986fb8a0ba14eb..bf2363d3939b1cca47da87fdb060b68177ab4ce5 100644
--- a/pkgs/applications/editors/rstudio/default.nix
+++ b/pkgs/applications/editors/rstudio/default.nix
@@ -124,7 +124,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib;
{ description = "Set of integrated tools for the R language";
- homepage = http://www.rstudio.com/;
+ homepage = https://www.rstudio.com/;
license = licenses.agpl3;
maintainers = with maintainers; [ ehmry changlinli ciil ];
platforms = platforms.linux;
diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix
index d1c0ab274f061d006bb108d0f189979c70ee9914..0dde8fbe72978e4f1f23537558b48207b45846da 100644
--- a/pkgs/applications/editors/tiled/default.nix
+++ b/pkgs/applications/editors/tiled/default.nix
@@ -1,17 +1,15 @@
{ stdenv, fetchFromGitHub, pkgconfig, qmake
, python, qtbase, qttools, zlib }:
-let
-# qtEnv = with qt5; env "qt-${qtbase.version}" [ qtbase qttools ];
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
name = "tiled-${version}";
- version = "1.0.3";
+ version = "1.1.1";
src = fetchFromGitHub {
owner = "bjorn";
repo = "tiled";
rev = "v${version}";
- sha256 = "1j8307h7xkxqwr8rpr9fn1svm5h10k61w6zxr4sgph1hiv8x33aa";
+ sha256 = "1c6n5xshadxv5qwv8kfrj1kbfnkvx6nyxc9p4mpzkjrkxw1b1qf1";
};
nativeBuildInputs = [ pkgconfig qmake ];
diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix
index b20a6e5ec45ce6c42318196dea69e935c9b32471..22e7c3d31b361e747111f7803b76822cdce2fbd7 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.38";
+ version = "0.9.41";
src =
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "https://www.typora.io/linux/typora_${version}_amd64.deb";
- sha256 = "bf6a069c5da4a7dc289bdb3c8d27e7a81daeaee99488d4d3b512c6b673780557";
+ sha256 = "e4916f86c7c12aec8fd59b3ef79c2a4d3f77b02a0a9e962916c688871c9fda1d";
}
else
fetchurl {
url = "https://www.typora.io/linux/typora_${version}_i386.deb";
- sha256 = "edd092e96ebf69503cf6b39b77a61ec5e3185f8a1447da0bed063fa11861c1b9";
+ sha256 = "18960fb4b2cd6cf9cb77025a4035a3258f1599b1d225fb673b49c1588fa272d6";
}
;
diff --git a/pkgs/applications/editors/vanubi/default.nix b/pkgs/applications/editors/vanubi/default.nix
index 273ef33250fc0e496a3cd926da28841d6c10d4d7..98f45f6be02d2b56e80a5648d450ef026c1f00e8 100644
--- a/pkgs/applications/editors/vanubi/default.nix
+++ b/pkgs/applications/editors/vanubi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, vala_0_26, which, autoconf, automake
+{ stdenv, fetchurl, pkgconfig, vala_0_28, which, autoconf, automake
, libtool, glib, gtk3, gnome3, libwnck3, asciidoc, python3Packages }:
stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ vala_0_26 which autoconf automake
+ buildInputs = [ vala_0_28 which autoconf automake
libtool glib gtk3 libwnck3 asciidoc
gnome3.gtksourceview gnome3.vte_290 python3Packages.pygments ];
diff --git a/pkgs/applications/editors/vbindiff/default.nix b/pkgs/applications/editors/vbindiff/default.nix
index becb5ccc29a188a2644100f8b793f96fa6018390..3a3a0d1a781269812401fbce442e68226aad0426 100644
--- a/pkgs/applications/editors/vbindiff/default.nix
+++ b/pkgs/applications/editors/vbindiff/default.nix
@@ -7,13 +7,13 @@ stdenv.mkDerivation rec {
buildInputs = [ ncurses ];
src = fetchurl {
- url = "http://www.cjmweb.net/vbindiff/${name}.tar.gz";
+ url = "https://www.cjmweb.net/vbindiff/${name}.tar.gz";
sha256 = "0gcqy4ggp60qc6blq1q1gc90xmhip1m6yvvli4hdqlz9zn3mlpbx";
};
meta = {
description = "A terminal visual binary diff viewer";
- homepage = http://www.cjmweb.net/vbindiff/;
+ homepage = https://www.cjmweb.net/vbindiff/;
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.unix;
};
diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index c87563293bab9eab2b79115ba98dc971b80c35f9..15477c5c7d45bb1650db6080881ff2e96e8d54ce 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.18.1";
+ version = "1.19.1";
channel = "stable";
plat = {
@@ -12,9 +12,9 @@ let
}.${stdenv.system};
sha256 = {
- "i686-linux" = "13gs0spqkbxw4i3a0b060v5bi68zfkp3i8vqk41i0fkbshnc7c7i";
- "x86_64-linux" = "0h7nfyrn4ybm9p1czjb48p3cd3970hpyn6pj8l4ir1hqygcq6dwi";
- "x86_64-darwin" = "093k8s2msi0xz11wy2yf1rppwkx6kv5psgii4w44l59ji8qgpamk";
+ "i686-linux" = "0ypx1jrzg76f8p4yh9hi3bhsrc6w4r7rg6i2aa6q7s8ny0q9hrlx";
+ "x86_64-linux" = "1934wdiy2d1fzcjxjyf60dw1g1pp3lk2wv41xgrabfy5j2xfz14r";
+ "x86_64-darwin" = "1zbcddgdwvmnk1gpmgw6rz0rswhkfc72wcjdbvgghm4msfwcgvc8";
}.${stdenv.system};
archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz";
diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix
index 3382bb3e56d7d8d3f0d897a96fd218c874af9e2e..987b544c556576acc5fd7e9e44e80b2cd6e50ecc 100644
--- a/pkgs/applications/gis/grass/default.nix
+++ b/pkgs/applications/gis/grass/default.nix
@@ -4,15 +4,15 @@
}:
stdenv.mkDerivation {
- name = "grass-7.0.2";
+ name = "grass-7.2.2";
src = fetchurl {
- url = http://grass.osgeo.org/grass70/source/grass-7.0.2.tar.gz;
- sha256 = "02qrdgn46gxr60amxwax4b8fkkmhmjxi6qh4yfvpbii6ai6diarf";
+ url = http://grass.osgeo.org/grass72/source/grass-7.2.2.tar.gz;
+ sha256 = "0yzljbrxlqp4wbw08n1dvmm4vmwkg8glf1ff4xyh589r5ryb7gxv";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite cairo
- readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql mysql.client blas ]
+ readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql mysql.connector-c blas ]
++ (with python2Packages; [ python dateutil wxPython30 numpy ]);
configureFlags = [
@@ -22,9 +22,12 @@ stdenv.mkDerivation {
"--with-wxwidgets"
"--with-netcdf"
"--with-geos"
- "--with-postgres" "--with-postgres-libs=${postgresql.lib}/lib/"
+ "--with-postgres"
+ "--with-postgres-libs=${postgresql.lib}/lib/"
# it complains about missing libmysqld but doesn't really seem to need it
- "--with-mysql" "--with-mysql-includes=${stdenv.lib.getDev mysql.client}/include/mysql"
+ "--with-mysql"
+ "--with-mysql-includes=${mysql.connector-c}/include/mysql"
+ "--with-mysql-libs=${mysql.connector-c}/lib/mysql"
"--with-blas"
];
@@ -40,17 +43,20 @@ stdenv.mkDerivation {
scripts/r.pack/r.pack.py \
scripts/r.tileset/r.tileset.py \
scripts/r.unpack/r.unpack.py \
- scripts/v.krige/v.krige.py \
scripts/v.rast.stats/v.rast.stats.py \
scripts/v.to.lines/v.to.lines.py \
scripts/v.what.strds/v.what.strds.py \
scripts/v.unpack/v.unpack.py \
scripts/wxpyimgview/*.py \
gui/wxpython/animation/g.gui.animation.py \
+ gui/wxpython/datacatalog/g.gui.datacatalog.py \
gui/wxpython/rlisetup/g.gui.rlisetup.py \
gui/wxpython/vdigit/g.gui.vdigit.py \
temporal/t.rast.accumulate/t.rast.accumulate.py \
temporal/t.rast.accdetect/t.rast.accdetect.py \
+ temporal/t.rast.algebra/t.rast.algebra.py \
+ temporal/t.rast3d.algebra/t.rast3d.algebra.py \
+ temporal/t.vect.algebra/t.vect.algebra.py \
temporal/t.select/t.select.py
for d in gui lib scripts temporal tools; do
patchShebangs $d
@@ -58,7 +64,7 @@ stdenv.mkDerivation {
'';
postInstall = ''
- wrapProgram $out/bin/grass70 \
+ wrapProgram $out/bin/grass72 \
--set PYTHONPATH $PYTHONPATH \
--set GRASS_PYTHON ${python2Packages.python}/bin/${python2Packages.python.executable} \
--suffix LD_LIBRARY_PATH ':' '${gdal}/lib'
@@ -72,6 +78,5 @@ 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 f64845f6e43aa99830992271518bbffe1bd5d1ea..d689254f2c85e46c4162fc10b0b12fb8055e035e 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.14";
+ name = "qgis-2.18.15";
buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla
fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags ] ++
@@ -14,8 +14,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake makeWrapper ];
+ # `make -f src/providers/wms/CMakeFiles/wmsprovider_a.dir/build.make src/providers/wms/CMakeFiles/wmsprovider_a.dir/qgswmssourceselect.cpp.o`:
# fatal error: ui_qgsdelimitedtextsourceselectbase.h: No such file or directory
- #enableParallelBuilding = true;
+ enableParallelBuilding = false;
# To handle the lack of 'local' RPATH; required, as they call one of
# their built binaries requiring their libs, in the build process.
@@ -25,7 +26,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://qgis.org/downloads/${name}.tar.bz2";
- sha256 = "199nc539kd8fxbfny61s4sv8bvrhlxw59dmvw6m70gnff6mpc8fq";
+ sha256 = "1jpprkk91s2wwx0iiqlnsngxnn52zs32bad799fjai58nrsh8b7b";
};
cmakeFlags = stdenv.lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}";
diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix
index 4d229450a4a72e7b0c29439e84ec3f4dba47be52..847421de3b1f4bfcf1b601e28bad69177f311af1 100644
--- a/pkgs/applications/gis/saga/default.nix
+++ b/pkgs/applications/gis/saga/default.nix
@@ -2,15 +2,15 @@
libharu, opencv, vigra, postgresql }:
stdenv.mkDerivation rec {
- name = "saga-5.0.0";
+ name = "saga-6.2.0";
buildInputs = [ gdal wxGTK30 proj libharu opencv vigra postgresql libiodbc lzma jasper ];
enableParallelBuilding = true;
src = fetchurl {
- url = "mirror://sourceforge/project/saga-gis/SAGA%20-%205/SAGA%20-%205.0.0/saga-5.0.0.tar.gz";
- sha256 = "9be997209737e80262d9f13fd9b9797194a9f2facb10e5b9bd756d8cda675089";
+ url = "mirror://sourceforge/project/saga-gis/SAGA%20-%206/SAGA%20-%206.2.0/saga-6.2.0.tar.gz";
+ sha256 = "91b030892c894ba02eb4292ebfc9ccbf4acf3062118f2a89a9a11208773fa280";
};
meta = {
diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix
index 973e7f88e800972ca743a5247ca59dd33a159b68..e1d8dd01f9c5cfabd26daf91dfeb1e26438ce9d1 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.7-9";
- sha256 = "0p0879chcfrghcamwgxxcmaaj04xv0z91ris7hxi37qdw8c7836w";
+ version = "7.0.7-19";
+ sha256 = "1naib6hspmq7d4gfpsksx78gc1lq3p2v3i9pxkkdvr9p9j15c4az";
patches = [];
};
in
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index 4e0ddfa8def80693497f19b08f0772bc568460a9..519bf025b43e68a588cf1d57cdccd52fe7706e33 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, libtool
+{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, libtool
, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg
, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp
, ApplicationServices
@@ -14,8 +14,8 @@ let
else throw "ImageMagick is not supported on this platform.";
cfg = {
- version = "6.9.9-23";
- sha256 = "0cd6zcbcfvznf0i3q4xz1c4wm4cfplg4zc466lvlb1w8qbn25948";
+ version = "6.9.9-28";
+ sha256 = "132kdl7jlkghfg3smdab14c29cpvrx65ibipxkmwg1nc88ycqivh";
patches = [];
}
# Freeze version on mingw so we don't need to port the patch too often.
@@ -36,13 +36,10 @@ stdenv.mkDerivation rec {
name = "imagemagick-${version}";
inherit (cfg) version;
- src = fetchurl {
- urls = [
- "mirror://imagemagick/releases/ImageMagick-${version}.tar.xz"
- # the original source above removes tarballs quickly
- "http://distfiles.macports.org/ImageMagick/ImageMagick-${version}.tar.xz"
- "https://bintray.com/homebrew/mirror/download_file?file_path=imagemagick-${version}.tar.xz"
- ];
+ src = fetchFromGitHub {
+ owner = "ImageMagick";
+ repo = "ImageMagick";
+ rev = cfg.version;
inherit (cfg) sha256;
};
diff --git a/pkgs/applications/graphics/awesomebump/default.nix b/pkgs/applications/graphics/awesomebump/default.nix
index f190b421b0566588832d991c2f1ece550dc07e71..f7a813f360612979f9a5deb00ccadde382b05ab4 100644
--- a/pkgs/applications/graphics/awesomebump/default.nix
+++ b/pkgs/applications/graphics/awesomebump/default.nix
@@ -15,6 +15,7 @@ let
name = "qtnproperty";
inherit src;
sourceRoot = "AwesomeBump/Sources/utils/QtnProperty";
+ patches = [ ./qtnproperty-parallel-building.patch ];
buildInputs = [ qtscript qtbase qtdeclarative ];
nativeBuildInputs = [ qmake flex bison ];
postInstall = ''
@@ -46,6 +47,10 @@ in stdenv.mkDerivation rec {
--run "cd $d"
'';
+ # $ cd Sources; qmake; make ../workdir/linux-g++-dgb-gl4/obj/glwidget.o
+ # fatal error: properties/ImageProperties.peg.h: No such file or directory
+ enableParallelBuilding = false;
+
meta = {
homepage = https://github.com/kmkolasinski/AwesomeBump;
description = "A program to generate normal, height, specular or ambient occlusion textures from a single image";
diff --git a/pkgs/applications/graphics/awesomebump/qtnproperty-parallel-building.patch b/pkgs/applications/graphics/awesomebump/qtnproperty-parallel-building.patch
new file mode 100644
index 0000000000000000000000000000000000000000..b3f8e68dd1adf25ac15725aaab164585dcdb3a6f
--- /dev/null
+++ b/pkgs/applications/graphics/awesomebump/qtnproperty-parallel-building.patch
@@ -0,0 +1,9 @@
+--- a/PEG/Flex.pri
++++ b/PEG/Flex.pri
+@@ -1,5 +1,6 @@
+ flex.name = Flex ${QMAKE_FILE_IN}
+ flex.input = FLEX_SOURCES
++flex.depends = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.parser.cpp
+ flex.output = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.lexer.cpp
+
+ win32:flex.commands = win_flex --wincompat -o ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.lexer.cpp ${QMAKE_FILE_IN}
diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index 8c1db9c039e72606f2f5978677df22f64f3a50db..5fd636ff7c5910db03ea62ecfa2a809fb199cc92 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -11,12 +11,12 @@
assert stdenv ? glibc;
stdenv.mkDerivation rec {
- version = "2.2.5";
+ version = "2.4.0";
name = "darktable-${version}";
src = fetchurl {
url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
- sha256 = "10gjzd4irxhladh4jyss9kgp627k8vgx2divipsb33pp6cms80z3";
+ sha256 = "0y0q7a7k09sbg05k5xl1lz8n2ak1v8yarfv222ksvmbrxs53hdwx";
};
buildInputs =
@@ -49,6 +49,6 @@ stdenv.mkDerivation rec {
homepage = https://www.darktable.org;
license = licenses.gpl3Plus;
platforms = platforms.linux;
- maintainers = [ maintainers.goibhniu maintainers.rickynils maintainers.flosse ];
+ maintainers = with maintainers; [ goibhniu rickynils flosse mrVanDalo ];
};
}
diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index a74c7c44bdb860ca78324f9db5aa6dc0419c7479..9a26dcdaa6a0975f0d7dc79aaf655e357d966351 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -75,7 +75,6 @@ mkDerivation rec {
libqtav
libusb1
mesa
- mysql
opencv3
pcre
@@ -84,7 +83,8 @@ mkDerivation rec {
qtsvg
qtwebkit
- kcalcore
+ # https://bugs.kde.org/show_bug.cgi?id=387960
+ #kcalcore
kconfigwidgets
kcoreaddons
kfilemetadata
@@ -99,8 +99,6 @@ mkDerivation rec {
threadweaver
];
- enableParallelBuilding = true;
-
cmakeFlags = [
"-DENABLE_MYSQLSUPPORT=1"
"-DENABLE_INTERNALMYSQL=1"
@@ -124,6 +122,10 @@ mkDerivation rec {
patchFlags = "-d core -p1";
+ # `en make -f core/utilities/assistants/expoblending/CMakeFiles/expoblending_src.dir/build.make core/utilities/assistants/expoblending/CMakeFiles/expoblending_src.dir/manager/expoblendingthread.cpp.o`:
+ # digikam_version.h:37:24: fatal error: gitversion.h: No such file or directory
+ enableParallelBuilding = false;
+
meta = with lib; {
description = "Photo Management Program";
license = licenses.gpl2;
diff --git a/pkgs/applications/graphics/displaycal/default.nix b/pkgs/applications/graphics/displaycal/default.nix
index 80d2b2903678edd499dc6a4312cab04b5560c6b5..a845bc63a385795d95f5a3843e6be8af77a3d76e 100644
--- a/pkgs/applications/graphics/displaycal/default.nix
+++ b/pkgs/applications/graphics/displaycal/default.nix
@@ -49,7 +49,7 @@ buildPythonPackage {
meta = {
description = "Display Calibration and Characterization powered by Argyll CMS";
- homepage = http://displaycal.net/;
+ homepage = https://displaycal.net/;
license = stdenv.lib.licenses.gpl3;
maintainers = [stdenv.lib.maintainers.marcweber];
platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index b447fa7810f449cf02ec9e955ef80fc9a2804f88..478e9d2b45304c7abc082eef45c853974d81ccc0 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.22.2";
+ version = "2.23";
src = fetchurl {
url = "https://feh.finalrewind.org/${name}.tar.bz2";
- sha256 = "1kcflv4jb4250g94nqn28i98xqvvci8w7vqpfr62gxlp16z1za05";
+ sha256 = "18922zv8ckm82r1ap1yn7plbk6djpj02za2ahng58sjj2fw3rpqn";
};
outputs = [ "out" "man" "doc" ];
diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix
index ff87b70a0c1eb36603ae9e7b97b65580ec2b7f1e..a2cbffd5d217bddeca2ff65ba39cf3aca1d27775 100644
--- a/pkgs/applications/graphics/gimp/2.8.nix
+++ b/pkgs/applications/graphics/gimp/2.8.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf
, pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, libtiff
, webkit, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, jasper
-, python2Packages, libart_lgpl, libexif, gettext, xorg
+, python2Packages, libexif, gettext, xorg
, AppKit, Cocoa, gtk-mac-integration }:
let
@@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
[ pkgconfig intltool babl gegl gtk2 glib gdk_pixbuf pango cairo
freetype fontconfig lcms libpng libjpeg poppler libtiff webkit
libmng librsvg libwmf zlib libzip ghostscript aalib jasper
- python pygtk libart_lgpl libexif gettext xorg.libXpm
+ python pygtk libexif gettext xorg.libXpm
wrapPython
]
++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Cocoa gtk-mac-integration ];
diff --git a/pkgs/applications/graphics/giv/default.nix b/pkgs/applications/graphics/giv/default.nix
index 92e6084ce673a506b2275bcce9cdb98d9a6b15ab..d01286e15a649e906d28a2aaefccaf9e725566b5 100644
--- a/pkgs/applications/graphics/giv/default.nix
+++ b/pkgs/applications/graphics/giv/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, gdk_pixbuf, scons, pkgconfig, gtk2, glib,
- pcre, cfitsio, perl, gob2, vala_0_23, libtiff, json_glib }:
+ pcre, cfitsio, perl, gob2, vala, libtiff, json_glib }:
stdenv.mkDerivation rec {
name = "giv-${version}";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
prePatch = ''
sed -i s,/usr/bin/perl,${perl}/bin/perl, doc/eperl
- sed -i s,/usr/local,$out, SConstruct
+ sed -i s,/usr/local,$out, SConstruct
'';
patches = [ ./build.patch ];
@@ -25,15 +25,14 @@ stdenv.mkDerivation rec {
installPhase = "scons install";
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ gdk_pixbuf gtk2 glib scons pcre cfitsio perl gob2 vala_0_23 libtiff
- json_glib ];
+ nativeBuildInputs = [ scons pkgconfig vala perl gob2 ];
+ buildInputs = [ gdk_pixbuf gtk2 glib pcre cfitsio libtiff json_glib ];
- meta = {
+ meta = with stdenv.lib; {
description = "Cross platform image and hierarchical vector viewer based";
homepage = http://giv.sourceforge.net/giv/;
- license = stdenv.lib.licenses.gpl2Plus;
- maintainers = with stdenv.lib.maintainers; [viric];
- platforms = with stdenv.lib.platforms; linux;
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ viric ];
+ platforms = with platforms; linux;
};
}
diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix
index c8c9ac8f26efa79572627a05df46f2bde019a2b7..11a2b3a8c8b9f94b2742b32213e59722ad1bad7b 100644
--- a/pkgs/applications/graphics/graphicsmagick/default.nix
+++ b/pkgs/applications/graphics/graphicsmagick/default.nix
@@ -2,14 +2,14 @@
, libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz, libX11
, libwebp, quantumdepth ? 8, fixDarwinDylibNames }:
-let version = "1.3.26"; in
+let version = "1.3.27"; in
stdenv.mkDerivation {
name = "graphicsmagick-${version}";
src = fetchurl {
url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz";
- sha256 = "122zgs96dqrys62mnh8x5yvfff6km4d3yrnvaxzg3mg5sprib87v";
+ sha256 = "0rq35p3rml10cxz2z4s7xcfsilhhk19mmy094g3ivz0fg797hcnh";
};
patches = [
diff --git a/pkgs/applications/graphics/leocad/default.nix b/pkgs/applications/graphics/leocad/default.nix
index 5f27cb4469947feb5f742af903720061d6d0fb84..4b5c4517deab300688642bd10510430d69b849c5 100644
--- a/pkgs/applications/graphics/leocad/default.nix
+++ b/pkgs/applications/graphics/leocad/default.nix
@@ -7,13 +7,13 @@ set the variable LEOCAD_LIB=/path/to/libs/ or use option -l /path/to/libs/
stdenv.mkDerivation rec {
name = "leocad-${version}";
- version = "17.02";
+ version = "17.07";
src = fetchFromGitHub {
owner = "leozide";
repo = "leocad";
rev = "v${version}";
- sha256 = "0d7l2il6r4swnmrmaf1bsrgpjgai5xwhwk2mkpcsddnk59790mmc";
+ sha256 = "1j361pvxywi4nb2alhnnd4qpqrpg6503gbi17cadcdi434gbqbsd";
};
nativeBuildInputs = [ qmake4Hook ];
@@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
description = "CAD program for creating virtual LEGO models";
homepage = http://www.leocad.org/;
license = licenses.gpl2;
- inherit (qt4.meta) platforms;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/graphics/meh/default.nix b/pkgs/applications/graphics/meh/default.nix
index ac2a194b7ca4a92d893f39102f885d737e23e7db..c25c1277ee0b96c82b28822ea2d6da921bf325df 100644
--- a/pkgs/applications/graphics/meh/default.nix
+++ b/pkgs/applications/graphics/meh/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
meta = {
description = "A minimal image viewer using raw XLib";
- homepage = http://www.johnhawthorn.com/meh/;
+ homepage = https://www.johnhawthorn.com/meh/;
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.linux;
};
diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix
index d73697673bfe2a840b735c49b050b3a2bf45f271..1e76743eccf4b718742d5109cb257f859ba4ccef 100644
--- a/pkgs/applications/graphics/meshlab/default.nix
+++ b/pkgs/applications/graphics/meshlab/default.nix
@@ -1,51 +1,65 @@
-{ stdenv, fetchurl, qt4, bzip2, lib3ds, levmar, muparser, unzip, vcg }:
+{ stdenv, fetchFromGitHub, mesa_glu, qtbase, qtscript, qtxmlpatterns }:
-stdenv.mkDerivation rec {
- name = "meshlab-1.3.3";
+let
+ meshlabRev = "5700f5474c8f90696a8925e2a209a0a8ab506662";
+ vcglibRev = "a8e87662b63ee9f4ded5d4699b28d74183040803";
+in stdenv.mkDerivation {
+ name = "meshlab-2016.12";
- src = fetchurl {
- url = "mirror://sourceforge/meshlab/meshlab/MeshLab%20v1.3.3/MeshLabSrc_AllInc_v133.tgz";
- sha256 = "03wqaibfbfag2w1zi1a5z6h546r9d7pg2sjl5pwg24w7yp8rr0n9";
- };
+ srcs =
+ [
+ (fetchFromGitHub {
+ owner = "cnr-isti-vclab";
+ repo = "meshlab";
+ rev = meshlabRev;
+ sha256 = "0srrp7zhi86dsg4zsx1615gr26barz38zdl8s03zq6vm1dgzl3cc";
+ name = "meshlab-${meshlabRev}";
+ })
+ (fetchFromGitHub {
+ owner = "cnr-isti-vclab";
+ repo = "vcglib";
+ rev = vcglibRev;
+ sha256 = "0jh8jc8rn7rci8qr3q03q574fk2hsc3rllysck41j8xkr3rmxz2f";
+ name = "vcglib-${vcglibRev}";
+ })
+ ];
- # I don't know why I need this; without this, the rpath set at the beginning of the
- # buildPhase gets removed from the 'meshlab' binary
- dontPatchELF = true;
+ sourceRoot = "meshlab-${meshlabRev}";
- patches = [ ./include-unistd.diff ];
+ patches = [ ./fix-2016.02.patch ];
hardeningDisable = [ "format" ];
+ enableParallelBuilding = true;
buildPhase = ''
- mkdir -p "$out/include"
+ # MeshLab has ../vcglib hardcoded everywhere, so move the source dir
+ mv ../vcglib-${vcglibRev} ../vcglib
+
+ cd src
export NIX_LDFLAGS="-rpath $out/opt/meshlab $NIX_LDFLAGS"
- cd meshlab/src
+
pushd external
qmake -recursive external.pro
- make
+ buildPhase
popd
qmake -recursive meshlab_full.pro
- make
+ buildPhase
'';
installPhase = ''
- mkdir -p $out/opt/meshlab $out/bin $out/lib
- pushd distrib
- cp -R * $out/opt/meshlab
- popd
+ mkdir -p $out/opt/meshlab $out/bin
+ cp -Rv distrib/* $out/opt/meshlab
ln -s $out/opt/meshlab/meshlab $out/bin/meshlab
+ ln -s $out/opt/meshlab/meshlabserver $out/bin/meshlabserver
'';
- sourceRoot = ".";
-
- buildInputs = [ qt4 unzip vcg ];
+ buildInputs = [ mesa_glu qtbase qtscript qtxmlpatterns ];
meta = {
- description = "System for the processing and editing of unstructured 3D triangular meshes";
- homepage = http://meshlab.sourceforge.net/;
- license = stdenv.lib.licenses.gpl2Plus;
+ description = "A system for processing and editing 3D triangular meshes.";
+ homepage = http://www.meshlab.net/;
+ license = stdenv.lib.licenses.gpl3;
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
- broken = true;
};
}
diff --git a/pkgs/applications/graphics/meshlab/fix-2016.02.patch b/pkgs/applications/graphics/meshlab/fix-2016.02.patch
new file mode 100644
index 0000000000000000000000000000000000000000..ebccccc00a296a5170f5510d5a3777b9f898b91d
--- /dev/null
+++ b/pkgs/applications/graphics/meshlab/fix-2016.02.patch
@@ -0,0 +1,88 @@
+From 0fd17cd2b6d57e8a2a981a70115c2565ee076d0f Mon Sep 17 00:00:00 2001
+From: Marco Callieri
+Date: Mon, 9 Jan 2017 16:06:14 +0100
+Subject: [PATCH 1/3] resolved ambiguity for abs overloads
+
+
+diff --git a/src/meshlabplugins/edit_quality/eqhandle.cpp b/src/meshlabplugins/edit_quality/eqhandle.cpp
+index 364d53bf..ef3d4a2d 100644
+--- a/src/meshlabplugins/edit_quality/eqhandle.cpp
++++ b/src/meshlabplugins/edit_quality/eqhandle.cpp
+@@ -83,7 +83,7 @@ void EqHandle::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
+ setCursor(Qt::OpenHandCursor);
+
+ QPointF newPos = event->scenePos();
+- qreal handleOffset = abs(newPos.x()-pos().x());
++ qreal handleOffset = std::fabs(newPos.x()-pos().x());
+
+ if (handleOffset >= std::numeric_limits::epsilon())
+ {
+--
+2.15.0
+
+
+From 33cfd5801e59b6c9e34360c75112e6dcb88d807b Mon Sep 17 00:00:00 2001
+From: Marco Callieri
+Date: Tue, 10 Jan 2017 10:05:05 +0100
+Subject: [PATCH 2/3] again, fabs ambiguity
+
+
+diff --git a/src/meshlabplugins/edit_quality/eqhandle.cpp b/src/meshlabplugins/edit_quality/eqhandle.cpp
+index ef3d4a2d..d29f8c45 100644
+--- a/src/meshlabplugins/edit_quality/eqhandle.cpp
++++ b/src/meshlabplugins/edit_quality/eqhandle.cpp
+@@ -30,6 +30,7 @@ FIRST RELEASE
+ #include "eqhandle.h"
+ #include
+ #include
++#include
+
+ EqHandle::EqHandle(CHART_INFO *environment_info, QColor color, QPointF position,
+ EQUALIZER_HANDLE_TYPE type, EqHandle** handles, qreal* midHandlePercentilePosition, QDoubleSpinBox* spinbox,
+@@ -83,7 +84,7 @@ void EqHandle::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
+ setCursor(Qt::OpenHandCursor);
+
+ QPointF newPos = event->scenePos();
+- qreal handleOffset = std::fabs(newPos.x()-pos().x());
++ qreal handleOffset = fabs(newPos.x()-pos().x());
+
+ if (handleOffset >= std::numeric_limits::epsilon())
+ {
+--
+2.15.0
+
+
+From d717e44f4134ebee03322a6a2a56fce626084a3c Mon Sep 17 00:00:00 2001
+From: Patrick Chilton
+Date: Mon, 4 Dec 2017 21:27:23 +0100
+Subject: [PATCH 3/3] io_TXT -> io_txt
+
+
+diff --git a/src/meshlab_full.pro b/src/meshlab_full.pro
+index 6ea7f1db..2a95c127 100644
+--- a/src/meshlab_full.pro
++++ b/src/meshlab_full.pro
+@@ -16,7 +16,7 @@ SUBDIRS = common \
+ meshlabplugins/io_x3d \
+ meshlabplugins/io_expe \
+ meshlabplugins/io_pdb \
+- plugins_experimental/io_TXT \
++ plugins_experimental/io_txt \
+ # Filter plugins
+ meshlabplugins/filter_aging \
+ meshlabplugins/filter_ao \
+diff --git a/src/plugins_experimental/io_TXT/io_txt.cpp b/src/plugins_experimental/io_txt/io_txt.cpp
+similarity index 100%
+rename from src/plugins_experimental/io_TXT/io_txt.cpp
+rename to src/plugins_experimental/io_txt/io_txt.cpp
+diff --git a/src/plugins_experimental/io_TXT/io_txt.h b/src/plugins_experimental/io_txt/io_txt.h
+similarity index 100%
+rename from src/plugins_experimental/io_TXT/io_txt.h
+rename to src/plugins_experimental/io_txt/io_txt.h
+diff --git a/src/plugins_experimental/io_TXT/io_txt.pro b/src/plugins_experimental/io_txt/io_txt.pro
+similarity index 100%
+rename from src/plugins_experimental/io_TXT/io_txt.pro
+rename to src/plugins_experimental/io_txt/io_txt.pro
+--
+2.15.0
+
diff --git a/pkgs/applications/graphics/meshlab/include-unistd.diff b/pkgs/applications/graphics/meshlab/include-unistd.diff
deleted file mode 100644
index 74f28a4d211959e062937984c2b6e17d48e92926..0000000000000000000000000000000000000000
--- a/pkgs/applications/graphics/meshlab/include-unistd.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-*** old/vcglib/wrap/ply/plystuff.h 2013-02-09 00:00:04.110705851 -0500
---- new/vcglib/wrap/ply/plystuff.h 2013-02-09 15:20:53.482205183 -0500
-***************
-*** 75,80 ****
---- 75,81 ----
- #define pb_close _close
- #define DIR_SEP "\\"
- #else
-+ #include
- #define pb_mkdir(n) mkdir(n,0755)
- #define pb_access access
- #define pb_stat stat
-
diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix
index f7175f9d2b87063dfa57df40d050b373858406b2..a4e73d2f5b5acb96aa8e324a5358172dc861f8f0 100644
--- a/pkgs/applications/graphics/pencil/default.nix
+++ b/pkgs/applications/graphics/pencil/default.nix
@@ -1,36 +1,104 @@
-{ stdenv, fetchurl, makeWrapper, xulrunner }:
+{ stdenv, fetchurl, lib, makeWrapper,
+ # build dependencies
+ alsaLib, atk, cairo, cups, dbus, expat, fontconfig,
+ freetype, gdk_pixbuf, glib, gnome2, nspr, nss, xlibs,
+ glibc, udev
+}:
stdenv.mkDerivation rec {
- version = "2.0.21";
+ version = "3.0.4";
name = "pencil-${version}";
src = fetchurl {
- url = "https://github.com/prikhi/pencil/releases/download/v${version}/Pencil-${version}-linux-pkg.tar.gz";
- sha256 = "0xq3gczqy7gzf1997qxdql5z7qqk1vabr0rzgakmsi4dq2q4d3kq";
+ url = "http://pencil.evolus.vn/dl/V${version}/Pencil_${version}_amd64.deb";
+ sha256 = "58e2b794c615ea8715d8374f177e19c87f7071e359826ec34a59836d537a62fd";
};
- buildPhase = "";
+ sourceRoot = ".";
- buildInputs = [ makeWrapper ];
+ unpackCmd = ''
+ ar p "$src" data.tar.xz | tar xJ
+ '';
+
+ buildPhase = ":";
+
+ nativeBuildInputs = [ makeWrapper ];
installPhase = ''
- mkdir -p "$out"
- cp -r usr/* "$out"
- sed -e "s|/usr/share/evolus-pencil|$out/share/evolus-pencil|" \
- -i "$out/bin/pencil"
- sed -e "s|/usr/bin/pencil|$out/bin/pencil|" \
- -e "s|Icon=.*|Icon=$out/share/evolus-pencil/skin/classic/icon.svg|" \
- -i "$out/share/applications/pencil.desktop"
-
- wrapProgram $out/bin/pencil \
- --prefix PATH ":" ${xulrunner}/bin
+ mkdir -p $out/bin
+ cp -R usr/share opt $out/
+
+ # fix the path in the desktop file
+ substituteInPlace \
+ $out/share/applications/pencil.desktop \
+ --replace /opt/ $out/opt/
+
+ # symlink the binary to bin/
+ ln -s $out/opt/Pencil/pencil $out/bin/pencil
+ '';
+
+
+ preFixup = let
+ packages = [
+ alsaLib
+ atk
+ cairo
+ cups
+ dbus
+ expat
+ fontconfig
+ freetype
+ gdk_pixbuf
+ glib
+ gnome2.GConf
+ gnome2.gtk
+ gnome2.pango
+ nspr
+ nss
+ xlibs.libX11
+ xlibs.libXScrnSaver
+ xlibs.libXcomposite
+ xlibs.libXcursor
+ xlibs.libXdamage
+ xlibs.libXext
+ xlibs.libXfixes
+ xlibs.libXi
+ xlibs.libXrandr
+ xlibs.libXrender
+ xlibs.libXtst
+ stdenv.cc.cc.lib
+ stdenv.cc.cc
+ glibc
+ ];
+ libPathNative = lib.makeLibraryPath packages;
+ libPath64 = lib.makeSearchPathOutput "lib" "lib64" packages;
+ libPath = "${libPathNative}:${libPath64}";
+ in ''
+ # patch executable
+ patchelf \
+ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+ --set-rpath "${libPath}:$out/opt/Pencil" \
+ $out/opt/Pencil/pencil
+
+ # patch libnode
+ patchelf \
+ --set-rpath "${libPath}" \
+ $out/opt/Pencil/libnode.so
+
+ # libffmpeg is for some reason not executable
+ chmod a+x $out/opt/Pencil/libffmpeg.so
+
+ # fix missing libudev
+ ln -s ${udev}/lib/systemd/libsystemd-shared.so $out/opt/Pencil/libudev.so.1
+ wrapProgram $out/opt/Pencil/pencil \
+ --prefix LD_LIBRARY_PATH : $out/opt/Pencil
'';
meta = with stdenv.lib; {
description = "GUI prototyping/mockup tool";
- homepage = https://github.com/prikhi/pencil;
- license = licenses.gpl2; # Commercial license is also available
- maintainers = with maintainers; [ bjornfor prikhi ];
- platforms = platforms.linux;
+ homepage = "https://pencil.evolus.vn/";
+ license = licenses.gpl2; # Commercial license is also available
+ maintainers = with maintainers; [ bjornfor prikhi mrVanDalo ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix
index 82e8793199b603a9f2c1a0aa9e91a67f634943f0..01affbbbd94cccc864ce32873bd81dad7beccdee 100644
--- a/pkgs/applications/graphics/photoqt/default.nix
+++ b/pkgs/applications/graphics/photoqt/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
version = "1.5.1";
src = fetchurl {
- url = "http://photoqt.org/pkgs/photoqt-${version}.tar.gz";
+ url = "https://photoqt.org/pkgs/photoqt-${version}.tar.gz";
sha256 = "17kkpzkmzfnigs26jjyd75iy58qffjsclif81cmviq73lzmqy0b1";
};
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = {
- homepage = http://photoqt.org/;
+ homepage = https://photoqt.org/;
description = "Simple, yet powerful and good looking image viewer";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix
index f4a4b6bb9d85d273cbf1b1fbbce3245d4c0248bf..a3151238438bba1fcc39ba702c0bdc90db930a2c 100644
--- a/pkgs/applications/graphics/pinta/default.nix
+++ b/pkgs/applications/graphics/pinta/default.nix
@@ -56,9 +56,9 @@ buildDotnetPackage rec {
'';
makeWrapperArgs = [
- ''--prefix MONO_GAC_PREFIX ':' "${gtksharp}"''
- ''--prefix LD_LIBRARY_PATH ':' "${gtksharp}/lib"''
- ''--prefix LD_LIBRARY_PATH ':' "${gtksharp.gtk.out}/lib"''
+ ''--prefix MONO_GAC_PREFIX : ${gtksharp}''
+ ''--prefix LD_LIBRARY_PATH : ${gtksharp}/lib''
+ ''--prefix LD_LIBRARY_PATH : ${gtksharp.gtk.out}/lib''
];
postInstall = ''
diff --git a/pkgs/applications/graphics/pqiv/default.nix b/pkgs/applications/graphics/pqiv/default.nix
index 39f4e0a26d24972818dc6434361b5e0089693d41..9e5958871cc054f26d0c46b86998bd2fbf2376a0 100644
--- a/pkgs/applications/graphics/pqiv/default.nix
+++ b/pkgs/applications/graphics/pqiv/default.nix
@@ -1,18 +1,20 @@
-{ stdenv, fetchFromGitHub, getopt, which, pkgconfig, gtk3 } :
+{ stdenv, fetchFromGitHub, pkgconfig
+, ffmpeg, gtk3, imagemagick, libarchive, libspectre, libwebp, poppler
+}:
stdenv.mkDerivation (rec {
name = "pqiv-${version}";
- version = "2.10.1";
+ version = "2.10.2";
src = fetchFromGitHub {
owner = "phillipberndt";
repo = "pqiv";
rev = version;
- sha256 = "06blqckj3bpbi2kl5ndv2d10r7nw62r386kfwrkic9amynlv9gki";
+ sha256 = "0zn7ps73lw04l9i4777c90ik07v3hkg66mnpz8vvvwjyi40i77a7";
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ getopt which gtk3 ];
+ buildInputs = [ ffmpeg gtk3 imagemagick libarchive libspectre libwebp poppler ];
prePatch = "patchShebangs .";
diff --git a/pkgs/applications/graphics/rawtherapee/ReleaseInfo.cmake b/pkgs/applications/graphics/rawtherapee/ReleaseInfo.cmake
deleted file mode 100644
index 7be7cb63f70178c57f96724be600d6d997cd7f71..0000000000000000000000000000000000000000
--- a/pkgs/applications/graphics/rawtherapee/ReleaseInfo.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-set(GIT_BRANCH master)
-set(GIT_VERSION 4.2.1115)
-set(GIT_CHANGESET 0821eea7b6a4ac2fce1fcf644e06078e161e41e3)
-set(GIT_TAGDISTANCE 1115)
diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix
index 91a34a505f2fb26c17f6bd0bb7e9e182761bbbd5..5743f0c1bcb618b60f8b67d3fffda201beff32c8 100644
--- a/pkgs/applications/graphics/rawtherapee/default.nix
+++ b/pkgs/applications/graphics/rawtherapee/default.nix
@@ -14,10 +14,10 @@ stdenv.mkDerivation rec {
sha256 = "1r6sx9zl1wkykgfx6k26268xadair6hzl15v5hmiri9sdhrn33q7";
};
- nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
+ nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook ];
buildInputs = [
- cmake pixman libpthreadstubs gtkmm3 libXau libXdmcp
+ pixman libpthreadstubs gtkmm3 libXau libXdmcp
lcms2 libiptcdata libcanberra_gtk3 fftw expat pcre libsigcxx lensfun
];
diff --git a/pkgs/applications/graphics/rawtherapee/dev.nix b/pkgs/applications/graphics/rawtherapee/dev.nix
deleted file mode 100644
index fb73feb4a09971b9784e1c1b88ad60218c70e081..0000000000000000000000000000000000000000
--- a/pkgs/applications/graphics/rawtherapee/dev.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, fetchFromGitHub, pkgconfig, cmake, pixman, libpthreadstubs, gtkmm2, libXau
-, libXdmcp, lcms2, libiptcdata, libcanberra_gtk2, fftw, expat, pcre, libsigcxx
-}:
-
-stdenv.mkDerivation rec {
- name = "rawtherapee-git-2016-10-10";
-
- src = fetchFromGitHub {
- owner = "Beep6581";
- repo = "RawTherapee";
- rev = "0821eea7b6a4ac2fce1fcf644e06078e161e41e3";
- sha256 = "1nwb6b1qrpdyigwig7bvr42lf7na1ngm0q2cislcvb2v1nmk6nlz";
- };
-
- 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";
-
- # Copy generated ReleaseInfo.cmake so we don't need git. File was
- # generated manually using `./tools/generateReleaseInfo` in the
- # source folder. Make sure to regenerate it when updating.
- preConfigure = ''
- cp ${./ReleaseInfo.cmake} ./ReleaseInfo.cmake
- '';
-
- enableParallelBuilding = true;
-
- meta = {
- description = "RAW converter and digital photo processing software";
- homepage = http://www.rawtherapee.com/;
- license = stdenv.lib.licenses.gpl3Plus;
- maintainers = with stdenv.lib.maintainers; [ viric jcumming mahe the-kenny ];
- platforms = with stdenv.lib.platforms; linux;
- };
-}
diff --git a/pkgs/applications/graphics/rawtherapee/fix-glibmm-output.patch b/pkgs/applications/graphics/rawtherapee/fix-glibmm-output.patch
deleted file mode 100644
index 3c87ce64e26b08484ea9cae5ed4e5aa132534c37..0000000000000000000000000000000000000000
--- a/pkgs/applications/graphics/rawtherapee/fix-glibmm-output.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From ca0afa8d5f3cc7d09b6bab32d155a87c550f0d7b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fl=C3=B6ssie?=
-Date: Sat, 1 Oct 2016 12:38:24 +0200
-Subject: [PATCH] Fix incompatibility with glibmm 2.50 (#3440)
-
-Kudos to @Hombre57 for the suggestion.
----
- rtgui/dirbrowser.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/rtgui/dirbrowser.cc b/rtgui/dirbrowser.cc
-index d3fc8bf..6f25f0f 100644
---- a/rtgui/dirbrowser.cc
-+++ b/rtgui/dirbrowser.cc
-@@ -59,7 +59,7 @@ std::vector listSubDirs (const Glib::RefPtr& dir, bool
- } catch (const Glib::Exception& exception) {
-
- if (options.rtSettings.verbose) {
-- std::cerr << "Failed to list subdirectories of \"" << dir << "\": " << exception.what () << std::endl;
-+ std::cerr << "Failed to list subdirectories of \"" << dir->get_basename() << "\": " << exception.what () << std::endl;
- }
-
- }
diff --git a/pkgs/applications/graphics/renderdoc/custom_swig.patch b/pkgs/applications/graphics/renderdoc/custom_swig.patch
new file mode 100644
index 0000000000000000000000000000000000000000..e6ed05ea97a541e27e8a294ba3721b51ed0fd843
--- /dev/null
+++ b/pkgs/applications/graphics/renderdoc/custom_swig.patch
@@ -0,0 +1,32 @@
+diff --git a/qrenderdoc/CMakeLists.txt b/qrenderdoc/CMakeLists.txt
+index 2df9ffa5..66bafaba 100644
+--- a/qrenderdoc/CMakeLists.txt
++++ b/qrenderdoc/CMakeLists.txt
+@@ -65,16 +65,6 @@ include(ExternalProject)
+ # Need bison for swig
+ find_package(BISON)
+
+-# Compile our custom SWIG that will do scoped/strong enum classes
+-ExternalProject_Add(custom_swig
+- # using an URL to a zip directly so we don't clone the history etc
+- URL ${RENDERDOC_SWIG_PACKAGE}
+- BUILD_IN_SOURCE 1
+- CONFIGURE_COMMAND ./autogen.sh > /dev/null 2>&1
+- COMMAND CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} ./configure --with-pcre=yes --prefix=${CMAKE_BINARY_DIR} > /dev/null
+- BUILD_COMMAND $(MAKE) > /dev/null 2>&1
+- INSTALL_COMMAND $(MAKE) install > /dev/null 2>&1)
+-
+ # Lastly find PySide 2, optionally, for Qt5 Python bindings
+ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
+
+@@ -186,9 +176,8 @@ foreach(in ${swig_interfaces})
+ get_filename_component(swig_file ${in} NAME_WE)
+
+ add_custom_command(OUTPUT ${swig_file}_python.cxx ${swig_file}.py
+- COMMAND ${CMAKE_BINARY_DIR}/bin/swig -v -Wextra -Werror -O -c++ -python -modern -modernargs -enumclass -fastunpack -py3 -builtin -I${CMAKE_CURRENT_SOURCE_DIR} -I${CMAKE_SOURCE_DIR}/renderdoc/api/replay -outdir ${CMAKE_CURRENT_BINARY_DIR} -o ${CMAKE_CURRENT_BINARY_DIR}/${swig_file}_python.cxx ${CMAKE_CURRENT_SOURCE_DIR}/${in}
++ COMMAND $ENV{NIXOS_CUSTOM_SWIG} -v -Wextra -Werror -O -c++ -python -modern -modernargs -enumclass -fastunpack -py3 -builtin -I${CMAKE_CURRENT_SOURCE_DIR} -I${CMAKE_SOURCE_DIR}/renderdoc/api/replay -outdir ${CMAKE_CURRENT_BINARY_DIR} -o ${CMAKE_CURRENT_BINARY_DIR}/${swig_file}_python.cxx ${CMAKE_CURRENT_SOURCE_DIR}/${in}
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${in}
+- DEPENDS custom_swig
+ DEPENDS ${RDOC_REPLAY_FILES}
+ DEPENDS ${QRD_INTERFACE_FILES})
+
diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix
index 2a5bbb9401a4b1e9f4170bcfde9a1eb8b6bf7f95..2bd3ab89161f5b3d2209dd723eb5f38c1434cb9a 100644
--- a/pkgs/applications/graphics/renderdoc/default.nix
+++ b/pkgs/applications/graphics/renderdoc/default.nix
@@ -1,8 +1,26 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig
, qtbase, qtx11extras, qtsvg, makeWrapper, python3, bison
-, autoconf, automake, pcre, vulkan-loader, xorg
+, pcre, vulkan-loader, xorg, autoreconfHook
}:
+let
+ custom_swig = stdenv.mkDerivation {
+ name = "renderdoc-custom-swig";
+ src = fetchFromGitHub {
+ owner = "baldurk";
+ repo = "swig";
+ rev = "renderdoc-modified-1";
+ sha256 = "1whymd3vamwnp4jqfc9asls3dw9wsdi21xhm1d2a4vx9nql8if1x";
+ };
+
+ nativeBuildInputs = [ autoreconfHook pcre ];
+
+ autoreconfPhase = ''
+ patchShebangs autogen.sh
+ ./autogen.sh
+ '';
+ };
+in
stdenv.mkDerivation rec {
name = "renderdoc-${version}";
version = "0.91";
@@ -17,7 +35,8 @@ stdenv.mkDerivation rec {
buildInputs = [
qtbase qtsvg xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader
];
- nativeBuildInputs = [ cmake makeWrapper pkgconfig python3 bison autoconf automake pcre ];
+
+ nativeBuildInputs = [ cmake makeWrapper pkgconfig python3 bison ];
cmakeFlags = [
"-DBUILD_VERSION_HASH=${src.rev}"
@@ -28,6 +47,7 @@ stdenv.mkDerivation rec {
# TODO: use this instead of preConfigure once placeholders land
#"-DVULKAN_LAYER_FOLDER=${placeholder out}/share/vulkan/implicit_layer.d/"
];
+
preConfigure = ''
cmakeFlags+=" -DVULKAN_LAYER_FOLDER=$out/share/vulkan/implicit_layer.d/"
'';
@@ -41,8 +61,14 @@ stdenv.mkDerivation rec {
ln -s $out/bin/.bin/renderdoccmd $out/bin/renderdoccmd
wrapProgram $out/bin/renderdoccmd --suffix LD_LIBRARY_PATH : $out/lib --suffix LD_LIBRARY_PATH : ${vulkan-loader}/lib
'';
+
+ # Set path to custom swig binary
+ NIXOS_CUSTOM_SWIG = "${custom_swig}/bin/swig";
+
enableParallelBuilding = true;
+ patches = [ ./custom_swig.patch ];
+
meta = with stdenv.lib; {
description = "A single-frame graphics debugger";
homepage = https://renderdoc.org/;
diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix
index 3ef23142b2ed5ef49c4ef0bd536a6b4f00ee89b5..5d35857f05e1dd371a3a872997ab5f383c078cbf 100644
--- a/pkgs/applications/graphics/sane/backends/generic.nix
+++ b/pkgs/applications/graphics/sane/backends/generic.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl
-, avahi, libjpeg, libusb1, libv4l, net_snmp
+, avahi, libjpeg, libusb1, libv4l, net_snmp, libpng
, gettext, pkgconfig
# List of { src name backend } attibute sets - see installFirmware below:
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
++ stdenv.lib.optional (libusb1 != null) "--enable-libusb_1_0"
;
- buildInputs = [ avahi libusb1 libv4l net_snmp ];
+ buildInputs = [ avahi libusb1 libv4l net_snmp libpng ];
nativeBuildInputs = [ gettext pkgconfig ];
enableParallelBuilding = true;
diff --git a/pkgs/applications/graphics/sane/backends/git.nix b/pkgs/applications/graphics/sane/backends/git.nix
index dbf79bf20acbd2c1665e7b3e82c839687e3321dc..e746f83e5d49ccbf9bf11d700f61e2d0cf4b92be 100644
--- a/pkgs/applications/graphics/sane/backends/git.nix
+++ b/pkgs/applications/graphics/sane/backends/git.nix
@@ -1,10 +1,10 @@
{ callPackage, fetchgit, ... } @ args:
callPackage ./generic.nix (args // {
- version = "2016-06-11";
+ version = "2017-12-01";
src = fetchgit {
- sha256 = "0jpavig7bg7l72drlwipmsg03j6qdy5aq2r3kj6a2h6ahpnm2549";
- rev = "5ba37467e88ca8052973b37128ce8fd36ad5d61d";
+ sha256 = "0qf7d7268kdxnb723c03m6icxhbgx0vw8gqvck2q1w5b948dy9g8";
+ rev = "e895ee55bec8a3320a0e972b32c05d35b47fe226";
url = "git://alioth.debian.org/git/sane/sane-backends.git";
};
})
diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix
index b0a6f7caf8852e3219205af0457e7da2c1083a93..b23ddbf9d78bc013c3f38e58abfc9dbac31b1459 100644
--- a/pkgs/applications/graphics/shotwell/default.nix
+++ b/pkgs/applications/graphics/shotwell/default.nix
@@ -1,38 +1,37 @@
-{ fetchurl, stdenv, m4, glibc, gtk3, libexif, libgphoto2, libsoup, libxml2, vala_0_28, sqlite
-, webkitgtk, pkgconfig, gnome3, gst_all_1, which, udev, libgudev, libraw, glib, json_glib
-, gettext, desktop_file_utils, lcms2, gdk_pixbuf, librsvg, wrapGAppsHook
-, gnome_doc_utils, hicolor_icon_theme, itstool, libgdata }:
+{ fetchurl, stdenv, meson, ninja, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite
+, webkitgtk, pkgconfig, gnome3, gst_all_1, libgudev, libraw, glib, json_glib
+, gettext, desktop_file_utils, gdk_pixbuf, librsvg, wrapGAppsHook
+, itstool, libgdata }:
-# for dependencies see http://www.yorba.org/projects/shotwell/install/
+# for dependencies see https://wiki.gnome.org/Apps/Shotwell/BuildingAndInstalling
stdenv.mkDerivation rec {
version = "${major}.${minor}";
major = "0.27";
- minor = "1";
+ minor = "2";
name = "shotwell-${version}";
src = fetchurl {
url = "mirror://gnome/sources/shotwell/${major}/${name}.tar.xz";
- sha256 = "1jav7qv0s1v6wvd7x2ri85hjqnbswq883pnd228qhd6bhjbryp89";
+ sha256 = "0bxc15gk2306fvxg6bg1s6c706yd89i66ldng0z102mcfi98warb";
};
- NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include";
+ nativeBuildInputs = [
+ meson ninja pkgconfig itstool gettext desktop_file_utils wrapGAppsHook
+ ];
- configureFlags = [ "--disable-gsettings-convert-install" ];
+ buildInputs = [
+ gtk3 libexif libgphoto2 libsoup libxml2 vala sqlite webkitgtk
+ gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee
+ libgudev gnome3.gexiv2 gnome3.gsettings_desktop_schemas
+ libraw json_glib glib gdk_pixbuf librsvg gnome3.rest
+ gnome3.gcr gnome3.defaultIconTheme libgdata
+ ];
- preConfigure = ''
- patchShebangs .
+ postInstall = ''
+ glib-compile-schemas $out/share/glib-2.0/schemas
'';
- nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
-
- buildInputs = [ m4 glibc gtk3 libexif libgphoto2 libsoup libxml2 vala_0_28 sqlite webkitgtk
- gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee
- which udev libgudev gnome3.gexiv2 hicolor_icon_theme
- libraw json_glib gettext desktop_file_utils glib lcms2 gdk_pixbuf librsvg
- gnome_doc_utils gnome3.rest gnome3.gcr
- gnome3.defaultIconTheme itstool libgdata ];
-
meta = with stdenv.lib; {
description = "Popular photo organizer for the GNOME desktop";
homepage = https://wiki.gnome.org/Apps/Shotwell;
diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix
index 43d6229ab2bc90c57334dd593b4d58aaf01602c2..be1a799a9ecf3b07c29d63196dfa14bf1f6b7b99 100644
--- a/pkgs/applications/graphics/solvespace/default.nix
+++ b/pkgs/applications/graphics/solvespace/default.nix
@@ -1,5 +1,6 @@
{ stdenv, fetchgit, cmake, pkgconfig, zlib, libpng, cairo, freetype
, json_c, fontconfig, gtkmm3, pangomm, glew, mesa_glu, xlibs, pcre
+, wrapGAppsHook
}:
stdenv.mkDerivation rec {
name = "solvespace-2.3-20170808";
@@ -11,9 +12,11 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [
+ pkgconfig cmake wrapGAppsHook
+ ];
buildInputs = [
- cmake zlib libpng cairo freetype
+ zlib libpng cairo freetype
json_c fontconfig gtkmm3 pangomm glew mesa_glu
xlibs.libpthreadstubs xlibs.libXdmcp pcre
];
@@ -38,11 +41,11 @@ stdenv.mkDerivation rec {
--replace /usr/bin/ $out/bin/
'';
- meta = {
+ meta = with stdenv.lib; {
description = "A parametric 3d CAD program";
- license = stdenv.lib.licenses.gpl3;
- maintainers = with stdenv.lib.maintainers; [ edef ];
- platforms = stdenv.lib.platforms.linux;
+ license = licenses.gpl3;
+ maintainers = [ maintainers.edef ];
+ platforms = platforms.linux;
homepage = http://solvespace.com;
};
}
diff --git a/pkgs/applications/graphics/unigine-valley/default.nix b/pkgs/applications/graphics/unigine-valley/default.nix
index 31908dcfd9f0b96b2e5238e86ee2d77891af1bcd..f1adc6bd10eaf0c017a16f03a83c26530f9b259f 100644
--- a/pkgs/applications/graphics/unigine-valley/default.nix
+++ b/pkgs/applications/graphics/unigine-valley/default.nix
@@ -22,7 +22,7 @@ let
else if stdenv.system == "i686-linux" then
"x86"
else
- abort "Unsupported platform";
+ throw "Unsupported platform ${stdenv.system}";
in
stdenv.mkDerivation rec {
diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix
index dcb7c512ddef508c59d646faca87860e8f44b0df..a8b4038b11f3cdf7cabd78ca4dd4b851bea3c376 100644
--- a/pkgs/applications/graphics/yed/default.nix
+++ b/pkgs/applications/graphics/yed/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "yEd-${version}";
- version = "3.17.1";
+ version = "3.17.2";
src = requireFile {
name = "${name}.zip";
url = "https://www.yworks.com/en/products/yfiles/yed/";
- sha256 = "0fk1gai7yghfmfvx1rfzdnpwihbq6hqzncyk6zkpqdrf6zz576nl";
+ sha256 = "0wpfvd3jqxgjk3xqkamvlg7rk0w0pmrv7srjfqns447ccc3i7qg2";
};
nativeBuildInputs = [ unzip makeWrapper ];
diff --git a/pkgs/applications/kde/akonadi/0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch b/pkgs/applications/kde/akonadi/0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch
new file mode 100644
index 0000000000000000000000000000000000000000..1b5e12c7ec3243e6f7c0aeb154aef0dd307e48e4
--- /dev/null
+++ b/pkgs/applications/kde/akonadi/0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch
@@ -0,0 +1,49 @@
+From bc018b4bc816a3b51deb9739bedbf8a2268d0684 Mon Sep 17 00:00:00 2001
+From: gnidorah
+Date: Fri, 22 Dec 2017 17:36:03 +0300
+Subject: [PATCH] Revert "Make Akonadi installation properly relocatable"
+
+This reverts commit b2bb55f13f2ac783f89cc414de8c39f62fa2096a.
+---
+ CMakeLists.txt | 3 ---
+ KF5AkonadiConfig.cmake.in | 6 +++---
+ 2 files changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9788bea94..15bad00fd 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -285,9 +285,6 @@ configure_package_config_file(
+ "${CMAKE_CURRENT_SOURCE_DIR}/KF5AkonadiConfig.cmake.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/KF5AkonadiConfig.cmake"
+ INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
+- PATH_VARS AKONADI_DBUS_INTERFACES_INSTALL_DIR
+- AKONADI_INCLUDE_DIR
+- KF5Akonadi_DATA_DIR
+ )
+
+ install(FILES
+diff --git a/KF5AkonadiConfig.cmake.in b/KF5AkonadiConfig.cmake.in
+index 75abede50..10f039376 100644
+--- a/KF5AkonadiConfig.cmake.in
++++ b/KF5AkonadiConfig.cmake.in
+@@ -13,8 +13,8 @@ find_dependency(KF5ConfigWidgets "@KF5_VERSION@")
+ find_dependency(Qt5DBus "@QT_REQUIRED_VERSION@")
+ find_dependency(Qt5Network "@QT_REQUIRED_VERSION@")
+
+-set_and_check(AKONADI_DBUS_INTERFACES_DIR "@PACKAGE_AKONADI_DBUS_INTERFACES_INSTALL_DIR@")
+-set_and_check(AKONADI_INCLUDE_DIR "@PACKAGE_AKONADI_INCLUDE_DIR@")
++set_and_check(AKONADI_DBUS_INTERFACES_DIR "@AKONADI_DBUS_INTERFACES_INSTALL_DIR@")
++set_and_check(AKONADI_INCLUDE_DIR "@AKONADI_INCLUDE_DIR@")
+
+ find_dependency(Boost "@Boost_MINIMUM_VERSION@")
+
+@@ -22,4 +22,4 @@ include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiTargets.cmake)
+ include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiMacros.cmake)
+
+ # The directory where akonadi-xml.xsd and kcfg2dbus.xsl are installed
+-set(KF5Akonadi_DATA_DIR "@PACKAGE_KF5Akonadi_DATA_DIR@")
++set(KF5Akonadi_DATA_DIR "@KF5Akonadi_DATA_DIR@")
+--
+2.15.1
+
diff --git a/pkgs/applications/kde/akonadi/series b/pkgs/applications/kde/akonadi/series
index 9e067f0a0008d16cd26362a6dcfc36e263dbec62..f828d503cc7701ed37baf34b1a603abac4e59f48 100644
--- a/pkgs/applications/kde/akonadi/series
+++ b/pkgs/applications/kde/akonadi/series
@@ -1,2 +1,3 @@
akonadi-paths.patch
akonadi-timestamps.patch
+0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch
diff --git a/pkgs/applications/kde/akonadiconsole.nix b/pkgs/applications/kde/akonadiconsole.nix
index 3d7bf26c794e3778f1e6fd0dd36c365fa60ca347..1470406d5a43e20808803724ec42ebfa4a1b03a4 100644
--- a/pkgs/applications/kde/akonadiconsole.nix
+++ b/pkgs/applications/kde/akonadiconsole.nix
@@ -3,7 +3,7 @@
extra-cmake-modules, kdoctools,
akonadi, akonadi-contacts, calendarsupport, kcalcore, kcompletion,
kconfigwidgets, kcontacts, kdbusaddons, kitemmodels, kpimtextedit, libkdepim,
- ktextwidgets, kxmlgui, messagelib, qtbase,
+ ktextwidgets, kxmlgui, messagelib, qtbase, akonadi-search, xapian
}:
mkDerivation {
@@ -16,6 +16,6 @@ mkDerivation {
buildInputs = [
akonadi akonadi-contacts calendarsupport kcalcore kcompletion kconfigwidgets
kcontacts kdbusaddons kitemmodels kpimtextedit ktextwidgets kxmlgui
- messagelib qtbase libkdepim
+ messagelib qtbase libkdepim akonadi-search xapian
];
}
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 378fcde41e10ba745eaebdc9cf999d0904a7f4a9..dc57a3554f31dd1dc3addde9fb204a26538b674b 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -63,7 +63,6 @@ let
kdepimTeam = with lib.maintainers; [ ttuegel vandenoever ];
};
in {
- kdelibs = callPackage ./kdelibs { inherit attica phonon; };
akonadi = callPackage ./akonadi {};
akonadi-calendar = callPackage ./akonadi-calendar.nix {};
akonadi-contacts = callPackage ./akonadi-contacts.nix {};
@@ -102,6 +101,7 @@ let
kdepim-apps-libs = callPackage ./kdepim-apps-libs {};
kdf = callPackage ./kdf.nix {};
keditbookmarks = callPackage ./keditbookmarks.nix {};
+ kget = callPackage ./kget.nix {};
kgpg = callPackage ./kgpg.nix {};
khelpcenter = callPackage ./khelpcenter.nix {};
kholidays = callPackage ./kholidays.nix {};
@@ -124,6 +124,7 @@ let
kontactinterface = callPackage ./kontactinterface.nix {};
korganizer = callPackage ./korganizer.nix {};
kpimtextedit = callPackage ./kpimtextedit.nix {};
+ ksmtp = callPackage ./ksmtp {};
kqtquickcharts = callPackage ./kqtquickcharts.nix {};
krdc = callPackage ./krdc.nix {};
krfb = callPackage ./krfb.nix {};
@@ -135,6 +136,7 @@ let
libkdcraw = callPackage ./libkdcraw.nix {};
libkdepim = callPackage ./libkdepim.nix {};
libkexiv2 = callPackage ./libkexiv2.nix {};
+ libkgapi = callPackage ./libkgapi.nix {};
libkipi = callPackage ./libkipi.nix {};
libkleo = callPackage ./libkleo.nix {};
libkomparediff2 = callPackage ./libkomparediff2.nix {};
@@ -154,8 +156,6 @@ let
print-manager = callPackage ./print-manager.nix {};
spectacle = callPackage ./spectacle.nix {};
syndication = callPackage ./syndication.nix {};
-
- l10n = recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib recurseIntoAttrs; });
};
in lib.makeScope libsForQt5.newScope packages
diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh
index 1542b9c25190a865385b76c9c85c5976d3a9259b..5a12918fb978ccfd7bfe09443e564637c3c83de2 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.3/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/applications/17.12.0/ -A '*.tar.xz' )
diff --git a/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch b/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch
index 6275bb84c17b08ba15460d127ec53a3ad9451d23..fe8b15febf2eb5022f6a5de79df924446d682daa 100644
--- a/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch
+++ b/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch
@@ -11,11 +11,72 @@ Index: grantleetheme-17.04.0/src/grantleetheme_p.h
QString author;
QString email;
-Index: grantleetheme-17.04.0/src/grantleetheme.cpp
+Index: grantleetheme-17.04.0/src/grantleetheme.h
+===================================================================
+--- grantleetheme-17.04.0.orig/src/grantleetheme.h
++++ grantleetheme-17.04.0/src/grantleetheme.h
+@@ -50,11 +50,14 @@ public:
+ QStringList displayExtraVariables() const;
+ QString dirName() const;
+ QString absolutePath() const;
++ QStringList absolutePaths() const;
+ QString author() const;
+ QString authorEmail() const;
+
+ QString render(const QString &templateName, const QVariantHash &data, const QByteArray &applicationDomain = QByteArray());
+
++ void addThemeDir(const QString&);
++
+ static void addPluginPath(const QString &path);
+
+ private:
+Index: grantleetheme-17.04.0/src/grantleethememanager.cpp
===================================================================
---- grantleetheme-17.04.0.orig/src/grantleetheme.cpp
-+++ grantleetheme-17.04.0/src/grantleetheme.cpp
-@@ -45,7 +45,7 @@ ThemePrivate::ThemePrivate(const ThemePr
+--- grantleetheme-17.04.0.orig/src/grantleethememanager.cpp
++++ grantleetheme-17.04.0/src/grantleethememanager.cpp
+@@ -142,25 +142,18 @@ public:
+
+ for (const QString &directory : qAsConst(themesDirectories)) {
+ QDirIterator dirIt(directory, QStringList(), QDir::AllDirs | QDir::NoDotAndDotDot);
+- QStringList alreadyLoadedThemeName;
+ while (dirIt.hasNext()) {
+ dirIt.next();
+ const QString dirName = dirIt.fileName();
+ GrantleeTheme::Theme theme = q->loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName);
+ if (theme.isValid()) {
+ QString themeName = theme.name();
+- if (alreadyLoadedThemeName.contains(themeName)) {
+- int i = 2;
+- const QString originalName(theme.name());
+- while (alreadyLoadedThemeName.contains(themeName)) {
+- themeName = originalName + QStringLiteral(" (%1)").arg(i);
+- ++i;
+- }
+- theme.d->name = themeName;
++ QMap::iterator i = themes.find(dirName);
++ if (i != themes.end()) {
++ i.value().addThemeDir(dirIt.filePath());
++ } else {
++ themes.insert(dirName, theme);
+ }
+- alreadyLoadedThemeName << themeName;
+- themes.insert(dirName, theme);
+- //qDebug()<<" theme.name()"<addDir(directory);
+@@ -374,7 +367,7 @@ QString ThemeManager::pathFromThemes(con
+ GrantleeTheme::Theme theme = loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName);
+ if (theme.isValid()) {
+ if (dirName == themeName) {
+- return theme.absolutePath();
++ return theme.absolutePaths().first();
+ }
+ }
+ }
+--- src/grantleetheme.cpp.orig 2017-12-22 16:11:39.863598126 +0300
++++ ./src/grantleetheme.cpp 2017-12-22 16:16:14.045664607 +0300
+@@ -46,7 +46,7 @@ ThemePrivate::ThemePrivate(const ThemePr
, description(other.description)
, name(other.name)
, dirName(other.dirName)
@@ -24,7 +85,7 @@ Index: grantleetheme-17.04.0/src/grantleetheme.cpp
, author(other.author)
, email(other.email)
, loader(other.loader)
-@@ -63,12 +63,15 @@ void ThemePrivate::setupEngine()
+@@ -64,12 +64,15 @@ void ThemePrivate::setupEngine()
void ThemePrivate::setupLoader()
{
@@ -38,13 +99,13 @@ Index: grantleetheme-17.04.0/src/grantleetheme.cpp
+ templateDirs << dir.absolutePath();
+ }
- loader = QSharedPointer::create();
+ loader = QSharedPointer::create();
- loader->setTemplateDirs({ dir.absolutePath() });
+ loader->setTemplateDirs(templateDirs);
loader->setTheme(dirName);
if (!sEngine) {
-@@ -122,7 +123,7 @@ Theme::Theme(const QString &themePath, c
+@@ -121,7 +124,7 @@ Theme::Theme(const QString &themePath, c
KConfigGroup group(&config, QStringLiteral("Desktop Entry"));
if (group.isValid()) {
d->dirName = dirName;
@@ -53,7 +114,7 @@ Index: grantleetheme-17.04.0/src/grantleetheme.cpp
d->name = group.readEntry("Name", QString());
d->description = group.readEntry("Description", QString());
d->themeFileName = group.readEntry("FileName", QString());
-@@ -141,7 +142,7 @@ Theme::~Theme()
+@@ -140,7 +143,7 @@ Theme::~Theme()
bool Theme::operator==(const Theme &other) const
{
@@ -62,7 +123,7 @@ Index: grantleetheme-17.04.0/src/grantleetheme.cpp
}
Theme &Theme::operator=(const Theme &other)
-@@ -185,7 +186,12 @@ QString Theme::dirName() const
+@@ -184,7 +187,12 @@ QString Theme::dirName() const
QString Theme::absolutePath() const
{
@@ -76,7 +137,7 @@ Index: grantleetheme-17.04.0/src/grantleetheme.cpp
}
QString Theme::author() const
-@@ -224,6 +230,13 @@ QString Theme::render(const QString &tem
+@@ -223,6 +231,13 @@ QString Theme::render(const QString &tem
return result;
}
@@ -90,66 +151,3 @@ Index: grantleetheme-17.04.0/src/grantleetheme.cpp
void Theme::addPluginPath(const QString &path)
{
if (!ThemePrivate::sEngine) {
-Index: grantleetheme-17.04.0/src/grantleetheme.h
-===================================================================
---- grantleetheme-17.04.0.orig/src/grantleetheme.h
-+++ grantleetheme-17.04.0/src/grantleetheme.h
-@@ -50,11 +50,14 @@ public:
- QStringList displayExtraVariables() const;
- QString dirName() const;
- QString absolutePath() const;
-+ QStringList absolutePaths() const;
- QString author() const;
- QString authorEmail() const;
-
- QString render(const QString &templateName, const QVariantHash &data, const QByteArray &applicationDomain = QByteArray());
-
-+ void addThemeDir(const QString&);
-+
- static void addPluginPath(const QString &path);
-
- private:
-Index: grantleetheme-17.04.0/src/grantleethememanager.cpp
-===================================================================
---- grantleetheme-17.04.0.orig/src/grantleethememanager.cpp
-+++ grantleetheme-17.04.0/src/grantleethememanager.cpp
-@@ -142,25 +142,18 @@ public:
-
- for (const QString &directory : qAsConst(themesDirectories)) {
- QDirIterator dirIt(directory, QStringList(), QDir::AllDirs | QDir::NoDotAndDotDot);
-- QStringList alreadyLoadedThemeName;
- while (dirIt.hasNext()) {
- dirIt.next();
- const QString dirName = dirIt.fileName();
- GrantleeTheme::Theme theme = q->loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName);
- if (theme.isValid()) {
- QString themeName = theme.name();
-- if (alreadyLoadedThemeName.contains(themeName)) {
-- int i = 2;
-- const QString originalName(theme.name());
-- while (alreadyLoadedThemeName.contains(themeName)) {
-- themeName = originalName + QStringLiteral(" (%1)").arg(i);
-- ++i;
-- }
-- theme.d->name = themeName;
-+ QMap::iterator i = themes.find(dirName);
-+ if (i != themes.end()) {
-+ i.value().addThemeDir(dirIt.filePath());
-+ } else {
-+ themes.insert(dirName, theme);
- }
-- alreadyLoadedThemeName << themeName;
-- themes.insert(dirName, theme);
-- //qDebug()<<" theme.name()"<addDir(directory);
-@@ -374,7 +367,7 @@ QString ThemeManager::pathFromThemes(con
- GrantleeTheme::Theme theme = loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName);
- if (theme.isValid()) {
- if (dirName == themeName) {
-- return theme.absolutePath();
-+ return theme.absolutePaths().first();
- }
- }
- }
diff --git a/pkgs/applications/kde/kde-locale-4.nix b/pkgs/applications/kde/kde-locale-4.nix
deleted file mode 100644
index daf0a55b19e5f135c450f6b9437fc71e83c1fd65..0000000000000000000000000000000000000000
--- a/pkgs/applications/kde/kde-locale-4.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-name: args:
-
-{ mkDerivation, automoc4, cmake, gettext, kdelibs, perl }:
-
-mkDerivation (args // {
- sname = "kde-l10n-${name}";
- name = "kde-l10n-${name}-qt4";
-
- outputs = [ "out" ];
-
- nativeBuildInputs =
- [ automoc4 cmake gettext perl ]
- ++ (args.nativeBuildInputs or []);
- buildInputs =
- [ kdelibs ]
- ++ (args.buildInputs or []);
-
- preConfigure = ''
- sed -e 's/add_subdirectory(5)//' -i CMakeLists.txt
- ${args.preConfigure or ""}
- '';
-
- preFixup = ''
- propagatedBuildInputs=
- propagatedNativeBuildInputs=
- '';
-})
diff --git a/pkgs/applications/kde/kdelibs/0001-old-kde4-cmake-policies.patch b/pkgs/applications/kde/kdelibs/0001-old-kde4-cmake-policies.patch
deleted file mode 100644
index b7d7300e9a84d34fc36b43bb5420ee447adc976c..0000000000000000000000000000000000000000
--- a/pkgs/applications/kde/kdelibs/0001-old-kde4-cmake-policies.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From b43c49109694940f0a26240753e879eb629dd02d Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel
-Date: Mon, 7 Sep 2015 13:54:57 -0500
-Subject: [PATCH 1/2] old kde4 cmake policies
-
----
- cmake/modules/FindKDE4Internal.cmake | 33 +++++++++++++++++++++++++++++++++
- 1 file changed, 33 insertions(+)
-
-diff --git a/cmake/modules/FindKDE4Internal.cmake b/cmake/modules/FindKDE4Internal.cmake
-index 7d54b9b..c435571 100644
---- a/cmake/modules/FindKDE4Internal.cmake
-+++ b/cmake/modules/FindKDE4Internal.cmake
-@@ -345,6 +345,39 @@
- # Redistribution and use is allowed according to the terms of the BSD license.
- # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-+# this is required now by cmake 2.6 and so must not be skipped by if(KDE4_FOUND) below
-+cmake_minimum_required(VERSION 2.8.9 FATAL_ERROR)
-+# set the cmake policies to the 2.4.x compatibility settings (may change for KDE 4.3)
-+cmake_policy(VERSION 2.4.5)
-+
-+# CMake 2.6, set compatibility behaviour to cmake 2.4
-+# this must be executed always, because the CMAKE_MINIMUM_REQUIRED() command above
-+# resets the policy settings, so we get a lot of warnings
-+
-+# CMP0000: don't require cmake_minimum_version() directly in the top level CMakeLists.txt, FindKDE4Internal.cmake is good enough
-+cmake_policy(SET CMP0000 OLD)
-+# CMP0002: in KDE4 we have multiple targets with the same name for the unit tests
-+cmake_policy(SET CMP0002 OLD)
-+# CMP0003: add the link paths to the link command as with cmake 2.4
-+cmake_policy(SET CMP0003 OLD)
-+# CMP0005: keep escaping behaviour for definitions added via add_definitions()
-+cmake_policy(SET CMP0005 OLD)
-+# since cmake 2.6.3: NEW behaviour is that setting policies doesn't "escape" the file
-+# where this is done, macros and functions are executed with the policies as they
-+# were when the were defined. Keep the OLD behaviour so we can set the policies here
-+# for all KDE software without the big warning
-+cmake_policy(SET CMP0011 OLD)
-+
-+# since cmake 2.8.4: when include()ing from inside cmake's module dir, prefer the files
-+# in this directory over those from CMAKE_MODULE_PATH
-+cmake_policy(SET CMP0017 NEW)
-+
-+# since cmake 3.0: use of the LOCATION target property is disallowed while it is used in KDE4Macros.cmake
-+if (POLICY CMP0026)
-+ cmake_policy(SET CMP0026 OLD)
-+endif (POLICY CMP0026)
-+
-+
- # Only do something if it hasn't been found yet
- if(NOT KDE4_FOUND)
-
---
-2.5.0
-
diff --git a/pkgs/applications/kde/kdelibs/0002-polkit-install-path.patch b/pkgs/applications/kde/kdelibs/0002-polkit-install-path.patch
deleted file mode 100644
index ff0306ea1488b12fe67eaee4edfd6bf5c4a8e672..0000000000000000000000000000000000000000
--- a/pkgs/applications/kde/kdelibs/0002-polkit-install-path.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From fab35bac146a817f3af80f45531355fd70cd226b Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel
-Date: Mon, 7 Sep 2015 13:56:03 -0500
-Subject: [PATCH 2/2] polkit install path
-
----
- kdecore/auth/ConfigureChecks.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kdecore/auth/ConfigureChecks.cmake b/kdecore/auth/ConfigureChecks.cmake
-index 7cf9cb5..c8334ae 100644
---- a/kdecore/auth/ConfigureChecks.cmake
-+++ b/kdecore/auth/ConfigureChecks.cmake
-@@ -150,7 +150,7 @@ elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "POLKITQT-1")
- ${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR
- ${POLKITQT-1_POLICY_FILES_INSTALL_DIR})
-
-- set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR ${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING
-+ set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING
- "Where policy files generated by KAuth will be installed" FORCE)
- elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE")
- set (KAUTH_COMPILING_FAKE_BACKEND TRUE)
---
-2.5.0
-
diff --git a/pkgs/applications/kde/kdelibs/0003-remove_xdg_impurities.patch b/pkgs/applications/kde/kdelibs/0003-remove_xdg_impurities.patch
deleted file mode 100644
index a79d7b2b7d16860df62268a10c679b7f438a5530..0000000000000000000000000000000000000000
--- a/pkgs/applications/kde/kdelibs/0003-remove_xdg_impurities.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/kdecore/kernel/kstandarddirs.cpp b/kdecore/kernel/kstandarddirs.cpp
-index ab8f76d..2ae5089 100644
---- a/kdecore/kernel/kstandarddirs.cpp
-+++ b/kdecore/kernel/kstandarddirs.cpp
-@@ -1768,12 +1768,6 @@ void KStandardDirs::addKDEDefaults()
- else
- {
- xdgdirList.clear();
-- xdgdirList.append(QString::fromLatin1("/etc/xdg"));
--#ifdef Q_WS_WIN
-- xdgdirList.append(installPath("kdedir") + QString::fromLatin1("etc/xdg"));
--#else
-- xdgdirList.append(QFile::decodeName(KDESYSCONFDIR "/xdg"));
--#endif
- }
-
- QString localXdgDir = readEnvPath("XDG_CONFIG_HOME");
-@@ -1821,10 +1815,6 @@ void KStandardDirs::addKDEDefaults()
- }
- } else {
- xdgdirList = kdedirDataDirs;
--#ifndef Q_WS_WIN
-- xdgdirList.append(QString::fromLatin1("/usr/local/share/"));
-- xdgdirList.append(QString::fromLatin1("/usr/share/"));
--#endif
- }
-
- localXdgDir = readEnvPath("XDG_DATA_HOME");
-diff --git a/solid/solid/xdgbasedirs.cpp b/solid/solid/xdgbasedirs.cpp
-index 4c9cad9..6849d45 100644
---- a/solid/solid/xdgbasedirs.cpp
-+++ b/solid/solid/xdgbasedirs.cpp
-@@ -70,12 +70,12 @@ QStringList Solid::XdgBaseDirs::systemPathList( const char *resource )
- {
- if ( qstrncmp( "data", resource, 4 ) == 0 ) {
- if ( instance()->mDataDirs.isEmpty() ) {
-- instance()->mDataDirs = instance()->systemPathList( "XDG_DATA_DIRS", "/usr/local/share:/usr/share" );
-+ instance()->mDataDirs = instance()->systemPathList( "XDG_DATA_DIRS", "" );
- }
- return instance()->mDataDirs;
- } else if ( qstrncmp( "config", resource, 6 ) == 0 ) {
- if ( instance()->mConfigDirs.isEmpty() ) {
-- instance()->mConfigDirs = instance()->systemPathList( "XDG_CONFIG_DIRS", "/etc/xdg" );
-+ instance()->mConfigDirs = instance()->systemPathList( "XDG_CONFIG_DIRS", "" );
- }
- return instance()->mConfigDirs;
- }
diff --git a/pkgs/applications/kde/kdelibs/default.nix b/pkgs/applications/kde/kdelibs/default.nix
deleted file mode 100644
index 31e578e228a981554d74f7c9d8f426e4930132c3..0000000000000000000000000000000000000000
--- a/pkgs/applications/kde/kdelibs/default.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{
- mkDerivation, lib,
- automoc4, bison, cmake, flex, libxslt, perl, pkgconfig, shared_mime_info,
- attica, attr, avahi, docbook_xml_dtd_42, docbook_xsl, giflib, ilmbase,
- libdbusmenu_qt, libjpeg, libxml2, phonon, polkit_qt4, qca2, qt4,
- shared_desktop_ontologies, soprano, strigi, udev, xz, pcre, fetchpatch
-}:
-
-mkDerivation {
- name = "kdelibs";
-
- outputs = [ "out" "dev" ];
-
- outputInclude = "out";
-
- setOutputFlags = false;
-
- nativeBuildInputs = [
- automoc4 bison cmake flex libxslt perl pkgconfig shared_mime_info
- ];
- buildInputs = [
- attica attr avahi giflib libdbusmenu_qt libjpeg libxml2
- polkit_qt4 qca2 shared_desktop_ontologies udev xz pcre
- ];
- propagatedBuildInputs = [ qt4 soprano phonon strigi ];
-
- patches = [
- ./0001-old-kde4-cmake-policies.patch
- ./0002-polkit-install-path.patch
- ./0003-remove_xdg_impurities.patch
- ];
-
- # cmake does not detect path to `ilmbase`
- NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
-
- cmakeFlags = [
- "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"
- "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook"
- "-DWITH_SOLID_UDISKS2=ON"
- "-DKDE_DEFAULT_HOME=.kde"
- ];
-
- meta = {
- platforms = lib.platforms.linux;
- homepage = http://www.kde.org;
- license = with lib.licenses; [ gpl2 fdl12 lgpl21 ];
- maintainers = [ lib.maintainers.ttuegel ];
- };
-}
diff --git a/pkgs/applications/kde/kdepim-runtime.nix b/pkgs/applications/kde/kdepim-runtime.nix
index 0fde861a023783a9bdb113e3a9fc208eeccd50c3..3230efd82017e5777516e825d53fca3487121ba8 100644
--- a/pkgs/applications/kde/kdepim-runtime.nix
+++ b/pkgs/applications/kde/kdepim-runtime.nix
@@ -5,7 +5,7 @@
akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes,
kalarmcal, kcalutils, kcontacts, kdav, kdelibs4support, kidentitymanagement,
kimap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig,
- pimcommon, qtwebengine,
+ pimcommon, qtwebengine, libkgapi
}:
mkDerivation {
@@ -19,7 +19,7 @@ mkDerivation {
akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes
kalarmcal kcalutils kcontacts kdav kdelibs4support kidentitymanagement kimap
kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine
- pimcommon
+ pimcommon libkgapi
];
# Attempts to build some files before dependencies have been generated
enableParallelBuilding = false;
diff --git a/pkgs/applications/kde/kget.nix b/pkgs/applications/kde/kget.nix
new file mode 100644
index 0000000000000000000000000000000000000000..6a50f1d08d1ce34825001e319eb41930d0cf712b
--- /dev/null
+++ b/pkgs/applications/kde/kget.nix
@@ -0,0 +1,22 @@
+{
+ mkDerivation, lib,
+ extra-cmake-modules, kdoctools,
+ kdelibs4support, libgcrypt, libktorrent, qca-qt5, qgpgme,
+ kcmutils, kcompletion, kcoreaddons, knotifyconfig, kparts, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui
+}:
+
+mkDerivation {
+ name = "kget";
+
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+
+ buildInputs = [
+ kdelibs4support libgcrypt libktorrent qca-qt5 qgpgme
+ kcmutils kcompletion kcoreaddons knotifyconfig kparts kwallet kwidgetsaddons kwindowsystem kxmlgui
+ ];
+
+ meta = with lib; {
+ license = with licenses; [ gpl2 ];
+ maintainers = with maintainers; [ peterhoeg ];
+ };
+}
diff --git a/pkgs/applications/kde/kmailtransport.nix b/pkgs/applications/kde/kmailtransport.nix
index 19ce2ba94f30ac8c0db2e6c45dd9360431ed3070..c4b7c0ab4327a545900c28c4584961cec32184dc 100644
--- a/pkgs/applications/kde/kmailtransport.nix
+++ b/pkgs/applications/kde/kmailtransport.nix
@@ -1,7 +1,7 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
- akonadi, akonadi-mime, cyrus_sasl, kcmutils, ki18n, kio, kmime, kwallet,
+ akonadi, akonadi-mime, cyrus_sasl, kcmutils, ki18n, kio, kmime, kwallet, ksmtp
}:
mkDerivation {
@@ -11,7 +11,7 @@ mkDerivation {
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
- buildInputs = [ akonadi kcmutils ki18n kio ];
+ buildInputs = [ akonadi kcmutils ki18n kio ksmtp ];
propagatedBuildInputs = [ akonadi-mime cyrus_sasl kmime kwallet ];
outputs = [ "out" "dev" ];
}
diff --git a/pkgs/applications/kde/kmime.nix b/pkgs/applications/kde/kmime.nix
index b18a3f7fdc1e4c35e4f6f896e86c401632fb8763..4523a69fc1be016edb76f3581f21e95ec0a6b3d7 100644
--- a/pkgs/applications/kde/kmime.nix
+++ b/pkgs/applications/kde/kmime.nix
@@ -10,7 +10,7 @@ mkDerivation {
license = [ lib.licenses.lgpl21 ];
maintainers = kdepimTeam;
};
- nativeBuildInputs = [ extra-cmake-modules ki18n ];
- buildInputs = [ kcodecs qtbase ];
+ nativeBuildInputs = [ extra-cmake-modules ];
+ buildInputs = [ kcodecs ki18n qtbase ];
outputs = [ "out" "dev" ];
}
diff --git a/pkgs/applications/kde/ksmtp/0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch b/pkgs/applications/kde/ksmtp/0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch
new file mode 100644
index 0000000000000000000000000000000000000000..74e83761eb7d5ab15cd974fc44d5e0cfbfea6b38
--- /dev/null
+++ b/pkgs/applications/kde/ksmtp/0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch
@@ -0,0 +1,25 @@
+From 749769232e7387ec8c8f2d3da845d8a6ae7d5977 Mon Sep 17 00:00:00 2001
+From: gnidorah
+Date: Fri, 22 Dec 2017 19:32:47 +0300
+Subject: [PATCH] Use KDE_INSTALL_TARGETS_DEFAULT_ARGS when installing targets
+
+---
+ src/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 83c2bcb..5f6d47c 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -51,7 +51,7 @@ ecm_generate_headers(KSMTP_CamelCase_HEADERS
+ REQUIRED_HEADERS KSMTP_HEADERS
+ )
+
+-install(TARGETS KPimSMTP EXPORT KPimSMTPTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
++install(TARGETS KPimSMTP EXPORT KPimSMTPTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
+
+ install(FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/ksmtp_export.h
+--
+2.15.1
+
diff --git a/pkgs/applications/kde/ksmtp/default.nix b/pkgs/applications/kde/ksmtp/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..6a5f51a17bfe9864af766a9b6fcfe5d7d7e28aab
--- /dev/null
+++ b/pkgs/applications/kde/ksmtp/default.nix
@@ -0,0 +1,17 @@
+{
+ mkDerivation, lib, kdepimTeam,
+ extra-cmake-modules, kdoctools,
+ kcoreaddons, kio, kmime, cyrus_sasl
+}:
+
+mkDerivation {
+ name = "ksmtp";
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+ maintainers = kdepimTeam;
+ };
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [ kcoreaddons kio kmime ];
+ propagatedBuildInputs = [ cyrus_sasl ];
+ patches = [ ./0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch ];
+}
diff --git a/pkgs/applications/kde/l10n.nix b/pkgs/applications/kde/l10n.nix
deleted file mode 100644
index 10a8472d5a9ed4c6208984d387c3f78cf9a99771..0000000000000000000000000000000000000000
--- a/pkgs/applications/kde/l10n.nix
+++ /dev/null
@@ -1,181 +0,0 @@
-{ callPackage, recurseIntoAttrs, lib }:
-
-let
-
- kdeLocale4 = import ./kde-locale-4.nix;
-
-in
-
-lib.mapAttrs (name: attr: recurseIntoAttrs attr) {
- ar = {
- qt4 = callPackage (kdeLocale4 "ar" {}) {};
- };
- bg = {
- qt4 = callPackage (kdeLocale4 "bg" {}) {};
- };
- bs = {
- qt4 = callPackage (kdeLocale4 "bs" {}) {};
- };
- ca = {
- qt4 = callPackage (kdeLocale4 "ca" {}) {};
- };
- ca_valencia = {
- qt4 = callPackage (kdeLocale4 "ca_valencia" {}) {};
- };
- cs = {
- qt4 = callPackage (kdeLocale4 "cs" {}) {};
- };
- da = {
- qt4 = callPackage (kdeLocale4 "da" {}) {};
- };
- de = {
- qt4 = callPackage (kdeLocale4 "de" {}) {};
- };
- el = {
- qt4 = callPackage (kdeLocale4 "el" {}) {};
- };
- en_GB = {
- qt4 = callPackage (kdeLocale4 "en_GB" {}) {};
- };
- eo = {
- qt4 = callPackage (kdeLocale4 "eo" {}) {};
- };
- es = {
- qt4 = callPackage (kdeLocale4 "es" {}) {};
- };
- et = {
- qt4 = callPackage (kdeLocale4 "et" {}) {};
- };
- eu = {
- qt4 = callPackage (kdeLocale4 "eu" {}) {};
- };
- fa = {
- qt4 = callPackage (kdeLocale4 "fa" {}) {};
- };
- fi = {
- qt4 = callPackage (kdeLocale4 "fi" {}) {};
- };
- fr = {
- qt4 = callPackage (kdeLocale4 "fr" {}) {};
- };
- ga = {
- qt4 = callPackage (kdeLocale4 "ga" {}) {};
- };
- gl = {
- qt4 = callPackage (kdeLocale4 "gl" {}) {};
- };
- he = {
- qt4 = callPackage (kdeLocale4 "he" {}) {};
- };
- hi = {
- qt4 = callPackage (kdeLocale4 "hi" {}) {};
- };
- hr = {
- qt4 = callPackage (kdeLocale4 "hr" {}) {};
- };
- hu = {
- qt4 = callPackage (kdeLocale4 "hu" {}) {};
- };
- ia = {
- qt4 = callPackage (kdeLocale4 "ia" {}) {};
- };
- id = {
- qt4 = callPackage (kdeLocale4 "id" {}) {};
- };
- is = {
- qt4 = callPackage (kdeLocale4 "is" {}) {};
- };
- it = {
- qt4 = callPackage (kdeLocale4 "it" {}) {};
- };
- ja = {
- qt4 = callPackage (kdeLocale4 "ja" {}) {};
- };
- kk = {
- qt4 = callPackage (kdeLocale4 "kk" {}) {};
- };
- km = {
- qt4 = callPackage (kdeLocale4 "km" {}) {};
- };
- ko = {
- qt4 = callPackage (kdeLocale4 "ko" {}) {};
- };
- lt = {
- qt4 = callPackage (kdeLocale4 "lt" {}) {};
- };
- lv = {
- qt4 = callPackage (kdeLocale4 "lv" {}) {};
- };
- mr = {
- qt4 = callPackage (kdeLocale4 "mr" {}) {};
- };
- nb = {
- qt4 = callPackage (kdeLocale4 "nb" {}) {};
- };
- nds = {
- qt4 = callPackage (kdeLocale4 "nds" {}) {};
- };
- nl = {
- qt4 = callPackage (kdeLocale4 "nl" {}) {};
- };
- nn = {
- qt4 = callPackage (kdeLocale4 "nn" {}) {};
- };
- pa = {
- qt4 = callPackage (kdeLocale4 "pa" {}) {};
- };
- pl = {
- qt4 = callPackage (kdeLocale4 "pl" {}) {};
- };
- pt = {
- qt4 = callPackage (kdeLocale4 "pt" {}) {};
- };
- pt_BR = {
- qt4 = callPackage (kdeLocale4 "pt_BR" {}) {};
- };
- ro = {
- qt4 = callPackage (kdeLocale4 "ro" {}) {};
- };
- ru = {
- qt4 = callPackage (kdeLocale4 "ru" {}) {};
- };
- sk = {
- qt4 = callPackage (kdeLocale4 "sk" {}) {};
- };
- sl = {
- qt4 = callPackage (kdeLocale4 "sl" {}) {};
- };
- sr = {
- qt4 = callPackage (kdeLocale4 "sr" {
- preConfigure = ''
- patchShebangs \
- 4/sr/sr@latin/scripts/ts-pmap-compile.py \
- 4/sr/scripts/ts-pmap-compile.py \
- 4/sr/data/resolve-sr-hybrid \
- 4/sr/sr@ijekavian/scripts/ts-pmap-compile.py \
- 4/sr/sr@ijekavianlatin/scripts/ts-pmap-compile.py
- '';
- }) {};
- };
- sv = {
- qt4 = callPackage (kdeLocale4 "sv" {}) {};
- };
- tr = {
- qt4 = callPackage (kdeLocale4 "tr" {}) {};
- };
- ug = {
- qt4 = callPackage (kdeLocale4 "ug" {}) {};
- };
- uk = {
- qt4 = callPackage (kdeLocale4 "uk" {}) {};
- };
- wa = {
- qt4 = callPackage (kdeLocale4 "wa" {}) {};
- };
- zh_CN = {
- qt4 = callPackage (kdeLocale4 "zh_CN" {}) {};
- };
- zh_TW = {
- qt4 = callPackage (kdeLocale4 "zh_TW" {}) {};
- };
-}
diff --git a/pkgs/applications/kde/libkcddb.nix b/pkgs/applications/kde/libkcddb.nix
index edd9732d051bca1f0f4d9b3d4275d78c1e0e5f18..3fd486056542899b2625daf5dd5990219b0bcb4a 100644
--- a/pkgs/applications/kde/libkcddb.nix
+++ b/pkgs/applications/kde/libkcddb.nix
@@ -8,8 +8,8 @@ mkDerivation {
license = with licenses; [ gpl2 lgpl21 bsd3 ];
maintainers = with maintainers; [ peterhoeg ];
};
- nativeBuildInputs = [ extra-cmake-modules ];
- buildInputs = [ qtbase kdoctools ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [ qtbase ];
propagatedBuildInputs = [
kcodecs ki18n kio kwidgetsaddons
libmusicbrainz5
diff --git a/pkgs/applications/kde/libkgapi.nix b/pkgs/applications/kde/libkgapi.nix
new file mode 100644
index 0000000000000000000000000000000000000000..7ff3a1f04b09931902e376d6c41ecf31ece2bf47
--- /dev/null
+++ b/pkgs/applications/kde/libkgapi.nix
@@ -0,0 +1,15 @@
+{
+ mkDerivation, lib, kdepimTeam,
+ extra-cmake-modules, kdoctools,
+ qtwebengine, kio, kcalcore, kcontacts
+}:
+
+mkDerivation {
+ name = "libkgapi";
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+ maintainers = kdepimTeam;
+ };
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [ qtwebengine kio kcalcore kcontacts ];
+}
diff --git a/pkgs/applications/kde/minuet.nix b/pkgs/applications/kde/minuet.nix
index fd628a7aacfd48880e6fd31e1ca723c383999ad7..efe850ab414d48acdc9e08f51621fb14ab6cf94d 100644
--- a/pkgs/applications/kde/minuet.nix
+++ b/pkgs/applications/kde/minuet.nix
@@ -1,5 +1,5 @@
{ mkDerivation
-, lib, extra-cmake-modules
+, lib, extra-cmake-modules, gettext, python
, drumstick, fluidsynth
, kcoreaddons, kcrash, kdoctools
, qtquickcontrols2, qtsvg, qttools
@@ -12,11 +12,13 @@ mkDerivation {
maintainers = with maintainers; [ peterhoeg ];
};
- nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ];
+
propagatedBuildInputs = [
drumstick fluidsynth
kcoreaddons kcrash
qtquickcontrols2 qtsvg qttools
];
+
enableParallelBuilding = true;
}
diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix
index 2edfb0d79bb3926acbd4f627f01ef39cbed0f8c4..4f6146598a1948501f6d2c59a7fc94a3b238a15e 100644
--- a/pkgs/applications/kde/srcs.nix
+++ b/pkgs/applications/kde/srcs.nix
@@ -3,2235 +3,1691 @@
{
akonadi = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/akonadi-17.08.3.tar.xz";
- sha256 = "01sn0c5b679v76djpd7rx3cgzn3idpsjc3m3wgrvjzfyqs18f2al";
- name = "akonadi-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/akonadi-17.12.0.tar.xz";
+ sha256 = "0f42wfsicibls845a50b7fzxcdyyi8k9g4l5jpf9si3q6imvq2zn";
+ name = "akonadi-17.12.0.tar.xz";
};
};
akonadi-calendar = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.12.0/src/akonadi-calendar-17.12.0.tar.xz";
+ sha256 = "196gn9lbyw8dv2w4a8j1fy85hql9q8f4ps6pf7pas2pcvja3j68x";
+ name = "akonadi-calendar-17.12.0.tar.xz";
};
};
akonadi-calendar-tools = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.12.0/src/akonadi-calendar-tools-17.12.0.tar.xz";
+ sha256 = "19wgijhmv3kjbwdplw9ggs1plhgd2n16aqs0wyhb18wkjv4dgl08";
+ name = "akonadi-calendar-tools-17.12.0.tar.xz";
};
};
akonadiconsole = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/akonadiconsole-17.08.3.tar.xz";
- sha256 = "1ccmdarzb60f22ypnfmr1gzrc7byw08c2h3zhni9g1jab327i2vk";
- name = "akonadiconsole-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/akonadiconsole-17.12.0.tar.xz";
+ sha256 = "0xz9vr49qfsry76rmmyfm78k6wqwbsx40nkhyim0pf5npa3ax0v5";
+ name = "akonadiconsole-17.12.0.tar.xz";
};
};
akonadi-contacts = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.12.0/src/akonadi-contacts-17.12.0.tar.xz";
+ sha256 = "17sxdayliw78vsnpknl81b8cd3kaz8aiblgjsh3xl9kdrmm1y0nj";
+ name = "akonadi-contacts-17.12.0.tar.xz";
};
};
akonadi-import-wizard = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.12.0/src/akonadi-import-wizard-17.12.0.tar.xz";
+ sha256 = "0pi08ab58wc6zxvw9pdkrnk5y6sg4ydb2a4dsyrb1dmzywrqcjk2";
+ name = "akonadi-import-wizard-17.12.0.tar.xz";
};
};
akonadi-mime = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.12.0/src/akonadi-mime-17.12.0.tar.xz";
+ sha256 = "04snsl5152b4jfgvdg2115z06zql15ny0pjs9iqld3mmmc371317";
+ name = "akonadi-mime-17.12.0.tar.xz";
};
};
akonadi-notes = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.12.0/src/akonadi-notes-17.12.0.tar.xz";
+ sha256 = "0ckr0c0zd8f2703gkrviilqxd5kfwm7ca77728hvzccs33nr1jr4";
+ name = "akonadi-notes-17.12.0.tar.xz";
};
};
akonadi-search = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.12.0/src/akonadi-search-17.12.0.tar.xz";
+ sha256 = "1kmqybhk47r6wr15aqg4j4z47yl0qzyllrnpcksm5ggfam8m2k58";
+ name = "akonadi-search-17.12.0.tar.xz";
};
};
akregator = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/akregator-17.08.3.tar.xz";
- sha256 = "1jd48yj9sl4z46qfk3qkm98q33f1qblsyjdr7ff8znxkg2pw5xg6";
- name = "akregator-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/akregator-17.12.0.tar.xz";
+ sha256 = "0lmjiw6b2ckfrq9c1xwrhdg5f3sgrh9l1hrxc5k0xyhx8hnbqj9r";
+ name = "akregator-17.12.0.tar.xz";
};
};
analitza = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/analitza-17.08.3.tar.xz";
- sha256 = "1j0z63sfah2ypjb3szcr7dqndw18lcy8l9440q8kzq0gyl83cn3v";
- name = "analitza-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/analitza-17.12.0.tar.xz";
+ sha256 = "0y418j7y2lhy5mp03irqpg8lgzqmwynfc8lkmf1rxj4445z8lpg2";
+ name = "analitza-17.12.0.tar.xz";
};
};
ark = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/ark-17.08.3.tar.xz";
- sha256 = "1qz333nd23x4ldx675cxs7ka2vz45xmkfsakdg8m3x26i7jnl86x";
- name = "ark-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/ark-17.12.0.tar.xz";
+ sha256 = "0l4agh5nd3v8chm75gha3fc6w0qzl60m28i2syfb6090xr7di5s3";
+ name = "ark-17.12.0.tar.xz";
};
};
artikulate = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/artikulate-17.08.3.tar.xz";
- sha256 = "13hg9cjdwhfya57xan96ma55msani0lx7v55zh0hv0jab9fxgv1n";
- name = "artikulate-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/artikulate-17.12.0.tar.xz";
+ sha256 = "042wf2h5jrj7dmpks6nj9vvqrc4xfw2n97lvindndhmj6sia1h72";
+ name = "artikulate-17.12.0.tar.xz";
};
};
audiocd-kio = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.12.0/src/audiocd-kio-17.12.0.tar.xz";
+ sha256 = "1nwwwsklz98dj4wvb5bbgphpw42vhnj7gxjgvskf52ap9q4y6xkm";
+ name = "audiocd-kio-17.12.0.tar.xz";
};
};
baloo-widgets = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.12.0/src/baloo-widgets-17.12.0.tar.xz";
+ sha256 = "1j8p0vfp3x8a5kbqjak8ikmby5hzabcwwa0n4lic596mb2s2v9xd";
+ name = "baloo-widgets-17.12.0.tar.xz";
};
};
blinken = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- 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.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/blogilo-17.08.3.tar.xz";
- sha256 = "18vbvs5cih9vcxfqsia35q8bzc4ldzaajvnv9iqmisg060fxfwi9";
- name = "blogilo-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/blinken-17.12.0.tar.xz";
+ sha256 = "0djzv65akvpi69nfv9jjjff986a7ph0mlw916m1iqiwg91ix1car";
+ name = "blinken-17.12.0.tar.xz";
};
};
bomber = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/bomber-17.08.3.tar.xz";
- sha256 = "1rmjlhyc46jxjsc303zl56c3k15q1qvp4yfl78v5l2pwmk8vdxzn";
- name = "bomber-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/bomber-17.12.0.tar.xz";
+ sha256 = "0cr72ym979dka7bw773ng85db2qix7ikw4pwncvan07x9c6kr0p9";
+ name = "bomber-17.12.0.tar.xz";
};
};
bovo = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/bovo-17.08.3.tar.xz";
- sha256 = "1npzzjgzhgbv7pnz3j9if2c5qa5b9ghzj7llp8yndf6dz31qibps";
- name = "bovo-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/bovo-17.12.0.tar.xz";
+ sha256 = "0m4sr7ym469lkpmc4syx0b90nn0l52iwiz59gw70bw394vmd88cn";
+ name = "bovo-17.12.0.tar.xz";
};
};
calendarsupport = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/calendarsupport-17.08.3.tar.xz";
- sha256 = "1ii3h42jkskrizg29ii17jkdxgsqs3lwzsd7ypgw1k8gk9fyyqxh";
- name = "calendarsupport-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/calendarsupport-17.12.0.tar.xz";
+ sha256 = "0vm6fp6cla3gwvznlzn69d9lc7nca8ns54j7jwd509gi4ssmh2bb";
+ name = "calendarsupport-17.12.0.tar.xz";
};
};
cantor = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/cantor-17.08.3.tar.xz";
- sha256 = "0yz71lxwzl5r9k2fzs4iyhyx811rc77m6n1lqagd2c29hnnchn9w";
- name = "cantor-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/cantor-17.12.0.tar.xz";
+ sha256 = "10zpv1j9h6cjpxkp4dc982zyw5dqzdayljfbwywxdqryxdw00rlw";
+ name = "cantor-17.12.0.tar.xz";
};
};
cervisia = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/cervisia-17.08.3.tar.xz";
- sha256 = "0272zf51rn1a9k796fspp456zq6j21bddfn7r350pd6ra19ay7j8";
- name = "cervisia-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/cervisia-17.12.0.tar.xz";
+ sha256 = "0blzqh51ii6a9ys64xphzgah1cvxaqxrxpvbhxvldywry9brbbhg";
+ name = "cervisia-17.12.0.tar.xz";
};
};
dolphin = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/dolphin-17.08.3.tar.xz";
- sha256 = "02bb66411jy03s4wicalnsl6sxmslhdb3wxsqh7sdyh63llna5b5";
- name = "dolphin-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/dolphin-17.12.0.tar.xz";
+ sha256 = "0swc8f502v3cvanxsry77bvwqzlspk934hcaahzklfigv7v5kg9v";
+ name = "dolphin-17.12.0.tar.xz";
};
};
dolphin-plugins = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.12.0/src/dolphin-plugins-17.12.0.tar.xz";
+ sha256 = "1cyfwp7ny8l1ak4a64gcphb0a5kvdb8d0mbqm1fbcq1zzcvi4w8b";
+ name = "dolphin-plugins-17.12.0.tar.xz";
};
};
dragon = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/dragon-17.08.3.tar.xz";
- sha256 = "0fxzwfg0l7lnsswb51h8gmh4wngmng9sgm5nhn6wmwhfbhbzgagq";
- name = "dragon-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/dragon-17.12.0.tar.xz";
+ sha256 = "1qa6mwr64z4c13jg9paqr8f462pcpk7hqvb46h3aswh4h57d837z";
+ name = "dragon-17.12.0.tar.xz";
};
};
eventviews = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/eventviews-17.08.3.tar.xz";
- sha256 = "0j1r833kzf9sparvqnfn8r7klf4j0z8jwrgclf87rggmx0dn2v4y";
- name = "eventviews-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/eventviews-17.12.0.tar.xz";
+ sha256 = "07p4fv5mzqbnafglr3ww7iccxyqm4shj03vw4aq790ld6qcxqbv4";
+ name = "eventviews-17.12.0.tar.xz";
};
};
ffmpegthumbs = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/ffmpegthumbs-17.08.3.tar.xz";
- sha256 = "19bkpc316wlhswgrbszpj65lrzsdp443c1174hqknm0srvp6fbvv";
- name = "ffmpegthumbs-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/ffmpegthumbs-17.12.0.tar.xz";
+ sha256 = "0102nqrvcjzmmbf0k3chivhpl44vgz53k2zskpzkpvpzzgd5s484";
+ name = "ffmpegthumbs-17.12.0.tar.xz";
};
};
filelight = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/filelight-17.08.3.tar.xz";
- sha256 = "06j6api909shraflfpn0cyvxaa57s2dq178kshkfv5yppxjpfpja";
- name = "filelight-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/filelight-17.12.0.tar.xz";
+ sha256 = "01pbpvi74wlz60vrz3cgrnyc22zcvlkfc8m2w7h765y4gddkgplj";
+ name = "filelight-17.12.0.tar.xz";
};
};
granatier = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/granatier-17.08.3.tar.xz";
- sha256 = "1z2gs73k8ymz09x72hvyylwqs6pxbnivz86hbb9pb1mlb7x5fgvs";
- name = "granatier-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/granatier-17.12.0.tar.xz";
+ sha256 = "1smcpjz4zfzpx92zs32hdgqkfxn0rljq6wgqjdcnbl8phjd04vqi";
+ name = "granatier-17.12.0.tar.xz";
};
};
grantlee-editor = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.12.0/src/grantlee-editor-17.12.0.tar.xz";
+ sha256 = "0h8987qydi310q0arg3l82n6ah8zs7z02vrnb30ffw827mxsfm99";
+ name = "grantlee-editor-17.12.0.tar.xz";
};
};
grantleetheme = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/grantleetheme-17.08.3.tar.xz";
- sha256 = "0zag5gmaqi068hw8s71ascj7s8clg1sickrfpzjf3nhcf6y669rp";
- name = "grantleetheme-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/grantleetheme-17.12.0.tar.xz";
+ sha256 = "0ak01wifp2zk10rmsnwh2df5xlqbha5jgdxjs6n873pz21hx0kng";
+ name = "grantleetheme-17.12.0.tar.xz";
};
};
gwenview = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/gwenview-17.08.3.tar.xz";
- sha256 = "05c96y5yrdgh7228bw3agn344g02hylnb2fw8crjcdapsiya4v1w";
- name = "gwenview-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/gwenview-17.12.0.tar.xz";
+ sha256 = "1m9vckn73i94n4gc66613ahx6i3qybafnn461fxnjwl5xykbsh9z";
+ name = "gwenview-17.12.0.tar.xz";
};
};
incidenceeditor = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- 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.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/jovie-17.08.3.tar.xz";
- sha256 = "1a4v97p3yfwr5zn5qkfkw1ln7liz47f3bnhdb6yzzi03s5xfrk1z";
- name = "jovie-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/incidenceeditor-17.12.0.tar.xz";
+ sha256 = "0vmiwhxa7hiplvy1m24z53293bkq14zgi5jvrc5kmficg4ms1361";
+ name = "incidenceeditor-17.12.0.tar.xz";
};
};
juk = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/juk-17.08.3.tar.xz";
- sha256 = "0735rdrn80akfb8viq8y77kxa28y1rg5infp26q7cy5cd4r6fvsi";
- name = "juk-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/juk-17.12.0.tar.xz";
+ sha256 = "18nxrddy4ifyjnbc1ynh4zgym16av53j1vbnz2y6szf8gqj96ci2";
+ name = "juk-17.12.0.tar.xz";
};
};
k3b = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- 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.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kaccessible-17.08.3.tar.xz";
- sha256 = "0sfrs57npp4y1yyw16chgrvyp6bnf4jymffblj5h7pb4bv0xlsmk";
- name = "kaccessible-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/k3b-17.12.0.tar.xz";
+ sha256 = "1rn2jk21gp3gw5l1gcl0jhiyds7wsf3cpk7jl0zwqvg17df5j82c";
+ name = "k3b-17.12.0.tar.xz";
};
};
kaccounts-integration = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.12.0/src/kaccounts-integration-17.12.0.tar.xz";
+ sha256 = "1vawy9bq4ngq8zxflaibazdjrx1vzxpkznh07lnz9isq6d21266k";
+ name = "kaccounts-integration-17.12.0.tar.xz";
};
};
kaccounts-providers = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.12.0/src/kaccounts-providers-17.12.0.tar.xz";
+ sha256 = "13fbq89blgics3ix0arkzdd4z6hq77n8jkdr060axs4kgnmbv7i6";
+ name = "kaccounts-providers-17.12.0.tar.xz";
};
};
kaddressbook = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kaddressbook-17.08.3.tar.xz";
- sha256 = "1dq3lgrvg7s65mc2x2sgkwpz623ygb0by0y571dqjaz219j03955";
- name = "kaddressbook-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kaddressbook-17.12.0.tar.xz";
+ sha256 = "10grv5a47gwfliz17qx74dwahabcrrz4553ijqlqkbjrw0p793zg";
+ name = "kaddressbook-17.12.0.tar.xz";
};
};
kajongg = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kajongg-17.08.3.tar.xz";
- sha256 = "00xb764nxzihz9kh7a82cm7slrj78zjl3s5qb90s03y375q4bha6";
- name = "kajongg-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kajongg-17.12.0.tar.xz";
+ sha256 = "16p6a2bzgy9r8v8zhwbdja3qkh1j75r3gr72lv7fqi2q8pnqn6m2";
+ name = "kajongg-17.12.0.tar.xz";
};
};
kalarm = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kalarm-17.08.3.tar.xz";
- sha256 = "0rmdxx59iykn6f746dw9p0dyk96wds4kqr6w2y8fscp889i05g2a";
- name = "kalarm-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kalarm-17.12.0.tar.xz";
+ sha256 = "0s9dbl7xf6kyjxxrip11a1f9vanxlcyrcmjkillp6iah2r9zghv2";
+ name = "kalarm-17.12.0.tar.xz";
};
};
kalarmcal = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kalarmcal-17.08.3.tar.xz";
- sha256 = "0g4vxkjkc38p2aigmfr2q2qd6x8pr4fj53jkvjq314vqg9sbak9c";
- name = "kalarmcal-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kalarmcal-17.12.0.tar.xz";
+ sha256 = "1qr6y46xzylwfr6af52gshcvh9485nfbfflcls8bp343kr0mcvyz";
+ name = "kalarmcal-17.12.0.tar.xz";
};
};
kalgebra = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kalgebra-17.08.3.tar.xz";
- sha256 = "0hcrl205z2m5108g1kgxnmkrrg6x2m2p59cmdkbsd0ly0jnfc9w2";
- name = "kalgebra-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kalgebra-17.12.0.tar.xz";
+ sha256 = "1h4ji0drl3mvxxwhfikxyg1ljwv8vjpr9npyp8qrj9swy7jjxzpw";
+ name = "kalgebra-17.12.0.tar.xz";
};
};
kalzium = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kalzium-17.08.3.tar.xz";
- sha256 = "142lcm1d7v8xknmqg00cgdz3iaydr6c9wblpij3wykffd53x7ind";
- name = "kalzium-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kalzium-17.12.0.tar.xz";
+ sha256 = "0y7873q3zbqm3hgh3gglrdc0bad7pcjpv5fgdmxil3m6vand3kfl";
+ name = "kalzium-17.12.0.tar.xz";
};
};
kamera = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kamera-17.08.3.tar.xz";
- sha256 = "0zrny1f27z0drsna2lpw9sr4y7z479lys3vzcysgf1fv8b8jdjdh";
- name = "kamera-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kamera-17.12.0.tar.xz";
+ sha256 = "0n60ycp4ldrn07lci6a78i8g0y5j708s4kgdrh2sn2f91ppwr90c";
+ name = "kamera-17.12.0.tar.xz";
};
};
kanagram = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kanagram-17.08.3.tar.xz";
- sha256 = "1v5k67dw47i3n8635w1sc63n7f63hd9wvb44yxaw88clk46acn0k";
- name = "kanagram-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kanagram-17.12.0.tar.xz";
+ sha256 = "15v22d7jdjjlc8lyraiiwx29qv0xf94y30zb7r1p661b7l1zqba3";
+ name = "kanagram-17.12.0.tar.xz";
};
};
kapman = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kapman-17.08.3.tar.xz";
- sha256 = "0gici0v3ya16nk0b33cm5n95gdfhjqpy8wjg5y8bj12dby1d0n2w";
- name = "kapman-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kapman-17.12.0.tar.xz";
+ sha256 = "10jwyr6dzryam720n53xmcky6a8dgvh9gpwl6c4lx68swq4s62hb";
+ name = "kapman-17.12.0.tar.xz";
};
};
kapptemplate = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kapptemplate-17.08.3.tar.xz";
- sha256 = "16j1lx6rp0lqmcd8fyaishc0i2670v0map270z9575101338cyvm";
- name = "kapptemplate-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kapptemplate-17.12.0.tar.xz";
+ sha256 = "17bkfnvaj23azra44rr9pf926nvwnsbzg5j23b65q83j6wd0k12w";
+ name = "kapptemplate-17.12.0.tar.xz";
};
};
kate = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kate-17.08.3.tar.xz";
- sha256 = "1yjzhf0a1skxz6iipac3z1p2wswn8bfjfr3k8qb6lhwlhbapc33x";
- name = "kate-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kate-17.12.0.tar.xz";
+ sha256 = "18nygn4ibxii4va84jlxc93j8v6v1wiilbfhvri140wdlfqqs1bv";
+ name = "kate-17.12.0.tar.xz";
};
};
katomic = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/katomic-17.08.3.tar.xz";
- sha256 = "0y00la43lc1352fipzglyvaf1cqalf0vkygg8r9vizm8vycp7hp9";
- name = "katomic-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/katomic-17.12.0.tar.xz";
+ sha256 = "1flkz4cvsrma12wyz84lcpirh1ns7ldn564asg25s7mffm2mlmni";
+ name = "katomic-17.12.0.tar.xz";
};
};
kblackbox = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kblackbox-17.08.3.tar.xz";
- sha256 = "18lz0nb8zp95higssscgcr2cj1ni71bckk1wazyryxkmmmqk2rdn";
- name = "kblackbox-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kblackbox-17.12.0.tar.xz";
+ sha256 = "0q9rk2cy75r9pbfl10plm4wbii3x8pp08g0kpyly20f8h4bmb5hd";
+ name = "kblackbox-17.12.0.tar.xz";
};
};
kblocks = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kblocks-17.08.3.tar.xz";
- sha256 = "1nf3ws0dzzwqc87v6jqi1x5zm7w56cgfingr5plpp3cj8wv8jnvw";
- name = "kblocks-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kblocks-17.12.0.tar.xz";
+ sha256 = "08rq5crw9d3m231g8cpnrcd8628p4ci6abc32hkpbcd01qyjlvis";
+ name = "kblocks-17.12.0.tar.xz";
};
};
kblog = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kblog-17.08.3.tar.xz";
- sha256 = "0cnbn0wmva8xm2i05w5pdikw5mbx3z6mim3k98v2r954qml7xqdk";
- name = "kblog-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kblog-17.12.0.tar.xz";
+ sha256 = "16hqdsni76ajm8a00xplh4k3cjckykbnv3bbf90hamx5cm8ycdf3";
+ name = "kblog-17.12.0.tar.xz";
};
};
kbounce = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kbounce-17.08.3.tar.xz";
- sha256 = "12yj5jmpvhj5cxr4i818lp9cbcrdrvq9r7s202nzx5znxs11bbf6";
- name = "kbounce-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kbounce-17.12.0.tar.xz";
+ sha256 = "1kgxl7nlr0j4y921bw1alrk40n3051bgcm08877iadna783j3xnd";
+ name = "kbounce-17.12.0.tar.xz";
};
};
kbreakout = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kbreakout-17.08.3.tar.xz";
- sha256 = "14d4cx91vv8bvvpjwbrwcvjczzs8j58yzazsfgqwhrj47cwhya43";
- name = "kbreakout-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kbreakout-17.12.0.tar.xz";
+ sha256 = "0pvz250z6h1x8mhdcgb662yhc6j6sxgr48r24j017q5k8r1pc2w5";
+ name = "kbreakout-17.12.0.tar.xz";
};
};
kbruch = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kbruch-17.08.3.tar.xz";
- sha256 = "0jxlybkmzs24482fmy7hhk2apyq26fpdblpnpdbqnydz95707475";
- name = "kbruch-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kbruch-17.12.0.tar.xz";
+ sha256 = "13brwkadwp92rwybxjcz3sb8iiy0rhykk2wlpn7jg8vfxi203v73";
+ name = "kbruch-17.12.0.tar.xz";
};
};
kcachegrind = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kcachegrind-17.08.3.tar.xz";
- sha256 = "0xmnpbli7ndlv0532hpnqgvbkpw8y176jydhs6hy73ywwm416mvs";
- name = "kcachegrind-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kcachegrind-17.12.0.tar.xz";
+ sha256 = "04ddsj0gsb7s967gn2g7018q2zl3lflybgkzq7rjkpbxyn3d503z";
+ name = "kcachegrind-17.12.0.tar.xz";
};
};
kcalc = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kcalc-17.08.3.tar.xz";
- sha256 = "0ck1hjv1v9fj7ckl4blpmfxzjx61ihc6av71m710nk7iv6gncsfm";
- name = "kcalc-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kcalc-17.12.0.tar.xz";
+ sha256 = "04k369crs8nsz16dk4cwyx3l7nycypjc4xs9jzkjx9rl9k9vnrqr";
+ name = "kcalc-17.12.0.tar.xz";
};
};
kcalcore = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kcalcore-17.08.3.tar.xz";
- sha256 = "0iy6dwzrcwzhjcz8yajp4mvbxr6vkxp4bnbnh9k2zvxgmg4y63h5";
- name = "kcalcore-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kcalcore-17.12.0.tar.xz";
+ sha256 = "1n5isq169dm3ngsnmwdhlcs2k4rp5zncv72vx0rb9p84skqn7xh4";
+ name = "kcalcore-17.12.0.tar.xz";
};
};
kcalutils = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kcalutils-17.08.3.tar.xz";
- sha256 = "1vs6qnv31s01i7wb7kz86v17z0wrymcclmwx2hj7vl4jqr532zdq";
- name = "kcalutils-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kcalutils-17.12.0.tar.xz";
+ sha256 = "19jwvakjiqwg3iakc8wgdw5fpyr2a2kpbxxsj9hf1ddi6wgq5hkq";
+ name = "kcalutils-17.12.0.tar.xz";
};
};
kcharselect = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kcharselect-17.08.3.tar.xz";
- sha256 = "1ib3rqd43yprnp07vvmg029a44dimisycv030j3qd87r3yw06phs";
- name = "kcharselect-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kcharselect-17.12.0.tar.xz";
+ sha256 = "190dhqc121bs4s13y4zdxrlwid7p1sjqj2ggb2xma6fq67bbsc2g";
+ name = "kcharselect-17.12.0.tar.xz";
};
};
kcolorchooser = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kcolorchooser-17.08.3.tar.xz";
- sha256 = "17aa2k8z7i7ds2s3ampkci4n0003rsbx4fj3l773ylb11fyl3b2f";
- name = "kcolorchooser-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kcolorchooser-17.12.0.tar.xz";
+ sha256 = "17arn0fdqkb9ixhdxmh6sicp2cs6k8f5sg4jc4z0fi076ysxwnlb";
+ name = "kcolorchooser-17.12.0.tar.xz";
};
};
kcontacts = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kcontacts-17.08.3.tar.xz";
- sha256 = "0dsx0bgf6rcqrl31xcklh368lr93pn2ylipw81svpnqya1ry31dk";
- name = "kcontacts-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kcontacts-17.12.0.tar.xz";
+ sha256 = "0358zb2imdnlilhz58niysvpfd6l33fjyiplzjdibswq1ad8bbbl";
+ name = "kcontacts-17.12.0.tar.xz";
};
};
kcron = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kcron-17.08.3.tar.xz";
- sha256 = "0xmd25dfhpkaa6zzmc7xdfn4fv0awfqjv2r166hmqd32gnx70bry";
- name = "kcron-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kcron-17.12.0.tar.xz";
+ sha256 = "092s5c4x59dflkgymk17pj7spzxl2vmiq76dr4d3ilh9w0yx77zl";
+ name = "kcron-17.12.0.tar.xz";
};
};
kdav = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kdav-17.08.3.tar.xz";
- sha256 = "1v7xclq8qz4pmvp1asavammlfwi2pg1y0fabapqpnglx194rbwic";
- name = "kdav-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kdav-17.12.0.tar.xz";
+ sha256 = "0cqshlidk4fbznpv5yk9ghmx7wxlmfmsd8w3pkqnbznzh2pd6zns";
+ name = "kdav-17.12.0.tar.xz";
};
};
kdebugsettings = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kdebugsettings-17.08.3.tar.xz";
- sha256 = "1gfcnwpmx6dd12d9kycf0khi5s85932b1wvyw1mr5dhlqyyqf1s4";
- name = "kdebugsettings-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kdebugsettings-17.12.0.tar.xz";
+ sha256 = "076g2hymykm6dxln3llwfhayzrdswjy9cjdhwi70kxmw3xd1x3fl";
+ name = "kdebugsettings-17.12.0.tar.xz";
};
};
kde-dev-scripts = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.12.0/src/kde-dev-scripts-17.12.0.tar.xz";
+ sha256 = "0yl0xffgr94ymk5cw32z1y9ymn1rr9nyh9k3gip9aspi3rmrhw4r";
+ name = "kde-dev-scripts-17.12.0.tar.xz";
};
};
kde-dev-utils = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.12.0/src/kde-dev-utils-17.12.0.tar.xz";
+ sha256 = "0qf1mpp4cq1gdhd29d5v2lvcdsi8k9xivqly1jha96b0wgziqqwq";
+ name = "kde-dev-utils-17.12.0.tar.xz";
};
};
kdeedu-data = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.12.0/src/kdeedu-data-17.12.0.tar.xz";
+ sha256 = "0fpxhz1pj1lz2b2l45ivmlr36hayj4h1g6b0960wavmhdfacr0pi";
+ name = "kdeedu-data-17.12.0.tar.xz";
};
};
kdegraphics-mobipocket = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.12.0/src/kdegraphics-mobipocket-17.12.0.tar.xz";
+ sha256 = "1015nd0cn1mbak68h0gl2hsax6angwxvssa8j8wsv96rnjfpds9f";
+ name = "kdegraphics-mobipocket-17.12.0.tar.xz";
};
};
kdegraphics-thumbnailers = {
- version = "17.08.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
+ version = "17.12.0";
src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.3";
- src = fetchurl {
- 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.38";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kdelibs-4.14.38.tar.xz";
- sha256 = "1zn3yb09sd22bm54is0rn98amj0398zybl550dp406419sil7z9p";
- name = "kdelibs-4.14.38.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kdegraphics-thumbnailers-17.12.0.tar.xz";
+ sha256 = "1p0jj4j28rab2m68zaiqfkz5h65ar99v5qd7v3jj7yqkgimiqrkh";
+ name = "kdegraphics-thumbnailers-17.12.0.tar.xz";
};
};
kdenetwork-filesharing = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.12.0/src/kdenetwork-filesharing-17.12.0.tar.xz";
+ sha256 = "0hhgxmsnjxv99qjbgyw0fli9mxffbk0i4lnmzla186i3wbbq0fng";
+ name = "kdenetwork-filesharing-17.12.0.tar.xz";
};
};
kdenlive = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kdenlive-17.08.3.tar.xz";
- sha256 = "1nh6cmxkr47zlpvcrjm8dfylsdmncb5qhyvb86rypr1qqmbifg5x";
- name = "kdenlive-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kdenlive-17.12.0.tar.xz";
+ sha256 = "1jn8bbsdishccdp7lqqyr9y7wcw7rq4gsisp3cjkdbzg44ahjmnp";
+ name = "kdenlive-17.12.0.tar.xz";
};
};
kdepim-addons = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.12.0/src/kdepim-addons-17.12.0.tar.xz";
+ sha256 = "0z13271dwavf4fiixbxc17l4iajk5dyfnfmjgdq95cpfajk5zchs";
+ name = "kdepim-addons-17.12.0.tar.xz";
};
};
kdepim-apps-libs = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.12.0/src/kdepim-apps-libs-17.12.0.tar.xz";
+ sha256 = "19ml929qzxzdm3rgnvqni63xq4h692wwr3gnh8x3m32gdc1shslx";
+ name = "kdepim-apps-libs-17.12.0.tar.xz";
};
};
kdepim-runtime = {
- version = "17.08.3";
- src = fetchurl {
- 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.3";
+ version = "17.12.0";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.12.0/src/kdepim-runtime-17.12.0.tar.xz";
+ sha256 = "1xxka2hi0ih8g4lxdga47zix3hf3krdh9rf5bvmpj7z1j317zvnp";
+ name = "kdepim-runtime-17.12.0.tar.xz";
};
};
kdesdk-kioslaves = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.12.0/src/kdesdk-kioslaves-17.12.0.tar.xz";
+ sha256 = "020a7d4k5901rpwxibm4ncm8vdncyranp8bmajzq4d3x1q2i63x8";
+ name = "kdesdk-kioslaves-17.12.0.tar.xz";
};
};
kdesdk-thumbnailers = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.12.0/src/kdesdk-thumbnailers-17.12.0.tar.xz";
+ sha256 = "11fmy2g1nhzgv158vhc1x57is4qjhkv4gkkafnmvww3cj2alsipx";
+ name = "kdesdk-thumbnailers-17.12.0.tar.xz";
};
};
kdf = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kdf-17.08.3.tar.xz";
- sha256 = "1s291c4g51y92wplrqkl528py83xfviyvv1qjyp3c7nyf6g2jvwq";
- name = "kdf-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kdf-17.12.0.tar.xz";
+ sha256 = "1g55wzjwyi3x1bfr4vpv4rbiah3fb5cdqx4h4cb4pxi7438hifbg";
+ name = "kdf-17.12.0.tar.xz";
};
};
kdialog = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kdialog-17.08.3.tar.xz";
- sha256 = "1n6n06sqgq1s2781pnsbfyczc68l5xx6l0idymj3pmniz3q4svp8";
- name = "kdialog-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kdialog-17.12.0.tar.xz";
+ sha256 = "1n1466qsgcj0x9z1745pvqcyljz3215kz71jd9ckghz8v3xllyrw";
+ name = "kdialog-17.12.0.tar.xz";
};
};
kdiamond = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kdiamond-17.08.3.tar.xz";
- sha256 = "1czhmxs3k7mx82r1k88h8riwn9jxlz6w60mi4jx8b29qcm532f53";
- name = "kdiamond-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kdiamond-17.12.0.tar.xz";
+ sha256 = "1x08y561l3qwnwwx4wp7j4y26cv0g102csm9zgy8pwp32r74c7my";
+ name = "kdiamond-17.12.0.tar.xz";
};
};
keditbookmarks = {
- version = "17.08.3";
- src = fetchurl {
- 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.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kfilereplace-17.08.3.tar.xz";
- sha256 = "1ksv9igzq65wgsam6ynbbzzyriacbk7y48dzh190p8k2bdf6gij6";
- name = "kfilereplace-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/keditbookmarks-17.12.0.tar.xz";
+ sha256 = "0kpm9a3b7ylf0admyfll7ysjmn76gihgh1d0faxvcdg099f19n2z";
+ name = "keditbookmarks-17.12.0.tar.xz";
};
};
kfind = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kfind-17.08.3.tar.xz";
- sha256 = "16f27ykh52vphq6wjyi1vy6vrzshj0cawmc8fy7y1j5yzzdkx1hk";
- name = "kfind-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kfind-17.12.0.tar.xz";
+ sha256 = "066780dnn031ppavin14jikxs8v1qv5b5hvxxdbfhay01gmj6fzy";
+ name = "kfind-17.12.0.tar.xz";
};
};
kfloppy = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kfloppy-17.08.3.tar.xz";
- sha256 = "1d5xn0rxc92k60hc1860mji8dzq932gg4by42gylwldcvgdija14";
- name = "kfloppy-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kfloppy-17.12.0.tar.xz";
+ sha256 = "0q61b8yw69gf9ssxkvisnk5i2f9plsxybdnzx6pfv6fxi427pv69";
+ name = "kfloppy-17.12.0.tar.xz";
};
};
kfourinline = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kfourinline-17.08.3.tar.xz";
- sha256 = "1bxzlx55i6vbk8cmpx38g1xdx0swqwd73lw5z584affw464ps1n9";
- name = "kfourinline-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kfourinline-17.12.0.tar.xz";
+ sha256 = "0gs5lpbv4vwknkj90i874ylmanc5lw5dx0hibg9khadqv7qgj1cr";
+ name = "kfourinline-17.12.0.tar.xz";
};
};
kgeography = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kgeography-17.08.3.tar.xz";
- sha256 = "19k39rjm9lwbv3p6iifam80li5bhw4xf2g4i4hj0h7gyrj9gb1mp";
- name = "kgeography-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kgeography-17.12.0.tar.xz";
+ sha256 = "14i0bpncqgldg7sviyqjhv2nw81g5niidvm15d3n4v5p2msabvv4";
+ name = "kgeography-17.12.0.tar.xz";
};
};
kget = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kget-17.08.3.tar.xz";
- sha256 = "01z3ij4iv3kgwy0fcnrf4qpfgapflx1pgv2hiaykgsj6ij24fx6a";
- name = "kget-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kget-17.12.0.tar.xz";
+ sha256 = "17al8j2dw0hdsrpgjbz4j8qgxqsj8asy9s4pqb5ks34an2vb7bp3";
+ name = "kget-17.12.0.tar.xz";
};
};
kgoldrunner = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kgoldrunner-17.08.3.tar.xz";
- sha256 = "1k09pw7lm17702p0lliyl767zwk4n3gkkzj441cq3fqjnwm93lx4";
- name = "kgoldrunner-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kgoldrunner-17.12.0.tar.xz";
+ sha256 = "0cm6rw2ar2j7xpnzrih39rrjky2cv6s6samqv2bfal7l7ra6ad3h";
+ name = "kgoldrunner-17.12.0.tar.xz";
};
};
kgpg = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kgpg-17.08.3.tar.xz";
- sha256 = "1g06n6i9qqvalmpg2zan7qg7j7dp4rn152pashs3jxij29n1bw7h";
- name = "kgpg-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kgpg-17.12.0.tar.xz";
+ sha256 = "1mabbarra8kca0r72pacbrgp3pcbb94ycm7z2sb65gd8d0qily7k";
+ name = "kgpg-17.12.0.tar.xz";
};
};
khangman = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/khangman-17.08.3.tar.xz";
- sha256 = "1fny78d3vaaz67css4i14pnvkm5p586ib8mwrs2rglc931c89dqq";
- name = "khangman-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/khangman-17.12.0.tar.xz";
+ sha256 = "09n62lkxrryvq36hmcygi4mdiy0r1ydql9khv3yz1p2zfz81qmwg";
+ name = "khangman-17.12.0.tar.xz";
};
};
khelpcenter = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/khelpcenter-17.08.3.tar.xz";
- sha256 = "089aahdr1yibff4y0l78m0wzz7m0mc090g4fp4aj4gp56wz6i5jn";
- name = "khelpcenter-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/khelpcenter-17.12.0.tar.xz";
+ sha256 = "0mcw60w3d93zgncvakzdds3mazw7ck469i20x4wwv6cd98cg1f7k";
+ name = "khelpcenter-17.12.0.tar.xz";
};
};
kholidays = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kholidays-17.08.3.tar.xz";
- sha256 = "17razwvskf6i5hidlfp98bmfrijp8hn5gxrqcjxc49wpkhlj70jm";
- name = "kholidays-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kholidays-17.12.0.tar.xz";
+ sha256 = "1m6vh2f0mm71jhbil0ck31axvhbxqpibzpf7x82fcrwmgvwjlzyg";
+ name = "kholidays-17.12.0.tar.xz";
};
};
kidentitymanagement = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kidentitymanagement-17.08.3.tar.xz";
- sha256 = "0k926vwdhrk4ilpn0zhkcn26j1h7nqlzzi9mimybz1sp4fzxa83v";
- name = "kidentitymanagement-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kidentitymanagement-17.12.0.tar.xz";
+ sha256 = "1jdlnjzabpfsbxp0yv1xanhp4hbigj7z80qsi0h27b3k0h3i4i8p";
+ name = "kidentitymanagement-17.12.0.tar.xz";
};
};
kig = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kig-17.08.3.tar.xz";
- sha256 = "0wf03fm7fpph52ilxckz02ikn6mq486ps8p8byq2vvfwh6z0w6wg";
- name = "kig-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kig-17.12.0.tar.xz";
+ sha256 = "06f5dcwqf012a4rszyf4mxjaaj4g35kn30pklsvb7kvdd2ybnmcf";
+ name = "kig-17.12.0.tar.xz";
};
};
kigo = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kigo-17.08.3.tar.xz";
- sha256 = "1k850vmsifvab14aaqkivgrw8794yhvn7d10c5ib2zf6447cl8m5";
- name = "kigo-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kigo-17.12.0.tar.xz";
+ sha256 = "0zrl0js6zj41ag9xp65kzmmli6phqps6w7a0sbg8h7qd0m1ml1v7";
+ name = "kigo-17.12.0.tar.xz";
};
};
killbots = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/killbots-17.08.3.tar.xz";
- sha256 = "0ds391xx2d792069kl998f84qym26964ph5bja6bwkhgvws84r9g";
- name = "killbots-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/killbots-17.12.0.tar.xz";
+ sha256 = "1594mdzdj9754gb26smains54lf1xs7mdxkx716cqjkm9fs7vv3s";
+ name = "killbots-17.12.0.tar.xz";
};
};
kimagemapeditor = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kimagemapeditor-17.08.3.tar.xz";
- sha256 = "0clzk2d63hy1vvkdpxa1j5pp7y28x467wd9zfvv6k2vw703ghqlx";
- name = "kimagemapeditor-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kimagemapeditor-17.12.0.tar.xz";
+ sha256 = "0dd0yg29r6cada1arm2b7ihjxc015hd56dzygc66cxy0ni8cxmyn";
+ name = "kimagemapeditor-17.12.0.tar.xz";
};
};
kimap = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kimap-17.08.3.tar.xz";
- sha256 = "0c5inldmlwc5x2q1vhvj0wv61h6986m068a2k4xrrbirpb4pcwls";
- name = "kimap-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kimap-17.12.0.tar.xz";
+ sha256 = "08hh5phcj33sni2bz8jqcip7ilvv9q0i0m4wxnlawli2wxkpzab5";
+ name = "kimap-17.12.0.tar.xz";
};
};
kio-extras = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.12.0/src/kio-extras-17.12.0.tar.xz";
+ sha256 = "07jj8fhvyl84y8b9q4vc2lha4fin44qjr77iynif4l79g98ns5ls";
+ name = "kio-extras-17.12.0.tar.xz";
};
};
kiriki = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kiriki-17.08.3.tar.xz";
- sha256 = "1cbijn0358gpr21yfab84gybf5vqxwilwbhfl6nj8qmppp2bpjqd";
- name = "kiriki-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kiriki-17.12.0.tar.xz";
+ sha256 = "0q7av2ff41vlnpb5p0zi1arzwc6568ddq98lypkkm376rjg47759";
+ name = "kiriki-17.12.0.tar.xz";
};
};
kiten = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kiten-17.08.3.tar.xz";
- sha256 = "0v00q9hs94p5r6x7s7i12814pfydd5y1bzp6sm5x0vx1ixdnkx89";
- name = "kiten-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kiten-17.12.0.tar.xz";
+ sha256 = "004x368gnw4x79q0g2c3xk4xj1qfqs9l9la46051kapbr96qkjgl";
+ name = "kiten-17.12.0.tar.xz";
};
};
kjumpingcube = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kjumpingcube-17.08.3.tar.xz";
- sha256 = "13ifm6drw4m1dzssfalazmnsr5f8z9gla3aypb9ny1xm9ahlgfwh";
- name = "kjumpingcube-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kjumpingcube-17.12.0.tar.xz";
+ sha256 = "12w7grdiddgk6k6qliw2n7b6smfw16ba4scmdy047ckfdajxm73f";
+ name = "kjumpingcube-17.12.0.tar.xz";
};
};
kldap = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kldap-17.08.3.tar.xz";
- sha256 = "0bnx5fc48ppsykpqwjgsqjd7s4azgzk82k9xgaw566nxqqvgpzsv";
- name = "kldap-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kldap-17.12.0.tar.xz";
+ sha256 = "18bx8fsamz6p791nmmgpd25rhy5zwb15hwkf0qsfyvxkygpw5jvv";
+ name = "kldap-17.12.0.tar.xz";
};
};
kleopatra = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kleopatra-17.08.3.tar.xz";
- sha256 = "0vglphfxq37pxdrrchgzkdlzlzr18qlfwy9g64njyddnsv48pfx8";
- name = "kleopatra-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kleopatra-17.12.0.tar.xz";
+ sha256 = "1dkgby8v7dxy4h69hm2j46ch3599drdj9p8x0da184d9isvjzyc2";
+ name = "kleopatra-17.12.0.tar.xz";
};
};
klettres = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/klettres-17.08.3.tar.xz";
- sha256 = "14jxbvil45hc2kqky7yhxrgzpv4094lk9ri0j05i1av6784s9555";
- name = "klettres-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/klettres-17.12.0.tar.xz";
+ sha256 = "1wfihmsx6sb3d2d8y6m5v1x17sraw8ql63qjprf80nzdrg5c1hyf";
+ name = "klettres-17.12.0.tar.xz";
};
};
klickety = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/klickety-17.08.3.tar.xz";
- sha256 = "01hqf41m8pviziq1x562rd85357kkfgd0x0ba1vasimjddg6v6qa";
- name = "klickety-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/klickety-17.12.0.tar.xz";
+ sha256 = "1s6bj19z9vvqcv8pwx5ja38mwpw05vkbfbfaay55y5ssxq8wvdfm";
+ name = "klickety-17.12.0.tar.xz";
};
};
klines = {
- version = "17.08.3";
- src = fetchurl {
- 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.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/klinkstatus-17.08.3.tar.xz";
- sha256 = "0bv5ahcnss6ziccx9mmvf5bdsff9drjqpmq9ln51524bjn4x58ic";
- name = "klinkstatus-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/klines-17.12.0.tar.xz";
+ sha256 = "1abwgyfm0qhwy07zbjs8pbq2s3m0kbwlmpfah3g4cvjq0b2i0wch";
+ name = "klines-17.12.0.tar.xz";
};
};
kmag = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kmag-17.08.3.tar.xz";
- sha256 = "0dadzzrmd982y7apjk783wm5q302y03ydai74pzyqy0awnjdm09d";
- name = "kmag-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kmag-17.12.0.tar.xz";
+ sha256 = "0i8h8c4ajvri4chwl3whmbcikrqkx32ijgkxihlmfk1s1h3hiqj5";
+ name = "kmag-17.12.0.tar.xz";
};
};
kmahjongg = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kmahjongg-17.08.3.tar.xz";
- sha256 = "09j2pmqc66zi851fsl4ijrcgq3y35arx9272p6z07bg0z9ja5vgb";
- name = "kmahjongg-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kmahjongg-17.12.0.tar.xz";
+ sha256 = "0cqgjnm12g7c5dagd6677a1bbcj8y4ccn38bv624zc8444nm3n6y";
+ name = "kmahjongg-17.12.0.tar.xz";
};
};
kmail = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kmail-17.08.3.tar.xz";
- sha256 = "1ibpq0alnk70ha1smfyw8gc91k5q4x1gw7zddwgzw1pjr4v1bqdc";
- name = "kmail-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kmail-17.12.0.tar.xz";
+ sha256 = "1bykjx68d2fnspv0if8sqhgz3bg3fh0hhsmhsanrl5zkbswi2krp";
+ name = "kmail-17.12.0.tar.xz";
};
};
kmail-account-wizard = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.12.0/src/kmail-account-wizard-17.12.0.tar.xz";
+ sha256 = "0mz5jkxqn2vd5py1ndf9ly02a9ixmah6z360y021bhl55zdh96z6";
+ name = "kmail-account-wizard-17.12.0.tar.xz";
};
};
kmailtransport = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kmailtransport-17.08.3.tar.xz";
- sha256 = "0cfyzvsn5x03i6kprqm7y6j6qsfys4yz2s3f4wb5igpdm25nclq1";
- name = "kmailtransport-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kmailtransport-17.12.0.tar.xz";
+ sha256 = "06izygskzkgcz3aaadnd33dbk26n0nrk6nvy3bic7g1p7s26qf9m";
+ name = "kmailtransport-17.12.0.tar.xz";
};
};
kmbox = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kmbox-17.08.3.tar.xz";
- sha256 = "0mf0005fs15vgmmikdsa44ig4hxrnysl13mrn168crk96h3sk8qi";
- name = "kmbox-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kmbox-17.12.0.tar.xz";
+ sha256 = "1nwnygb483r9sfxa67g6s6z1ix4nwx6cy6jq2i7sbzcxzv7qyxga";
+ name = "kmbox-17.12.0.tar.xz";
};
};
kmime = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kmime-17.08.3.tar.xz";
- sha256 = "17ziw8g1wdys4iy2yqavqy7wj4kw617m80fg77zlf1cscswhg23d";
- name = "kmime-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kmime-17.12.0.tar.xz";
+ sha256 = "0fyfjc6l1jqs5m0pvk12714b5hjdkd4rsbk5b8i2pxddlqxa0m8x";
+ name = "kmime-17.12.0.tar.xz";
};
};
kmines = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kmines-17.08.3.tar.xz";
- sha256 = "14b0klnlbxkvln3q9fliw6cijc2xmsfmvm6sfikdzzgj59jcylzp";
- name = "kmines-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kmines-17.12.0.tar.xz";
+ sha256 = "0cv0rby602c32zpcprp9fvx3w8pijzavsmmnwma6kk289bmw8klm";
+ name = "kmines-17.12.0.tar.xz";
};
};
kmix = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kmix-17.08.3.tar.xz";
- sha256 = "0fd38banrbgpp8g5gz09w6wny8mdi9szvddl1rv7yx67zf112g67";
- name = "kmix-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kmix-17.12.0.tar.xz";
+ sha256 = "18g7hwz0p496bcvdxpa9n82wgs9a2xplrkk4jhx0svh2wd0zihj0";
+ name = "kmix-17.12.0.tar.xz";
};
};
kmousetool = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kmousetool-17.08.3.tar.xz";
- sha256 = "0y2zavs442wpz438p1kyzrqlv9qgvxd4l5gw1pmmx8lkvjjdi91v";
- name = "kmousetool-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kmousetool-17.12.0.tar.xz";
+ sha256 = "0kzkpq2nc961pik8kw4cdd3k9wad40bczgaz9k5iwxxwwk3b8wl0";
+ name = "kmousetool-17.12.0.tar.xz";
};
};
kmouth = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kmouth-17.08.3.tar.xz";
- sha256 = "0gzc6apskfpvih7aap5mfv45q3pg70nfis1vh5ywidia36wbf26i";
- name = "kmouth-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kmouth-17.12.0.tar.xz";
+ sha256 = "1npzrfiddy5frnga20xiqblzfn0mk9xfdq60l2xi9wanlbbhfi2x";
+ name = "kmouth-17.12.0.tar.xz";
};
};
kmplot = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kmplot-17.08.3.tar.xz";
- sha256 = "1ann38zzzd5pds889mc5vw8xw80qlpm9l9nmkczkqyhkfvwxd605";
- name = "kmplot-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kmplot-17.12.0.tar.xz";
+ sha256 = "1z8i1klj8irix7nylkqfchwryk1h5il7snlgmndcfkyd71yhb71k";
+ name = "kmplot-17.12.0.tar.xz";
};
};
knavalbattle = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/knavalbattle-17.08.3.tar.xz";
- sha256 = "1zj6pki0v3p4xg25ivl45mb877p5xh47d066442pahkf8l3wnsh5";
- name = "knavalbattle-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/knavalbattle-17.12.0.tar.xz";
+ sha256 = "1bw7l197690rq9m347nk79rrgdfyap436l01m45y9bkyk0lxmgk8";
+ name = "knavalbattle-17.12.0.tar.xz";
};
};
knetwalk = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/knetwalk-17.08.3.tar.xz";
- sha256 = "0i32f54z5hinafy1v5s1j8ahnbw30721lxa2mvh5qcbr21fan3mc";
- name = "knetwalk-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/knetwalk-17.12.0.tar.xz";
+ sha256 = "0hax9p3lypaqqvvgyjp8082bvaz6fp8nsbgm0qicl55j5ah9gzjs";
+ name = "knetwalk-17.12.0.tar.xz";
};
};
knotes = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/knotes-17.08.3.tar.xz";
- sha256 = "0ly9gpji3nl3i53nzqd5z27li8qnc1asfv1d1kawchz077da02xy";
- name = "knotes-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/knotes-17.12.0.tar.xz";
+ sha256 = "1awmn4drm0vb8ppabc9ljcwpbvrmvziib82ik46g5lsdg0bd1xl0";
+ name = "knotes-17.12.0.tar.xz";
};
};
kolf = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kolf-17.08.3.tar.xz";
- sha256 = "1wc6x1hgkniwzb53bcph3alk0fxlb91s6j39blhync6713x8b4g0";
- name = "kolf-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kolf-17.12.0.tar.xz";
+ sha256 = "03hxknch0mjwmmgjqgg1wn27mz3d4zrsppmajxkm1mafr517gx5n";
+ name = "kolf-17.12.0.tar.xz";
};
};
kollision = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kollision-17.08.3.tar.xz";
- sha256 = "14ama8cfi4d7whgck0gywm7869gpargq1lrkq8ik4k914pharkzi";
- name = "kollision-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kollision-17.12.0.tar.xz";
+ sha256 = "13wg2j3pdr5qlwp1hcqfxamxfdx6ppdr4ccvbabn6s8w7n73cm02";
+ name = "kollision-17.12.0.tar.xz";
};
};
kolourpaint = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kolourpaint-17.08.3.tar.xz";
- sha256 = "1y44q14f6brdmccnmf8143kjjqais8ps15z31dpx2935qzjxw8sc";
- name = "kolourpaint-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kolourpaint-17.12.0.tar.xz";
+ sha256 = "1pcld1anafnb9s7dvm1kzr1wbhf9728z4v1pk44n9grqas8p3z5l";
+ name = "kolourpaint-17.12.0.tar.xz";
};
};
kompare = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kompare-17.08.3.tar.xz";
- sha256 = "0fi3s02rsaa3xl7j69lq2qvg9jn9hxdp44ns89q94s06rqkbjyr1";
- name = "kompare-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kompare-17.12.0.tar.xz";
+ sha256 = "1aiiw11g7ipfsil7wfaabqr1y9k31s3l1swhhx4chcdri2d00gwc";
+ name = "kompare-17.12.0.tar.xz";
};
};
konqueror = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/konqueror-17.08.3.tar.xz";
- sha256 = "1b2hs0fp0a51y87dl8rnv47b8kzjylsps9nczgi8zsipg03z9ja7";
- name = "konqueror-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/konqueror-17.12.0.tar.xz";
+ sha256 = "19ypj6kgawvn5jkz73l4j54lpjm9ldikl3i35nc1xp0pzgd6vkjy";
+ name = "konqueror-17.12.0.tar.xz";
};
};
konquest = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/konquest-17.08.3.tar.xz";
- sha256 = "1k5s9cvlsx3j2774i6p6xx2sfg75aafj9a4imvm7mzvn3gvmkm3q";
- name = "konquest-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/konquest-17.12.0.tar.xz";
+ sha256 = "0p5d0bzzpnqnnqvxryn5l1a5gf3w50fihm777607q74mvx4m2h1l";
+ name = "konquest-17.12.0.tar.xz";
};
};
konsole = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/konsole-17.08.3.tar.xz";
- sha256 = "07v9nbikzpanpggglp07slkbn6h0cl2anz7735f9b0lg55fydv42";
- name = "konsole-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/konsole-17.12.0.tar.xz";
+ sha256 = "0hazq3yjsw9f4vg9dksasvslhldcyn9zl17fn46ldw44dp9y5imd";
+ name = "konsole-17.12.0.tar.xz";
};
};
kontact = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kontact-17.08.3.tar.xz";
- sha256 = "1hj6vgvn73bzf43ckk4cm24m1n0a4c9c6p14q95hbfbcp5bdra1i";
- name = "kontact-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kontact-17.12.0.tar.xz";
+ sha256 = "0spryq6m9hvljn3s55ahlacsqymrf1yv149imhalkfr26h3zqsna";
+ name = "kontact-17.12.0.tar.xz";
};
};
kontactinterface = {
- version = "17.08.3";
- src = fetchurl {
- 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.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kopete-17.08.3.tar.xz";
- sha256 = "1v5gmh521si3zbxgcm9m4rcp0csqy52xgvpjpb8j7iq9m0fcqv7q";
- name = "kopete-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kontactinterface-17.12.0.tar.xz";
+ sha256 = "15fhrq4hfxi84zw2gm0i1wq9inxxaaic64z71zvaw0wv4hf9js9b";
+ name = "kontactinterface-17.12.0.tar.xz";
};
};
korganizer = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/korganizer-17.08.3.tar.xz";
- sha256 = "1nsj03h1r5mnz2dvdmydvqz2fspgw2ybs5z05gg0f903sq1gz80l";
- name = "korganizer-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/korganizer-17.12.0.tar.xz";
+ sha256 = "0s7j2myr873rajmn49kd1lm99a7gcj65ajqz75l207cvni9z2ydl";
+ name = "korganizer-17.12.0.tar.xz";
};
};
kpat = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kpat-17.08.3.tar.xz";
- sha256 = "0l5s5rrn67lbf8hjqyyxvxij935pb1fd9x9dlskxyc2w7n6acmn2";
- name = "kpat-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kpat-17.12.0.tar.xz";
+ sha256 = "1zzhzsx6kpaqvawihyd8lascig1m0f5rh41b38jbvcc9ihfknwhp";
+ name = "kpat-17.12.0.tar.xz";
};
};
kpimtextedit = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- 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.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kppp-17.08.3.tar.xz";
- sha256 = "00y19x306r3pnax1b2cv8bndd6vq1qp30r1hrgw8npy5mm4mn8jw";
- name = "kppp-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kpimtextedit-17.12.0.tar.xz";
+ sha256 = "07092z46r94hh5r5qxpwfqzinmaqnanv3ah220cckp8axv04njrm";
+ name = "kpimtextedit-17.12.0.tar.xz";
};
};
kqtquickcharts = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kqtquickcharts-17.08.3.tar.xz";
- sha256 = "0w8hlnhdgqrmad4ii07f9hsyx6vlaqnvlc54prnah1bqzymvc2ms";
- name = "kqtquickcharts-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kqtquickcharts-17.12.0.tar.xz";
+ sha256 = "02vf68nnixvsqg14gp5ddif20rp2b6ag1amr91zp8ymw9vpaqsfg";
+ name = "kqtquickcharts-17.12.0.tar.xz";
};
};
krdc = {
- version = "17.08.3";
- src = fetchurl {
- 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.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kremotecontrol-17.08.3.tar.xz";
- sha256 = "1p23q7bvppv8fabvpwi793zplb4kry8njczma7c4nya4mkdk9370";
- name = "kremotecontrol-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/krdc-17.12.0.tar.xz";
+ sha256 = "07ggwr59y71bkkd83v2ilhm4vkn6fhwjki9svsm1f366x8fhsjx6";
+ name = "krdc-17.12.0.tar.xz";
};
};
kreversi = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kreversi-17.08.3.tar.xz";
- sha256 = "0ma0y1n38hw5rawzazlaqfa4vsawgvaq8j2pa5n7z23nwckh19wd";
- name = "kreversi-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kreversi-17.12.0.tar.xz";
+ sha256 = "0b4ibgyra929vy0ml2j8qrh731gbnrwzy213qsrj19ax7rdbg242";
+ name = "kreversi-17.12.0.tar.xz";
};
};
krfb = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/krfb-17.08.3.tar.xz";
- sha256 = "1k7rziw0l0bdjxi5i92w1zsjbakzbklc95dyn2jsnm36jljjqpv1";
- name = "krfb-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/krfb-17.12.0.tar.xz";
+ sha256 = "10m6xsbs8qbzx9gsb754gydvnylrnq9d6kfbb4m2zz2fpqp4pf36";
+ name = "krfb-17.12.0.tar.xz";
};
};
kross-interpreters = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.12.0/src/kross-interpreters-17.12.0.tar.xz";
+ sha256 = "1bzwq47dz00ap42z3060b7jnshjajscc3c0wzbdhy1a4dyw51845";
+ name = "kross-interpreters-17.12.0.tar.xz";
};
};
kruler = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kruler-17.08.3.tar.xz";
- sha256 = "1qizjvysfnh5x3fa8hav3y9pyaiq8hpwi1grw9dd921cbb16cww4";
- name = "kruler-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kruler-17.12.0.tar.xz";
+ sha256 = "1234ixmjvd193lhw5k5s56mp9mzazy3dkhr0gs8nnqxr3rnzk76j";
+ name = "kruler-17.12.0.tar.xz";
};
};
- ksaneplugin = {
- version = "17.08.3";
- src = fetchurl {
- 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.3";
+ kshisen = {
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kscd-17.08.3.tar.xz";
- sha256 = "08r9zhp7d7xf8iyi56hvlm5vyjqrjpj9dc8ynda0n7hyngxrbvm0";
- name = "kscd-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kshisen-17.12.0.tar.xz";
+ sha256 = "0cibkb65sg0nrv8xld5x30jdbkbvz473hk3dsf6ag206cya21k4s";
+ name = "kshisen-17.12.0.tar.xz";
};
};
- kshisen = {
- version = "17.08.3";
+ ksirk = {
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kshisen-17.08.3.tar.xz";
- sha256 = "18nwnxn7i0p2b78cxv8ppsl4lrzdm4ck6hqqdf738npli271shq0";
- name = "kshisen-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/ksirk-17.12.0.tar.xz";
+ sha256 = "1jp15l6j1cds282vz4yr1c8aq33q9zim9plhk3l56i1pbqsiwm4j";
+ name = "ksirk-17.12.0.tar.xz";
};
};
- ksirk = {
- version = "17.08.3";
+ ksmtp = {
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/ksirk-17.08.3.tar.xz";
- sha256 = "1601fh93jcy7x622hpvdrb9ddb262n9ivakxli054cz2bq3dbpim";
- name = "ksirk-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/ksmtp-17.12.0.tar.xz";
+ sha256 = "0kii3ikf18bqzyxzw48qymrafnwxz2761i9vgfbnsl55v96jwjyq";
+ name = "ksmtp-17.12.0.tar.xz";
};
};
ksnakeduel = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/ksnakeduel-17.08.3.tar.xz";
- sha256 = "1a7xki783799ala0zx1jngvhsky994sk32xyza2lfir5ym1w0pkm";
- name = "ksnakeduel-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/ksnakeduel-17.12.0.tar.xz";
+ sha256 = "0ial173raw00kv5l6ysb3y0s6fvazy9zvgmqllxsaqsbdc5pamk4";
+ name = "ksnakeduel-17.12.0.tar.xz";
};
};
kspaceduel = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kspaceduel-17.08.3.tar.xz";
- sha256 = "1wskg788mc51dh3hv0d7hrqyy14gnzzw2sqhc0pd65jj8hra7kh2";
- name = "kspaceduel-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kspaceduel-17.12.0.tar.xz";
+ sha256 = "0azf2dq8mpabqq29fcmp660hvp5ziq1c63ypby4r60cw07a224qg";
+ name = "kspaceduel-17.12.0.tar.xz";
};
};
ksquares = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- 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.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kstars-17.08.3.tar.xz";
- sha256 = "0i165snb4wnw2kzbhcawgwwqppgq5fmw23rqa4q2k3alaz9smcdn";
- name = "kstars-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/ksquares-17.12.0.tar.xz";
+ sha256 = "1lv1bxn6p5d08r7a4w03kr12z518xjr1v74vj0lmyhrx234kzbn4";
+ name = "ksquares-17.12.0.tar.xz";
};
};
ksudoku = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/ksudoku-17.08.3.tar.xz";
- sha256 = "1dmqss272z7s7vbh71zg7s5drn66a2yyrv53f34yk3d93mhk8dq2";
- name = "ksudoku-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/ksudoku-17.12.0.tar.xz";
+ sha256 = "0bwr93lc2fp25qdzz0d45zya9cqkxq0jmfmbncvz3j4229dlgz71";
+ name = "ksudoku-17.12.0.tar.xz";
};
};
ksystemlog = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/ksystemlog-17.08.3.tar.xz";
- sha256 = "0smhbdpj2xf9q8l8cjhk4x80qq6apn6mmf7dna9hznp6nd6jrsgv";
- name = "ksystemlog-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/ksystemlog-17.12.0.tar.xz";
+ sha256 = "02i83i0ixkk9whlbbp5f0mk0ldgf8gw9sk0bxvab9hdj8k545im4";
+ name = "ksystemlog-17.12.0.tar.xz";
};
};
kteatime = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kteatime-17.08.3.tar.xz";
- sha256 = "0pp08b2rjz329kdaqq5a490r353n346ah0ag6wfxmpchqy11lr3r";
- name = "kteatime-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kteatime-17.12.0.tar.xz";
+ sha256 = "1ky9ajzlq67z2rqh2n8s6ynz5fhj96whi2bb56x0q4l9kcm777yc";
+ name = "kteatime-17.12.0.tar.xz";
};
};
ktimer = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/ktimer-17.08.3.tar.xz";
- sha256 = "15k1rfih9k7zpcsdyiwl60jmp1w1svwb8c6cykjzqpc9acyfpba5";
- name = "ktimer-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/ktimer-17.12.0.tar.xz";
+ sha256 = "13q7c6avhmjqb4ilpnd4sn8ddsxspdf7vrdnknb0g9fh8sjrfyqz";
+ name = "ktimer-17.12.0.tar.xz";
};
};
ktnef = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/ktnef-17.08.3.tar.xz";
- sha256 = "0fh0ybb3nijhxhkwcmcygw413blkmra83az1jhkmlpp6q5459jin";
- name = "ktnef-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/ktnef-17.12.0.tar.xz";
+ sha256 = "0vvl0lqqgfx9isizaciz6dvx7f913zkzqn4lzjsnbnhr19r3h5wj";
+ name = "ktnef-17.12.0.tar.xz";
};
};
ktouch = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/ktouch-17.08.3.tar.xz";
- sha256 = "0z21wb82m3sds4sjkkadb48zxcfj1qbab07i3cs3g3a730zdj5ld";
- name = "ktouch-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/ktouch-17.12.0.tar.xz";
+ sha256 = "089wy9apy2i3y4w83barfhwigcpp35idiav023wx6zy9dj63gl2p";
+ name = "ktouch-17.12.0.tar.xz";
};
};
ktp-accounts-kcm = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.12.0/src/ktp-accounts-kcm-17.12.0.tar.xz";
+ sha256 = "0q840r44i0bwj7b55ck6id5v5vl3f18r86diaihqawy600k32f0r";
+ name = "ktp-accounts-kcm-17.12.0.tar.xz";
};
};
ktp-approver = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.12.0/src/ktp-approver-17.12.0.tar.xz";
+ sha256 = "1ryyfnxksfvyfgpi4q0qzv1mdlrfbp9scbnxgi1br599wqxk4va9";
+ name = "ktp-approver-17.12.0.tar.xz";
};
};
ktp-auth-handler = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.12.0/src/ktp-auth-handler-17.12.0.tar.xz";
+ sha256 = "1qjc2vh1533wh9pv634m9s6j9a0q5k0chvh1f1w2s0mrayhis4kq";
+ name = "ktp-auth-handler-17.12.0.tar.xz";
};
};
ktp-call-ui = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.12.0/src/ktp-call-ui-17.12.0.tar.xz";
+ sha256 = "0qg2l3040ayi1znfqk8l1bpmnqknpjb5spmlyqgjmn5cf6xv7pgq";
+ name = "ktp-call-ui-17.12.0.tar.xz";
};
};
ktp-common-internals = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.12.0/src/ktp-common-internals-17.12.0.tar.xz";
+ sha256 = "1ixsj8dr15zf9hxrmngrz4839yk4dvll0gj059yq2nigfzibmh8d";
+ name = "ktp-common-internals-17.12.0.tar.xz";
};
};
ktp-contact-list = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.12.0/src/ktp-contact-list-17.12.0.tar.xz";
+ sha256 = "1mx9cm6hh7k6n61wl9x1shmyl10am5y0kj7gz5df0p8p9fnwfqz9";
+ name = "ktp-contact-list-17.12.0.tar.xz";
};
};
ktp-contact-runner = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.12.0/src/ktp-contact-runner-17.12.0.tar.xz";
+ sha256 = "14ljix2rbwq1n29hli2qy5kvnw058205ydq2bqif4w8v83wg1af6";
+ name = "ktp-contact-runner-17.12.0.tar.xz";
};
};
ktp-desktop-applets = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.12.0/src/ktp-desktop-applets-17.12.0.tar.xz";
+ sha256 = "1ns03f2zhmwqc4wigi5clykyyaydlikk92f6k7b42410v0s0vqvc";
+ name = "ktp-desktop-applets-17.12.0.tar.xz";
};
};
ktp-filetransfer-handler = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.12.0/src/ktp-filetransfer-handler-17.12.0.tar.xz";
+ sha256 = "1pmvm5r1ik310cif954ka2l6abkr269akhwgk9s5ldpzgzc726b8";
+ name = "ktp-filetransfer-handler-17.12.0.tar.xz";
};
};
ktp-kded-module = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.12.0/src/ktp-kded-module-17.12.0.tar.xz";
+ sha256 = "028jr1dfq3mpj0lmwhdb351dg50rqr1m5y8dyil3mgcgfvgda5cn";
+ name = "ktp-kded-module-17.12.0.tar.xz";
};
};
ktp-send-file = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.12.0/src/ktp-send-file-17.12.0.tar.xz";
+ sha256 = "0zsxs11zk1d5wni9nmf92mwy63c3b69l8964ph9hiqqr0gd3vqba";
+ name = "ktp-send-file-17.12.0.tar.xz";
};
};
ktp-text-ui = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.12.0/src/ktp-text-ui-17.12.0.tar.xz";
+ sha256 = "1lvc989l1lmgbfqk6z91cpj96lkhqlf75384qx3ynkmqpjrkyv41";
+ name = "ktp-text-ui-17.12.0.tar.xz";
};
};
ktuberling = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/ktuberling-17.08.3.tar.xz";
- sha256 = "1jvyg09c5458m066sd0x6p2z41rpgbdvkgmw1f6wiybqwxg82h43";
- name = "ktuberling-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/ktuberling-17.12.0.tar.xz";
+ sha256 = "0wj6nf4zsvf65zyi15dcw7jzzznw03gxi07gjzv2ncak48i9si0v";
+ name = "ktuberling-17.12.0.tar.xz";
};
};
kturtle = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kturtle-17.08.3.tar.xz";
- sha256 = "1ral1y1s2jsc8zm1bwiliblywlpsb7q79cjqafz31r6cb72rkcs4";
- name = "kturtle-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kturtle-17.12.0.tar.xz";
+ sha256 = "0qc7clrqc75xqs7iyl44qp2z6pswp7kmwdf55zwv4pq2phvssxvf";
+ name = "kturtle-17.12.0.tar.xz";
};
};
kubrick = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kubrick-17.08.3.tar.xz";
- sha256 = "02hzlkqrb55dc45zgqx3r58r7syb3kr2dfwws3s96j5i4q1bp5p8";
- name = "kubrick-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kubrick-17.12.0.tar.xz";
+ sha256 = "0dd6g4kah0kvlavy5swiz1a81ms63wzwp045zliay5i4x1bf8jjj";
+ name = "kubrick-17.12.0.tar.xz";
};
};
kwalletmanager = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kwalletmanager-17.08.3.tar.xz";
- sha256 = "1ggrswys6ip3lxj6qjy32i36rlmzn2cxddjildlb2b2hk6c3k36r";
- name = "kwalletmanager-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kwalletmanager-17.12.0.tar.xz";
+ sha256 = "0jvbyyqqhz7gz2szwx2gb00xxgazczb52331s3sb1rscxb1dbmxq";
+ name = "kwalletmanager-17.12.0.tar.xz";
};
};
kwave = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kwave-17.08.3.tar.xz";
- sha256 = "0gxmmz5ry6gjfrxwksrxvqyff8f3p807q5s4rcpfh975f10ixqqi";
- name = "kwave-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kwave-17.12.0.tar.xz";
+ sha256 = "1iwpqnl92y3js4x43wkvxnhlc6ql8jkbacbj1qrlwxv3d8cm8rb9";
+ name = "kwave-17.12.0.tar.xz";
};
};
kwordquiz = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kwordquiz-17.08.3.tar.xz";
- sha256 = "0bzfil8pml6jmc0zgszxybyxvkdgzzq37l97z2qvhmjw8pfk0zsr";
- name = "kwordquiz-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/kwordquiz-17.12.0.tar.xz";
+ sha256 = "1zb6y85bgwvc3z016bq7x687yfvs45kh7h3lj9g2r3bh4l14aggx";
+ name = "kwordquiz-17.12.0.tar.xz";
};
};
libgravatar = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/libgravatar-17.08.3.tar.xz";
- sha256 = "0xx9xik5xcg9gs2hjf0z24v7bqqf5qk8x0743qlspyc35i8jq7hx";
- name = "libgravatar-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/libgravatar-17.12.0.tar.xz";
+ sha256 = "1rnhvg2s622vpm9b2nvfxl16d2rm2vjjqd9g6k0jsdj15gd6i22q";
+ name = "libgravatar-17.12.0.tar.xz";
};
};
libkcddb = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/libkcddb-17.08.3.tar.xz";
- sha256 = "0yhs9acv87i8635dw79hpsiywgxcbnaa4vx0l95v50r3v2pknx7h";
- name = "libkcddb-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/libkcddb-17.12.0.tar.xz";
+ sha256 = "0xr97hmqhnjlybhlr73j3p1i7skg17cbm0269rpwg52pqk7w1hg5";
+ name = "libkcddb-17.12.0.tar.xz";
};
};
libkcompactdisc = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/libkcompactdisc-17.08.3.tar.xz";
- sha256 = "0r0w7qwi1pqcs9fv5rnpf7d2zjvaqd3yj2x12z2vc81qz4vrdr19";
- name = "libkcompactdisc-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/libkcompactdisc-17.12.0.tar.xz";
+ sha256 = "1pz652n7rmyjf0m4i67y5wv423fnpif18vvqdbawhij58vh3cfxj";
+ name = "libkcompactdisc-17.12.0.tar.xz";
};
};
libkdcraw = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/libkdcraw-17.08.3.tar.xz";
- sha256 = "0hnbphkdmz3yd0callcwk2bqnkr2i9ljck63rz6yn4adnfdclkad";
- name = "libkdcraw-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/libkdcraw-17.12.0.tar.xz";
+ sha256 = "1w8gwvi42kin58dx7scsbg9wfmqi7917dvx4gi6s0k6m7arg4w97";
+ name = "libkdcraw-17.12.0.tar.xz";
};
};
libkdegames = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/libkdegames-17.08.3.tar.xz";
- sha256 = "1sc6y01z0alxdgrm3rlki6n5a3gblrim7cbxj9xbsghy6s8s3pn0";
- name = "libkdegames-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/libkdegames-17.12.0.tar.xz";
+ sha256 = "0l1iwpngwsqs11scx2pbafkxgjazcj86qwc3fznrq0h3zg22zzxk";
+ name = "libkdegames-17.12.0.tar.xz";
};
};
libkdepim = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/libkdepim-17.08.3.tar.xz";
- sha256 = "19njszdhca7lk6cmkj4nnvj8zk7nakb9gq8bg34dqhhiq3nc6si5";
- name = "libkdepim-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/libkdepim-17.12.0.tar.xz";
+ sha256 = "1dmbs48xfy50dmfyfkglphlakn3bg4ww2rqkbwv68qy6hwkj750m";
+ name = "libkdepim-17.12.0.tar.xz";
};
};
libkeduvocdocument = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/libkeduvocdocument-17.08.3.tar.xz";
- sha256 = "0q978wn4brcszlf47iqnc93fqgcsvfcw2292n2hapf0cv8j8vzbm";
- name = "libkeduvocdocument-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/libkeduvocdocument-17.12.0.tar.xz";
+ sha256 = "1m9ff4qswjlczv7j5ravfagjw8dga5iw8x2d3mxyalgffc3810ab";
+ name = "libkeduvocdocument-17.12.0.tar.xz";
};
};
libkexiv2 = {
- version = "17.08.3";
- src = fetchurl {
- 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.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/libkface-17.08.3.tar.xz";
- sha256 = "0im9k72rxpk17m8ckl06rvylsxwjhgh3yxji1visvxljwkdscbmx";
- name = "libkface-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/libkexiv2-17.12.0.tar.xz";
+ sha256 = "0isqxj8c8inxdjs1gqvc1wv17nzvm8y9ga85n45417hxcfccrdrd";
+ name = "libkexiv2-17.12.0.tar.xz";
};
};
libkgapi = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/libkgapi-17.08.3.tar.xz";
- sha256 = "1yw00c16g2h59x5wzaaicv8b9dvdhbp0mqv49m8krnw07awh7isz";
- name = "libkgapi-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/libkgapi-17.12.0.tar.xz";
+ sha256 = "0nsn2kicdparjwqncian7v1b4m0jr5z99cc6ijycp3agg07lvppi";
+ name = "libkgapi-17.12.0.tar.xz";
};
};
libkgeomap = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/libkgeomap-17.08.3.tar.xz";
- sha256 = "0k0ndgwwm78z8hybyi0clfpkvmrpaj9b3xyda57c410m73fbdr0m";
- name = "libkgeomap-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/libkgeomap-17.12.0.tar.xz";
+ sha256 = "11mcqqcjmspjyskxd8r1vzrg2zcyx2cwdamwv40x4jmcx4g4nijp";
+ name = "libkgeomap-17.12.0.tar.xz";
};
};
libkipi = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/libkipi-17.08.3.tar.xz";
- sha256 = "0c0bhw0wpm6y21wj15cs73150dh0vxddl4lypj3xjpknxspiv32x";
- name = "libkipi-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/libkipi-17.12.0.tar.xz";
+ sha256 = "0fmjjy49cl8qam1bm335fvm8mzn68dli6nnx1d3m4kxffrzzi9gy";
+ name = "libkipi-17.12.0.tar.xz";
};
};
libkleo = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/libkleo-17.08.3.tar.xz";
- sha256 = "1nyf7c1q7dngk28852lkhz3h1cvi5xy4ydshkm376h32ps905yb7";
- name = "libkleo-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/libkleo-17.12.0.tar.xz";
+ sha256 = "0b15z81g6062qh9x7fqmn04gx7z7xkncbpf0ngp2m6795k38rp0s";
+ name = "libkleo-17.12.0.tar.xz";
};
};
libkmahjongg = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/libkmahjongg-17.08.3.tar.xz";
- sha256 = "1w7fzvp44dl74m5pl206mrwxpj3fh4fd0fwfinxps616jx1q76fd";
- name = "libkmahjongg-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/libkmahjongg-17.12.0.tar.xz";
+ sha256 = "0vg9041q5yp6ld7sn5pnzldxlci1kxzpq66vx4c67s81lpr3hqlm";
+ name = "libkmahjongg-17.12.0.tar.xz";
};
};
libkomparediff2 = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/libkomparediff2-17.08.3.tar.xz";
- sha256 = "01bd04av3jnsc2kxirfi4d8k2baaskdk2kasmbih1gml2mw9sbff";
- name = "libkomparediff2-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/libkomparediff2-17.12.0.tar.xz";
+ sha256 = "0ylhw5vj6frrffr27q4s5zidaxviggxwj592s3hxpy9np8avf7mq";
+ name = "libkomparediff2-17.12.0.tar.xz";
};
};
libksane = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/libksane-17.08.3.tar.xz";
- sha256 = "1skmqiw3j8jsdaj2haridslkx27wf55swjkzgjk4cxsk96j7y4ib";
- name = "libksane-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/libksane-17.12.0.tar.xz";
+ sha256 = "1qznn9s203ny37khg4lj8mpy9z3qblp8skh0lyw6s4wd46ni0vxw";
+ name = "libksane-17.12.0.tar.xz";
};
};
libksieve = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/libksieve-17.08.3.tar.xz";
- sha256 = "1nphwghis0mmmb92nr4f5d364nd5jyi1has9dc1hx6qz8p0wphwg";
- name = "libksieve-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/libksieve-17.12.0.tar.xz";
+ sha256 = "1yvs69c7lz5kqcnb16lq8sbykr22l0bmxsbgl7a1wzg3fqwnqlyn";
+ name = "libksieve-17.12.0.tar.xz";
};
};
lokalize = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/lokalize-17.08.3.tar.xz";
- sha256 = "0d4ym1vif1ggdlbs2k3ralc6lsm81xnlfp3z3mlkvg0vv77sfbra";
- name = "lokalize-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/lokalize-17.12.0.tar.xz";
+ sha256 = "189vrvdmavlnpk8cqyclwyqf2xml2fismfrncnh3nnaawr99mxmb";
+ name = "lokalize-17.12.0.tar.xz";
};
};
lskat = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/lskat-17.08.3.tar.xz";
- sha256 = "07vhmk03z2jw6mlfv5mdhzafcqa06skzm6ssk70y3whkwkck385b";
- name = "lskat-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/lskat-17.12.0.tar.xz";
+ sha256 = "0bfp2h566xry428b77a8wz91w2hxd7jwjzfgvvzj4rjajrydkr1m";
+ name = "lskat-17.12.0.tar.xz";
};
};
mailcommon = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/mailcommon-17.08.3.tar.xz";
- sha256 = "1zgy8sjng40w8m0b8fdy62p9sng7nld84py1k8zjw8mzhqqzqxs5";
- name = "mailcommon-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/mailcommon-17.12.0.tar.xz";
+ sha256 = "03jwf8g646wlxw5qxdcn4hghbrb7176zcchisky7mpb4cpkbl148";
+ name = "mailcommon-17.12.0.tar.xz";
};
};
mailimporter = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/mailimporter-17.08.3.tar.xz";
- sha256 = "0h3wsbca2lhw1zjv2l1q6fhdwnx9kznyiykcn7jgzsh6f7grzqa8";
- name = "mailimporter-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/mailimporter-17.12.0.tar.xz";
+ sha256 = "18f2zp63y95f14b9bwqgq68q4s5lqa9kv0l5xq4mylk4cdsb76kx";
+ name = "mailimporter-17.12.0.tar.xz";
};
};
marble = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/marble-17.08.3.tar.xz";
- sha256 = "0qmzy9b1gd40xzw4i978315dxf1ay1937wplb9nc670gmlrqnzy2";
- name = "marble-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/marble-17.12.0.tar.xz";
+ sha256 = "0zqwyf2lmdsf1cc7c9ld8agmp7fd9rdh2v2jn0p2ghzm578d0r34";
+ name = "marble-17.12.0.tar.xz";
};
};
mbox-importer = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.12.0/src/mbox-importer-17.12.0.tar.xz";
+ sha256 = "0zw6qslsr0rdhz3crq7h5ngaz0g0v6c12v7bz3749pm4pqd4wri9";
+ name = "mbox-importer-17.12.0.tar.xz";
};
};
messagelib = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/messagelib-17.08.3.tar.xz";
- sha256 = "1nxi79dyavjvgn83bjjrdwg0ry298ib126dxyl7inx7qgc4nhddn";
- name = "messagelib-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/messagelib-17.12.0.tar.xz";
+ sha256 = "1rz81bpf5s0nsf823l467p3dcyb7h746ipiv514frxddahh2kikz";
+ name = "messagelib-17.12.0.tar.xz";
};
};
minuet = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/minuet-17.08.3.tar.xz";
- sha256 = "1jg47mb5wnpw60is5zmdrqhjwsq6bnd5vw0pfiiw1arws50rv2h6";
- name = "minuet-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/minuet-17.12.0.tar.xz";
+ sha256 = "12ih1x8dl7w581jkagp59l8430gd7iip6m4pj3gh79sldsy3hkiq";
+ name = "minuet-17.12.0.tar.xz";
};
};
okteta = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/okteta-17.08.3.tar.xz";
- sha256 = "1zs0g5mnlj2fd0wipxgajnvbl5s24a37v6zdkixck5fmvlj6g14v";
- name = "okteta-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/okteta-17.12.0.tar.xz";
+ sha256 = "0zyhm8kbi064iics3f53k0g8z3j6kk9cy0cbmpn1bpwl481hkk7k";
+ name = "okteta-17.12.0.tar.xz";
};
};
okular = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/okular-17.08.3.tar.xz";
- sha256 = "1zalj2v9fgxc50b339i3j4n3gpf87pjnnqbgvkmd041apsv6jbnk";
- name = "okular-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/okular-17.12.0.tar.xz";
+ sha256 = "0czzh1djmmxmj8fa3sy3601i4mmd2hmnhsj1lmp5k6lkpmhyp505";
+ name = "okular-17.12.0.tar.xz";
};
};
palapeli = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/palapeli-17.08.3.tar.xz";
- sha256 = "1i689gycqlpi83wfy9l2dqzdypaizdx7cx069fbm4akv8r4xfjfz";
- name = "palapeli-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/palapeli-17.12.0.tar.xz";
+ sha256 = "1988z8ggchxbzqqrigybvx0hkpj0ikvzlzskk84s2wmm5nvvqwpq";
+ name = "palapeli-17.12.0.tar.xz";
};
};
parley = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/parley-17.08.3.tar.xz";
- sha256 = "0crrf7k8p9rz72q4zfbyxxfza5dm0z4nhhc4jqafra8vvbjyja2j";
- name = "parley-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/parley-17.12.0.tar.xz";
+ sha256 = "0qhx7wbk7wl6mdzv7arjidn80bagrxi4y8rpvylmpacn3skl1p55";
+ name = "parley-17.12.0.tar.xz";
};
};
picmi = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/picmi-17.08.3.tar.xz";
- sha256 = "0zj3ang96rwzpjr3y8lig1dhqxd2ipcs3q873plra0lxmlhnzq6b";
- name = "picmi-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/picmi-17.12.0.tar.xz";
+ sha256 = "04ykhzdwpgq34i7inqs9a29v9dkmnh9sj44vv5m97xqpsg64pkj8";
+ name = "picmi-17.12.0.tar.xz";
};
};
pimcommon = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/pimcommon-17.08.3.tar.xz";
- sha256 = "0d1avdhm78kfjvl8sybjqsmp7k1wl961bqlzgbxk9wq6411p9r8r";
- name = "pimcommon-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/pimcommon-17.12.0.tar.xz";
+ sha256 = "1naxg9954vd0j7n4j9dyjwn3jbx6n1ngc3apm0gxr49b9m6shbfj";
+ name = "pimcommon-17.12.0.tar.xz";
};
};
pim-data-exporter = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.12.0/src/pim-data-exporter-17.12.0.tar.xz";
+ sha256 = "09q7rwsnc0hinag48y54mfkw642nqgnvvw2dnzn8bvc76jvjy4xc";
+ name = "pim-data-exporter-17.12.0.tar.xz";
};
};
pim-sieve-editor = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.12.0/src/pim-sieve-editor-17.12.0.tar.xz";
+ sha256 = "0mjs8daycp7g287hfidixw13g83pclsz5k22m7vx4swa8hnsw885";
+ name = "pim-sieve-editor-17.12.0.tar.xz";
};
};
poxml = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/poxml-17.08.3.tar.xz";
- sha256 = "0vgh77rdqp8pq5k20794fl8m12azx6r2pkl0rijmwar2ln5k0k25";
- name = "poxml-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/poxml-17.12.0.tar.xz";
+ sha256 = "0v5ydzcpr4khbwwz9170ag7hdyqxsqamnhgr4nn4xhsdl3wxf36m";
+ name = "poxml-17.12.0.tar.xz";
};
};
print-manager = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.12.0/src/print-manager-17.12.0.tar.xz";
+ sha256 = "1v43kmlbyvmm5s4yijqizypzjar9ang4czbm8zk4k1pspbwvqm9v";
+ name = "print-manager-17.12.0.tar.xz";
};
};
rocs = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/rocs-17.08.3.tar.xz";
- sha256 = "1nvwjxsfqccrig25m9qkivrjn302g6blb6h2p3q1qnlszcw8b9wd";
- name = "rocs-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/rocs-17.12.0.tar.xz";
+ sha256 = "1ii2v9mhj42ydvgalc8xj1liy93xlf39bcc64vc6f7l76786kbvr";
+ name = "rocs-17.12.0.tar.xz";
};
};
signon-kwallet-extension = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.12.0/src/signon-kwallet-extension-17.12.0.tar.xz";
+ sha256 = "1iv26ny02qamnyxk7r3m1fiyqqmxi75y65vavxqqngdqrx5h9s45";
+ name = "signon-kwallet-extension-17.12.0.tar.xz";
};
};
spectacle = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/spectacle-17.08.3.tar.xz";
- sha256 = "18z0sqd38146nc73kmwvshjxl0wgm1fh4zzxai1hcp7yiipndzm6";
- name = "spectacle-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/spectacle-17.12.0.tar.xz";
+ sha256 = "008j8nl26phr24329wqj9z4bw078bj81mpy267pwzaqf411xfgd5";
+ name = "spectacle-17.12.0.tar.xz";
};
};
step = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/step-17.08.3.tar.xz";
- sha256 = "1gnsfn2iz2lax30pdyqvm6s5b8zjsn4gs031dlr1xgsd98c1xq87";
- name = "step-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/step-17.12.0.tar.xz";
+ sha256 = "0krd8kl29sk1ib6kszhkz6328d3ap2fl7lw4hcycl1z0cnrpf1b0";
+ name = "step-17.12.0.tar.xz";
};
};
svgpart = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/svgpart-17.08.3.tar.xz";
- sha256 = "07i3ny0bl1fjfia2rbrb7n4qycdpz4gjpvx6v540ghq58dy7nfgw";
- name = "svgpart-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/svgpart-17.12.0.tar.xz";
+ sha256 = "0q157qnyl6sabd879200s1fp22qb3rc940pw70dyy03sd16vb0k0";
+ name = "svgpart-17.12.0.tar.xz";
};
};
sweeper = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/sweeper-17.08.3.tar.xz";
- sha256 = "0jymkz024ywss8y2xpyndpr7pk89v7bbgr5anpnywfkgx3lv06xn";
- name = "sweeper-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/sweeper-17.12.0.tar.xz";
+ sha256 = "0csccxd3pjw2ih2h4m168vkmiyyzvqzqx8pyhxjc2jgqkmqy0njj";
+ name = "sweeper-17.12.0.tar.xz";
};
};
syndication = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/syndication-17.08.3.tar.xz";
- sha256 = "0yakzq927prd9pd1g7gld90pz1cxjwzic2c2cw9bw17x19yr748h";
- name = "syndication-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/syndication-17.12.0.tar.xz";
+ sha256 = "1cxbrckgpbzgj791c97840yy011x6vii0nzxd6sc7sp5sh8y2k6l";
+ name = "syndication-17.12.0.tar.xz";
};
};
umbrello = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/umbrello-17.08.3.tar.xz";
- sha256 = "1g149nkp02b1sgsq83r0p3vfii8jsc4kx79znglcjlf20dg89j70";
- name = "umbrello-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.0/src/umbrello-17.12.0.tar.xz";
+ sha256 = "1i6rvxgpk166gpjm91g1d87lhcswpfvsysa4jc1bmxw8qyzd6yc9";
+ name = "umbrello-17.12.0.tar.xz";
};
};
zeroconf-ioslave = {
- version = "17.08.3";
+ version = "17.12.0";
src = fetchurl {
- 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";
+ url = "${mirror}/stable/applications/17.12.0/src/zeroconf-ioslave-17.12.0.tar.xz";
+ sha256 = "07mxy2wg5f92zv2vcy72d2z73jfm0w6rzs2vlixsyzmig3v8azga";
+ name = "zeroconf-ioslave-17.12.0.tar.xz";
};
};
}
diff --git a/pkgs/applications/misc/airspy/default.nix b/pkgs/applications/misc/airspy/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..9b6771a3925bf09371b900d5918b9efe4b79b310
--- /dev/null
+++ b/pkgs/applications/misc/airspy/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, lib, fetchFromGitHub
+, cmake , pkgconfig, libusb
+}:
+
+let
+ version = "1.0.9";
+in
+ stdenv.mkDerivation {
+ name = "airspy-${version}";
+
+ src = fetchFromGitHub {
+ owner = "airspy";
+ repo = "airspyone_host";
+ rev = "v${version}";
+ sha256 = "04kx2p461sqd4q354n1a99zcabg9h29dwcnyhakykq8bpg3mgf1x";
+ };
+
+ postPatch = ''
+ substituteInPlace airspy-tools/CMakeLists.txt --replace "/etc/udev/rules.d" "$out/etc/udev/rules.d"
+ '';
+
+ nativeBuildInputs = [ cmake pkgconfig ];
+ buildInputs = [ libusb ];
+
+ cmakeFlags =
+ lib.optionals stdenv.isLinux [ "-DINSTALL_UDEV_RULES=ON" ];
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/airspy/airspyone_host;
+ description = "Host tools and driver library for the AirSpy SDR";
+ license = licenses.free;
+ platforms = with platforms; linux ++ darwin;
+ maintainers = with maintainers; [ markuskowa ];
+ };
+ }
diff --git a/pkgs/applications/misc/airtame/default.nix b/pkgs/applications/misc/airtame/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..56fc11a20e12b9f49cfd72ffa5ad0f6444bc234b
--- /dev/null
+++ b/pkgs/applications/misc/airtame/default.nix
@@ -0,0 +1,100 @@
+{ stdenv, lib, fetchurl, makeDesktopItem, makeWrapper
+, alsaLib, atk, cairo, cups, curl, dbus, expat, ffmpeg, fontconfig, freetype
+, gdk_pixbuf, glib, glibc, gnome2, gtk2, libX11, libXScrnSaver, libXcomposite
+, libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender
+, libXtst, libopus, libpulseaudio, libxcb, nspr, nss, pango, udev, x264
+}:
+
+let libPath = lib.makeLibraryPath [
+ alsaLib
+ atk
+ cairo
+ cups
+ curl
+ dbus
+ expat
+ ffmpeg
+ fontconfig
+ freetype
+ gdk_pixbuf
+ glib
+ glibc
+ gnome2.GConf
+ gtk2
+ libopus
+ nspr
+ nss
+ pango
+ stdenv.cc.cc
+ udev
+ x264
+ libX11
+ libXScrnSaver
+ libXcomposite
+ libXcursor
+ libXdamage
+ libXext
+ libXfixes
+ libXi
+ libXrandr
+ libXrender
+ libXtst
+ libpulseaudio
+ libxcb
+];
+in stdenv.mkDerivation rec {
+ pname = "airtame";
+ version = "3.0.1";
+ name = "${pname}-${version}";
+ longName = "${pname}-application";
+
+ src = fetchurl {
+ url = "https://downloads.airtame.com/application/ga/lin_x64/releases/${longName}-${version}.tar.gz";
+ sha256 = "1z5v9dwcvcmz190acm89kr4mngirha1v2jpvfzvisi0vidl2ba60";
+ };
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ desktopItem = makeDesktopItem rec {
+ name = "airtame";
+ exec = longName;
+ comment = "Airtame Streaming Client";
+ desktopName = "Airtame";
+ icon = name;
+ genericName = comment;
+ categories = "Application;Network;";
+ };
+
+ installPhase = ''
+ opt="$out/opt/airtame"
+ mkdir -p "$opt"
+ cp -R . "$opt"
+ mkdir -p "$out/bin"
+ ln -s "$opt/${longName}" "$out/bin/"
+ mkdir -p "$out/share"
+ cp -r "${desktopItem}/share/applications" "$out/share/"
+ mkdir -p "$out/share/icons"
+ ln -s "$opt/icon.png" "$out/share/icons/airtame.png"
+
+ # Flags and rpath are copied from launch-airtame.sh.
+ interp="$(< $NIX_CC/nix-support/dynamic-linker)"
+ vendorlib="$opt/resources/app.asar.unpacked/streamer/vendor/airtame-core/lib"
+ rpath="${libPath}:$opt:$vendorlib:$opt/resources/app.asar.unpacked/encryption/out/lib"
+ rm $vendorlib/libcurl.so*
+ find "$opt" \( -type f -executable -o -name "*.so" -o -name "*.so.*" \) \
+ -exec patchelf --set-rpath "$rpath" {} \;
+ # The main binary also needs libudev which was removed by --shrink-rpath.
+ patchelf --set-interpreter "$interp" $opt/${longName}
+ wrapProgram $opt/${longName} --add-flags "--disable-gpu --enable-transparent-visuals"
+ '';
+
+ dontPatchELF = true;
+
+ meta = with stdenv.lib; {
+ homepage = https://airtame.com/download;
+ description = "Wireless streaming client for Airtame devices";
+ license = licenses.unfree;
+ maintainers = with maintainers; [ thanegill ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
index bb934ff4812cbf170f7cff830549f3beedcf8784..7bfcc6e72c89e2818c0b47bdbe96f578001c49d3 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -12,6 +12,7 @@
libXcursor,
libXxf86vm,
libXi,
+ libXrandr,
xclip }:
with rustPlatform;
@@ -24,22 +25,23 @@ let
libX11
libXcursor
libXxf86vm
+ libXrandr
libXi
];
in buildRustPackage rec {
name = "alacritty-unstable-${version}";
- version = "2017-11-12";
+ version = "2017-12-29";
# 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 = "0096fzrfzj0a2n2n531r4b6c8rlfj5qc90d6i4iin5axalk3i1h4";
+ sha256 = "0pk4b8kfxixmd9985v2fya1m7np8ggws8d9msw210drc0grwbfkd";
fetchSubmodules = true;
};
- cargoSha256 = "10blch8pzk1zk3w27sbcszhcnq908xh1q55vqgy8iv5x47rpl02q";
+ cargoSha256 = "0acj526cx4xl52vbcbd3hp1klh4p756j6alxqqz3x715zi2dqkzf";
nativeBuildInputs = [
cmake
diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix
index 5abd8953a4439ea93e7cacfea89ea59ce44a2442..3a5fde28706790e0fdcc8a05d668646845ded54c 100644
--- a/pkgs/applications/misc/albert/default.nix
+++ b/pkgs/applications/misc/albert/default.nix
@@ -1,15 +1,15 @@
-{ mkDerivation, lib, fetchFromGitHub, makeWrapper, qtbase, qtdeclarative, qtsvg, qtx11extras, muparser,
- cmake, python3 }:
+{ mkDerivation, lib, fetchFromGitHub, makeWrapper, qtbase,
+ qtdeclarative, qtsvg, qtx11extras, muparser, cmake, python3 }:
mkDerivation rec {
name = "albert-${version}";
- version = "0.14.7";
+ version = "0.14.14";
src = fetchFromGitHub {
owner = "albertlauncher";
repo = "albert";
rev = "v${version}";
- sha256 = "1ryjrbrbgignhkvsv4021l4am8ml7g8v4bs5cp5jj288k4p2rf4n";
+ sha256 = "1skh709f4y4p0vqabvvysn6fgws2yq8izbwkib7rfjc357chhmi7";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/misc/bb/default.nix b/pkgs/applications/misc/bb/default.nix
index 71196e919915c639d4b6902d11941c5c7188c14c..3d04b53dcde76405185676411256079bb5ea2118 100644
--- a/pkgs/applications/misc/bb/default.nix
+++ b/pkgs/applications/misc/bb/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
homepage = http://aa-project.sourceforge.net/bb;
description = "AA-lib demo";
license = licenses.gpl2;
- maintainers = maintainers.rnhmjoj;
+ maintainers = [ maintainers.rnhmjoj ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/misc/calcurse/default.nix b/pkgs/applications/misc/calcurse/default.nix
index 3f22d1629e27b2950ddba061a68a5768f0785a80..d4b07cb91dcd8426c0d1aef49e89ff996725e11a 100644
--- a/pkgs/applications/misc/calcurse/default.nix
+++ b/pkgs/applications/misc/calcurse/default.nix
@@ -1,20 +1,26 @@
-{stdenv, fetchurl, ncurses, gettext, python3, makeWrapper }:
+{ stdenv, fetchurl, ncurses, gettext, python3, python3Packages, makeWrapper }:
stdenv.mkDerivation rec {
name = "calcurse-${version}";
- version = "4.2.2";
+ version = "4.3.0";
src = fetchurl {
url = "http://calcurse.org/files/${name}.tar.gz";
- sha256 = "0il0y06akdqgy0f9p40m4x6arn66nh7sr1w1i41bszycs7div266";
+ sha256 = "16jzg0nasnxdlz23i121x41pq5kbxmjzk52c5d863rg117fc7v1i";
};
- buildInputs = [ncurses gettext python3 ];
+ buildInputs = [ ncurses gettext python3 ];
nativeBuildInputs = [ makeWrapper ];
+ # Build Python environment with httplib2 for calcurse-caldav
+ pythonEnv = python3Packages.python.buildEnv.override {
+ extraLibs = [ python3Packages.httplib2 ];
+ };
+ propogatedBuildInputs = [ pythonEnv ];
+
postInstall = ''
- makeWrapper ${python3}/bin/python3 $out/bin/calcurse-caldav
- '';
+ substituteInPlace $out/bin/calcurse-caldav --replace /usr/bin/python3 ${pythonEnv}/bin/python3
+ '';
meta = with stdenv.lib; {
description = "A calendar and scheduling application for the command line";
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index e548b944a8d4cafadde7b297883d4cdd076d5542..14e9375cb7941bdb0ff79605639adee420334916 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,12 +5,12 @@
}:
stdenv.mkDerivation rec {
- version = "3.12.0";
+ version = "3.14.0";
name = "calibre-${version}";
src = fetchurl {
url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
- sha256 = "0l7r5ny9a36yg22fqzz3as6wh1xqpa3hrlx2gy25yp649sbkd9vq";
+ sha256 = "1367jh82mhjjlvyd30mfz3qwscg60l0gimakvzpbkrah918kfk51";
};
patches = [
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
poppler_utils libpng imagemagick libjpeg
fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils wrapGAppsHook
] ++ (with python2Packages; [
- apsw cssselect cssutils dateutil dns html5-parser lxml mechanize netifaces pillow
+ apsw cssselect cssutils dateutil dnspython html5-parser lxml mechanize netifaces pillow
python pyqt5 sip
regex msgpack
# the following are distributed with calibre, but we use upstream instead
diff --git a/pkgs/applications/misc/camlistore/default.nix b/pkgs/applications/misc/camlistore/default.nix
deleted file mode 100644
index d90e8a6dba667734a6b3d9ab287554ec9c2290be..0000000000000000000000000000000000000000
--- a/pkgs/applications/misc/camlistore/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, lib, go, fetchgit, git, buildGoPackage }:
-
-buildGoPackage rec {
- name = "camlistore-${version}";
- version = "0.9";
-
- src = fetchgit {
- url = "https://github.com/camlistore/camlistore";
- rev = "refs/tags/${version}";
- sha256 = "1ypplr939ny9drsdngapa029fgak0wic8sbna588m79cbl17psya";
- leaveDotGit = true;
- };
-
- buildInputs = [ git ];
-
- goPackagePath = "";
- buildPhase = ''
- cd go/src/camlistore
- go run make.go
- '';
-
- installPhase = ''
- mkdir -p $bin/bin
- rm bin/README
- cp bin/* $bin/bin
- '';
-
- meta = with stdenv.lib; {
- description = "A way of storing, syncing, sharing, modelling and backing up content";
- homepage = https://camlistore.org;
- license = licenses.asl20;
- maintainers = with maintainers; [ cstrahan ];
- platforms = platforms.unix;
- };
-}
diff --git a/pkgs/applications/misc/ddgr/default.nix b/pkgs/applications/misc/ddgr/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..ca7e332cc286df573b078ac5bb203ef9fe2962ca
--- /dev/null
+++ b/pkgs/applications/misc/ddgr/default.nix
@@ -0,0 +1,46 @@
+{stdenv, fetchpatch, fetchFromGitHub, python3Packages}:
+
+stdenv.mkDerivation rec {
+ version = "1.1";
+ name = "ddgr-${version}";
+
+ src = fetchFromGitHub {
+ owner = "jarun";
+ repo = "ddgr";
+ rev = "v${version}";
+ sha256 = "1q66kwip5y0kfkfldm1x54plz85mjyvv1xpxjqrs30r2lr0najgf";
+ };
+
+ buildInputs = [
+ (python3Packages.python.withPackages (ps: with ps; [
+ requests
+ ]))
+ ];
+
+ patches = [
+ (fetchpatch {
+ sha256 = "1rxr3biq0mk4m0m7dsxr70dhz4fg5siil5x5fy9nymcmhvcm1cdc";
+ name = "Fix-zsh-completion.patch";
+ url = "https://github.com/jarun/ddgr/commit/10c1a911a3d5cbf3e96357c932b0211d3165c4b8.patch";
+ })
+ ];
+
+ makeFlags = "PREFIX=$(out)";
+
+ postInstall = ''
+ mkdir -p "$out/share/bash-completion/completions/"
+ cp "auto-completion/bash/ddgr-completion.bash" "$out/share/bash-completion/completions/"
+ mkdir -p "$out/share/fish/vendor_completions.d/"
+ cp "auto-completion/fish/ddgr.fish" "$out/share/fish/vendor_completions.d/"
+ mkdir -p "$out/share/zsh/site-functions/"
+ cp "auto-completion/zsh/_ddgr" "$out/share/zsh/site-functions/"
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/jarun/ddgr;
+ description = "Search DuckDuckGo from the terminal";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ markus1189 ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/applications/misc/deepin-terminal/default.nix b/pkgs/applications/misc/deepin-terminal/default.nix
index 7f38e801c4cb5f96aca1b8e7b8fc24b66417cfa8..12ceb0958f0d87cf491b4d3c7e5e21e48548a2b3 100644
--- a/pkgs/applications/misc/deepin-terminal/default.nix
+++ b/pkgs/applications/misc/deepin-terminal/default.nix
@@ -1,31 +1,46 @@
-{ stdenv, unzip, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, vte, libgee, wnck, gettext, libsecret, json_glib }:
+{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, vte, libgee, wnck, zssh, gettext, librsvg, libsecret, json_glib, gobjectIntrospection }:
stdenv.mkDerivation rec {
name = "deepin-terminal-${version}";
- version = "2.6.1";
+ version = "2.9.2";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = "deepin-terminal";
rev = version;
- sha256 = "11lylkrv69k2jvwparnxymr7z3x9cs82q9p0lr2wrfr48hnfwp8b";
+ sha256 = "1pmg1acs44c30hz9rpr6x1l6lyvlylc2pz5lv4ai0rhv37n51yn2";
};
- patchPhase = ''
- substituteInPlace project_path.c --replace __FILE__ \"$out/share/deepin-terminal/\"
+ patches = [
+ # Do not build vendored zssh and vte
+ (fetchurl {
+ name = "remove-vendor.patch";
+ url = https://git.archlinux.org/svntogit/community.git/plain/trunk/remove-vendor.patch?h=packages/deepin-terminal&id=5baa756e8e6ac8ce43fb122fce270756cc55086c;
+ sha256 = "0zrq004malphpy7xv5z502bpq30ybyj1rr4hlq4k5m4fpk29dlw6";
+ })
+ ];
+
+ postPatch = ''
+ substituteInPlace project_path.c --replace __FILE__ \"$out/share/deepin-terminal/\"
+ substituteInPlace ssh_login.sh --replace /usr/lib/deepin-terminal/zssh "${zssh}/bin/zssh"
'';
- nativeBuildInputs = [ pkgconfig vala cmake gettext unzip ];
- buildInputs = [ gtk3 vte libgee wnck libsecret json_glib ];
+ nativeBuildInputs = [
+ pkgconfig vala cmake gettext
+ # For setup hook
+ gobjectIntrospection
+ ];
+ buildInputs = [ gtk3 vte libgee wnck librsvg libsecret json_glib ];
- meta = {
+ meta = with stdenv.lib; {
description = "The default terminal emulation for Deepin";
longDescription = ''
- Deepin terminal, it sharpens your focus in the world of command line!
- It is an advanced terminal emulator with workspace, multiple windows, remote management, quake mode and other features.
+ Deepin terminal, it sharpens your focus in the world of command line!
+ It is an advanced terminal emulator with workspace, multiple windows, remote management, quake mode and other features.
'';
homepage = https://github.com/linuxdeepin/deepin-terminal/;
- license = stdenv.lib.licenses.gpl3;
- platforms = stdenv.lib.platforms.linux;
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/misc/dmensamenu/default.nix b/pkgs/applications/misc/dmensamenu/default.nix
index 0c9fa5ea2d27969874385f61e7b1c663b2a604ee..924b95d8b6a9a6b6e53ffa28645ff0564a523ac2 100644
--- a/pkgs/applications/misc/dmensamenu/default.nix
+++ b/pkgs/applications/misc/dmensamenu/default.nix
@@ -2,7 +2,7 @@
buildPythonApplication rec {
name = "dmensamenu-${version}";
- version = "1.0.0";
+ version = "1.1.1";
propagatedBuildInputs = [
requests
@@ -12,8 +12,8 @@ buildPythonApplication rec {
src = fetchFromGitHub {
owner = "dotlambda";
repo = "dmensamenu";
- rev = "v${version}";
- sha256 = "05wbpmgjpm0ik9pcydj7r9w7i7bfpcij24bc4jljdwl9ilw62ixp";
+ rev = version;
+ sha256 = "0gc23k2zbv9zfc0v27y4spiva8cizxavpzd5pch5qbawh2lak6a3";
};
meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/dmenu/wayland.nix b/pkgs/applications/misc/dmenu/wayland.nix
deleted file mode 100644
index 340e8f161647bee40aedf579cf6a6b584abcc76f..0000000000000000000000000000000000000000
--- a/pkgs/applications/misc/dmenu/wayland.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{stdenv, fetchurl #, libX11, libXinerama, enableXft, libXft, zlib
-, swc, wld, wayland, libxkbcommon, pixman, fontconfig
-}:
-
-with stdenv.lib;
-
-stdenv.mkDerivation rec {
- name = "dmenu-wayland-${version}";
- version = "git-2017-04-07";
- rev = "f385d9d18813071b4b4257bf8d4d572daeda0e70";
-
- src = fetchurl {
- url = "https://github.com/michaelforney/dmenu/archive/${rev}.tar.gz";
- sha256 = "0y1jvh2815c005ns0bsjxsmz82smw22n6jsfg2g03a1pacakp6ys";
- };
-
- buildInputs = [ swc wld wayland libxkbcommon pixman fontconfig ];
-
- postPatch = ''
- sed -ri -e 's!\<(dmenu|dmenu_path)\>!'"$out/bin"'/&!g' dmenu_run
- '';
-
- preConfigure = [
- ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g; s@/usr/share/swc@${swc}/share/swc@g" config.mk''
- ];
-
- meta = {
- description = "A generic, highly customizable, and efficient menu for the X Window System";
- homepage = http://tools.suckless.org/dmenu;
- license = stdenv.lib.licenses.mit;
- maintainers = with stdenv.lib.maintainers; [ ];
- platforms = with stdenv.lib.platforms; all;
- };
-}
diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix
index 56c1a8168a820262b10a589514bd240df7383f03..21af05133bf8066904c4c27e689f8cdd1731b078 100644
--- a/pkgs/applications/misc/electron-cash/default.nix
+++ b/pkgs/applications/misc/electron-cash/default.nix
@@ -1,24 +1,31 @@
-{ stdenv, fetchurl, python2Packages }:
+{ stdenv, fetchurl, python3Packages, qtbase }:
-python2Packages.buildPythonApplication rec {
- version = "2.9.4";
+let
+
+ python = python3Packages.python;
+
+in
+
+python3Packages.buildPythonApplication rec {
+ version = "3.1.2";
name = "electron-cash-${version}";
src = fetchurl {
- url = "https://electroncash.org/downloads/${version}/win-linux/Electron-Cash-${version}.tar.gz";
+ url = "https://electroncash.org/downloads/${version}/win-linux/ElectronCash-${version}.tar.gz";
# Verified using official SHA-1 and signature from
# https://github.com/fyookball/keys-n-hashes
- sha256 = "1y8mzwa6bb8zj4l92wm4c2icnr42wmhbfz6z5ymh356gwll914vh";
+ sha256 = "18h44jfbc2ksj34hdzgszvvq82xi28schl3wp3lkq9fjp7ny0mf3";
};
- propagatedBuildInputs = with python2Packages; [
- dns
+ propagatedBuildInputs = with python3Packages; [
+ dnspython
ecdsa
- jsonrpclib
+ jsonrpclib-pelix
+ matplotlib
pbkdf2
pyaes
pycrypto
- pyqt4
+ pyqt5
pysocks
qrcode
requests
@@ -29,18 +36,25 @@ python2Packages.buildPythonApplication rec {
trezor
];
+ postPatch = ''
+ # Remove pyqt5 check
+ sed -i '/pyqt5/d' setup.py
+ '';
+
preBuild = ''
sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py
- pyrcc4 icons.qrc -o gui/qt/icons_rc.py
+ pyrcc5 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
'';
+ doCheck = false;
+
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
+ mv $out/${python.sitePackages}/nix/store"/"*/share $out
+ rm -rf $out/${python.sitePackages}/nix
substituteInPlace $out/share/applications/electron-cash.desktop \
--replace "Exec=electron-cash %u" "Exec=$out/bin/electron-cash %u"
@@ -60,6 +74,7 @@ python2Packages.buildPythonApplication rec {
of the blockchain.
'';
homepage = https://www.electroncash.org/;
+ platforms = platforms.linux;
maintainers = with maintainers; [ lassulus ];
license = licenses.mit;
};
diff --git a/pkgs/applications/misc/electrum-dash/default.nix b/pkgs/applications/misc/electrum-dash/default.nix
index e7a5a1be1979b52b3edc5cb994ad5cceefcec7cc..bde8d5b81e3e9d9e43fe5d270a3cd4ef5eb3c3d6 100644
--- a/pkgs/applications/misc/electrum-dash/default.nix
+++ b/pkgs/applications/misc/electrum-dash/default.nix
@@ -10,7 +10,7 @@ python2Packages.buildPythonApplication rec {
};
propagatedBuildInputs = with python2Packages; [
- dns
+ dnspython
ecdsa
pbkdf2
protobuf
diff --git a/pkgs/applications/misc/electrum-ltc/default.nix b/pkgs/applications/misc/electrum-ltc/default.nix
index bb41f8665e57886cd1ddcf55c842073b363a6be7..10b2aacbf8cbb8148b61478b45c7804421970854 100644
--- a/pkgs/applications/misc/electrum-ltc/default.nix
+++ b/pkgs/applications/misc/electrum-ltc/default.nix
@@ -1,33 +1,34 @@
{ stdenv
, fetchurl
-, python2Packages
+, python3Packages
}:
-python2Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
name = "electrum-ltc-${version}";
- version = "2.6.4.2";
+ version = "3.0.5.1";
src = fetchurl {
url = "https://electrum-ltc.org/download/Electrum-LTC-${version}.tar.gz";
- sha256 = "0sqcyk6n6kgaiinnwh6mzbbn4whk3ga59r5bw5rqmnnfqk1xdnb4";
+ sha256 = "1acsgzmd83cz6ha5fw63mi7123fr6gbiq537p5lxxfs2i8zrl63r";
};
- propagatedBuildInputs = with python2Packages; [
- pyqt4
- slowaes
+ propagatedBuildInputs = with python3Packages; [
+ pyaes
ecdsa
pbkdf2
requests
qrcode
- ltc_scrypt
+ py_scrypt
+ pyqt5
protobuf
- dns
- jsonrpclib
+ dnspython
+ jsonrpclib-pelix
+ pysocks
];
preBuild = ''
sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py
- pyrcc4 icons.qrc -o gui/qt/icons_rc.py
+ pyrcc5 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
'';
@@ -47,7 +48,7 @@ python2Packages.buildPythonApplication rec {
'';
homepage = https://electrum-ltc.org/;
license = licenses.mit;
- platforms = platforms.all;
+ platforms = platforms.linux;
maintainers = with maintainers; [ asymmetric ];
};
}
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index abe8d0dde84b081594ccc5ed957c4a769f8fc53d..caa050581bf707f00f06034728025ea659c14c78 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -1,24 +1,24 @@
-{ stdenv, fetchurl, python2Packages }:
+{ stdenv, fetchurl, python3, python3Packages, zbar }:
-python2Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
name = "electrum-${version}";
- version = "2.9.3";
+ version = "3.0.5";
src = fetchurl {
url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
- sha256 = "0d0fzb653g7b8ka3x90nl21md4g3n1fv11czdxpdq3s9yr6js6f2";
+ sha256 = "06z0a5p1jg93jialphslip8d72q9yg3651qqaf494gs3h9kw1sv1";
};
- propagatedBuildInputs = with python2Packages; [
- dns
+ propagatedBuildInputs = with python3Packages; [
+ dnspython
ecdsa
- jsonrpclib
+ jsonrpclib-pelix
matplotlib
pbkdf2
protobuf
pyaes
pycrypto
- pyqt4
+ pyqt5
pysocks
qrcode
requests
@@ -35,21 +35,24 @@ python2Packages.buildPythonApplication rec {
preBuild = ''
sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py
- pyrcc4 icons.qrc -o gui/qt/icons_rc.py
+ pyrcc5 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
+ sed -i "s|name = 'libzbar.*'|name='${zbar}/lib/libzbar.so'|" lib/qrscanner.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
+ mv $out/${python3.sitePackages}/nix/store"/"*/share $out
+ rm -rf $out/${python3.sitePackages}/nix
substituteInPlace $out/share/applications/electrum.desktop \
--replace "Exec=electrum %u" "Exec=$out/bin/electrum %u"
'';
+ doCheck = false;
+
doInstallCheck = true;
installCheckPhase = ''
$out/bin/electrum help >/dev/null
diff --git a/pkgs/applications/misc/emem/default.nix b/pkgs/applications/misc/emem/default.nix
index 7248fe2c875414bf6891a8c02a526642b944e79b..d447e7f50d527f341ba6a155c668b967ea1a1c9f 100644
--- a/pkgs/applications/misc/emem/default.nix
+++ b/pkgs/applications/misc/emem/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "emem";
- version = "0.2.48";
+ version = "0.2.50";
name = "${pname}-${version}";
inherit jdk;
src = fetchurl {
url = "https://github.com/ebzzry/${pname}/releases/download/v${version}/${pname}.jar";
- sha256 = "0l68qqjh8lbqb2yqvggiga9qz2j32h3qklcfkycmcffn6l1nlqnq";
+ sha256 = "18x3s3jrph8k3pc75jgwkfqazygpsx93zjxx68zms58my17cybh1";
};
phases = [ "buildPhase" "installPhase" ];
diff --git a/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch b/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch
index 68a16b196fa31e914f55270c5fd198ed05d7fcb1..0ed98ee947b2c1b7170c7947ca349ff96a57bbec 100644
--- a/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch
+++ b/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch
@@ -77,8 +77,8 @@ index 0000000..1bd9bb5
+
+
+
-+
-+
++
++
+
+
+
@@ -91,6 +91,7 @@ index 0000000..1bd9bb5
+
+
+
++
+
+
+
diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix
index 7bd876f1d4aa0312f675e41d9d096af52be6a107..aaaa7f3c214ff79ee8f03fa2f28152a67f023709 100644
--- a/pkgs/applications/misc/far2l/default.nix
+++ b/pkgs/applications/misc/far2l/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchFromGitHub, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash,
+{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash,
xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick, darwin }:
with stdenv.lib;
stdenv.mkDerivation rec {
- rev = "1ecd3a37c7b866a4599c547ea332541de2a2af26";
- build = "unstable-2017-09-30.git${builtins.substring 0 7 rev}";
+ rev = "192dace49c2e5456ca235833ee9877e4b8b491cc";
+ build = "unstable-2017-10-08.git${builtins.substring 0 7 rev}";
name = "far2l-2.1.${build}";
src = fetchFromGitHub {
owner = "elfmz";
repo = "far2l";
rev = rev;
- sha256 = "0mavg9z1n81b1hbkj320m36r8lpw28j07rl1d2hpg69y768yyq05";
+ sha256 = "1l1sf5zlr99xrmjlpzfk3snxqw13xgvnqilw4n7051b8km0snrbl";
};
nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ];
diff --git a/pkgs/applications/misc/finalterm/default.nix b/pkgs/applications/misc/finalterm/default.nix
index add46f8871d571f19c006b71e08d7db4e0a8329c..ee16ba24ed46fcedecc63f6b77cb690c30eaada7 100644
--- a/pkgs/applications/misc/finalterm/default.nix
+++ b/pkgs/applications/misc/finalterm/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper
-, pkgconfig, cmake, libxml2, vala_0_23, intltool, libmx, gnome3, gtk3, gtk_doc
+, pkgconfig, cmake, libxml2, vala_0_26, intltool, libmx, gnome3, gtk3, gtk_doc
, keybinder3, clutter_gtk, libnotify
, libxkbcommon, xorg, udev
, bashInteractive
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig cmake intltool makeWrapper ];
buildInputs = [
- vala_0_23 gtk3 gnome3.gnome_common gnome3.libgee
+ vala_0_26 gtk3 gnome3.gnome_common gnome3.libgee
gtk_doc clutter_gtk libmx keybinder3 libxml2 libnotify
xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence
libxkbcommon
diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix
index 6d67d3a340f5d3bfc970f191ae2089ac8f3790c6..8c63c856578118f29f0ba7b464cfe267130e444a 100644
--- a/pkgs/applications/misc/font-manager/default.nix
+++ b/pkgs/applications/misc/font-manager/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, makeWrapper, automake, autoconf, libtool,
+{ stdenv, fetchFromGitHub, automake, autoconf, libtool,
pkgconfig, file, intltool, libxml2, json_glib , sqlite, itstool,
- librsvg, vala_0_34, gnome3, wrapGAppsHook
+ librsvg, vala_0_34, gnome3, wrapGAppsHook, gobjectIntrospection
}:
stdenv.mkDerivation rec {
@@ -15,7 +15,6 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
- makeWrapper
pkgconfig
automake autoconf libtool
file
@@ -23,6 +22,8 @@ stdenv.mkDerivation rec {
vala_0_34
gnome3.yelp_tools
wrapGAppsHook
+ # For setup hook
+ gobjectIntrospection
];
buildInputs = [
diff --git a/pkgs/applications/misc/gcal/default.nix b/pkgs/applications/misc/gcal/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..67bb5feff8c7f896fe6701cdf888a2de1e2ae6e6
--- /dev/null
+++ b/pkgs/applications/misc/gcal/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, pkgconfig, ncurses }:
+
+stdenv.mkDerivation rec {
+ name = "gcal-${version}";
+ version = "4.1";
+
+ src = fetchurl {
+ url = "mirror://gnu/gcal/${name}.tar.xz";
+ sha256 = "1av11zkfirbixn05hyq4xvilin0ncddfjqzc4zd9pviyp506rdci";
+ };
+
+ enableParallelBuilding = true;
+
+ buildInputs = [ ncurses ];
+
+ meta = {
+ description = "Program for calculating and printing calendars";
+ longDescription = ''
+ Gcal is the GNU version of the trusty old cal(1). Gcal is a
+ program for calculating and printing calendars. Gcal displays
+ hybrid and proleptic Julian and Gregorian calendar sheets. It
+ also displays holiday lists for many countries around the globe.
+ '';
+ homepage = https://www.gnu.org/software/gcal/;
+ license = stdenv.lib.licenses.gpl3Plus;
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.romildo ];
+ };
+}
diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix
index b6bb3c2fd83d40a99d3fdd4d836b1e73107e8908..7fd3db860dfb33dd524ab73940c9ef712042141a 100644
--- a/pkgs/applications/misc/girara/default.nix
+++ b/pkgs/applications/misc/girara/default.nix
@@ -6,11 +6,11 @@ assert withBuildColors -> ncurses != null;
stdenv.mkDerivation rec {
name = "girara-${version}";
- version = "0.2.7";
+ version = "0.2.8";
src = fetchurl {
url = "http://pwmt.org/projects/girara/download/${name}.tar.gz";
- sha256 = "1r9jbhf9n40zj4ddqv1q5spijpjm683nxg4hr5lnir4a551s7rlq";
+ sha256 = "18wss3sak3djip090v2vdbvq1mvkwcspfswc87zbvv3magihan98";
};
preConfigure = ''
diff --git a/pkgs/applications/misc/gnuradio-osmosdr/default.nix b/pkgs/applications/misc/gnuradio-osmosdr/default.nix
index 2fd64d02f18bcffe7b606cf453fd34c52e72f3b3..355ca0e9544994dcc010b66e84d57130fa7d9fc0 100644
--- a/pkgs/applications/misc/gnuradio-osmosdr/default.nix
+++ b/pkgs/applications/misc/gnuradio-osmosdr/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchgit, cmake, pkgconfig, boost, gnuradio, rtl-sdr, uhd
-, makeWrapper, hackrf
+, makeWrapper, hackrf, airspy
, pythonSupport ? true, python, swig
}:
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- cmake boost gnuradio rtl-sdr uhd makeWrapper hackrf
+ cmake boost gnuradio rtl-sdr uhd makeWrapper hackrf airspy
] ++ stdenv.lib.optionals pythonSupport [ python swig ];
postInstall = ''
diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix
index 358d9dff44a6b6fc8f9c0b895401208a83960e34..efd3bfe73dd9265131333ad4520ab34dd26290b6 100644
--- a/pkgs/applications/misc/golden-cheetah/default.nix
+++ b/pkgs/applications/misc/golden-cheetah/default.nix
@@ -30,6 +30,10 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
+
+ # RCC: Error in 'Resources/application.qrc': Cannot find file 'translations/gc_fr.qm'
+ enableParallelBuilding = false;
+
meta = {
description = "Performance software for cyclists, runners and triathletes";
platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix
index df8cb71d6f9eea5f5498166da048c78315e83562..52903a1f80143449761e27448039f02da0c787a4 100644
--- a/pkgs/applications/misc/googleearth/default.nix
+++ b/pkgs/applications/misc/googleearth/default.nix
@@ -6,7 +6,7 @@ let
arch =
if stdenv.system == "x86_64-linux" then "amd64"
else if stdenv.system == "i686-linux" then "i386"
- else abort "Unsupported architecture";
+ else throw "Unsupported system ${stdenv.system}";
sha256 =
if arch == "amd64"
then "0dwnppn5snl5bwkdrgj4cyylnhngi0g66fn2k41j3dvis83x24k6"
diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix
index dc771fc2d5e4135b6cc2b4fd7b14b1355a6878c0..c82e5026ff18bc28b007ca06dcffcb641770dcd5 100644
--- a/pkgs/applications/misc/haxor-news/default.nix
+++ b/pkgs/applications/misc/haxor-news/default.nix
@@ -1,15 +1,17 @@
-{ stdenv, fetchurl, pythonPackages }:
+{ stdenv, fetchurl, python }:
-pythonPackages.buildPythonApplication rec {
- version = "0.4.2";
- name = "haxor-news-${version}";
+with python.pkgs;
- src = fetchurl {
- url = "https://github.com/donnemartin/haxor-news/archive/${version}.tar.gz";
- sha256 = "0543k5ys044f2a1q8k36djnnq2h2dffnwbkva9snjjy30nlwwdgs";
+buildPythonApplication rec {
+ pname = "haxor-news";
+ version = "0.4.3";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "5b9af8338a0f8b95a8133b66ef106553823813ac171c0aefa3f3f2dbeb4d7f88";
};
- propagatedBuildInputs = with pythonPackages; [
+ propagatedBuildInputs = [
click
colorama
requests
@@ -18,6 +20,12 @@ pythonPackages.buildPythonApplication rec {
six
];
+ checkInputs = [ mock ];
+
+ checkPhase = ''
+ ${python.interpreter} -m unittest discover -s tests -v
+ '';
+
meta = with stdenv.lib; {
homepage = https://github.com/donnemartin/haxor-news;
description = "Browse Hacker News like a haxor";
diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index 0dfc725b9ea67ac58d618227c550011975adf1f7..86b806a916c3056b2b2237628edad25bd10d4def 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.29";
+ version = "0.32.2";
goPackagePath = "github.com/gohugoio/hugo";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "gohugoio";
repo = "hugo";
rev = "v${version}";
- sha256 = "1vklws05534ig9rj55cqnxpqfsvns64kfdg6zjyrcpz7l0z07a33";
+ sha256 = "0k62sg9rvr4aqzh1r60m456cw8mj6kxjpri2nnj4c2dxmvll8qhr";
};
goDeps = ./deps.nix;
diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix
index 35faf6b5704774b27eeb1d20ffefdbf6caa4b95e..6c870833d1af21c9c344a93cfdebb7e591e1ff64 100644
--- a/pkgs/applications/misc/hugo/deps.nix
+++ b/pkgs/applications/misc/hugo/deps.nix
@@ -1,3 +1,4 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
[
{
goPackagePath = "github.com/BurntSushi/toml";
@@ -13,8 +14,8 @@
fetch = {
type = "git";
url = "https://github.com/PuerkitoBio/purell";
- rev = "b938d81255b5473c57635324295cb0fe398c7a58";
- sha256 = "0d44lrg04g9nibhdlagwq9n8g5ka1784pm0jzyl6cfpq8nc1ppj8";
+ rev = "1c4bec281e4bbc75b4f4a1bd923bdf1bd989a969";
+ sha256 = "05aif0xf3i6j6r0ivas8ywagkz92iynsa0xnkbrif4w1chzalx0f";
};
}
{
@@ -22,8 +23,8 @@
fetch = {
type = "git";
url = "https://github.com/PuerkitoBio/urlesc";
- rev = "bbf7a2afc14f93e1e0a5c06df524fbd75e5031e5";
- sha256 = "13r896yy71i6jj1cwv2pjp53wjfxkg7bh884fggv6y79ly0qr63j";
+ rev = "de5bf2ad457846296e2031421a34e2568e304e35";
+ sha256 = "0n0srpqwbaan1wrhh2b7ysz543pjs1xw2rghvqyffg9l0g8kzgcw";
};
}
{
@@ -31,8 +32,8 @@
fetch = {
type = "git";
url = "https://github.com/alecthomas/chroma";
- rev = "b0295f66bdb7c61d54906003d7649185794e21b4";
- sha256 = "1hnvv13nphbzr9xm21fys7lgm0kd6qlbk58vc8fi802lxzsfmdis";
+ rev = "c9f612c1940a4951cd2b55811744632a7b3b3bb2";
+ sha256 = "0s1mzb175s96adxfx5vhyazpzfq9j4dzx4sr4n8gj7r8afkqys8h";
};
}
{
@@ -49,8 +50,8 @@
fetch = {
type = "git";
url = "https://github.com/chaseadamsio/goorgeous";
- rev = "098da33fde5f9220736531b3cb26a2dec86a8367";
- sha256 = "1cwag5vzgrzy22rvcp12whzgqbgrmdmaxar0fl4nwqxdhy90s67k";
+ rev = "dcf1ef873b8987bf12596fe6951c48347986eb2f";
+ sha256 = "07qdqi46klizq3wigxqbiksnlgbrdc8hvmizgzg0aas5iqy88dcb";
};
}
{
@@ -58,8 +59,8 @@
fetch = {
type = "git";
url = "https://github.com/cpuguy83/go-md2man";
- rev = "23709d0847197db6021a51fdb193e66e9222d4e7";
- sha256 = "1a87v4cnd5y5whcdkjcqjpg1s5pxqhrspdxrsk2af49zsw9fsj9f";
+ rev = "8d868be6e9bf9d5350910bab97a050e49887600f";
+ sha256 = "0vy096wzkq1z59in1if486k0adaj1idvma0ax9z1igh9qpq53vd9";
};
}
{
@@ -81,30 +82,30 @@
};
}
{
- goPackagePath = "github.com/dlclark/regexp2";
+ goPackagePath = "github.com/disintegration/imaging";
fetch = {
type = "git";
- url = "https://github.com/dlclark/regexp2";
- rev = "487489b64fb796de2e55f4e8a4ad1e145f80e957";
- sha256 = "144s81ndviwhyy20ipxvvfvap8phv5p762glxrz6aqxprkxfarj5";
+ url = "https://github.com/disintegration/imaging";
+ rev = "1884593a19ddc6f2ea050403430d02c1d0fc1283";
+ sha256 = "13wlkidihz7gc36hd1vy7i81d0v1rbnw97118z3slq1kv1j56zll";
};
}
{
- goPackagePath = "github.com/eknkc/amber";
+ goPackagePath = "github.com/dlclark/regexp2";
fetch = {
type = "git";
- url = "https://github.com/eknkc/amber";
- rev = "b8bd8b03e4f747e33f092617225e9fa8076c0448";
- sha256 = "0qp5y9zhr6hi9ck33p7cnwla7d7p8vi4hj9llhg3bn1a69g21y0a";
+ url = "https://github.com/dlclark/regexp2";
+ rev = "7632a260cbaf5e7594fc1544a503456ecd0827f1";
+ sha256 = "0vhp5r0ywv9p1c74fm8xzclnwx2mg9f0764b3id7a9nwh0plisx2";
};
}
{
- goPackagePath = "github.com/fortytw2/leaktest";
+ goPackagePath = "github.com/eknkc/amber";
fetch = {
type = "git";
- url = "https://github.com/fortytw2/leaktest";
- rev = "3b724c3d7b8729a35bf4e577f71653aec6e53513";
- sha256 = "0dmf7dp6b86nbfaq0s1mpjzd8q7jwrxvyxc0r6dhx3qx4dhddwpz";
+ url = "https://github.com/eknkc/amber";
+ rev = "cdade1c073850f4ffc70a829e31235ea6892853b";
+ sha256 = "152w97yckwncgw7lwjvgd8d00wy6y0nxzlvx72kl7nqqxs9vhxd9";
};
}
{
@@ -121,8 +122,8 @@
fetch = {
type = "git";
url = "https://github.com/gorilla/websocket";
- rev = "a69d9f6de432e2c6b296a947d8a5ee88f68522cf";
- sha256 = "01y3ni7xzazsdzq2xqyjr69q9m4w1668zkrcbf58yp3q99jvckhi";
+ rev = "d965e9adc66deebadcc7d0c6c7598e2a4baa7838";
+ sha256 = "0ka8pvby06farlji7pixlrk3zb962qp5xarvy2vxnfrdzlarv7xb";
};
}
{
@@ -148,17 +149,8 @@
fetch = {
type = "git";
url = "https://github.com/hashicorp/hcl";
- rev = "392dba7d905ed5d04a5794ba89f558b27e2ba1ca";
- sha256 = "1rfm67kma2hpakabf7hxlj196jags4rpjpcirwg4kan4g9b6j0kb";
- };
- }
- {
- goPackagePath = "github.com/inconshreveable/mousetrap";
- fetch = {
- type = "git";
- url = "https://github.com/inconshreveable/mousetrap";
- rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75";
- sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
+ rev = "23c074d0eceb2b8a5bfdbb271ab780cde70f05a8";
+ sha256 = "0db4lpqb5m130rmfy3s3gjjf4dxllypmyrzxv6ggqhkmwmc7w4mc";
};
}
{
@@ -166,8 +158,8 @@
fetch = {
type = "git";
url = "https://github.com/jdkato/prose";
- rev = "c24611cae00c16858e611ef77226dd2f7502759f";
- sha256 = "0xdrjwbcnwiwbqyrxfknb9bskrsrbnqp0nza44bycwaj23by9bs1";
+ rev = "e27abfd3f31b84c37bbce37179b0428fcb1384be";
+ sha256 = "04rjqh3jdxaqr9czp4vcj14hqfv7yppv4nb7ynb04c9jcq23ajw7";
};
}
{
@@ -184,8 +176,8 @@
fetch = {
type = "git";
url = "https://github.com/kyokomi/emoji";
- rev = "ddd4753eac3f6480ca86b16cc6c98d26a0935d17";
- sha256 = "16vnpj8zxg3gg9ljwmvrlmdf4dqbxjagi8mldpq1cr481r35dsqh";
+ rev = "2e9a9507333f3ee28f3fab88c2c3aba34455d734";
+ sha256 = "005rxyxlqcd2sfjn686xb52l11wn2w0g5jv042ka6pnsx24r812a";
};
}
{
@@ -193,8 +185,8 @@
fetch = {
type = "git";
url = "https://github.com/magiconair/properties";
- rev = "be5ece7dd465ab0765a9682137865547526d1dfb";
- sha256 = "0spk58x9b0hj29cw6wy6rlvc6s9xk4r0gmlxgsc194pkzqcg1my8";
+ rev = "49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934";
+ sha256 = "0cnvcd4q88nvxk3q9617dcis2kng2xxsx3iivi5xs8azk290lpyy";
};
}
{
@@ -202,8 +194,17 @@
fetch = {
type = "git";
url = "https://github.com/markbates/inflect";
- rev = "6cacb66d100482ef7cc366289ccb156020e57e76";
- sha256 = "1cglvw75qagnz6bnaxpkfyq9j4j0vw377a8ywa9i1vskxlssj1b2";
+ rev = "a12c3aec81a6a938bf584a4bac567afed9256586";
+ sha256 = "0mawr6z9nav4f5j0nmjdxg9lbfhr7wz8zi34g7b6wndmzyf8jbsd";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/go-runewidth";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-runewidth";
+ rev = "97311d9f7767e3d6f422ea06661bc2c7a19e8a5d";
+ sha256 = "0dxlrzn570xl7gb11hjy1v4p3gw3r41yvqhrffgw95ha3q9p50cg";
};
}
{
@@ -211,8 +212,8 @@
fetch = {
type = "git";
url = "https://github.com/miekg/mmark";
- rev = "fd2f6c1403b37925bd7fe13af05853b8ae58ee5f";
- sha256 = "0q2zrwa2vwk7a0zhmi000zpqrc01zssrj9c5n3573rg68fksg77m";
+ rev = "057eb9e3ae87944c038036d046101dec0c56e21f";
+ sha256 = "0hlqcwx6qqgy3vs13r10wn0d9x0xmww1v9jm09y2dp1ykgbampnk";
};
}
{
@@ -220,8 +221,8 @@
fetch = {
type = "git";
url = "https://github.com/mitchellh/mapstructure";
- rev = "d0303fe809921458f417bcf828397a65db30a7e4";
- sha256 = "1fjwi5ghc1ibyx93apz31n4hj6gcq1hzismpdfbg2qxwshyg0ya8";
+ rev = "06020f85339e21b2478f756a78e295255ffa4d6a";
+ sha256 = "12zb5jh7ri4vna3f24y9g10nzrnz9wbvwnk29wjk3vg0ljia64s9";
};
}
{
@@ -229,8 +230,17 @@
fetch = {
type = "git";
url = "https://github.com/nicksnyder/go-i18n";
- rev = "3e70a1a463008cea6726380c908b1a6a8bdf7b24";
- sha256 = "0fxjgmwn9927wckl2xx8byv64cxgc0yxdwpfzval5n3wm5l5ij1i";
+ rev = "aa0ce51472e0a9982717fd19cf02cb08b1e433aa";
+ sha256 = "0355fxpd69wnw56m6dak8k7rlw3q36bql8algg3jkjnxjpgfii4p";
+ };
+ }
+ {
+ goPackagePath = "github.com/olekukonko/tablewriter";
+ fetch = {
+ type = "git";
+ url = "https://github.com/olekukonko/tablewriter";
+ rev = "65fec0d89a572b4367094e2058d3ebe667de3b60";
+ sha256 = "116waspmr33dqq3zxj2msnqp2f5v2b6ihk3rxqj7gz25rmcxh5wp";
};
}
{
@@ -238,8 +248,8 @@
fetch = {
type = "git";
url = "https://github.com/pelletier/go-toml";
- rev = "69d355db5304c0f7f809a2edc054553e7142f016";
- sha256 = "1ay861x1bqcs629rqb3nq4f347y80phmgm8w7w8kjfdlgpy1v9dm";
+ rev = "0131db6d737cfbbfb678f8b7d92e55e27ce46224";
+ sha256 = "10sz1bh45346wdv8i3nffdmpfh8fb6xd0b3r474cs2mk961pw73v";
};
}
{
@@ -247,8 +257,8 @@
fetch = {
type = "git";
url = "https://github.com/russross/blackfriday";
- rev = "4048872b16cc0fc2c5fd9eacf0ed2c2fedaa0c8c";
- sha256 = "17zg26ia43c8axrxp5q2bxh1asiqfhin4ah7h5d8ibil6pv7xbx4";
+ rev = "6d1ef893fcb01b4f50cb6e57ed7df3e2e627b6b2";
+ sha256 = "13p2xq5624b9j2f6j6j76j1h4l2lvmh7w6vcv2f5xsvzjy779r27";
};
}
{
@@ -256,8 +266,8 @@
fetch = {
type = "git";
url = "https://github.com/shurcooL/sanitized_anchor_name";
- rev = "541ff5ee47f1dddf6a5281af78307d921524bcb5";
- sha256 = "1fslblamqkd0yrvl1kbq95hnnji78bq9m33nnxiqs7y9w32zylv5";
+ rev = "86672fcb3f950f35f2e675df2240550f2a50762f";
+ sha256 = "142m507s9971cl8qdmbcw7sqxnkgi3xqd8wzvfq15p0w7w8i4a3h";
};
}
{
@@ -265,8 +275,8 @@
fetch = {
type = "git";
url = "https://github.com/spf13/afero";
- rev = "9be650865eab0c12963d8753212f4f9c66cdcf12";
- sha256 = "12dhh6d07304lsjv7c4p95hkip0hnshqhwivdw39pbypgg0p8y34";
+ rev = "57afd63c68602b63ed976de00dd066ccb3c319db";
+ sha256 = "0jf9v16m7k46j3mgw469yilhs5p3i32qvzi5954cqyigs6zzqbnk";
};
}
{
@@ -283,8 +293,8 @@
fetch = {
type = "git";
url = "https://github.com/spf13/cobra";
- rev = "34594c771f2c18301dc152640ad40ece28795373";
- sha256 = "0cgyba80gbw4vq2zp1chjz5zil3rapv65y7883f7va2ygcy57s38";
+ rev = "ccaecb155a2177302cb56cae929251a256d0f646";
+ sha256 = "1zm89akryx6x0vzvn50736z732gdm3jsx5898annr0zr1cfpf443";
};
}
{
@@ -301,8 +311,8 @@
fetch = {
type = "git";
url = "https://github.com/spf13/jwalterweatherman";
- rev = "0efa5202c04663c757d84f90f5219c1250baf94f";
- sha256 = "1sfd72zvw9lrzfc8haswhqf93bzm20q4yhbynm6n5fnnc56zn4gs";
+ rev = "12bd96e66386c1960ab0f74ced1362f66f552f7b";
+ sha256 = "1abvqd1dl3m7mxv44wvl0vwd50l6qpndzrxk28vyb77x41rc8b2g";
};
}
{
@@ -319,8 +329,8 @@
fetch = {
type = "git";
url = "https://github.com/spf13/pflag";
- rev = "e57e3eeb33f795204c1ca35f56c44f83227c6e66";
- sha256 = "13mhx4i913jil32j295m3a36jzvq1y64xig0naadiz7q9ja011r2";
+ rev = "4c012f6dcd9546820e378d0bdda4d8fc772cdfea";
+ sha256 = "0plmm67lkm25ir0lczwh7hmanyilrs1vxmbp8a0dyr282ji1dqm5";
};
}
{
@@ -328,17 +338,8 @@
fetch = {
type = "git";
url = "https://github.com/spf13/viper";
- rev = "25b30aa063fc18e48662b86996252eabdcf2f0c7";
- sha256 = "1a1xxsn39sgiyhz3pd9v5qhi7d5p4z4cml0mcdgm65n3f8vgkdv3";
- };
- }
- {
- goPackagePath = "github.com/stretchr/testify";
- fetch = {
- type = "git";
- url = "https://github.com/stretchr/testify";
- rev = "05e8a0eda380579888eb53c394909df027f06991";
- sha256 = "03l83nrgpbyc2hxxfi928gayj16fsclbr88dja6r9kikq19a6yhv";
+ rev = "aafc9e6bc7b7bb53ddaa75a5ef49a17d6e654be5";
+ sha256 = "089balmspfs2x68wr4riwh7qvhf0b061wqqqfw8j4p9pxvwrxsdc";
};
}
{
@@ -355,8 +356,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/image";
- rev = "426cfd8eeb6e08ab1932954e09e3c2cb2bc6e36d";
- sha256 = "0zbqvkn7amq9bnq38pxjqyn1xggphrisaw98x7diw3i0a5phk93r";
+ rev = "12117c17ca67ffa1ce22e9409f3b0b0a93ac08c7";
+ sha256 = "017xpcshrj1r2w20xvpcx0rklpfmbz6h16msv12l3x0w6vy0800s";
};
}
{
@@ -364,8 +365,17 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
- rev = "f5079bd7f6f74e23c4d65efa0f4ce14cbd6a3c0f";
- sha256 = "0sck2mq4bwyh5iv51jpbywzwhc47ci1q5yd7pqr68xnsz7b3b55k";
+ rev = "d866cfc389cec985d6fda2859936a575a55a3ab6";
+ sha256 = "10iahqcsiih5hgmqw8yfgv5b3fimfwl1skxg5062avcjjks59f03";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/sync";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/sync";
+ rev = "fd80eb99c8f653c847d294a001bdf2a3a6f768f5";
+ sha256 = "12lzldlj1cqc1babp1hkkn76fglzn5abkqvmbpr4f2j95mf9x836";
};
}
{
@@ -373,8 +383,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
- rev = "35ef4487ce0a1ea5d4b616ffe71e34febe723695";
- sha256 = "1gxxj4vcsds5aiphv39d3x5jgyfscwxylf10hxgsmzs5m7jzr47n";
+ rev = "83801418e1b59fb1880e363299581ee543af32ca";
+ sha256 = "0ilykaanvnzb27d42kmbr4i37hcn7hgqbx98z945gy63aa8dskji";
};
}
{
@@ -382,8 +392,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
- rev = "836efe42bb4aa16aaa17b9c155d8813d336ed720";
- sha256 = "11s7bjk0karl1lx8v4n6dvdnsh702x4f2qlmnqac2qdz8hdswmi1";
+ rev = "e19ae1496984b1c655b8044a65c0300a3c878dd3";
+ sha256 = "1cvnnx8nwx5c7gr6ajs7sldhbqh52n7h6fsa3i21l2lhx6xrsh4w";
};
}
{
@@ -391,8 +401,8 @@
fetch = {
type = "git";
url = "https://gopkg.in/yaml.v2";
- rev = "25c4ec802a7d637f88d584ab26798e94ad14c13b";
- sha256 = "053mknsl3xhjscmd552005xnwbfcg0z2iphvbvj3wi0w3pvmlw44";
+ rev = "287cf08546ab5e7e37d55a84f7ed3fd1db036de5";
+ sha256 = "15502klds9wwv567vclb9kx95gs8lnyzn4ybsk6l9fc7a67lk831";
};
}
]
diff --git a/pkgs/applications/misc/icesl/default.nix b/pkgs/applications/misc/icesl/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..d39d734dd7b9d9cdadf0ac4b9ebc2cee14177ba3
--- /dev/null
+++ b/pkgs/applications/misc/icesl/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, lib, fetchzip, patchelf, freeglut, libXmu, libXi, libX11, libICE, mesa, libSM, libXext, dialog, makeWrapper }:
+let
+ lpath = stdenv.lib.makeLibraryPath [ libXmu libXi libX11 freeglut libICE mesa libSM libXext ];
+in
+stdenv.mkDerivation rec {
+ name = "iceSL-${version}";
+ version = "2.1.10";
+
+ src = if stdenv.system == "x86_64-linux" then fetchzip {
+ url = "https://gforge.inria.fr/frs/download.php/file/37268/icesl${version}-amd64.zip";
+ sha256 = "0dv3mq6wy46xk9blzzmgbdxpsjdaxid3zadfrysxlhmgl7zb2cn2";
+ } else if stdenv.system == "i686-linux" then fetchzip {
+ url = "https://gforge.inria.fr/frs/download.php/file/37267/icesl${version}-i386.zip";
+ sha256 = "0sl54fsb2gz6dy0bwdscpdq1ab6ph5b7zald3bwzgkqsvna7p1jr";
+ } else throw "Unsupported architecture";
+
+ buildInputs = [ makeWrapper ];
+ installPhase = ''
+ cp -r ./ $out
+ mkdir $out/oldbin
+ mv $out/bin/IceSL-slicer $out/oldbin/IceSL-slicer
+ runHook postInstall
+ '';
+
+ postInstall = ''
+ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+ --set-rpath "${lpath}" \
+ $out/oldbin/IceSL-slicer
+ makeWrapper $out/oldbin/IceSL-slicer $out/bin/icesl --prefix PATH : ${dialog}/bin
+ '';
+
+ meta = with lib; {
+ description = "IceSL is a GPU-accelerated procedural modeler and slicer for 3D printing.";
+ homepage = http://shapeforge.loria.fr/icesl/index.html;
+ license = licenses.inria-icesl;
+ platforms = [ "i686-linux" "x86_64-linux" ];
+ maintainers = with maintainers; [ mgttlinger ];
+ };
+}
diff --git a/pkgs/applications/misc/ipmicfg/default.nix b/pkgs/applications/misc/ipmicfg/default.nix
index af67db3f654a194b6a410994b6e8e1206415b7ff..2efd0ee969f14704201c1912f34077a4711655b6 100644
--- a/pkgs/applications/misc/ipmicfg/default.nix
+++ b/pkgs/applications/misc/ipmicfg/default.nix
@@ -2,12 +2,13 @@
stdenv.mkDerivation rec {
name = "ipmicfg-${version}";
- version = "1.27.0";
- buildVersion = "170620";
+ version = "1.27.1";
+ buildVersion = "170901";
src = fetchzip {
url = "ftp://ftp.supermicro.com/utility/IPMICFG/IPMICFG_${version}_build.${buildVersion}.zip";
- sha256 = "0jr2vih4hzymb62mbqyykwcrjhbhazf6wr1g0cq8ji586i3z3vw5";
+ sha256 = "11xhzw36pg4has8857pypf44cni8m2mg8qsqi1s4bfjbxlfgxgwk";
+ extraPostFetch = "chmod u+rwX,go-rwx+X $out/";
};
installPhase = ''
diff --git a/pkgs/applications/misc/j4-dmenu-desktop/default.nix b/pkgs/applications/misc/j4-dmenu-desktop/default.nix
index 9896fd15b85c37fe9bc642b3bd1f28ad79005ce6..6b4762c0de4787361c9da6922d75b4757a744c12 100644
--- a/pkgs/applications/misc/j4-dmenu-desktop/default.nix
+++ b/pkgs/applications/misc/j4-dmenu-desktop/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
description = "A wrapper for dmenu that recognize .desktop files";
homepage = "https://github.com/enkore/j4-dmenu-desktop";
license = licenses.gpl3;
- maintainer = with maintainers; [ ericsagnes ];
- platforms = with platforms; unix;
+ maintainers = with maintainers; [ ericsagnes ];
+ platforms = with platforms; unix;
};
}
diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix
index f3661030a2ba90fc79cb6a4cd165e1ab2ef9bded..ad8b7b262e55f41f9f8ec62aade03620e84e6093 100644
--- a/pkgs/applications/misc/jekyll/default.nix
+++ b/pkgs/applications/misc/jekyll/default.nix
@@ -11,7 +11,7 @@ bundlerEnv rec {
meta = with lib; {
description = "Simple, blog aware, static site generator";
- homepage = http://jekyllrb.com/;
+ homepage = https://jekyllrb.com/;
license = licenses.mit;
maintainers = with maintainers; [ pesterhazy ];
platforms = platforms.unix;
diff --git a/pkgs/applications/misc/jgmenu/default.nix b/pkgs/applications/misc/jgmenu/default.nix
index 1beff54ba3e7c8f1763c312f8d7d21f124efa507..39f5557947658f8325ab287c4ad58e90c7243144 100644
--- a/pkgs/applications/misc/jgmenu/default.nix
+++ b/pkgs/applications/misc/jgmenu/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "jgmenu-${version}";
- version = "0.7.5";
+ version = "0.7.6";
src = fetchFromGitHub {
owner = "johanmalm";
repo = "jgmenu";
rev = "v${version}";
- sha256 = "1gml2g711pr6wakznlxjrlmz8kylkv0ydpvv0jx2y5qczp3rwk3a";
+ sha256 = "13bmvg9kqjng8jqc3xiif587l05ygk5b3k9xn2lq8yxcwxi9p30v";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index 46263f7d83b8717e54030baa2bb9a04e395469a6..b908941d2bc973ff4b013c5690da60630e0c3f46 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 = "13053";
+ version = "13265";
src = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
- sha256 = "0czsmx0gsml3vqzx6940jw2xpmh16idypydw0d4147k4fi9gzyz6";
+ sha256 = "0mmpxmf17lw1j1m1gfz2jrm3qj2416zgbwgcy7xbvn6qcd8k7dr5";
};
buildInputs = [ jre8 makeWrapper ];
diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix
index 015ef8760648c3143d5370e979f2b4fe05af8f7e..1cab20baef152347040d023c73d6db742feca9a6 100644
--- a/pkgs/applications/misc/k2pdfopt/default.nix
+++ b/pkgs/applications/misc/k2pdfopt/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchzip, fetchurl, fetchpatch, cmake, pkgconfig
-, zlib, libpng
+, zlib, libpng, openjpeg
, enableGSL ? true, gsl
, enableGhostScript ? true, ghostscript
, enableMuPDF ? true, mupdf
@@ -40,11 +40,7 @@ stdenv.mkDerivation rec {
# Patches from previous 1.10a version in nixpkgs
patches = [
# Compatibility with new openjpeg
- (fetchpatch {
- name = "mupdf-1.9a-openjpeg-2.1.1.patch";
- url = "https://git.archlinux.org/svntogit/community.git/plain/mupdf/trunk/0001-mupdf-openjpeg.patch?id=5a28ad0a8999a9234aa7848096041992cc988099";
- sha256 = "1i24qr4xagyapx4bijjfksj4g3bxz8vs5c2mn61nkm29c63knp75";
- })
+ ./load-jpx.patch
(fetchurl {
name = "CVE-2017-5896.patch";
@@ -64,6 +60,14 @@ stdenv.mkDerivation rec {
# Don't remove mujs because upstream version is incompatible
rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,jpeg,openjpeg,zlib}
'';
+ postPatch = let
+ # OpenJPEG version is hardcoded in package source
+ openJpegVersion = with stdenv;
+ lib.concatStringsSep "." (lib.lists.take 2
+ (lib.splitString "." (lib.getVersion openjpeg)));
+ in ''
+ sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c
+ '';
});
leptonica_modded = leptonica.overrideAttrs (attrs: {
prePatch = ''
diff --git a/pkgs/applications/misc/k2pdfopt/load-jpx.patch b/pkgs/applications/misc/k2pdfopt/load-jpx.patch
new file mode 100644
index 0000000000000000000000000000000000000000..02a3799d040ae3ef4a2a0a2c2e0a02a58ffe22d3
--- /dev/null
+++ b/pkgs/applications/misc/k2pdfopt/load-jpx.patch
@@ -0,0 +1,29 @@
+--- a/source/fitz/load-jpx.c
++++ b/source/fitz/load-jpx.c
+@@ -484,12 +484,16 @@
+ /* Without the definition of OPJ_STATIC, compilation fails on windows
+ * due to the use of __stdcall. We believe it is required on some
+ * linux toolchains too. */
++#ifdef __cplusplus
++extern "C"
++{
+ #define OPJ_STATIC
+ #ifndef _MSC_VER
+ #define OPJ_HAVE_STDINT_H
+ #endif
++#endif
+
+-#include
++#include
+
+ /* OpenJPEG does not provide a safe mechanism to intercept
+ * allocations. In the latest version all allocations go
+@@ -971,4 +975,8 @@
+ fz_drop_pixmap(ctx, img);
+ }
+
++#ifdef __cplusplus
++}
++#endif
++
+ #endif /* HAVE_LURATECH */
diff --git a/pkgs/applications/misc/keepassx/cmake.patch b/pkgs/applications/misc/keepassx/cmake.patch
new file mode 100644
index 0000000000000000000000000000000000000000..4ddf8b2e7e99a9f4a79de8cbed4508f9dc37156f
--- /dev/null
+++ b/pkgs/applications/misc/keepassx/cmake.patch
@@ -0,0 +1,18 @@
+Fix "No known features for CXX compiler", see
+https://cmake.org/pipermail/cmake/2016-December/064733.html and the note at
+https://cmake.org/cmake/help/v3.10/command/cmake_minimum_required.html
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -20,10 +20,10 @@ if(NOT CMAKE_BUILD_TYPE)
+ FORCE)
+ endif()
+
+-project(KeePassXC)
+-
+ cmake_minimum_required(VERSION 3.1.0)
+
++project(KeePassXC)
++
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+
+ # Support Visual Studio Code
diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix
index 72d9c7d2fb5d107cae2ad7bf8484f8b1ebaf1e18..2f08fbd5fc7ae231d522c139833c62adade54f54 100644
--- a/pkgs/applications/misc/keepassx/community.nix
+++ b/pkgs/applications/misc/keepassx/community.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, fetchpatch,
- cmake, libgcrypt, zlib, libmicrohttpd, libXtst, qtbase, qttools, libgpgerror, glibcLocales, libyubikey, yubikey-personalization, libXi, qtx11extras
+{ stdenv, fetchFromGitHub, cmake, makeWrapper, qttools
+, libgcrypt, zlib, libmicrohttpd, libXtst, qtbase, libgpgerror, glibcLocales, libyubikey, yubikey-personalization, libXi, qtx11extras
, withKeePassHTTP ? true
}:
@@ -7,17 +7,19 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "keepassxc-${version}";
- version = "2.2.2";
+ version = "2.2.4";
src = fetchFromGitHub {
owner = "keepassxreboot";
repo = "keepassxc";
rev = "${version}";
- sha256 = "01pqpa3vzk2q1vrj2lqayr7a3nzpnj176yhnqbrwlm3s9rga4wzn";
+ sha256 = "0q913v2ka6p7jr7c4w9fq8aqh5v6nxqgcv9h7zllk5p0amsf8d80";
};
- cmakeFlags = [
- "-DWITH_GUI_TESTS=ON"
+ patches = [ ./cmake.patch ./darwin.patch ];
+
+ cmakeFlags = [
+ "-DWITH_GUI_TESTS=ON"
"-DWITH_XC_AUTOTYPE=ON"
"-DWITH_XC_YUBIKEY=ON"
] ++ (optional withKeePassHTTP "-DWITH_XC_HTTP=ON");
@@ -28,13 +30,22 @@ stdenv.mkDerivation rec {
make test ARGS+="-E testgui --output-on-failure"
'';
- buildInputs = [ cmake libgcrypt zlib qtbase qttools libXtst libmicrohttpd libgpgerror glibcLocales libyubikey yubikey-personalization libXi qtx11extras ];
+ nativeBuildInputs = [ cmake makeWrapper qttools ];
+
+ buildInputs = [ libgcrypt zlib qtbase libXtst libmicrohttpd libgpgerror glibcLocales libyubikey yubikey-personalization libXi qtx11extras ];
+
+ postInstall = optionalString stdenv.isDarwin ''
+ # Make it work without Qt in PATH.
+ wrapProgram $out/Applications/KeePassXC.app/Contents/MacOS/KeePassXC \
+ --set QT_PLUGIN_PATH ${qtbase.bin}/${qtbase.qtPluginPrefix}
+ '';
meta = {
- description = "Fork of the keepassX password-manager with additional http-interface to allow browser-integration an use with plugins such as PasslFox (https://github.com/pfn/passifox). See also keepassX2.";
- homepage = https://github.com/keepassxreboot/keepassxc;
- license = stdenv.lib.licenses.gpl2;
- maintainers = with stdenv.lib.maintainers; [ s1lvester jonafato ];
- platforms = with stdenv.lib.platforms; linux;
+ description = "Password manager to store your passwords safely and auto-type them into your everyday websites and applications";
+ longDescription = "A community fork of KeePassX, which is itself a port of KeePass Password Safe. The goal is to extend and improve KeePassX with new features and bugfixes to provide a feature-rich, fully cross-platform and modern open-source password manager. Accessible via native cross-platform GUI and via CLI. Includes optional http-interface to allow browser-integration with plugins like PassIFox (https://github.com/pfn/passifox).";
+ homepage = https://keepassxc.org/;
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ s1lvester jonafato ];
+ platforms = with platforms; linux ++ darwin;
};
}
diff --git a/pkgs/applications/misc/keepassx/darwin.patch b/pkgs/applications/misc/keepassx/darwin.patch
new file mode 100644
index 0000000000000000000000000000000000000000..85fc49e363658cb289c5dd65188b4179988418cd
--- /dev/null
+++ b/pkgs/applications/misc/keepassx/darwin.patch
@@ -0,0 +1,52 @@
+Remove the use of macdeployqt to avoid copying dependencies and
+reduce installation size from 90 MB to 9 MB.
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -188,8 +188,8 @@ else()
+ set(PROGNAME keepassxc)
+ endif()
+
+-if(APPLE AND WITH_APP_BUNDLE AND "${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr/local")
+- set(CMAKE_INSTALL_PREFIX "/Applications")
++if(APPLE AND WITH_APP_BUNDLE)
++ set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/Applications")
+ endif()
+
+ if(MINGW)
+@@ -198,7 +198,7 @@ if(MINGW)
+ set(PLUGIN_INSTALL_DIR ".")
+ set(DATA_INSTALL_DIR "share")
+ elseif(APPLE AND WITH_APP_BUNDLE)
+- set(CLI_INSTALL_DIR "/usr/local/bin")
++ set(CLI_INSTALL_DIR "../bin")
+ set(BIN_INSTALL_DIR ".")
+ set(PLUGIN_INSTALL_DIR "${PROGNAME}.app/Contents/PlugIns")
+ set(DATA_INSTALL_DIR "${PROGNAME}.app/Contents/Resources")
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 5255186..0175983 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -282,11 +282,6 @@ if(APPLE AND WITH_APP_BUNDLE)
+ if(NOT DEFINED QT_BINARY_DIR)
+ set(QT_BINARY_DIR "/usr/local/opt/qt5/bin" CACHE PATH "QT binary folder")
+ endif()
+- add_custom_command(TARGET ${PROGNAME}
+- POST_BUILD
+- COMMAND ${QT_BINARY_DIR}/macdeployqt ${PROGNAME}.app
+- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
+- COMMENT "Deploying app bundle")
+ endif()
+
+ if(MINGW)
+diff --git a/src/autotype/mac/CMakeLists.txt b/src/autotype/mac/CMakeLists.txt
+index ac93de0..03d502e 100644
+--- a/src/autotype/mac/CMakeLists.txt
++++ b/src/autotype/mac/CMakeLists.txt
+@@ -16,7 +16,6 @@ if(WITH_APP_BUNDLE)
+ add_custom_command(TARGET keepassx-autotype-cocoa
+ POST_BUILD
+ COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/libkeepassx-autotype-cocoa.so ${PLUGIN_INSTALL_DIR}
+- COMMAND ${QT_BINARY_DIR}/macdeployqt ${PROGNAME}.app -executable=${PLUGIN_INSTALL_DIR}/libkeepassx-autotype-cocoa.so -no-plugins
+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
+ COMMENT "Deploying autotype plugin")
+ else()
diff --git a/pkgs/applications/misc/kgocode/default.nix b/pkgs/applications/misc/kgocode/default.nix
deleted file mode 100644
index b12c9fe25510e47333065232a191ef9be2c32460..0000000000000000000000000000000000000000
--- a/pkgs/applications/misc/kgocode/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ fetchgit, stdenv, cmake, kdelibs4, automoc4 } :
-
-stdenv.mkDerivation rec {
- name = "kgocode-0.0.1";
-
- buildInputs = [ cmake kdelibs4 automoc4 ];
-
- src = fetchgit {
- url = https://bitbucket.org/lucashnegri/kgocode.git;
- rev = "024536e4b2f371db4f51c1d80fb6b444352ff6a6";
- sha256 = "10q4nvx3wz5wl3wwpfprz26j4x59s41bpdgafbg6604im58hklal";
- };
-
- meta = with stdenv.lib; {
- description = "Go code completion for Kate, KDevelop and others";
- longDescription = ''
- A plugin for KTextEditor (Kate, KDevelop, among others) that provides
- basic code completion for the Go programming language.
- Uses gocode as completion provider.
- '';
- homepage = https://bitbucket.org/lucashnegri/kgocode/overview;
- maintainers = with maintainers; [ qknight ];
- license = licenses.gpl3Plus;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix
index c0db798c56e76475941c08c8f886f33aea10de81..bd671a6c90de412b103a076a595824ecb35aa0f9 100644
--- a/pkgs/applications/misc/kitty/default.nix
+++ b/pkgs/applications/misc/kitty/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchFromGitHub, pkgs, python3Packages, glfw, libunistring, harfbuzz, fontconfig, zlib, pkgconfig, ncurses, imagemagick, makeWrapper, xsel, libstartup_notification }:
+{ stdenv, fetchFromGitHub, pkgs, python3Packages, glfw, libunistring, harfbuzz, fontconfig, zlib, pkgconfig, ncurses, imagemagick, makeWrapper, xsel, libstartup_notification, libX11, libXrandr, libXinerama, libXcursor, libxkbcommon, libXi, libXext }:
with python3Packages;
buildPythonApplication rec {
- version = "0.5.0";
+ version = "0.6.0";
name = "kitty-${version}";
format = "other";
@@ -10,10 +10,10 @@ buildPythonApplication rec {
owner = "kovidgoyal";
repo = "kitty";
rev = "v${version}";
- sha256 = "1w202rsgswagb3kiqbwg4xixcglip2hhz6wj1qx9x2whi4zl1l68";
+ sha256 = "1p86gry91m4kicy79fc1qfr0hcsd5xnvxzmm4q956x883h6h766r";
};
- buildInputs = [ fontconfig glfw ncurses libunistring harfbuzz ];
+ buildInputs = [ fontconfig glfw ncurses libunistring harfbuzz libX11 libXrandr libXinerama libXcursor libxkbcommon libXi libXext ];
nativeBuildInputs = [ pkgconfig ];
@@ -38,6 +38,7 @@ buildPythonApplication rec {
homepage = https://github.com/kovidgoyal/kitty;
description = "A modern, hackable, featureful, OpenGL based terminal emulator";
license = licenses.gpl3;
+ platforms = platforms.linux;
maintainers = with maintainers; [ tex ];
};
}
diff --git a/pkgs/applications/misc/kupfer/default.nix b/pkgs/applications/misc/kupfer/default.nix
index f3bb825cbf7430466b169122989e662849d4cc38..e2290105c9258d823efe8ce70fa9a84c3659151e 100644
--- a/pkgs/applications/misc/kupfer/default.nix
+++ b/pkgs/applications/misc/kupfer/default.nix
@@ -3,6 +3,7 @@
, fetchurl
, intltool
, python3Packages
+, gobjectIntrospection
, gtk3
, dbus
, libwnck3
@@ -22,7 +23,11 @@ buildPythonApplication rec {
sha256 = "0c9xjx13r8ckfr4az116bhxsd3pk78v04c3lz6lqhraak0rp4d92";
};
- nativeBuildInputs = [ wrapGAppsHook intltool ];
+ nativeBuildInputs = [
+ wrapGAppsHook intltool
+ # For setup hook
+ gobjectIntrospection
+ ];
buildInputs = [ hicolor_icon_theme docutils libwnck3 keybinder3 ];
propagatedBuildInputs = [ pygobject3 gtk3 pyxdg dbus-python pycairo ];
diff --git a/pkgs/applications/misc/lxterminal/default.nix b/pkgs/applications/misc/lxterminal/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..a514b0ff63ddcab485cc0d0a2751519908cd8336
--- /dev/null
+++ b/pkgs/applications/misc/lxterminal/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchurl, automake, autoconf, intltool, pkgconfig, gtk2, vte
+, libxslt, docbook_xml_dtd_412, docbook_xml_xslt, libxml2, findXMLCatalogs
+}:
+
+let version = "0.3.1"; in
+
+stdenv.mkDerivation rec {
+ name = "lxterminal-${version}";
+
+ src = fetchurl {
+ url = "https://github.com/lxde/lxterminal/archive/${version}.tar.gz";
+ sha256 = "e91f15c8a726d5c13227263476583137a2639d4799c021ca0726c9805021b54c";
+ };
+
+ configureFlags = [
+ "--enable-man"
+ ];
+
+ nativeBuildInputs = [
+ automake autoconf intltool pkgconfig
+ libxslt docbook_xml_dtd_412 docbook_xml_xslt libxml2 findXMLCatalogs
+ ];
+
+ buildInputs = [ gtk2 vte ];
+
+ patches = [
+ ./respect-xml-catalog-files-var.patch
+ ];
+
+ preConfigure = ''
+ ./autogen.sh
+ '';
+
+ doCheck = true;
+
+ meta = {
+ description = "The standard terminal emulator of LXDE";
+ longDescription = ''
+ LXTerminal is the standard terminal emulator of LXDE. The terminal is a
+ desktop-independent VTE-based terminal emulator for LXDE without any
+ unnecessary dependencies.
+ '';
+ homepage = https://wiki.lxde.org/en/LXTerminal;
+ license = stdenv.lib.licenses.gpl2;
+ maintainers = [ stdenv.lib.maintainers.velovix ];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/applications/misc/lxterminal/respect-xml-catalog-files-var.patch b/pkgs/applications/misc/lxterminal/respect-xml-catalog-files-var.patch
new file mode 100644
index 0000000000000000000000000000000000000000..598f506118f295b6dcfedb8528339afe1b1bdea7
--- /dev/null
+++ b/pkgs/applications/misc/lxterminal/respect-xml-catalog-files-var.patch
@@ -0,0 +1,15 @@
+diff --git a/acinclude.m4 b/acinclude.m4
+index be626c5..b449b1b 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -40,8 +40,8 @@ AC_DEFUN([JH_CHECK_XML_CATALOG],
+ [
+ AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl
+ AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog])
+- if $jh_found_xmlcatalog && \
+- AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then
++ # empty argument forces libxml to use XML_CATALOG_FILES variable
++ if AC_RUN_LOG([$XMLCATALOG --noout "" "$1" >&2]); then
+ AC_MSG_RESULT([found])
+ ifelse([$3],,,[$3
+ ])dnl
diff --git a/pkgs/applications/misc/metamorphose2/default.nix b/pkgs/applications/misc/metamorphose2/default.nix
index 8f18f166d4a38027820607e52a89c348b6dc5b76..602d4a032efda266c789808040add8e8480621dd 100644
--- a/pkgs/applications/misc/metamorphose2/default.nix
+++ b/pkgs/applications/misc/metamorphose2/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
description = "a graphical mass renaming program for files and folders";
homepage = "https://github.com/metamorphose/metamorphose2";
license = with licenses; gpl3Plus;
- maintainer = with maintainers; [ ramkromberg ];
+ maintainers = with maintainers; [ ramkromberg ];
platforms = with platforms; linux;
};
}
diff --git a/pkgs/applications/misc/multimon-ng/default.nix b/pkgs/applications/misc/multimon-ng/default.nix
index 24a8b0c46a647ffe66176e787dea23e72cd04f59..953c4c1d9a94b3ebc54c992310f31c9424565e26 100644
--- a/pkgs/applications/misc/multimon-ng/default.nix
+++ b/pkgs/applications/misc/multimon-ng/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, qt4, qmake4Hook, libpulseaudio }:
let
- version = "1.0.0";
+ version = "1.1.4";
in
stdenv.mkDerivation {
name = "multimon-ng-${version}";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
src = fetchFromGitHub {
owner = "EliasOenal";
repo = "multimon-ng";
- rev = "4cc984f35f859539c94aa56d3fc6218a6de51148";
+ rev = "${version}";
sha256 = "12z6f0ra2k0qh56pcvnwvlxd3msvr6yr97jvs7w5kf42jqbxdsga";
};
diff --git a/pkgs/applications/misc/mupdf/darwin.patch b/pkgs/applications/misc/mupdf/darwin.patch
new file mode 100644
index 0000000000000000000000000000000000000000..e0c7d6a7a6769195a55820a80b0cfb3d42e4373a
--- /dev/null
+++ b/pkgs/applications/misc/mupdf/darwin.patch
@@ -0,0 +1,35 @@
+diff --git a/Makerules b/Makerules
+--- a/Makerules
++++ b/Makerules
+@@ -81,22 +81,10 @@ HAVE_GLUT ?= yes
+ SYS_GLUT_CFLAGS := -Wno-deprecated-declarations
+ SYS_GLUT_LIBS := -framework GLUT -framework OpenGL
+
+-CC = xcrun cc
+-AR = xcrun ar
+-LD = xcrun ld
+-RANLIB_CMD = xcrun ranlib $@
+-
+-# Linux uses pkg-config for system libraries.
+-else ifeq "$(OS)" "Linux"
+-
+ HAVE_PTHREAD := yes
+ SYS_PTHREAD_CFLAGS :=
+ SYS_PTHREAD_LIBS := -lpthread
+
+-HAVE_GLUT := yes
+-SYS_GLUT_CFLAGS :=
+-SYS_GLUT_LIBS := -lglut -lGL
+-
+ ifeq "$(shell pkg-config --exists 'libcrypto <= 1.0.1t' && echo yes)" "yes"
+ HAVE_LIBCRYPTO := yes
+ SYS_LIBCRYPTO_CFLAGS := -DHAVE_LIBCRYPTO $(shell pkg-config --cflags libcrypto)
+@@ -113,7 +101,7 @@ SYS_CURL_CFLAGS += $(shell pkg-config --cflags openssl)
+ SYS_CURL_DEPS += $(shell pkg-config --libs openssl)
+ endif
+ endif
+-SYS_CURL_DEPS += -lpthread -lrt
++SYS_CURL_DEPS += -lpthread
+
+ ifeq "$(shell pkg-config --exists x11 xext && echo yes)" "yes"
+ HAVE_X11 := yes
diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index 9dcba11b3fafe720832016e8af0a19bfbab5370b..75d8463cf7f8df88746bf9fd88475629a88a5fe6 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -1,7 +1,8 @@
-{ stdenv, lib, fetchurl, fetchpatch, pkgconfig
-, freetype, harfbuzz, openjpeg, jbig2dec, libjpeg
-, enableX11 ? true, libX11, libXext
+{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, freetype, harfbuzz, openjpeg
+, jbig2dec, libjpeg , darwin
+, enableX11 ? true, libX11, libXext, libXi, libXrandr
, enableCurl ? true, curl, openssl
+, enableGL ? true, freeglut, mesa_glu
}:
let
@@ -13,64 +14,28 @@ let
in stdenv.mkDerivation rec {
- version = "1.11";
+ version = "1.12.0";
name = "mupdf-${version}";
src = fetchurl {
url = "http://mupdf.com/downloads/archive/${name}-source.tar.gz";
- sha256 = "02phamcchgsmvjnb3ir7r5sssvx9fcrscn297z73b82n1jl79510";
+ sha256 = "0mc7a92zri27lk17wdr2iffarbfi4lvrmxhc53sz84hm5yl56qsw";
};
patches = [
# Compatibility with new openjpeg
(fetchpatch {
- name = "mupdf-1.11-openjpeg-version.patch";
- url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/0001-mupdf-openjpeg.patch?h=packages/mupdf&id=c19349f42838e4dca02e564b97e0a5ab3e1b943f";
- sha256 = "0sx7jq84sr8bj6sg2ahg9cdgqz8dh4w6r0ah2yil8vrsznn4la8r";
+ name = "mupdf-1.12-openjpeg-version.patch";
+ url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/0001-mupdf-openjpeg.patch?h=packages/mupdf&id=a910cd33a2b311712f83710dc042fbe80c104306";
+ sha256 = "05i9v2ia586jyjqdb7g68ss4vkfwgp6cwhagc8zzggsba83azyqk";
})
+ ]
- (fetchurl {
- name = "mupdf-1.11-CVE-2017-6060.patch";
- url = "http://git.ghostscript.com/?p=mupdf.git;a=blobdiff_plain;f=platform/x11/jstest_main.c;h=f158d9628ed0c0a84e37fe128277679e8334422a;hp=13c3a0a3ba3ff4aae29f6882d23740833c1d842f;hb=06a012a42c9884e3cd653e7826cff1ddec04eb6e;hpb=34e18d127a02146e3415b33c4b67389ce1ddb614";
- sha256 = "163bllvjrbm0gvjb25lv7b6sih4zr4g4lap3h0cbq8dvpjxx0jfc";
- })
-
- (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";
- })
+ # Use shared libraries to decrease size
+ ++ stdenv.lib.optional (!stdenv.isDarwin) ./mupdf-1.12-shared_libs-1.patch
- (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";
- })
-
- (fetchurl {
- name = "mupdf-1.11-CVE-2017-15369.patch";
- url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=c2663e51238ec8256da7fc61ad580db891d9fe9a";
- sha256 = "0xx2mrbjcymi3gh0l3cq81m6bygp9dv79v1kyrbcvpl5z6wgl71y";
- })
- ];
+ ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch
+ ;
postPatch = ''
sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c
@@ -78,9 +43,15 @@ in stdenv.mkDerivation rec {
makeFlags = [ "prefix=$(out)" ];
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg ]
- ++ lib.optionals enableX11 [ libX11 libXext ]
- ++ lib.optionals enableCurl [ curl openssl ];
+ buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg freeglut mesa_glu ]
+ ++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ]
+ ++ lib.optionals enableCurl [ curl openssl ]
+ ++ lib.optionals enableGL (
+ if stdenv.isDarwin then
+ with darwin.apple_sdk.frameworks; [ GLUT OpenGL ]
+ else
+ [ freeglut mesa_glu ])
+ ;
outputs = [ "bin" "dev" "out" "man" "doc" ];
preConfigure = ''
@@ -123,6 +94,6 @@ in stdenv.mkDerivation rec {
description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C";
license = licenses.agpl3Plus;
maintainers = with maintainers; [ viric vrthra fpletz ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/misc/mupdf/mupdf-1.12-shared_libs-1.patch b/pkgs/applications/misc/mupdf/mupdf-1.12-shared_libs-1.patch
new file mode 100644
index 0000000000000000000000000000000000000000..b39f005ed74a179f008498347fe56989ff55c5ee
--- /dev/null
+++ b/pkgs/applications/misc/mupdf/mupdf-1.12-shared_libs-1.patch
@@ -0,0 +1,41 @@
+--- mupdf-1.12.0-source.orig/Makefile 2017-12-13 15:00:30.000000000 +0100
++++ mupdf-1.12.0-source/Makefile 2017-12-31 00:05:23.003277481 +0100
+@@ -14,7 +14,7 @@
+ # Do not specify CFLAGS or LIBS on the make invocation line - specify
+ # XCFLAGS or XLIBS instead. Make ignores any lines in the makefile that
+ # set a variable that was set on the command line.
+-CFLAGS += $(XCFLAGS) -Iinclude
++CFLAGS += $(XCFLAGS) -Iinclude -fPIC
+ LIBS += $(XLIBS) -lm
+
+ LIBS += $(FREETYPE_LIBS)
+@@ -312,9 +312,9 @@
+
+ # --- Library ---
+
+-MUPDF_LIB = $(OUT)/libmupdf.a
+-THIRD_LIB = $(OUT)/libmupdfthird.a
+-THREAD_LIB = $(OUT)/libmuthreads.a
++MUPDF_LIB = $(OUT)/libmupdf.so
++THIRD_LIB = $(OUT)/libmupdfthird.so
++THREAD_LIB = $(OUT)/libmuthreads.so
+
+ MUPDF_OBJ := \
+ $(FITZ_OBJ) \
+@@ -343,11 +343,14 @@
+
+ THREAD_OBJ := $(THREAD_OBJ)
+
+-$(MUPDF_LIB) : $(MUPDF_OBJ)
++$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_LIB) $(THREAD_LIB)
++ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf.so -Wl,--no-undefined
+ $(THIRD_LIB) : $(THIRD_OBJ)
++ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdfthird.so -Wl,--no-undefined
+ $(THREAD_LIB) : $(THREAD_OBJ)
++ $(LINK_CMD) -shared -Wl,-soname -Wl,libmuthreads.so -Wl,--no-undefined -lpthread
+
+-INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB)
++INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB)
+
+ # --- Tools and Apps ---
+
diff --git a/pkgs/applications/misc/nrsc5/default.nix b/pkgs/applications/misc/nrsc5/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..f1211851b4c673b394019c315eef9c25a74e8b79
--- /dev/null
+++ b/pkgs/applications/misc/nrsc5/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchFromGitHub,
+ autoconf, automake, libtool, cmake,
+ rtl-sdr, libao, fftwFloat
+} :
+let
+ src_faad2 = fetchFromGitHub {
+ owner = "dsvensson";
+ repo = "faad2";
+ rev = "b7aa099fd3220b71180ed2b0bc19dc6209a1b418";
+ sha256 = "0pcw2x9rjgkf5g6irql1j4m5xjb4lxj6468z8v603921bnir71mf";
+ };
+
+in stdenv.mkDerivation {
+ name = "nrsc5-20171129";
+
+ src = fetchFromGitHub {
+ owner = "theori-io";
+ repo = "nrsc5";
+ rev = "f87beeed96f12ce6aa4789ac1d45761cec28d2db";
+ sha256 = "03d5k59125qrjsm1naj9pd0nfzwi008l9n30p9q4g5abgqi5nc8v";
+ };
+
+ postUnpack = ''
+ export srcRoot=`pwd`
+ export faadSrc="$srcRoot/faad2-prefix/src/faad2_external"
+ mkdir -p $faadSrc
+ cp -r ${src_faad2}/* $faadSrc
+ chmod -R u+w $faadSrc
+ '';
+
+ postPatch = ''
+ sed -i '/GIT_REPOSITORY/d' CMakeLists.txt
+ sed -i '/GIT_TAG/d' CMakeLists.txt
+ sed -i "s:set (FAAD2_PREFIX .*):set (FAAD2_PREFIX \"$srcRoot/faad2-prefix\"):" CMakeLists.txt
+ '';
+
+ nativeBuildInputs = [ cmake autoconf automake libtool ];
+ buildInputs = [ rtl-sdr libao fftwFloat ];
+
+ cmakeFlags = [ "-DUSE_COLOR=ON" "-DUSE_FAAD2=ON" ];
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/theori-io/nrsc5;
+ description = "HD-Radio decoder for RTL-SDR";
+ platforms = stdenv.lib.platforms.linux;
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ markuskowa ];
+ };
+}
+
diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix
index a6d40c75c1c004017238f03c4d10b7787a2d245f..972fbfb7b072d5c3bb81807dc56b1fffe0c386e2 100644
--- a/pkgs/applications/misc/octoprint/default.nix
+++ b/pkgs/applications/misc/octoprint/default.nix
@@ -101,7 +101,7 @@ in pythonPackages.buildPythonApplication rec {
checkPhase = "nosetests";
meta = with stdenv.lib; {
- homepage = http://octoprint.org/;
+ homepage = https://octoprint.org/;
description = "The snappy web interface for your 3D printer";
license = licenses.agpl3;
maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/applications/misc/ola/default.nix b/pkgs/applications/misc/ola/default.nix
index 9db6042e60f6df699f214d69ff442baae3c16518..499653b1435902f8230c7e1941641b6f347a92fd 100644
--- a/pkgs/applications/misc/ola/default.nix
+++ b/pkgs/applications/misc/ola/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A framework for controlling entertainment lighting equipment.";
maintainers = [ maintainers.globin ];
- licenses = with licenses; [ lgpl21 gpl2Plus ];
+ license = with licenses; [ lgpl21 gpl2Plus ];
platforms = platforms.all;
};
}
diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/applications/misc/onboard/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..a78b98a58cb3040a074b1359f4a3eade5ddfa677
--- /dev/null
+++ b/pkgs/applications/misc/onboard/default.nix
@@ -0,0 +1,156 @@
+{ fetchurl
+, stdenv
+, aspellWithDicts
+, at_spi2_core ? null
+, atspiSupport ? true
+, bash
+, glib
+, glibcLocales
+, gnome3
+, gobjectIntrospection
+, gsettings_desktop_schemas
+, gtk3
+, hunspell
+, hunspellDicts
+, hunspellWithDicts
+, intltool
+, isocodes
+, libcanberra_gtk3
+, libudev
+, libxkbcommon
+, pkgconfig
+, procps
+, python3
+, wrapGAppsHook
+, xorg
+, yelp
+}:
+
+let
+ customHunspell = hunspellWithDicts [hunspellDicts.en-us];
+ majorVersion = "1.4";
+ version = "${majorVersion}.1";
+in python3.pkgs.buildPythonApplication rec {
+ name = "onboard-${version}";
+ src = fetchurl {
+ url = "https://launchpad.net/onboard/${majorVersion}/${version}/+download/${name}.tar.gz";
+ sha256 = "01cae1ac5b1ef1ab985bd2d2d79ded6fc99ee04b1535cc1bb191e43a231a3865";
+ };
+
+ patches = [
+ # Allow loading hunspell dictionaries installed in NixOS system path
+ ./hunspell-use-xdg-datadirs.patch
+ ];
+
+ # For tests
+ LC_ALL = "en_US.UTF-8";
+ doCheck = false;
+ checkInputs = [
+ # for Onboard.SpellChecker.aspell_cmd doctests
+ (aspellWithDicts (dicts: with dicts; [ en ]))
+
+ # for Onboard.SpellChecker.hunspell_cmd doctests
+ customHunspell
+
+ # for Onboard.SpellChecker.hunspell doctests
+ hunspellDicts.en-us
+ hunspellDicts.es-es
+ hunspellDicts.it-it
+
+ python3.pkgs.nose
+ ];
+
+ propagatedBuildInputs = [
+ glib
+ python3
+ python3.pkgs.dbus-python
+ python3.pkgs.distutils_extra
+ python3.pkgs.pyatspi
+ python3.pkgs.pycairo
+ python3.pkgs.pygobject3
+ python3.pkgs.systemd
+ ];
+
+ buildInputs = [
+ bash
+ gnome3.dconf
+ gsettings_desktop_schemas
+ gtk3
+ hunspell
+ isocodes
+ libcanberra_gtk3
+ libudev
+ libxkbcommon
+ wrapGAppsHook
+ xorg.libXtst
+ xorg.libxkbfile
+ ] ++ stdenv.lib.optional atspiSupport at_spi2_core;
+
+ nativeBuildInputs = [
+ glibcLocales
+ intltool
+ pkgconfig
+ ];
+
+ propagatedUserEnvPkgs = [
+ gnome3.dconf
+ ];
+
+ preBuild = ''
+ # Unnecessary file, has been removed upstream
+ # https://github.com/NixOS/nixpkgs/pull/24986#issuecomment-296114062
+ rm -r Onboard/pypredict/attic
+
+ substituteInPlace ./scripts/sokSettings.py \
+ --replace "#!/usr/bin/python3" "" \
+ --replace "PYTHON_EXECUTABLE," "\"$out/bin/onboard-settings\"" \
+ --replace '"-cfrom Onboard.settings import Settings\ns = Settings(False)"' ""
+
+ chmod -x ./scripts/sokSettings.py
+
+ patchShebangs .
+
+ substituteInPlace ./Onboard/LanguageSupport.py \
+ --replace "/usr/share/xml/iso-codes" "${isocodes}/share/xml/iso-codes" \
+ --replace "/usr/bin/yelp" "${yelp}/bin/yelp"
+
+ substituteInPlace ./Onboard/Indicator.py \
+ --replace "/usr/bin/yelp" "${yelp}/bin/yelp"
+
+ substituteInPlace ./gnome/Onboard_Indicator@onboard.org/extension.js \
+ --replace "/usr/bin/yelp" "${yelp}/bin/yelp"
+
+ substituteInPlace ./Onboard/SpellChecker.py \
+ --replace "/usr/lib" "$out/lib"
+
+ substituteInPlace ./data/org.onboard.Onboard.service \
+ --replace "/usr/bin" "$out/bin"
+
+ substituteInPlace ./Onboard/utils.py \
+ --replace "/usr/share" "$out/share"
+ substituteInPlace ./onboard-defaults.conf.example \
+ --replace "/usr/share" "$out/share"
+ substituteInPlace ./Onboard/Config.py \
+ --replace "/usr/share/onboard" "$out/share/onboard"
+
+ substituteInPlace ./Onboard/WordSuggestions.py \
+ --replace "/usr/bin" "$out/bin"
+
+ # killall is dangerous on non-gnu platforms. Use pkill instead.
+ substituteInPlace ./setup.py \
+ --replace '"killall",' '"${procps}/bin/pkill", "-x",'
+ '';
+
+ postInstall = ''
+ cp onboard-default-settings.gschema.override.example $out/share/glib-2.0/schemas/10_onboard-default-settings.gschema.override
+
+ glib-compile-schemas $out/share/glib-2.0/schemas/
+ '';
+
+ meta = {
+ homepage = https://launchpad.net/onboard;
+ description = "An onscreen keyboard useful for tablet PC users and for mobility impaired users.";
+ maintainers = with stdenv.lib.maintainers; [ johnramsden ];
+ license = stdenv.lib.licenses.gpl3;
+ };
+}
diff --git a/pkgs/applications/misc/onboard/hunspell-use-xdg-datadirs.patch b/pkgs/applications/misc/onboard/hunspell-use-xdg-datadirs.patch
new file mode 100644
index 0000000000000000000000000000000000000000..2463c8d5f5acdaab52941a9c62d3d5536fe0d084
--- /dev/null
+++ b/pkgs/applications/misc/onboard/hunspell-use-xdg-datadirs.patch
@@ -0,0 +1,20 @@
+diff --git a/Onboard/SpellChecker.py b/Onboard/SpellChecker.py
+index 6a92757..46e755e 100644
+--- a/Onboard/SpellChecker.py
++++ b/Onboard/SpellChecker.py
+@@ -506,6 +506,10 @@ class hunspell(SCBackend):
+ if dicpath:
+ paths.extend(dicpath.split(pathsep))
+
++ datadirs = os.getenv("XDG_DATA_DIRS")
++ if datadirs:
++ paths.extend(map(lambda datadir: os.path.join(datadir, 'hunspell'), datadirs.split(pathsep)))
++
+ paths.extend(LIBDIRS)
+
+ home = os.getenv("HOME")
+@@ -723,4 +727,3 @@ class aspell_cmd(SCBackend):
+ _logger.error(_format("Failed to execute '{}', {}", \
+ " ".join(args), e))
+ return [id for id in dict_ids if id]
+-
diff --git a/pkgs/applications/misc/oneko/default.nix b/pkgs/applications/misc/oneko/default.nix
index a3770715532f7b526ee52b8e29d0a13652ca0eb5..4655b059b339024f44ebff6357172c8145d15855 100644
--- a/pkgs/applications/misc/oneko/default.nix
+++ b/pkgs/applications/misc/oneko/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
homepage = "http://www.daidouji.com/oneko/";
license = licenses.publicDomain;
maintainers = [ maintainers.xaverdh ];
- meta.platforms = platforms.linux;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..fc7fd95bbb9553bfed17cf025bbc04453aab5054
--- /dev/null
+++ b/pkgs/applications/misc/orca/default.nix
@@ -0,0 +1,67 @@
+{ stdenv, lib, pkgconfig, fetchurl, buildPythonApplication
+, autoreconfHook, wrapGAppsHook
+, intltool, yelp_tools, itstool, libxmlxx3
+, python, pygobject3, gtk3, gnome3, substituteAll
+, at_spi2_atk, at_spi2_core, pyatspi, dbus, dbus-python, pyxdg
+, xkbcomp, gsettings_desktop_schemas, liblouis
+, speechd, brltty, setproctitle, gst_all_1, gst-python
+}:
+
+with lib;
+let
+ version = "3.26.0";
+ majorVersion = builtins.concatStringsSep "." (take 2 (splitString "." version));
+in buildPythonApplication rec {
+ name = "orca-${version}";
+
+ format = "other";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/orca/${majorVersion}/${name}.tar.xz";
+ sha256 = "0xk5k9cbswymma60nrfj00dl97wypx59c107fb1hwi75gm0i07a7";
+ };
+
+ patches = [
+ (substituteAll {
+ src = ./fix-paths.patch;
+ xkbcomp = "${xkbcomp}/bin/xkbcomp";
+ })
+ ];
+
+ nativeBuildInputs = [
+ autoreconfHook wrapGAppsHook pkgconfig libxmlxx3
+ intltool yelp_tools itstool
+ ];
+
+ propagatedBuildInputs = [
+ pygobject3 pyatspi dbus-python pyxdg brltty liblouis speechd gst-python setproctitle
+ ];
+
+ buildInputs = [
+ python gtk3 at_spi2_atk at_spi2_core dbus gsettings_desktop_schemas
+ gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
+ ];
+
+ # Run intltoolize to create po/Makefile.in.in
+ preConfigure = ''
+ intltoolize
+ '';
+
+ meta = {
+ homepage = https://wiki.gnome.org/Projects/Orca;
+ description = "Screen reader";
+ longDescription = ''
+ A free, open source, flexible and extensible screen reader that provides
+ access to the graphical desktop via speech and refreshable braille.
+ It works with applications and toolkits that support the Assistive
+ Technology Service Provider Interface (AT-SPI). That includes the GNOME
+ Gtk+ toolkit, the Java platform's Swing toolkit, LibreOffice, Gecko, and
+ WebKitGtk. AT-SPI support for the KDE Qt toolkit is being pursued.
+
+ Needs `services.gnome3.at-spi2-core.enable = true;` in `configuration.nix`.
+ '';
+ maintainers = with maintainers; [ berce ] ++ gnome3.maintainers;
+ license = licenses.lgpl21;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/misc/orca/fix-paths.patch b/pkgs/applications/misc/orca/fix-paths.patch
new file mode 100644
index 0000000000000000000000000000000000000000..d3e77773f28f4a747a27c1306c1e099bd532e5c6
--- /dev/null
+++ b/pkgs/applications/misc/orca/fix-paths.patch
@@ -0,0 +1,29 @@
+--- a/src/orca/orca.py
++++ b/src/orca/orca.py
+@@ -239,7 +239,7 @@
+
+ def _setXmodmap(xkbmap):
+ """Set the keyboard map using xkbcomp."""
+- p = subprocess.Popen(['xkbcomp', '-w0', '-', os.environ['DISPLAY']],
++ p = subprocess.Popen(['@xkbcomp@', '-w0', '-', os.environ['DISPLAY']],
+ stdin=subprocess.PIPE, stdout=None, stderr=None)
+ p.communicate(xkbmap)
+
+@@ -297,7 +297,7 @@
+ """
+
+ global _originalXmodmap
+- _originalXmodmap = subprocess.check_output(['xkbcomp', os.environ['DISPLAY'], '-'])
++ _originalXmodmap = subprocess.check_output(['@xkbcomp@', os.environ['DISPLAY'], '-'])
+
+ def _restoreXmodmap(keyList=[]):
+ """Restore the original xmodmap values for the keys in keyList.
+@@ -309,7 +309,7 @@
+
+ global _capsLockCleared
+ _capsLockCleared = False
+- p = subprocess.Popen(['xkbcomp', '-w0', '-', os.environ['DISPLAY']],
++ p = subprocess.Popen(['@xkbcomp@', '-w0', '-', os.environ['DISPLAY']],
+ stdin=subprocess.PIPE, stdout=None, stderr=None)
+ p.communicate(_originalXmodmap)
+
diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix
index 8e0fc6137210ef98014299bc9da9ec0441646cfa..515127e12ebbe34a24f0599ff576f5e0a9925230 100644
--- a/pkgs/applications/misc/pdfpc/default.nix
+++ b/pkgs/applications/misc/pdfpc/default.nix
@@ -1,19 +1,23 @@
{ stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig, vala, gtk3, libgee
-, poppler, libpthreadstubs, gstreamer, gst-plugins-base, librsvg, pcre }:
+, poppler, libpthreadstubs, gstreamer, gst-plugins-base, librsvg, pcre, gobjectIntrospection }:
stdenv.mkDerivation rec {
name = "${product}-${version}";
product = "pdfpc";
- version = "4.0.7";
+ version = "4.1";
src = fetchFromGitHub {
repo = "pdfpc";
owner = "pdfpc";
rev = "v${version}";
- sha256 = "00qfmmk8h762p53z46g976z7j4fbxyi16w5axzsv1ymvdq95ds8c";
+ sha256 = "02cp0x5prqrizxdp0sf2sk5ip0363vyw6fxsb3zwyx4dw0vz4g96";
};
- nativeBuildInputs = [ cmake pkgconfig vala ];
+ nativeBuildInputs = [
+ cmake pkgconfig vala
+ # For setup hook
+ gobjectIntrospection
+ ];
buildInputs = [ gstreamer gst-plugins-base gtk3 libgee poppler
libpthreadstubs makeWrapper librsvg pcre ];
diff --git a/pkgs/applications/misc/pell/default.nix b/pkgs/applications/misc/pell/default.nix
index ad2ab147340ea3c8d64b9cab04520b1efb2c7ad5..d55c7a2af12bbf20a7aca3d0d9a3fa22a2b31f88 100644
--- a/pkgs/applications/misc/pell/default.nix
+++ b/pkgs/applications/misc/pell/default.nix
@@ -2,21 +2,22 @@
stdenv.mkDerivation rec {
pname = "pell";
- version = "0.0.2";
+ version = "0.0.4";
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "ebzzry";
repo = pname;
- rev = "ec14de0a9b666433954184167bf3b82cf21193f8";
- sha256 = "0r2gbb4l9rr5x99m62zicknsp1gf9fr124xpyd8ak9izr5hvskn9";
+ rev = "f251625ece6bb5517227970287119e7d2dfcea8b";
+ sha256 = "0k8m1lv2kyrs8fylxmbgxg3jn65g57frf2bndc82gkr5svwb554a";
};
installPhase = ''
mkdir -p $out/bin
mkdir -p $out/share
cp pell $out/bin
- cp resources/notification.mp3 $out/share
+ cp resources/online.mp3 $out/share
+ cp resources/offline.mp3 $out/share
chmod +x $out/bin/pell
'';
@@ -24,7 +25,8 @@ stdenv.mkDerivation rec {
substituteInPlace $out/bin/pell --replace "/usr/bin/env scsh" "${scsh}/bin/scsh"
substituteInPlace $out/bin/pell --replace "(play " "(${sox}/bin/play "
substituteInPlace $out/bin/pell --replace "(notify-send " "(${libnotify}/bin/notify-send "
- substituteInPlace $out/bin/pell --replace "/usr/share/pell/notification.mp3" "$out/share/notification.mp3"
+ substituteInPlace $out/bin/pell --replace "/usr/share/pell/online.mp3" "$out/share/online.mp3"
+ substituteInPlace $out/bin/pell --replace "/usr/share/pell/offline.mp3" "$out/share/offline.mp3"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/perkeep/default.nix b/pkgs/applications/misc/perkeep/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..3b64cf4aa6c0de9cdd4cf24a326daebbe288372d
--- /dev/null
+++ b/pkgs/applications/misc/perkeep/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, lib, go_1_8, fetchzip, git }:
+
+stdenv.mkDerivation rec {
+ name = "perkeep-${version}";
+ version = "20170505";
+
+ src = fetchzip {
+ url = "https://perkeep.org/dl/monthly/camlistore-${version}-src.zip";
+ sha256 = "1vliyvkyzmhdi6knbh8rdsswmz3h0rpxdpq037jwbdbkjccxjdwa";
+ };
+
+ buildInputs = [ git go_1_8 ];
+
+ goPackagePath = "";
+ buildPhase = ''
+ go run make.go
+ '';
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp bin/* $out/bin
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A way of storing, syncing, sharing, modelling and backing up content (née Camlistore)";
+ homepage = https://perkeep.org;
+ license = licenses.asl20;
+ maintainers = with maintainers; [ cstrahan ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix
index 3f39a356312eb76675b427e02ae413e0071117ff..44650d001e347f16723cf02094b6f42e9fd4e93a 100644
--- a/pkgs/applications/misc/playonlinux/default.nix
+++ b/pkgs/applications/misc/playonlinux/default.nix
@@ -48,7 +48,7 @@ let
ld32 =
if stdenv.system == "x86_64-linux" then "${stdenv.cc}/nix-support/dynamic-linker-m32"
else if stdenv.system == "i686-linux" then "${stdenv.cc}/nix-support/dynamic-linker"
- else abort "Unsupported platform for PlayOnLinux: ${stdenv.system}";
+ else throw "Unsupported platform for PlayOnLinux: ${stdenv.system}";
ld64 = "${stdenv.cc}/nix-support/dynamic-linker";
libs = pkgs: stdenv.lib.makeLibraryPath [ pkgs.xlibs.libX11 ];
diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix
index e88a49740745bce341d09ab0117b050105249c61..a3b87fd34f6829686f170c13e087ccba15f1d92c 100644
--- a/pkgs/applications/misc/polybar/default.nix
+++ b/pkgs/applications/misc/polybar/default.nix
@@ -21,11 +21,11 @@ assert i3GapsSupport -> ! i3Support && jsoncpp != null && i3-gaps != null;
stdenv.mkDerivation rec {
name = "polybar-${version}";
- version = "3.0.5";
+ version = "3.1.0";
src = fetchgit {
url = "https://github.com/jaagr/polybar";
- rev = "4e2e2a7a5e0fe81669031ade0f60e1d379b6516d";
- sha256 = "1iiks9q13pbkgbjhdns18a5zgr6d40ydcm4qn168m73fs6ivf1vn";
+ rev = "bf16a4d415ea7d8845f578544de0c71e56ad314e";
+ sha256 = "1jcvqxl0477j0snvh1rzqsm1dkfsybix2lgrlsgiczdxfknwz8iy";
};
meta = with stdenv.lib; {
@@ -39,14 +39,6 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.afldcr ];
platforms = platforms.unix;
};
- # This patch should be removed with next stable release.
- patches = [
- (fetchpatch {
- name = "polybar-remove-curlbuild.patch";
- url = "https://github.com/jaagr/polybar/commit/d35abc7620c8f06618b4708d9a969dfa2f309e96.patch";
- sha256 = "14xr65vsjvd51hzg9linj09w0nnixgn26dh9lqxy25bxachcyzxy";
- })
- ];
buildInputs = [
cairo libXdmcp libpthreadstubs libxcb pcre python2 xcbproto xcbutil
diff --git a/pkgs/applications/misc/procmail/default.nix b/pkgs/applications/misc/procmail/default.nix
index b62c6b77cac3043403c8de31b2e5b507c6aae84b..cd3a46ab09ba8d892dd3fc215587c7a07129d3e9 100644
--- a/pkgs/applications/misc/procmail/default.nix
+++ b/pkgs/applications/misc/procmail/default.nix
@@ -3,7 +3,14 @@
stdenv.mkDerivation {
name = "procmail-3.22";
- patches = [ ./CVE-2014-3618.patch ];
+ patches = [
+ ./CVE-2014-3618.patch
+ (fetchurl {
+ url = https://sources.debian.org/data/main/p/procmail/3.22-26/debian/patches/30;
+ sha256 = "11zmz1bj0v9pay3ldmyyg7473b80h89gycrhndsgg9q50yhcqaaq";
+ name = "CVE-2017-16844";
+ })
+ ];
# getline is defined differently in glibc now. So rename it.
# Without the .PHONY target "make install" won't install anything on Darwin.
diff --git a/pkgs/applications/misc/ptask/default.nix b/pkgs/applications/misc/ptask/default.nix
index abb1fb596fac56f2f3248eb09a513ceed57a2015..af74ea570ab36cb81ba9799230bd50798f1ee31b 100644
--- a/pkgs/applications/misc/ptask/default.nix
+++ b/pkgs/applications/misc/ptask/default.nix
@@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
homepage = http://wpitchoune.net/ptask/;
description = "GTK-based GUI for taskwarrior";
license = licenses.gpl2;
- maintainer = [ maintainers.spacefrogg ];
+ maintainers = [ maintainers.spacefrogg ];
};
}
diff --git a/pkgs/applications/misc/qmapshack/default.nix b/pkgs/applications/misc/qmapshack/default.nix
index 7330dfa4f1998080395821d1403582d38dad8996..bc09d0b4d0ac21dffbb66f87b9c9cafafab65b67 100644
--- a/pkgs/applications/misc/qmapshack/default.nix
+++ b/pkgs/applications/misc/qmapshack/default.nix
@@ -1,14 +1,12 @@
-{ stdenv, fetchFromBitbucket, cmake, qtscript, qtwebkit, gdal, proj, routino, quazip }:
+{ stdenv, fetchurl, cmake, qtscript, qtwebkit, gdal, proj, routino, quazip }:
stdenv.mkDerivation rec {
name = "qmapshack-${version}";
- version = "1.9.1";
+ version = "1.10.0";
- src = fetchFromBitbucket {
- owner = "maproom";
- repo = "qmapshack";
- rev = "V%20${version}";
- sha256 = "1yswdq1s9jjhwb3wfiy3kkiiaqzagw28vjqvl13jxcnmq7y763sr";
+ src = fetchurl {
+ url = "https://bitbucket.org/maproom/qmapshack/downloads/${name}.tar.gz";
+ sha256 = "10qk6c5myw5dhkbw7pcrx3900kiqhs32vy47xl2844nzb4fq2liw";
};
nativeBuildInputs = [ cmake ];
@@ -27,7 +25,7 @@ stdenv.mkDerivation rec {
homepage = https://bitbucket.org/maproom/qmapshack/wiki/Home;
description = "Plan your next outdoor trip";
license = licenses.gpl3;
- maintainter = with maintainers; [ dotlambda ];
+ maintainers = with maintainers; [ dotlambda ];
platforms = with platforms; linux;
};
}
diff --git a/pkgs/applications/misc/qmetro/default.nix b/pkgs/applications/misc/qmetro/default.nix
index 932d8156a79affadd9f18a9d196630dfa1b06f7e..49993f2f7ea7515e0a991872a5bd25eee8ce70ba 100644
--- a/pkgs/applications/misc/qmetro/default.nix
+++ b/pkgs/applications/misc/qmetro/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
description = "Worldwide transit maps viewer";
license = licenses.gpl3;
- maintainter = with maintainers; [ orivej ];
+ maintainers = with maintainers; [ orivej ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix
index d300e411c94266f81312ee488800455c28ff07af..e03dd65b9eb372cf9d5dbb357e24d16f0a600431 100644
--- a/pkgs/applications/misc/qtpass/default.nix
+++ b/pkgs/applications/misc/qtpass/default.nix
@@ -2,32 +2,29 @@
stdenv.mkDerivation rec {
name = "qtpass-${version}";
- version = "1.1.6";
+ version = "1.2.1";
src = fetchFromGitHub {
owner = "IJHack";
repo = "QtPass";
rev = "v${version}";
- sha256 = "0jq5a1cvqvsjwld0nldl6kmcz9g59hiccmbg98xwji04n8174y7j";
+ sha256 = "0pp38b3fifkfwqcb6vi194ccgb8j3zc8j8jq8ww5ib0wvhldzsg8";
};
+ patches = [ ./hidpi.patch ];
+
buildInputs = [ git gnupg pass qtbase qtsvg qttools ];
nativeBuildInputs = [ makeWrapper qmake ];
- preConfigure = ''
- qmakeFlags="$qmakeFlags DESTDIR=$out"
- '';
-
- installPhase = ''
- mkdir $out/bin
- mv $out/qtpass $out/bin
- install -D {,$out/share/applications/}qtpass.desktop
- install -D artwork/icon.svg $out/share/icons/hicolor/scalable/apps/qtpass-icon.svg
- runHook postInstall
+ postPatch = ''
+ substituteInPlace qtpass.pro --replace "SUBDIRS += src tests main" "SUBDIRS += src main"
+ substituteInPlace qtpass.pro --replace "main.depends = tests" "main.depends = src"
'';
postInstall = ''
+ install -D qtpass.desktop $out/share/applications/qtpass.desktop
+ install -D artwork/icon.svg $out/share/icons/hicolor/scalable/apps/qtpass-icon.svg
wrapProgram $out/bin/qtpass \
--suffix PATH : ${git}/bin \
--suffix PATH : ${gnupg}/bin \
diff --git a/pkgs/applications/misc/qtpass/hidpi.patch b/pkgs/applications/misc/qtpass/hidpi.patch
new file mode 100644
index 0000000000000000000000000000000000000000..629bcbb5baca8084d9d1317c6047f3625781dfda
--- /dev/null
+++ b/pkgs/applications/misc/qtpass/hidpi.patch
@@ -0,0 +1,13 @@
+diff --git a/main/main.cpp b/main/main.cpp
+index 8a18409c..1cddd911 100644
+--- a/main/main.cpp
++++ b/main/main.cpp
+@@ -35,7 +35,7 @@
+ * @return
+ */
+ int main(int argc, char *argv[]) {
+- qputenv("QT_AUTO_SCREEN_SCALE_FACTOR", "1");
++ QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+ QString text = "";
+ for (int i = 1; i < argc; ++i) {
+ if (i > 1)
diff --git a/pkgs/applications/misc/redis-desktop-manager/default.nix b/pkgs/applications/misc/redis-desktop-manager/default.nix
index ca65e4bf7f8e35943beaf6e03ac696788f5a4ca5..169d6951d45598c26863ff8206b656c94f71f8cd 100644
--- a/pkgs/applications/misc/redis-desktop-manager/default.nix
+++ b/pkgs/applications/misc/redis-desktop-manager/default.nix
@@ -76,7 +76,7 @@ EOF
meta = with lib; {
description = "Cross-platform open source Redis DB management tool";
- homepage = http://redisdesktop.com/;
+ homepage = https://redisdesktop.com/;
license = licenses.lgpl21;
platforms = platforms.linux;
maintainers = with maintainers; [ cstrahan ];
diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix
index 7ad8a85a419ca8992a6aced80f8d67a8b355b8a7..57cdfd08d5b024b5faddd34322d4431950d14e93 100644
--- a/pkgs/applications/misc/rescuetime/default.nix
+++ b/pkgs/applications/misc/rescuetime/default.nix
@@ -11,33 +11,26 @@ let
url = "https://www.rescuetime.com/installers/rescuetime_current_amd64.deb";
sha256 = "0b56iglg8g45biddwsdn1hmx9gsz4kxr64civwyy7f69f022ppab";
};
-
-in
-
-stdenv.mkDerivation {
+in stdenv.mkDerivation {
# https://www.rescuetime.com/updates/linux_release_notes.html
name = "rescuetime-2.10.0.1322";
inherit src;
buildInputs = [ dpkg makeWrapper ];
+ # avoid https://github.com/NixOS/patchelf/issues/99
+ dontStrip = true;
unpackPhase = ''
mkdir pkg
dpkg-deb -x $src pkg
sourceRoot=pkg
'';
- installPhase = let
-
- lib = p: stdenv.lib.makeLibraryPath [ p ];
-
- in ''
+ installPhase = ''
mkdir -p $out/bin
cp usr/bin/rescuetime $out/bin
${patchelf}/bin/patchelf \
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+ --set-rpath "${lib.makeLibraryPath [ qt4 libXtst libXext libX11 libXScrnSaver ]}" \
$out/bin/rescuetime
-
- wrapProgram $out/bin/rescuetime \
- --prefix LD_PRELOAD : ${lib qt4}/libQtGui.so.4:${lib qt4}/libQtCore.so.4:${lib libXtst}/libXtst.so.6:${lib libXext}/libXext.so.6:${lib libX11}/libX11.so.6:${lib libXScrnSaver}/libXss.so.1
'';
meta = with lib; {
description = "Helps you understand your daily habits so you can focus and be more productive";
diff --git a/pkgs/applications/misc/st/xst.nix b/pkgs/applications/misc/st/xst.nix
index 877990861fd7997fb0cd35dba25cf783358aa172..b63a41bb915627d5a6c7084c2ea27fc47ed63ab2 100644
--- a/pkgs/applications/misc/st/xst.nix
+++ b/pkgs/applications/misc/st/xst.nix
@@ -26,7 +26,7 @@ in stdenv.mkDerivation {
homepage = https://github.com/neeasade/xst;
description = "Simple terminal fork that can load config from Xresources";
license = licenses.mit;
- maintainers = maintainers.vyp;
+ maintainers = [ maintainers.vyp ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix
index 051b67bc972c83cbdc0bc7bc1a96bc59b18e719a..376ea9e293aad1cb058d519f401d9c748b05cdbf 100644
--- a/pkgs/applications/misc/subsurface/default.nix
+++ b/pkgs/applications/misc/subsurface/default.nix
@@ -1,17 +1,17 @@
{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, cmake, makeWrapper, pkgconfig, qmake
, curl, grantlee, libgit2, libusb, libssh2, libxml2, libxslt, libzip, zlib
-, qtbase, qtconnectivity, qtlocation, qtsvg, qttools, qtwebkit
+, qtbase, qtconnectivity, qtlocation, qtsvg, qttools, qtwebkit, libXcomposite
}:
let
- version = "4.7.2";
+ version = "4.7.5";
libdc = stdenv.mkDerivation rec {
name = "libdivecomputer-ssrf-${version}";
src = fetchurl {
url = "https://subsurface-divelog.org/downloads/libdivecomputer-subsurface-branch-${version}.tgz";
- sha256 = "04wadhhva1bfnwk0kl359kcv0f83mgym2fzs441spw5llcl7k52r";
+ sha256 = "1xsgnmgc7yb46lflx8ynkbdxg2f6sny6xg6caqgx7rf0x1jmjj4x";
};
nativeBuildInputs = [ autoreconfHook ];
@@ -32,24 +32,25 @@ let
googlemaps = stdenv.mkDerivation rec {
name = "googlemaps-${version}";
- version = "2017-09-17";
+ version = "2017-12-18";
src = fetchFromGitHub {
owner = "vladest";
repo = "googlemaps";
- rev = "1b857c02504dd52b1aa442418b8dcea78ced3f35";
- sha256 = "14icmc925g4abwwdrldjc387aiyvcp3ia5z7mfh9qa09bv829a84";
+ rev = "79f3511d60dc9640de02a5f24656094c8982b26d";
+ sha256 = "11334w0bnfb97sv23vvj2b5hcwvr0171hxldn91jms9y12l5j15d";
};
nativeBuildInputs = [ qmake ];
- buildInputs = [ qtbase qtlocation ];
+ buildInputs = [ qtbase qtlocation libXcomposite ];
pluginsSubdir = "lib/qt-${qtbase.qtCompatVersion}/plugins";
installPhase = ''
- mkdir $out $(dirname ${pluginsSubdir})
- mv plugins ${pluginsSubdir}
+ mkdir -p $out $(dirname ${pluginsSubdir})
+ mkdir -p ${pluginsSubdir}
+ mv *.so ${pluginsSubdir}
mv lib $out/
'';
@@ -69,7 +70,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://subsurface-divelog.org/downloads/Subsurface-${version}.tgz";
- sha256 = "06f215xx1nc2q2qff2ihcl86fkrlnkvacl1swi3fw9iik6nq3bjp";
+ sha256 = "0qqmnrmj2alr4rc2nqkv8sbdp92xb6j4j468wn6yqvgb23n77b82";
};
buildInputs = [
diff --git a/pkgs/applications/misc/synapse/default.nix b/pkgs/applications/misc/synapse/default.nix
index 2533014c56079990663fd1bc386eafaf22864b0e..13f3fa98d56d620af50cbf4f9d990e3ea47d30af 100644
--- a/pkgs/applications/misc/synapse/default.nix
+++ b/pkgs/applications/misc/synapse/default.nix
@@ -1,35 +1,37 @@
{ stdenv, fetchurl, intltool, pkgconfig, glib, libnotify, gtk3, libgee
-, keybinder3, json_glib, zeitgeist, vala_0_23, hicolor_icon_theme
+, keybinder3, json_glib, zeitgeist, vala_0_34, hicolor_icon_theme, gobjectIntrospection
}:
-with stdenv.lib;
-
-stdenv.mkDerivation rec {
- name = "synapse-0.2.99.1";
+let
+ version = "0.2.99.2";
+in stdenv.mkDerivation rec {
+ name = "synapse-${version}";
src = fetchurl {
- url = "https://launchpad.net/synapse-project/0.3/0.2.99.1/+download/${name}.tar.xz";
- sha256 = "846d8a5130580bb47c754bb7f20dc76311e589c00a18b02370a5d78b52409220";
+ url = "https://launchpad.net/synapse-project/0.3/${version}/+download/${name}.tar.xz";
+ sha256 = "04cnsmwf9xa52dh7rpb4ia715c0ls8jg1p7llc9yf3lbg1m0bvzv";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [
+ pkgconfig intltool vala_0_34
+ # For setup hook
+ gobjectIntrospection
+ ];
buildInputs = [
- intltool glib libnotify gtk3 libgee keybinder3 json_glib zeitgeist
- vala_0_23 hicolor_icon_theme
+ glib libnotify gtk3 libgee keybinder3 json_glib zeitgeist
+ hicolor_icon_theme
];
- meta = {
- longDescription = ''
- Semantic launcher written in Vala that you can use to start applications
- as well as find and access relevant documents and files by making use of
- the Zeitgeist engine
- '';
- description = ''
- Semantic launcher to start applications and find relevant files
- '';
- homepage = https://launchpad.net/synapse-project;
- license = stdenv.lib.licenses.gpl3;
- maintainers = with stdenv.lib.maintainers; [ mahe ];
- platforms = with stdenv.lib.platforms; all;
+ meta = with stdenv.lib; {
+ longDescription = ''
+ Semantic launcher written in Vala that you can use to start applications
+ as well as find and access relevant documents and files by making use of
+ the Zeitgeist engine
+ '';
+ description = "Semantic launcher to start applications and find relevant files";
+ homepage = https://launchpad.net/synapse-project;
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ mahe ];
+ platforms = with platforms; all;
};
}
diff --git a/pkgs/applications/misc/terminator/default.nix b/pkgs/applications/misc/terminator/default.nix
index 3959ad88ece90f282cee9802af7ac2c9e47ed506..e4b1d7f8c1bcc8db6bed4bdc7fb1581958416e89 100644
--- a/pkgs/applications/misc/terminator/default.nix
+++ b/pkgs/applications/misc/terminator/default.nix
@@ -32,7 +32,7 @@ pythonPackages.buildPythonApplication rec {
quadkonsole, etc. in that the main focus is arranging terminals in grids
(tabs is the most common default method, which Terminator also supports).
'';
- homepage = http://gnometerminator.blogspot.no/p/introduction.html;
+ homepage = https://gnometerminator.blogspot.no/p/introduction.html;
license = licenses.gpl2;
maintainers = with maintainers; [ bjornfor globin ];
platforms = platforms.linux;
diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix
index cf99304473c1120f5cd34a23b462dd1c1fcf4b44..46276bbb03fbf72f6f14444e069d9c3e281724aa 100644
--- a/pkgs/applications/misc/termite/default.nix
+++ b/pkgs/applications/misc/termite/default.nix
@@ -3,16 +3,19 @@
}:
let
- version = "12";
+ version = "13";
termite = stdenv.mkDerivation {
name = "termite-${version}";
src = fetchgit {
url = "https://github.com/thestinger/termite";
rev = "refs/tags/v${version}";
- sha256 = "0s6dyg3vcqk5qcx90bs24wdnd3p56rdjdcanx4pcxvp6ksjl61jz";
+ sha256 = "02cn70ygl93ghhkhs3xdxn5b1yadc255v3yp8cmhhyzsv5027hvj";
};
+ # https://github.com/thestinger/termite/pull/516
+ patches = [ ./url_regexp_trailing.patch ];
+
postPatch = "sed '1i#include ' -i termite.cc";
makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ];
diff --git a/pkgs/applications/misc/termite/url_regexp_trailing.patch b/pkgs/applications/misc/termite/url_regexp_trailing.patch
new file mode 100644
index 0000000000000000000000000000000000000000..96deaa073d71b6a9225173af0ad4b39c7fa664c5
--- /dev/null
+++ b/pkgs/applications/misc/termite/url_regexp_trailing.patch
@@ -0,0 +1,27 @@
+Based on https://github.com/thestinger/termite/pull/516
+Modified to apply to v13
+
+From 65a454ffa8e681f3f14729cba7c42e1570a85e8a Mon Sep 17 00:00:00 2001
+From: Paul Baecher
+Date: Thu, 7 Sep 2017 22:58:51 +0200
+Subject: [PATCH] Do not match punctuation at the end of URLs
+
+Punctuation at the end of URLs is most likely part of natural language
+or markup (for example in Markdown). Do not match it as part of the URL.
+---
+ url_regex.hh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/url_regex.hh b/url_regex.hh
+index 2ec6be8..3039b53 100644
+--- a/url_regex.hh
++++ b/url_regex.hh
+@@ -9,7 +9,7 @@
+ #define PORT "(?:\\:[[:digit:]]{1,5})?"
+ #define SCHEME "(?:[[:alpha:]][+-.[:alnum:]]*:)"
+ #define USERPASS USERCHARS_CLASS "+(?:\\:" PASSCHARS_CLASS "+)?"
+-#define URLPATH "(?:/[[:alnum:]\\Q-_.!~*'();/?:@&=+$,#%\\E]*)?"
++#define URLPATH "(?:/[[:alnum:]\\Q-_.!~*'();/?:@&=+$,#%\\E]*(?(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-glibc2.26-r1.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-glibc2.26-r1.patch
deleted file mode 100644
index ec37a2816d5194553f4aae0184fa502ea12530e6..0000000000000000000000000000000000000000
--- a/pkgs/applications/networking/browsers/chromium/patches/chromium-glibc2.26-r1.patch
+++ /dev/null
@@ -1,220 +0,0 @@
-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
deleted file mode 100644
index 6cfd08d58c237c5bc4f2a20f426a3d45bbf32302..0000000000000000000000000000000000000000
--- a/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r17.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- 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/gn_bootstrap_observer.patch b/pkgs/applications/networking/browsers/chromium/patches/gn_bootstrap_observer.patch
deleted file mode 100644
index f1207439bb4da7d04016b984e7a2b79f1d775255..0000000000000000000000000000000000000000
--- a/pkgs/applications/networking/browsers/chromium/patches/gn_bootstrap_observer.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index d9adad1189f8cf8a7c8af3f969664277c36d6142..fa42c2f3b11511266137d954ac596103ad5a2ef5 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.187";
+ version = "28.0.0.137";
src = fetchzip {
url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/"
+ "${version}/flash_player_ppapi_linux.x86_64.tar.gz";
- sha256 = "102z9aflm0a29klc26jch3wl4y8hdrxzqdqvf5yj0bnibx3hwpsy";
+ sha256 = "1776jjv2abzrwhgff8c75wm9dh3gfsihv9c5vzllhdys21zvravy";
stripRoot = false;
};
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index 6e3ba922d25f808856c901ea4c8b3600a7e209ee..b15bc16c89dd7aa1cc6760b07c66ca89c18431c8 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 = "1pk6ssvriqmckf61lafkbwyy98ylpaz0mq3g0zrifbhxzwkk01ni";
- sha256bin64 = "0svdxgszy377hm3lzys90xj8qna93r4xz3d89sy086c9sq1ncsr0";
- version = "63.0.3239.40";
+ sha256 = "1mkschqjdn3n3709qkxha1zs626vhh33dp80gi3h6hhk8w0gx4sb";
+ sha256bin64 = "05hyfm9j127mprj2wjrq3m9qm4zp3bny40164vscr6vkfxvmjh03";
+ version = "64.0.3282.71";
};
dev = {
- sha256 = "0kpn5w1qvjlkxqhsc7lz269mxp7i0z9k92ay178kgsph3ygncm0x";
- sha256bin64 = "1pvnkhvks3yvpdh2qg9iqg6xmi5bxrl1n6mp9akywv1d5wsba7kg";
- version = "64.0.3260.2";
+ sha256 = "1b7f1bs9i7dhrccssn5zk4s62sfpmkj8b4w6aq8g4jbyg7hw9pql";
+ sha256bin64 = "0lp8m62p8h60hi8h5nskcjdh6k8vq4g00xbq5limg7d6pgc0vyyz";
+ version = "65.0.3311.3";
};
stable = {
- sha256 = "1m2qjm4x789s3hx255gmmihqrqfx8f608fap3khsp2phgck4vg6a";
- sha256bin64 = "1wxszymlv2y1dk4f0hpgq9b86fzqb7x8q87rfbq7dvfj8g4vipz1";
- version = "62.0.3202.94";
+ sha256 = "139x3cbc5pa14x69493ic8i2ank12c9fwiq6pqm11aps88n6ri44";
+ sha256bin64 = "03r97jg1fcb23k1xg5qnw5hp5p9m8anyx346nchbas63rfn439km";
+ version = "63.0.3239.132";
};
}
diff --git a/pkgs/applications/networking/browsers/eolie/0001-Extend-the-python-path-rather-than-replacing-it.patch b/pkgs/applications/networking/browsers/eolie/0001-Extend-the-python-path-rather-than-replacing-it.patch
new file mode 100644
index 0000000000000000000000000000000000000000..347fb8e128770f30c9a0809823d994844e2acbf2
--- /dev/null
+++ b/pkgs/applications/networking/browsers/eolie/0001-Extend-the-python-path-rather-than-replacing-it.patch
@@ -0,0 +1,35 @@
+From b51b63b78c9ff1639f5f65ccfdd54681f1cadc1d Mon Sep 17 00:00:00 2001
+From: Sam Parkinson
+Date: Tue, 26 Dec 2017 14:46:27 +1100
+Subject: [PATCH] Extend the python path; rather than replacing it
+
+Some distros (i.e. NixOS) require the special PYTHONPATH, so that
+the web extension has access to the python packages it wants (i.e. gi).
+
+Previously, the PYTHONPATH was replaced with the web extension path;
+meaning it would crash on NixOS. This instead prepends the web
+extension path to the PYTHONPATH.
+---
+ eolie/application.py | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/eolie/application.py b/eolie/application.py
+index 3c21542..bed4e55 100644
+--- a/eolie/application.py
++++ b/eolie/application.py
+@@ -340,7 +340,11 @@ class Application(Gtk.Application):
+ self.settings = Settings.new()
+
+ # Init extensions
+- GLib.setenv("PYTHONPATH", self.__extension_dir, True)
++ current_path = GLib.getenv("PYTHONPATH")
++ new_path = self.__extension_dir
++ if current_path:
++ new_path = new_path + ':' + current_path
++ GLib.setenv("PYTHONPATH", new_path, True)
+
+ # Create favicon path
+ if not GLib.file_test(self.__FAVICONS_PATH, GLib.FileTest.IS_DIR):
+--
+2.15.0
+
diff --git a/pkgs/applications/networking/browsers/eolie/0001-Remove-post-install-script-handle-in-nix-config-inst.patch b/pkgs/applications/networking/browsers/eolie/0001-Remove-post-install-script-handle-in-nix-config-inst.patch
new file mode 100644
index 0000000000000000000000000000000000000000..770cd8afa9ef4b7c37e8eea419366b0f74dea271
--- /dev/null
+++ b/pkgs/applications/networking/browsers/eolie/0001-Remove-post-install-script-handle-in-nix-config-inst.patch
@@ -0,0 +1,23 @@
+From a79d2dcd1b6275904193454fb9d68614813929f3 Mon Sep 17 00:00:00 2001
+From: Sam Parkinson
+Date: Mon, 27 Nov 2017 11:17:35 +1100
+Subject: [PATCH] Remove post install script - handle in nix config instead
+
+---
+ meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index fc45296..2227f1f 100644
+--- a/meson.build
++++ b/meson.build
+@@ -53,5 +53,3 @@ configure_file(
+ configuration: conf,
+ install_dir: bindir
+ )
+-
+-meson.add_install_script('meson_post_install.py')
+--
+2.15.0
+
+
diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..e41783ddf5ba1fe9893fa790965b4024ba82aa1f
--- /dev/null
+++ b/pkgs/applications/networking/browsers/eolie/default.nix
@@ -0,0 +1,68 @@
+{ stdenv, fetchgit, intltool, itstool, meson, ninja, pkgconfig, wrapGAppsHook
+, git, glib, glib_networking, gsettings_desktop_schemas, gst_all_1, gtk3
+, gtkspell3, libsecret, python36, python36Packages, webkitgtk }:
+
+stdenv.mkDerivation rec {
+ name = "eolie-${version}";
+ version = "0.9.16";
+
+ src = fetchgit {
+ url = "https://gitlab.gnome.org/gnumdk/eolie";
+ rev = version;
+ sha256 = "0mvhr6hy4nx7xaq9r9qp5rb0y293kjjryw5ykzb473cr3iwzk25b";
+ };
+
+ nativeBuildInputs = [
+ intltool
+ itstool
+ meson
+ ninja
+ pkgconfig
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ git # required to download ad blocking DB
+ glib_networking
+ gsettings_desktop_schemas
+ 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
+ gtk3
+ gtkspell3
+ libsecret
+ python36
+ python36Packages.pygobject3
+ python36Packages.pycairo
+ python36Packages.dateutil
+ python36Packages.dbus-python
+ python36Packages.beautifulsoup4
+ python36Packages.pycrypto
+ python36Packages.requests
+ webkitgtk
+ ];
+
+ wrapPrefixVariables = [ "PYTHONPATH" ];
+
+ enableParallelBuilding = true;
+
+ postInstall = ''
+ ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas
+ '';
+
+ patches = [
+ ./0001-Remove-post-install-script-handle-in-nix-config-inst.patch
+ ./0001-Extend-the-python-path-rather-than-replacing-it.patch
+ ];
+
+ meta = with stdenv.lib; {
+ description = "A new GNOME web browser";
+ homepage = https://gitlab.gnome.org/gnumdk/eolie;
+ license = licenses.gpl3;
+ maintainers = [ maintainers.samdroid-apps ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index 82b5ce080e50aaa4184619a0db9cd6224c669797..deac6e2722307475745d0ef73637205b46949c62 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,965 +1,965 @@
{
- version = "58.0b8";
+ version = "58.0b15";
sources = [
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/ach/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/ach/firefox-58.0b15.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha512 = "923c63db4bc252a2740b035765c820af86b64f0bef5204806d5f871fd63e7b847389bdaa9745b2548710ae20e1623d51b8b2709c6c6b11d35ea2bcc8b8f7fb5b";
+ sha512 = "5397865cdb1db5996ddc2e6b3d21380d56d8a6372b6b9733ede452e54fe5fec73b1cc12749e85c36bc7169a28ad6e4df278c4d8f9a3021f9c4622fb38fd36f12";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/af/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/af/firefox-58.0b15.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha512 = "9a6bd31d0469639dff730db1ddc3a9683019563b90a29b262d7edc5ccd8cf079bfb0901ae370b033188d13d8762878cb1d18b85e8acb33e66cf98ba64ce98faa";
+ sha512 = "cd18983a0b397435ace96b79645d3b8b994f25001b59aacb53ca20fe223e243151f3cdd4d0b1f8f68b8c87cdc747e98d0c1835ee37610d674f26c481764b531d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/an/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/an/firefox-58.0b15.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha512 = "a372f896ce03d6a2e76b091c3bb401f69704e1e54287e116e2c8708481d01f28568f406cfe6210c1e61bd58f4d7b8833e51cb3120af94047dff5fe60055c601e";
+ sha512 = "80773287f69ec0c2012877887816ba0ff5cc447fe463aaa077c7753c7f50a66c8b23ff096a872eb3c9ce625cd2226ee11f11640f8ad0f1ab92f1137984355eca";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/ar/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/ar/firefox-58.0b15.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha512 = "94bcc54caa36e2bd296862d4725577d65ec8c38c53bdd4fc264922854b95a695a272aeb9956350440980b41f37bc662f17a72ffcb5631ecf43b37d1769850378";
+ sha512 = "9abe954a8cd68c57586d45759f1390ab24cb8371bf153053125f532e93a8646fcb5fd798009032ae6ec5852f0c524202a2140532276cd59d6580839c47fb3616";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/as/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/as/firefox-58.0b15.tar.bz2";
locale = "as";
arch = "linux-x86_64";
- sha512 = "b2420cc943ead5f314adb1f24fd2d344c75d233670e2a80acfed47a8aba7cb8b1edaaea8725366b9ed88959625cf5cf8498d8a891ddc85f2c3f353b0b519a5d4";
+ sha512 = "f6bc470fda85afe00b175f2da26ba7fd63139f22fecda62a2e3bd8a7b327bbe73cba727dd6df4092295f2d819a219471e37135ba418d84db296d230561067084";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/ast/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/ast/firefox-58.0b15.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha512 = "a25723bdbeb1d228426b225afec40bd83848aeef5ea24b755af8bdf95739b997b21e6a1d47c28bb5ad66a73d202947a3e82be00ff826242a02dbb32de2bd1bfd";
+ sha512 = "1c5245a594d909935a3e406fe8dfbd5e53b55fa08ad4973609bffe80a964554a69cc05f3d70f88ae55574535b5c2a367883298676995cddce99e4c5f0c2abb97";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/az/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/az/firefox-58.0b15.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha512 = "55a761f2b000931cb20b609697099cd16e2e5490f39a7a434a72cc3d98dbbbbcbc71e2e2a21806f025904219405008f8d3cfa19ffa1025071dab50c634f2f2bc";
+ sha512 = "4e9cdb529b4cd91a23a07d573d215f0f7ca47b7820cf1bc1f4fb0a05e963af674eda9ee61cfeeca18a8e6d20bb0bece1d6bd20a780e86330b1d3e9462c232744";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/be/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/be/firefox-58.0b15.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha512 = "7a66f13d9b88cf24fa45793dd52671dd6cd89c7f9a9872788187773a9feeea0ff8bb6bcd87a4fcf1cd4a6377095d8644289b7a1c3a21bfc24932aca127bacaf2";
+ sha512 = "fbfef089f40514779051d60fa1ff1b245d4f91a31cf25f960cfdb7fa08ae78299d340191b2b71d472a3a97b228f8b53fd2afa116157952e415a4737573acef09";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/bg/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/bg/firefox-58.0b15.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha512 = "a4548c0648299a31c4708183bdbeac0ad91e885d027e37651c89cec2fe17aa50faf3371db78125f1d141eb4b511783e42e4f16a55a9ef85ab6586cfcc29ffac8";
+ sha512 = "0a06d47b02792540627142bb029aa3f099dcfa4facaaa77a3982d1c5cfc3b58ff946cd94448bf6ca11dd1bff0fe3496a411aa7e3f241c02c1fa5b24d4a8b9d93";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/bn-BD/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/bn-BD/firefox-58.0b15.tar.bz2";
locale = "bn-BD";
arch = "linux-x86_64";
- sha512 = "0bf256f3ce4b5a930c014344fcedf396c28ab45d3e375825eea6b10961e5e3788bc87b069518ead46aba0c6d3ec3815582b4f66617394f00e1dceaaca7cf8c65";
+ sha512 = "cb78b30d32280b14c0ddfebcd02ca29d106173b3e3e590347b183a2e66fc03c607ccbace0754fc7713f7c7aadc431399e003229ac0b39d2b990d3cce85803ca6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/bn-IN/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/bn-IN/firefox-58.0b15.tar.bz2";
locale = "bn-IN";
arch = "linux-x86_64";
- sha512 = "c22d92171dc452068bdac7030921a950c783def99c5fe6f6712bcdeaeab9f515ccb13213e9e7330db44277ff59844be8d38a729429f65e2dcfed88be47d866a1";
+ sha512 = "25e1dd45b294ff707b64966a3cd0262d253bcdfa0b8cc5c3fd4ccdb1bb457fb2699a2bc6a1ac1707ced941dbd1cf0dd0e3474604d897a776b2cefb71d8a4f8f6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/br/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/br/firefox-58.0b15.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha512 = "76d0e7accc70ecf4a0120c922df8922dc44263493d2b6630c37094cb96b65ff663a6a139cd12db68f31ec6b1ffac09cdcf125c368017e22eeb3fe4b0d17e0362";
+ sha512 = "3f08b36c87414d380f5104acb3a296dd56d8c54073d34d3fbbb1df384c138c0e58187e948358df2d634026f01f38dafaa59c108dc0b9d81d9ef05b0c388e18ba";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/bs/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/bs/firefox-58.0b15.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha512 = "e9484befe104cd5c186bfa97a23e50a541b822fb9383093421be8f7905be09d64d84d0c8ecf2eab3a9bdeebe1cc8b18340ad7ad08127d89abc37439c292c9bb1";
+ sha512 = "6770f5016ed7cb162b8dd5cf76d9a076e3299eb8f67839e495bfc4057987b375f9eb15d536df6f92405eddaa00cab9c9970076e3b4774bac28593a4800d3187b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/ca/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/ca/firefox-58.0b15.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha512 = "22e245a41be90d4508c5afcf72caabeabfe6510861c4dcada0aba5f47a542334261448963987f7fb1f0f632606ab8d99da473bb8134af53016c71736a59e1501";
+ sha512 = "69f2f14f5d15cbdb5a2dc5ff4035f783f5533315cc9bca67aae74e31691ce07f5e63e86f458cb7df28609fec547f5bbdaaddfa13ab776592d99136c175a16ecf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/cak/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/cak/firefox-58.0b15.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha512 = "ad4eff6b70302b1885e5423cf1f86677979260fdda38bc8db0f56329ae5338d2982694b327de0be9e89910896668b3e335de9ba61c01d3e622c09ae18cb2b729";
+ sha512 = "6c95305b1db952de2c23f887ac878f31c2b07a9f4daec30d1e59df54b05d730d6def93b679c61e84e647267863e0ac1457428220e7926c5b828a2ae963b6d75b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/cs/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/cs/firefox-58.0b15.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha512 = "4ab0bab66b868e2f5e2c0bf30a96e433d7482358b09f9334191b749b7070ce785d4f4d590122e483745b1a305befeea0fcebbd92cfa18c2bcb2809c22b690b71";
+ sha512 = "54e520b6bd4d15648ced14ac2700258c6338180a87d8493d314a4c843024e1fb062d4dc2e9f4f143063e037d375849e9c2c2c53e56c0b2c539a4254278a06a4e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/cy/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/cy/firefox-58.0b15.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha512 = "39e37dc32e5a06894de494d6857455dcd371f8935a0ce37a7d4b843a2fb9cb5b8a7873b8bddf5d4ffbd864e0e6150bdc0b5ce3805b0ec98b5cea4a99a2168118";
+ sha512 = "569f6c5a554265ecbafb195d2f943d6bed7ef6eb5865e45474e3217e4d5ba13d5036bf86cc3d9fae6e5e2149caa26737c0d0b99c4ef8b244590ecfae612a0c2c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/da/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/da/firefox-58.0b15.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha512 = "66040fad8bfac9eaf320d947aa9af192c9df7fc38f9481ec06f9086eecb484d7c14fd52a19dfc1899b6bcd783c39b8b401ab61aebe8da3cf925ff39dc8f779f8";
+ sha512 = "dc2b4e6d1bfe80984b99aec27ccd1274decd5397fb216b69b7ad3845f824c4c52956cd2f5766b11d28b9765f8355ab73973acdf029b76415575a20674e95f1ff";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/de/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/de/firefox-58.0b15.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha512 = "661ff66987b0d8d34b767f50a1da458e3141ebe0ef530a2b98c9d7f086cc09f7c670d33ad3f251b107a751331ec5174ba7adb2f9c3cb91151f377b6403552045";
+ sha512 = "2f7508107dedc8afc517b420e2776186fcbda37c24273ca1f2602702bfbeeb59e7fbea8a160bd337430bccd96af7dcd22b2eb7b55e88c5b001d9c2fc0d9e0f9c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/dsb/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/dsb/firefox-58.0b15.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha512 = "aa37410b780dc6d27aa79d68cd77c9dab97d96c234d95327531c25d0689280b6e622c7c7c327401f087c34b26a16fdd765227cbdbd1f475ae337ef59e4d05bd0";
+ sha512 = "a9fa820fef23f0eabe9e37ff8db3aa7e5908b31ec65dfe4d8fbfaede47258454b4f5d1b8571bd255c2d25f9b176f07d64f24ee69a7acde6a210a13a08dcb7be2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/el/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/el/firefox-58.0b15.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha512 = "068129735aa03c0395e2062b26f5145e38dd9899d0e3e9bcc20b18ee8159c80efcf831ffca8b87bdf3902319f324529e5699e5f310a82dd51260878955672886";
+ sha512 = "16bd5066d01c117f16d88e080e046dc2c21bccbabcf9a3f598ab990cb4408e095e2d6fa3b649bf16bcca8f7e1c7067d6b9b7099509bc809942437eb1841200dc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/en-GB/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/en-GB/firefox-58.0b15.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha512 = "fc5b304743e78ecec9648a6d239113d9d40f98f0ccc357a1dc3ea11c7073b7f8b98a344cb0b4c10c6225fb18b5e1630af71548c147d4bf173d7e2624bd9125b9";
+ sha512 = "33d06b44192402fc9290f8ec8d9ae124f5ca195f499d145235355e1db928b0ddbd44933cb797968f6d683d05664dbe4b417a47d6e719ef8f4a42fc4aa5ea9a4f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/en-US/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/en-US/firefox-58.0b15.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha512 = "0aa20d21b3f0265bce64a3e1c9bcf306815a77b8b103c1c258cc8915588d5ea2395ec2d133b97f626fefa6493b336d19ccded6d4261e335b0462912cb9e88eea";
+ sha512 = "d5f198f4acf984b3d83b2eaa44811902a2d5965a665276b887990ed0ee49c1d6e1e0a8f82ac69a2aa7a17fc016e311a6ba9aefccfe1ed62f283be59476a82312";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/en-ZA/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/en-ZA/firefox-58.0b15.tar.bz2";
locale = "en-ZA";
arch = "linux-x86_64";
- sha512 = "13bf9ddd1f704323d732cd6820b37a4220bd1b689e146b98923505b3841733c1e301d7f2dc843d52f1e3030b6e263674fdb4b41845513777c802ff958c7166f7";
+ sha512 = "7e1a7fc8f875e5ab9f195bb8df413f454660c0c38897ae36973a4494b40c2a4e4c0360ee344f1cd3480eea2b98e5432df0e84ea710063815f62a2e690b1afd11";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/eo/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/eo/firefox-58.0b15.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha512 = "0788e522b8462c00989cce2a3f4e35acbb03b5e6211d991d8c29f9103c083e348115d65e8938ec2f3fe7824cdfcdc57154c56bc09aa0fc9c4aec6eb10d1ca761";
+ sha512 = "11d9f0b8ce3c6d8aa1e0c35ce1e6aa69ebbedef7c0e8e548f19556cf6c86c8af11763a2bda200d6f05ea91134c8b79bc8a29e99ee5209c0bd741f5bf996922d4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/es-AR/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/es-AR/firefox-58.0b15.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha512 = "cfbe36f97a2629f91939b0ee5ea76684d51ba5b6aa2a31428f946904fbde21bd3dfc7d411f0a5d84f640913cf07b91129ae313606d76195ce17882eab14cbcb1";
+ sha512 = "316af39537f733d8524e91448b16efc38f180368905a461f38b2107836732ccc2d8496e6b43975ce07c75652bff97dfa26fce982abafef94996d7d5e0ea92dbe";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/es-CL/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/es-CL/firefox-58.0b15.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha512 = "bc3bf6207fa3a48dfadcf5274d1baa603756600eb71c6aab332dbac97eb3050d487d6c8a95cfe67e9273dc18139ede152975d050d73927636875a21b322143ef";
+ sha512 = "3ac1229c932f5a73c99129a63419aef394522d8dbbc419567ba1631aa49c7d1012fcc963c7d678ff284b00775ac125e97ac07a4421b869920e62e7897136142f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/es-ES/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/es-ES/firefox-58.0b15.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha512 = "992d99c5f3b631149d4ba86b5e7b47ab27a4ac4ea82addcbaabe1466d3b007777b4bec93b38100104aa68976ee11e9d753926d8b6227237684005f33af4cfcc8";
+ sha512 = "21e16839bc530f174ed6325e643a9ee9fe8bbcf8718b785265039eb61a3bc5f0d03b75425b65cc815b261a4f759639df02095998e715f67ae4ff801659e2f651";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/es-MX/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/es-MX/firefox-58.0b15.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha512 = "25870412e846f169fbf609b0900b208727fe0e6adbe1719fb6384079a5d5629696fa45d26dc646bb493ca798adc0a10a999ee1c4611976a2d97ca8c3ab1e0f1c";
+ sha512 = "642247a3e96c4d6bf5fa865e3377852611057c72e0894b6bfca18fa9ae1d8a8e0ec27b28494b45a3cb093cf229ce9eb7bceebc640afd70380ed1f65ce5202ede";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/et/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/et/firefox-58.0b15.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha512 = "6c0002889c3fc9c98e7dbcb0eeb3f294916e8386a56d72b78707c8dfb8decfc1c3be2301d5e8ddefad8b6ced90a48c4e6edc00fa632a0e0d2e16894241b1230b";
+ sha512 = "6c11847f25acf36ae76a2c47ac094bf5724dbecfbc7c8d9844caa3e2f86327eb2b01f64448875a3fee3d8c32fc16ecd16f8cd0a7e9aab6bba48012767d113665";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/eu/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/eu/firefox-58.0b15.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha512 = "4b13c45b8386757b2c5a03ff4ca00766d1151ae7bb354da5f40758450ef81e79c894a385d8859f6bbc825be85ea462b73113233ad2ffc555de4f46643dec51ca";
+ sha512 = "08229454895d7eea9b0a1df103a443e29e488cfc25c0844075b7ffbdf221ac85ea2905fe37e61292b5c8abed4e4ea946ee2edb2030f7ece27eaf5680fccf4ed4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/fa/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/fa/firefox-58.0b15.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha512 = "b6dfef8e581027303becc027787b4fdda099a65320cc1f2ffe13b7e20e1a6fe5c0e122a8a6cd4154f41cfe1bdb9de1362e8a8bec15d455792c240977c0260c36";
+ sha512 = "5dc0de2a76d1577a56162c5598b882bef03fdece5f7e0eb0d44501eed2f5bf52455499735c376b2a68e5b599406854cc4d0a27e6c74de3b62e8f50f0c084243b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/ff/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/ff/firefox-58.0b15.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha512 = "b1df5b9e5a31f37926d25f1ddc2c8bf27c0235863a1ff5de1774cf0f2baf16a58875839756d99376e3f127800f73073432a4bbe5f2a11216598b004d0a464393";
+ sha512 = "9324770ddf0a62811acafeb0dbef37fae7a16fd10f8dfb5c75e450d674f8c0f8fc15429d753d24a68cdbded44a859d3e7fffa3933f623859de015575c91ac45a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/fi/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/fi/firefox-58.0b15.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha512 = "7afc8a19fc92180f415a8df1ebc81ae29fa9207a5758f3540fbfd0bbf1f8ff358d390a6dcd5702bd6c0e9ff14468cf61617fbf2b1139ea5c079bf5427a32dd64";
+ sha512 = "f9b1870be74aacc8757436b4b806a626a0fcbc6dac77f2eb5e37fb3000ae1c5e174ef27432b3974cca9f2917940e682819e2cf92a98d83de640913c30b2f0190";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/fr/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/fr/firefox-58.0b15.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha512 = "aff3a8988e7a06c1adf9e386ed8ab0a37d0f8b64f81f1a551d13554e2b6782df20fc5b846c6174e9464f15d64472a2bcb7f250c97c0eb724061efca3e26f6f7c";
+ sha512 = "b47de97c83c160faf799f0c9b33a9b2ac25e56a6ba58c0d987bd94be47979cbdfa9264cc18912b6c0f12e7919209e8dae05415dfe6a4d4cd510043479516dca2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/fy-NL/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/fy-NL/firefox-58.0b15.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha512 = "5bea6fb654f8f6bf4fea0dac192656eb85c6f39f956a98791284592f5d7fd97d866f9f1d4b1c68a23dbab99bdc3042e43a3b2108afacd035f2b5be5f0faa1db8";
+ sha512 = "387375313e5d7920bf05feeaf76591bbd30e1e5c6c84a455a2d76f1c32c4a28a0e6bf3a1a9143844b199977cacdc444bb44d62fbe18b3a7d94ec3362c51ee48e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/ga-IE/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/ga-IE/firefox-58.0b15.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha512 = "e61e814913793b463d803c776b757b7bf75cd5901fe655fe983be4359753e02591bc60a69c2f7144aaf8a8597f8061515b26fb655f0ff86f265e75c29990357a";
+ sha512 = "5e0f9e33547acaedf6a27608fad1e9bc8e5444a04fc9267070dd327235a9e5a9faab6809b86d72243fdd5c6d3c0246b6129b7620e851fcea75d2914eef7db48e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/gd/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/gd/firefox-58.0b15.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha512 = "648c23369858dae251d6b77882b3ee2dc7fb629dbb663aded2194397c2f7be7844b16a81524fe2b5424a607e537c0c5a89628832a29c12b8963ea3b1ee3803fd";
+ sha512 = "ed93968c6a6e4d231ff6d0ec9205248e4e8a755a5fdaefcf77a972bd4d37938293363395469bf7ac70fa3a7e8b7dfba65a5add59438e68e6d0f7cca48096dae9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/gl/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/gl/firefox-58.0b15.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha512 = "552bffe8e151bf24e87a70cf7b521b19331160997bc60aeaa545742f87b937b8d39d1ffd349bdba1ad18d5658756df3545640bb2cd550493b05dc7e8e8ee570f";
+ sha512 = "0273d8338fc36d759c2b87109891565dcdb409df7b42c4e31e1509cb1b517fd6930ea4b4ef8ee1281d5374c8b77aea6c50ea6db5866542d2bd11346ea165c797";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/gn/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/gn/firefox-58.0b15.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha512 = "335bcafc85932a4f0dd4cadd5df423b718815aa88f65768bc3357a4c212cda16e0d92b8877179a5bd7732bb4e603c1cf9c88fe0e79ffb4ef5a28dbef86ba2abc";
+ sha512 = "78af73aa9ef4ddb183cccb9da3d080bff18db20f38fbc8e58e410765b350e1bcf51810994e3af26288e020ef8a1fb1b324a67b71a744a83a762d7dec3d5f3c88";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/gu-IN/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/gu-IN/firefox-58.0b15.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha512 = "af83f3246aa54664baa010eb112749f3c2ddefce08ad4259fed8772205534c93c9826b165b70bca316b1fbb314b08787168c27c522d14a46267174bd9b1bda62";
+ sha512 = "8c89b46da45861490a9c54a6cc65cb9e306be3d3d479a583f54f79d659824856c4dddc88c8631043457b3414a15eb80535d2c44ea2b5518eacc521db782e243d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/he/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/he/firefox-58.0b15.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha512 = "fec8303acc73f8521496dcb60f830aa41bbd0ad8b3c34022d38ef0e904b76973fb285f56d01e2611988bb41e8c26966d07ed98883f110377450648feaebd1d9a";
+ sha512 = "6a857b7f4c4efecebf360fc065ee8d6a7754daa918efccfe54c09a8d04a8501ca25fa0909cfe10db2003d530cb7ffad68d996757d11d5706acb91bfb7793826d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/hi-IN/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/hi-IN/firefox-58.0b15.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha512 = "03a46f38c02d98e192e623159c9d8c46be97b17e90566b95f5f60b6e037570abca9d3953a0b26ba63e3b8e5b61d783e8b77f0e6cf334f6438ae1e0c132aa4bb1";
+ sha512 = "9c55430b0c1e7ec85da9cf8dc6e682284e8b1d1a815a40bf381cd2e07fde6690097d75bcf17461d9cf932280ec09671fce2156953e426f7de3a3d80cadf6f2cc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/hr/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/hr/firefox-58.0b15.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha512 = "27d92e45a4c515abed0f4dcb66a510a1858c317834547de7d737aa400ae93602f06bcbee0c44afaf37070ff0c61cdcfbba012ccf26857a7a035cd22b7bccb506";
+ sha512 = "360dd1fbe26fee13295fc24b8b30dc32f5d06b8a43529aca19b2df03073e8a9fd56afbb687179b5d96c558a8a6b75b770dba0c26d1e19adc31d7780d7113ad18";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/hsb/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/hsb/firefox-58.0b15.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha512 = "1b8ce20bf6b79b7c99036bce309058eb9077126815a3774cc2c005991fc7be77466661a2bd2678024570322221da44eb07ab0503e2c654a8e42e127b39b7c0af";
+ sha512 = "0db06e66a0d73b669dfedf3202d142ee5eedc75bf30b0852a1a14b410cc0a4090d8a05db956607fd65d09136806f864b0b1e7f444aad589e63b8679deff6fad9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/hu/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/hu/firefox-58.0b15.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha512 = "ef396521906d741b3dae5652838afdac0b618de90b711f2c6d822d70ea1ba74346381657a260c85f8cd5636f33f4ebf819e5007b0942ea1b359df612001e9472";
+ sha512 = "3c5433ce133318afb9634f23bb42912cf49a063fbcc7c4a16747314cf3b3569c30ca38148755c8e3a0f11fdd923c4e6fd5a67f5a32b8ba9ca78b168f1d666c5d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/hy-AM/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/hy-AM/firefox-58.0b15.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha512 = "be883f31ae0b015d5e159de599ff0c510122e3160f0d7305702b36f835578be85445ef8dcc468d3abe8cd0f9469c763727fe6b49eb0983b67ff8724607867973";
+ sha512 = "76254c7c907f9b9c767af642fc70a0393b077a07fcd458031938c8961a0e00329be6082052f367e4ee5f652a527711cf7e6e0f9ac10c6c076d29f5a44468415d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/id/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/id/firefox-58.0b15.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha512 = "3c094628732fd3b6af02e895a63c0b3b9f81626ceea674899e3cbba33e64ae7f6a89896f088b25ce9e2e9c1329c272dbeec65ba14e3c46ee3a12d91c1cabda71";
+ sha512 = "269fc012fdcd2509da13b30fe5f7e2f6774ce7aa6bc43ab8001d584e68d389f5a058f74419d095fb90db426de03eaaeb75ce87b92b09e30dd6f2d7ad6ac895f6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/is/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/is/firefox-58.0b15.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha512 = "0d0e51f0246b84ade26bc320bfe60f08c5f6bf7f898836646ff02fdeac020b8111d287c80a68cdf177f4b111dc72933077a509144a164e3cb04ad9380a84e37e";
+ sha512 = "bcbf0ec6331ba7f4de5c80612e90fbfa9c13b31e450e95081501a4178d1067baed01f2fbf746e14b8705846aab78ff851c101525e065501c769c7bfb1ae3426a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/it/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/it/firefox-58.0b15.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha512 = "9adc4949df0322f39ecbb3bfab75ab27326186657519fcdbc668e84df445c4f739eb175e3d6169707059723023e13655022a90683f4d6349ac12d6c8a94e4863";
+ sha512 = "2fd518dce248a6127fd10204d9477fa698a7c3277674e034b89f7490123a3f2bd12ba5823e8a87065b238b0d480e2c772e915a802a893cf398b72ec84d01f87b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/ja/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/ja/firefox-58.0b15.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha512 = "a8f3d230eddc13f817c57985496714cdd1fc238ec9a86f528e4d91217a15250d6c0467c0d000d728bb5f6c3ab986a2e1ec74f6c6b8f6531958a063b3cdf1bf8b";
+ sha512 = "8bcb7686bd8d64f338d3ac7ae11dc70a062842c079b8cbbdd65ee53dd5a216f343a1aa8b83124ded57839248ccec384006bc513d1478601cb5ebd048add336b8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/ka/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/ka/firefox-58.0b15.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha512 = "9a15a435981f6f13d54eb24ceac1c46fb34f3c1f98b6f7c66f3805ad6b66c22c64415f826f276f8b8e7e685e1004928f6c39d18f34706d2e553411f81c40a3fb";
+ sha512 = "63a1ab4ee92b26a9a730b6772be54ce6edd64c5d42ec420bbcb4867d1247021781c983b382ab6346d99019f8c430fd12208a199c0b90507043195b3522891c81";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/kab/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/kab/firefox-58.0b15.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha512 = "e733e3eee75ba734e7a58eb7fff4209dc907a2ffa8d01de6d41a3389f9be4f2127970406385281ec817a1d0e4a5ccc9eed3aa6a39812f98b72c8eadc29f6a238";
+ sha512 = "93016e490d87de09dc18434fa1488069649cce5218dfe4f75bd3ee09807a8ecef9e1f0875fda2e8fa28e887a42fbf289ba1d73503a7f0e879e58c07212743899";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/kk/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/kk/firefox-58.0b15.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha512 = "e25484bdf28e66a44b092ebc4c1dce4b1b10e21b30243721d06add9c39299feb9ab0a71b1ea0b7e1d257d6a9f87d815a87db97c73ac06373a92917132e12f713";
+ sha512 = "2ec047b1300ba3af57516c861e294c47641d394d507e20769037536280538837dff96bbaa65873789134a59e3af4d97b42b8ff125630b4d82fe887af591b0793";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/km/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/km/firefox-58.0b15.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha512 = "61c2565015bec74fcd4920dd1d5e46abc6fbb407b1493ce9cd44983d31387a6f20f1fd009e9dfb371ac6fa10c03e4ad4be7638ef5b203ef373d40f8bf8893edd";
+ sha512 = "34b96630d2f67cf8d8893bddafac6a72e400e8df2324337384a45a76eae97245a0c4f122c47be7814395f03dce163fcd6f355f0431fb2b8aa7092e1c064008b8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/kn/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/kn/firefox-58.0b15.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha512 = "ef1758d4982fd5d27b1a58d55c6ae24f6b160a2ff36338dab6acd5b1f8baefb4576313e34e55e31e6e00f1c6e502788b5a5c3f0d6a1f61c22c4f6d676c16dfef";
+ sha512 = "8074b6d8c9a5673c3247d6d294e1f85afef4ba31d8cbe7ec3b456387c2692319a515d4cbba7336efc58e064cba2b2847ed4378b62e389a80c76f2e0efd9d8347";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/ko/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/ko/firefox-58.0b15.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha512 = "10ec9f9fdeb60fc42b8ec1c212fbd539204948138f0b095c331cfd1870c2379fa584fb40cc41b0ea9aafba5429f76e58cc19029b7033c216d9bc9335a90f388d";
+ sha512 = "cf55fb2eb1f1699890f5eeab0570303c2a87d433ad07747a4987b496fe18edf82995eb1856ab16295f4683c90889378cf7ad1a32394ca45dc0245958ed57d2c0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/lij/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/lij/firefox-58.0b15.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha512 = "24ef4572938af3122fc987ff575d5d3017a678c3d554579d4d41627a24208bc3fc7a244fba1f00e808dc0ca09804ac1ff04c717c20f8fcb087a537c02a702243";
+ sha512 = "e0db3342bad86b5244c474be5299b47965a75ac981ce78bfecde8880141b4f02ba61a8bd7d43489d847d2f3dc4f74ad68861af97cea70e414422c66449a9f12e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/lt/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/lt/firefox-58.0b15.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha512 = "40296a228d1b8a464a92ac8111661d210c239cde400cbcdf661d6a356882b8c31176b847bf9dd59683e047862d867d357646d4aa0e9fddf2ba88c2de6154b87c";
+ sha512 = "facd732a0b87714e8ef310aa55038ba2c3e1aa497b107d210915bb7ca648171508b5a245baa7551dfbaa7e22e4481d7413cf17591067e373667e8b35f4cd7265";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/lv/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/lv/firefox-58.0b15.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha512 = "a48b9f2bf0fe43dc3ea115b30a99ac2d8555e75f9ae2d4443bbbc30c3726a9b822a55374b7d105e3037c36e52f95a4e970c3cab0ae76e6cc52120d49022b618c";
+ sha512 = "a9b0f10f534f673cd0aa8823c139f713f724762be2f7575e0ed89323c814b894ad0c550dbf2cdf311ae1d3cd87d8e5905ebb953ede9031974cf8c306ee1184da";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/mai/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/mai/firefox-58.0b15.tar.bz2";
locale = "mai";
arch = "linux-x86_64";
- sha512 = "8187483dd28701aa7ca71690b336c28dfa75a51f88ae0b66947a2b4e48e17ba5b0f21ec9191b990fe4c2b31500a2abfc5fb6af6956faa4d0ab7e1b55a1330220";
+ sha512 = "28a9553559b6297a8b6a5bd04eeb02a125bcbae55e8a230e3a540d4abf93f9ca1d699eabbcf193838810a69348bd4250f948f6b55393ab4e69d21ecf976d52f1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/mk/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/mk/firefox-58.0b15.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha512 = "d5fcedda34bf04cc6f5bc67218851d56d7ce35776e3220f320e00991fe0fdae70dcfc2c2f05dcc007c601857e48f9ecd9b123128db4c2f0973a7624d3556ca7b";
+ sha512 = "44b1b419700c2ee0c81f2962866dc2f6f4ae694d600f2ca2373110508c24bc65ebd2128cb305a2a8c854f791e69c5db38ff862f9c12e15753fe4880139f911d4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/ml/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/ml/firefox-58.0b15.tar.bz2";
locale = "ml";
arch = "linux-x86_64";
- sha512 = "0c0d2a6a24bb64206770af711a5d0eca882dbbe4e8ac984adce94ce5471049bed43873f8399f4a0a88d37e49494f1beea28142207ec8a8cb8608dc1300205fb7";
+ sha512 = "fa63d35f37b95884b08022405376f2e1c2d0fb50b4297c6238ee5f0fe77925caef6c8353943515079ab9fa4e5c9de095a1d4aa4cf6dc35f4038cc1de04739c3a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/mr/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/mr/firefox-58.0b15.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha512 = "c2490552fe67d5619f12b8abda195fa07228ec7cad8293861a6a0e398dac257fcaaf2ef8dd05c6adc19be7929a6f2e19522a0c0a36b8d698216bf46ab8f0bd86";
+ sha512 = "81a2bad8f1ee56746fc4ecf2bdc526dfbd151536f9bece02fe40a4e6b88b4c2cad7f9b56b2e346339b1574a7f5efbd6d57f968dba1d6b3b2b771537884f95170";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/ms/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/ms/firefox-58.0b15.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha512 = "1d37dd0c7b5af3c3321a8ed1d00d5c6cdcadb5e32a90984f0f8c059ba2c379f9fe8b0abc8e185e3272b018ce84183c033bbcb493ba95880ad105a5a5875f9267";
+ sha512 = "a4515567ed399774c2c1cd8bf746533431c098bfda720afbf49c33119b156802cb3125536832a0867481522a4b5d0dc109323e9540838fcb41be7f3411f57d7c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/my/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/my/firefox-58.0b15.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha512 = "44e0b38e2624e651fc3a42ccd49583852c2942e1d831bacad7cb37c5ff51db02f0edb43ee8c2f221626da6ee012837dbcb92f7b479b72775649aabde8d2f23c1";
+ sha512 = "a7eafb22eac502c7eca0b2d8ac1374f4ba7d644d06853f403560114d5d5d72f9682777315f76cf573453603383f37626a68ba5cf726a8f836220db13d57c2172";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/nb-NO/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/nb-NO/firefox-58.0b15.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha512 = "b6da0d21770551fadaa0e5a5c322941c9fef1d2aa3a1d376c54cda36d108e0a5fae50f33a6cca27e50d6f01daa45a07fab67c07e7ea7ae12db75b1c99e993378";
+ sha512 = "aa77822565e69f1852fe097d19a5fc3370e2876643f076020e07fd66b034418f1e012e167a8ecf87267268424788b1dc81264c748832a9529a4a879ffb90f23a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/ne-NP/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/ne-NP/firefox-58.0b15.tar.bz2";
locale = "ne-NP";
arch = "linux-x86_64";
- sha512 = "bd50ddc9124569ee68dba6ff957c759a27062a94d6d7633143b9cbccdf2d1fcb93388c72fb7283f7399131b320699bfdac9584ffb6b8d0b2c6f7c78315601e4b";
+ sha512 = "1972a57e7c81d1f1de662178c07365b6b6c35fe6678a2841f1eff24a83a6f8d4ef1517b47434225f892231d754561890444117ed2c2be420b812b5ad166d8597";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/nl/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/nl/firefox-58.0b15.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha512 = "83dcb0eed351afee0c4a3138a6d5677c2c5f30e24e9b8f424e6000d73fda221b3652b1879754f2b7c9fb9dc06f97d687909845cc0dbccfeb864789f3143cabfd";
+ sha512 = "4f25f0319b35384062dda85314c40f1328d553e752478ee9a053900dfa6140e0d8d4e5aae2989cf76b9dcf5d3ecc6304cab3250752c778c6c5f64d901ffb5f2f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/nn-NO/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/nn-NO/firefox-58.0b15.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha512 = "e73637d4800987aa4314bd0157bd7d271f2c210af693337005f325930b839d5d45b5384b11466eb429bfbbc818e131836661dee6bd916860a1ee46ed0f7ec6c3";
+ sha512 = "3f3c214ff210b1d8c27c4cac0de5b674d24a730ea9a10a269f974cb63b8e29880f9711b8d316f9eee35a64ea6e9b500587e4acd895c9a33e87ca539b65688b84";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/or/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/or/firefox-58.0b15.tar.bz2";
locale = "or";
arch = "linux-x86_64";
- sha512 = "5794cf2649f9a4564854101f3bb0e3841142217fbabbc6078bdd2ea318c9ae0067fa1a298040c6f07d6b9c9447e882d4f4b9962aa48e6db193ce3bed8dd467dd";
+ sha512 = "9736e52bd129be199ba6867dd0a8b3a9d0313384fe9a7b77b21c96dbcb3080c3e98e8f74c3981262a045575d194d4d6968690da6b2056984e32b3a333142fc19";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/pa-IN/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/pa-IN/firefox-58.0b15.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha512 = "04e01b4a361a1a9e42ccb5f1c2ddc3032205d3a3eec25815a6bf5fb0b503062942e428668cfc4e0562b07a30d2b05939324fa31255b6c1a5f34db8a7d3b860bf";
+ sha512 = "4806337d20414df52afaf27d452f141016fb32693a278f25488e7e92c781b4c1048c51d80c62a372f351fe83270d5cc9f9429d603a5165ff59d040beac9d53fc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/pl/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/pl/firefox-58.0b15.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha512 = "410f502a9799da40912ea288e5599434aca3c6a6475be90ef7007e2313dbb1987e48ab42a256a63542717400de1223850cf910db8a9cf7cc9494ac8a5248c7dc";
+ sha512 = "e4b7e3cc62f53c2ab97d60d45f9b5a45ca141b64493fb72068dd0f1253c0c5663d7218a01e37b28e69112d0ea998b2388f8cdc74c8051c25e478cdb2c2247907";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/pt-BR/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/pt-BR/firefox-58.0b15.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha512 = "54b26b5c216e95269153d8c06f1d6ef9702fddfe4eb1a1f9c818527f48959088569ba87394b1c1cf40ad04713392e3725b001936636c4be9c9835c8c832bc276";
+ sha512 = "d4a66667175f7616c8e3f9c422eafc4022b8070f4c11c40c589f7e19b20b9cbd1770f8068a2eca79066085368b29027c860b8b06f086795bdf0a0cd164cf79f9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/pt-PT/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/pt-PT/firefox-58.0b15.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha512 = "9ebfe643010f56e115cd9414215515038ddc7ab8328716d1296743afe4334014efa66cbbb91f824894b2d8bd541c46724cafed9c2780c5204ce44a0d86c6baff";
+ sha512 = "ba2118d9060a7c8f85e4a59c37a850de0c82cf6e5ac7bb057efb86791596c8423a3a27912d9f2839934009cb962ebeb8c3c5b1aa63daf115c48dd2431c0cc8bc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/rm/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/rm/firefox-58.0b15.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha512 = "c80040682d738530a380cddb87504fd4aaf2553eced632802ef57cbec5f0c984d5bf5dc167be62c58dcd98a67520896af4a69cb27cf178881cd55ae3bafc8431";
+ sha512 = "9952f5c19f6c96d87a9a73ac72717b1906a2389cd92e3f2644d5f93f3c81b408d61ede7a68928ee7e6d740ac9166a02018d7eae490dd8e22bdb1e9321bc6343a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/ro/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/ro/firefox-58.0b15.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha512 = "1edf351afed7e04343d5807975207d9a2ce8424d180c131a4836cfc71d743a95688ce8f5f62f50e7bbae73ca0d9209292f0f2402de362509c6b028bfb70d7c33";
+ sha512 = "62ecc8abdb3f2e9ef7f10a0763b2fc8dc59d5b3c55bd45633d07c03a3ffd969b57e649c3509b1e2a1fb8dfca0b4060f6dabf85d124d485f879e5debff9e6624c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/ru/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/ru/firefox-58.0b15.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha512 = "a667fa5a91a6e229628b9bd9ef75877f4ea9e2d7e51af0486ef9a22ef470fc3661b6b7b2bae5c35e79912b8584e7fc40f83327f34774a5688f213dfb9ae98aca";
+ sha512 = "50b693b131504e10541261ebc97d1e22aba10a357d3653eb6803d9c5b57bbd89d948847876e36ffed17c435241dd56b1308ca52a08737fb97c1800f278f5230b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/si/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/si/firefox-58.0b15.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha512 = "27eb234f6543794310cc28778fdf32b22a466d71c78c751c7a72f0665a50d6b6daafcfb7def5e703d0967e1d44d20b70a6c50c7d62a087a5d698ae85cd1e5732";
+ sha512 = "65d702e4ba5f0763042dd37abfd70c330c5d96eb6fc73e5a747809ba0fabe692691293784f17e60628217cf70747d98eea4fb790c5bc062c017949f4861585a0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/sk/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/sk/firefox-58.0b15.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha512 = "88e83315aa23c2ed1de9b9875da1deec5ede8b2d4bb2e333f6e755c342c0643e6ad76416486067e3780bd80c912cdb47e15f1919f15c8b99ab5f3237d22e789e";
+ sha512 = "b0dfa69307262f464d95d4713f165bf89d6f8afb482642f0b2b7838d3201a0fc141ef8fe6efaae25d398e7ad36e60c0a36fcb3fe364f1bbe4ad641a88fca1d9f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/sl/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/sl/firefox-58.0b15.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha512 = "d7a3716a0590a1736ca16a43f34a860dde13f657bc5b15e480c9d522d4c7f96a2197e73505e87b1f0d15bd87b074d82c8a68b214d4afa56364b67c641a675b31";
+ sha512 = "b02f4d80c4c54da5c2f22609687acd3e6b9b2c0691071ea374f873c9619d68274bd6556265d4c2ba3ff4df5d54be61629faa512e6fc5d1f7f1892cc0fbe29867";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/son/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/son/firefox-58.0b15.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha512 = "eaefafee07aa2a07e25071f81ad5cc906144f84d46c59999d897f411d68ff825136f85c614b54f5c6a800d3222054762ff11401e10443a6729e27739880c6208";
+ sha512 = "4d18ea890da9dd8b55254eb397aed5a369450fd2a287adfe6519d2199b89b6d4250491fd816fb8593e1e707636c91bf1e44319eb93c0b0839dad647b8aaea327";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/sq/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/sq/firefox-58.0b15.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha512 = "f78b537858e76932b7f1f45288e5e36fadcda47921f82a9b9749bae99d571b17c54484c628958b7d0226bf108fe684aef8a30d91fec6a7468ac9d35e6c67c8ac";
+ sha512 = "05ddd15040570d4ff5ee3734d967c3857084cf8dbee6dc450dc7b17adcbb1aab3487802944269c12e6b3c1467a68be7fe50efbdb3eadcaf16566eccec10c9336";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/sr/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/sr/firefox-58.0b15.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha512 = "b07653765cd822840152350789a99072d8dd61eeaa82dcd7d86262beb21bc884d18cbf4b0fef6fd328558a0e64c40d770cdf7e158310a96cee222ed618bee8e9";
+ sha512 = "4f431f3600ae21015a86251cce00ec8732cc1ba4c7d7ca474f45d8dc5b4c2d9723ee43b160258fc488e472681dcc52784c2b78a82b622df47c1e30f4d1385d06";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/sv-SE/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/sv-SE/firefox-58.0b15.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha512 = "0795a3119d11bdd426370430435b75ecbf3ccd3f956ffa4c65d99202e18861e80a5c7541753e493ec722c0fff742f4e2ed42a1299fc6d3e18b3de4fedb36df28";
+ sha512 = "e7536a9d8ff4296d5de9202a3978bcc8c93c6c1d3c38c8517ef1c54522b9dc7bf7ca5e472b17173fa2243f1a279481ee8dbd2bd4433e5aaf7fe3d2b537386175";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/ta/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/ta/firefox-58.0b15.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha512 = "829b117c2fbd45d415a619a507010f2fe33153f7f21c1d73e4c29e8734347b8960fb3bcbfb96529062ddac47ee081f9225b688bf5c1f07078484fd50c848d6ac";
+ sha512 = "a25cf590f7d69c292db0dc2833448fa4aa60625a2aabe6c0da4feba4ec3f6e47c5efb10283cbe94e9e0961d77d8703c2c66c2f06974dcc6bfdab4b756d70d92a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/te/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/te/firefox-58.0b15.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha512 = "9813e932c1c84e90c2888c4f96ab0cad129969df470da0136722ac23ef0fe16ff0b8a14c87449b8ca166cd745f753369e54dafd689c09b8a7371d4855aa50b95";
+ sha512 = "9f112b1236f4b83d5d127d7ed64c238d2a71ab9285157663c8465846e4002bc301cb2e907cdaeb1f724a12bceb8e9d452835c33db75171cee0cc145f10e8cf4e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/th/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/th/firefox-58.0b15.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha512 = "6e11aafa7029a23354b5088857f9a79b43872dcf0666c11ea3e15c1f4cd1a0d8c64bbda6a942d1606ab8d2fc17500e03a561dfafbb102ae6ccf3e0d55e93959e";
+ sha512 = "52e25c19f93bbfa2a0690ebf855c428ced8b4511342e1befaeb234b3da788f7d9931e68ed8677fc824d3310aacdfb1f22e0af92d6638f6273e4acc0872df32f9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/tr/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/tr/firefox-58.0b15.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha512 = "9c153dac318b7ae68c0a7da6cd91d92147d034f9036db68d9c83b3aa94b4975b51f6266663053a9afd16af0c40683e81def6d1b4b8ae212dd1aaf217450b7357";
+ sha512 = "aea1383de1813fe8b2ad42e9613479954207f828fb3f7a10d7fe524c4b3fbf27ed6c1e2c710cbdf6526e1c869b44bb42e3319d15eb7ceb38a937eb9bc828ed3e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/uk/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/uk/firefox-58.0b15.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha512 = "f943b5cacc76bd6be55014de0ce8becab63e59f49ff7351ea1add60cb1f421f4fc2d23bc88a72810c60cb0ec3b5540f35b87227a093234b135da96b3de294c5d";
+ sha512 = "21de13497599337af0c3bd0c507922400eb55282bcb9a6e517863c708a7147f5222f85dc9b47a6483fd4919c0b4aa0099b9f3da6fe048dd70e16d595893a177f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/ur/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/ur/firefox-58.0b15.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha512 = "2309c79150071f22f12776050e2faa837ed7e45e9db60a628e93799fe7ff12c8c8225e281cba911cebe411e5224add41442b687af1836b32a8eabe0041bd704f";
+ sha512 = "fc0dee731ad7e17c8eca3c4bd1e38dc5d6226fbac74a3c5892434a74d3ce42648231963dd02ddd2f8661e9d6f46087ef351d91897f7c6eed9bfdfc51a7f09dcb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/uz/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/uz/firefox-58.0b15.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha512 = "cf588642dfd6b2ff28087c150fa146287428adefdfccdf072abd6b5216917291d5ea882079ffc06e43ccd33e5d57767f3a08cfcb1e9c73e28651059ee5e4ae63";
+ sha512 = "52553dfaadc88f0e19275a093109e05064f166a66f390f11840c8cbb7b8c5bd933f4caecd895a21353d8186f6f9a45b26fda831455809da48fd3e8da650e0de2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/vi/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/vi/firefox-58.0b15.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha512 = "c7716a437ed449c4e1a7ad737e90a750ea23ea612a54ebadc28944e3dc413797edf27756194cf51a62229c2030233d4ffbdaa6361b0765fe183d47c80eb6f9f8";
+ sha512 = "f944fe926faa407aeb0322f937b0e665aca61e5776f2c01c786be0b0c285095f8c17d1d4fcdb432ae3e984483afcd197a79450327dd8755906a778e3d8787094";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/xh/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/xh/firefox-58.0b15.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha512 = "821d6f5f3524e15cf0a7bab517d23c10438d6786084a3eb895bce713676feaa0f8b966333f99ddb6e41b5f8bb3320f78a525ea07fd39307d62c6dd395534b2ba";
+ sha512 = "42a4eacdf7c9429de2048a538e32af26b1ab41ad7452f52749ebb76d66cd7cbaf6504d2abd638b1ffa3e63744e6926cb00d7f0f44d63e75710ac67e2280e106d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/zh-CN/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/zh-CN/firefox-58.0b15.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha512 = "ed41eac4e685ae785f83c148100b6e6da8c426790d8169e2f50287773c104d571f8af9bf4b0c56945ceb295ef811dc3142fac9c7edcdd58dd8f7e0c75e26b494";
+ sha512 = "8c0a1aaec3f1636fba572c61a7d94d334dd061e09c72a802953ef32c01c8ca16a9d61b04f46798e39f0d4aebf92c57860cb0572d41376513fd16c6b9429788cb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-x86_64/zh-TW/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/zh-TW/firefox-58.0b15.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha512 = "f6fc4aa7d15a90fe1d2dcf9491c43cd39171e04ce1cc0808a697735cec07208aca310d895b7ff5fb4e02e680ef225fa8cf78ffdb647d8d82ef46180678a15632";
+ sha512 = "1647cddfe766af88e11fba9811c91c821390e849698aaae122c4ed9ae3d285d0e4af784333d7a0ff061c333cadb63ab3a250fbfa6ed4da07959e2261f4d518d2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/ach/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/ach/firefox-58.0b15.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha512 = "17816bf735cf0ed093dae243d8e3a0a58a95b16d1b96a9ca797a86ba3174b00089341dbbeacd74407d1d462899a4a70d5ca090fcc1ece0f34b8db87707101089";
+ sha512 = "217583245d5ea137c8ffb8768cc964903da67cdaa9d1e923a73a954bb1ab8d748fb78cadbfc209e83eacd06e0de7bee8f6fb11d7c8fdc7a361c98a978d7f03c3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/af/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/af/firefox-58.0b15.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha512 = "f02f3260ed73bc102c1463435957f5448cdaf40b433f249c1e74a77c1ff16f4752f26aaee8d706d98a29f38b1057e8d06f211a4254536ea6545ec3f482ea0e44";
+ sha512 = "e30d3903433b84bd7bc47ee61a2a06353193a6c8a6bfe9b23cf11231bec7fa7643d55126ad045d8f17606cd336cbcf59651ebccf1c9da115d85d6516a169b85c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/an/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/an/firefox-58.0b15.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha512 = "3bdbdc47a9428fe3bceb43162904caba174429203487ab3710f865b4b0e9e3964bd0d7b20e32da92b93a7e01f23c090b7cbea3af9837ec0b57621099a88d7ac8";
+ sha512 = "232bcd3756981493f26ae1cdab7f2ee2a315963f135e73a8d810acec495d934e5b5ce8d7692a6aff3e6893fd02f67364d4ffbb580f05e113642ae82f1406013f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/ar/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/ar/firefox-58.0b15.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha512 = "ab306f81b20e8dc57d81f5c35368f0b31a3d1a784e4bad6a984d78288e2e61a41eb02866ea87121a909a12aab778d858ab96d776106078ffcf7e32f726dd6f11";
+ sha512 = "088a81bf11b6bd12e22a6121762d7084a0da829456736ebc4a45953740219329e347492851b5103a7599ec265becf9ab217b67f652b84381f0aea03224b67bf9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/as/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/as/firefox-58.0b15.tar.bz2";
locale = "as";
arch = "linux-i686";
- sha512 = "2e465ea31136debd7670e02d47bb392ba93e393dd0c58ac3a51217ea3fe472ff39267aa16cd21fcbe1f391e4a9b4b1b4fea252dfac268741bf7315344f8f521c";
+ sha512 = "b009fcf6e470b0b9bb3c95841834491d303a9f8cb1059a91256c969db7da0f5a7e8b38196d3735481e77442904135be636b43576cf73bc2dc218867db3213f96";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/ast/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/ast/firefox-58.0b15.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha512 = "dc4fc559b7ed7bd6399300047ecce47b97d36479d332b81d02449d12996113246c2651717455a3e3514e14e960917b678cd2228ac58744bfc16087813ae36c07";
+ sha512 = "1a461da268478b31a16a8995c7b1974367750c214b6cdade6810a6fceaca5ca20ef5f886d1fc634605e00022121fd0eb6350cf19f12a6016b2f1e45c00236d73";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/az/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/az/firefox-58.0b15.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha512 = "46968cc00a06b38747297fe5efeb656f459be06ab583697b1ce25f8ad080e2d73a9b28312712af030208567fd9099ffa55ea6e936130d42c1ef54562a296ab66";
+ sha512 = "58fade178475698e43757c9cf47e4d72ed86e35bc67e017369786a79dd5656b8731749fb1afe17b90613ac4ce53c60a32458e3fcdc86cf638c2f30dd9d108f83";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/be/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/be/firefox-58.0b15.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha512 = "17b377b2d9d7d5d8791d06f3f35036eae5019270c39537fe4f712bcc5b1ddea17e35c5e43c15a5c25457082ea7dc7c456d94a088beb868a8fa3c9a11e948f517";
+ sha512 = "ecb6cf9917f3c6790ce0137a7fc9e4ae9f2f6c1a24a9a4d91d6ea6c3c6c541f8d40f95e38132213a31cc83c87f5798dcbc95c72e9deebed6deb73dadedc50ec1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/bg/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/bg/firefox-58.0b15.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha512 = "59327840726711229bc6f82d244ac75dfe457fc23aea19f964793745c771be67984652ef933c869d65fda57f40c8034e215ba4b6a953f66ae32f264bb5cd7b55";
+ sha512 = "d2258b93e05ffcdf7a9012458537addb378819abaeabd2026d12cfa4b34dd3faed388d5eb8dfaf32761b2406c6f72279b0970c2e35bfd74a373e9f7db53a0578";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/bn-BD/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/bn-BD/firefox-58.0b15.tar.bz2";
locale = "bn-BD";
arch = "linux-i686";
- sha512 = "d4dbfd8b735453fded37db464ff9a8eecf49c767d52cfd9faa7c1bf59326c594dd090a82cf5f226283c713d95f91fcf621420801e642bc53c3a1f64ffd087fcc";
+ sha512 = "8f3ec4491225c56659143ba787703c54ca869128d4cac331573506d4707b28fa200d0a6d560c90184d881a61d98f40d8919a6d30d6ce4b5ee42dcd77b7124864";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/bn-IN/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/bn-IN/firefox-58.0b15.tar.bz2";
locale = "bn-IN";
arch = "linux-i686";
- sha512 = "243f956066c691a4c0917719e37ac45912bc2c8a1a2df92383896d22f5fd4369a596754268317ead8537e3e0a368b484217083921419cadc40bb19ee5f10648f";
+ sha512 = "c6bb046180d5e3ed0e4198cb293eaa049c27bce27a3f6780a97b8c90fe95ea7ec69cb23427dd53ab6d736ee0862a3054f0b66333544e80fa9e027731c95f54e1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/br/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/br/firefox-58.0b15.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha512 = "c1c948b72c345ba22bb5454ad97856d32d70acdfe82f117286597878439334a90020d558c8674cae5d7c9686e2b69968cfa397252c872ada02e9105424a98144";
+ sha512 = "a7f3d646b7a3e77cfe1817ec4751e324fcf94397e5327610c9153df45808033fa2a55062a0cebe52fe9b9e4f86db55317e974247d6fe7820774334cd9652bc60";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/bs/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/bs/firefox-58.0b15.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha512 = "4e500e3be9d3cbe72f555bda52a60dedee82283224f6274b936c0d8b87c7e4bb037f05d0f0fa8e53e4064b25f480345f77c91d77ebe3ec28f17b66dd09b484cc";
+ sha512 = "e5a92e807c272e16f10018e2ab46896e8b152942418396983527caab01a00d0aa4b666ce0841a08504ab8094abcee28125bb90f35c6b323cd5f90af57f25bf7a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/ca/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/ca/firefox-58.0b15.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha512 = "ed8c046cbbd5d7b3957438f510ff4e59fbfe3d2e619e6078f635d106dcbd18a435a619da0aea195b3732e89be73aa176b3ba98a0daf73a6943401d03b78fbbe1";
+ sha512 = "3bb8573e229d6aab4fa03da2cfcf9ed52603706cfd5255885e60af53ad56e2981b50163de284647f64afc1ee499517dcf97f67532487d028ee6d654fa5d52088";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/cak/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/cak/firefox-58.0b15.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha512 = "85066e0c6ff9cdf12a95789c7bc9a4eaf75e23ca87924274e84ac54aaccb54fa09255f0e513b80163189a50dcc603931dcad95864763eec9f7738e6ea0438ce4";
+ sha512 = "cc67e759368964bcea2ca87a2330c1ba5f54b24756c5a9ea371428679cf856b475e404bb509c673b4b7f603023850319ae62bee46fe32bdc27d862c4a94e189f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/cs/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/cs/firefox-58.0b15.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha512 = "aec6fa674b85182d55ca3d37d82a8fd5f751a16c0be55039098f92e536cc49475d7a4da223f6c505bb8d62e805f147050d4a307fc967ee5fc4be3af113dc516b";
+ sha512 = "329c4d5ef00c3176d49cd5db0ba810c68cb4ebfec1748232f76ec016cf3a96d4aa964024a5469f40693b7347f64feaccb94e1a5d971bec96cd5cdd202328505d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/cy/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/cy/firefox-58.0b15.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha512 = "d63ebd3fd90b712ecabb73da4c0613ce72d727e8293de266dd235e50342376856ea9654b8326a75c2cd76fec1baebedebcc873d27e37cbafc9417c6d318ce89c";
+ sha512 = "67ccbe48b9764391a592d7cfe8862b3bbe8c51b34af79506470d05a8c92098dc067dbcd5fff0f2f0bdcb1b8019f178ddaaef4b164465e4c5b22d40d078aafe6d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/da/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/da/firefox-58.0b15.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha512 = "65acdc35e15ac4180bab980d3ca4ef4a66b24ebf6ab5e2a617d7cdde7489250a07e20e0769ed0336119e8736dd5f17382991305b025dc0cc406cef135bb6414a";
+ sha512 = "0bb1b55c94a7c227631c2fa55fc0ec94aaf0b5efc173d8c23b32a592760732839b4f7d19d64a8ad92e7bd327cff129936aa5142a48fd3a7e19e5b87a006fd75c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/de/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/de/firefox-58.0b15.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha512 = "af8be4c16ab58d70875915d9a2d0823042c1cecd0de167ae7918114850e0b5fd0ecbe4a6640c20dcc9c82f2f25d432c6f416437db17dd5550cecf4e1c2a0999f";
+ sha512 = "7371cb1a4990eb13efb649a25594da67fb46c29b8cf2e0e69c3621bce7c18ae84978a8d39e2d3fe8d2cff1d48e2ad00d38354ddca32f0e2dcd5b4a2f88c59059";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/dsb/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/dsb/firefox-58.0b15.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha512 = "9a33b692c610791060568db4a0c6566dcbc436bde310c3589a518644c61fc85e424661ee0cfb94836e3f36f3eb4b13f011ea788096f96277eafdd7f4a9a431cd";
+ sha512 = "7eb9a2d00d5417287af53ed3ad3ee472fac42b4c338e78e7c8deb2cb11abd2b8373deb569d1ce2fe84ba328ec0b6273eec5be20654ddd65a1eb14fa9da4a5f23";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/el/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/el/firefox-58.0b15.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha512 = "eb0436998d08cd8951f537ddbea697ddb349cbc8777913e27038894a787fe31f5295125b89b099b53e319ecd225bd032898aa7871a6dffe964320f55230bcec5";
+ sha512 = "2ab0e13eef9cf4de5057a04b275c948006a1c328bc4bf65f224c3d9176350a0bf963e152619aca784d9867d359d8c622e3865bc6419fcba7ce48bc294488dd4e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/en-GB/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/en-GB/firefox-58.0b15.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha512 = "afe351df0edd62c459f6730c96d96abd7dc3dabbb7776f1c7035b2e58bf13ebf4aab2c148478a6bea4e0c9777757485cdd739b040f26ea260c0bc97de0e531b0";
+ sha512 = "191b5f4db9ef476701045cf660607f4be4acf1823e5b765a355324565b928572e4ea7aacc822405e7b9edc1e4ab33a56e7b4f2cbc231b20a559eb89fea171f7d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/en-US/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/en-US/firefox-58.0b15.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha512 = "dbb858c163f6fecd58267dc9c7556af0e87bdd0c5b5ce68421239b2a3ccc60d19d49b92a186a0c3c8113e941040c49358c991d916a9ac41f31d7ddcc59c8c2b1";
+ sha512 = "0599ff0b37fb79b378b01368834d22e76139d67e54cf3655d829aec75c1ac095744f6f171e7559c3b409ad2faa1c8b47b81ef6a9ff90bf9b1dc4122abc382d7c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/en-ZA/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/en-ZA/firefox-58.0b15.tar.bz2";
locale = "en-ZA";
arch = "linux-i686";
- sha512 = "751ea8ea74d02efa866604d28e65bc0a7c6006b6627e44f9853a24b8018d6672b254b218efc674bee926942c790830a26d6e90bc5edd7c34a1640a613f4d14ab";
+ sha512 = "e6d927b28adf2ec1978a50f4d6e9986b28006df165ab4f4901c8d5916541f0b51ada03e82403687e73e5e6dcc0b9f517cd33879d91f363dcc0f1cd799ec9cb6c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/eo/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/eo/firefox-58.0b15.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha512 = "8791e1afc830fb6c77bacce9427c96eb1573aaf2c74496c2fdb2f7263ff9d4adb80a5d2f2dcdcb9287bc6df7dbfa1ccef12a9ec81be29194d6abe909eec203f3";
+ sha512 = "1f6c6618ef2c108e5fef0a288eb70e519ff8456cf12d348a167eb208842fd4cf2523d72e44b778f9210218a2853aad1fe305f332dacdc498e0cbc2f4b7fd50d2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/es-AR/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/es-AR/firefox-58.0b15.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha512 = "adca758881a62929db99644a38fa6b0b5e58b6003ae61ecf0a8b3053b2ae4dcfe622d81cba07babf6d07be6f4fadeda12805829f44b18f3945654a999ba8689c";
+ sha512 = "60c2d315fc692bcfd682990ea3be4933e5bb185174b0c2260e56d4e7a437dc5405e3141bfcde3f177006c858c240934cd71834a0ec5403f33c7a0bc195592088";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/es-CL/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/es-CL/firefox-58.0b15.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha512 = "2d6c98393903b48a43e2990839e6701a7a5228f9eb940ea0619227a18bc172e9f35f3616ca6016312052c8547f81fcd2cbdd32649cab2e52a8522081f502c741";
+ sha512 = "b3b65a0e58096393750e71445188b32962a3c31770be40f6fbeb63ba42823153243eca9e303592dc93f568f8fdb88caa274ecabb037ed3421bb0429f94c3ee1a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/es-ES/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/es-ES/firefox-58.0b15.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha512 = "feaa976b250d3c214273cd19384012a1ba75c30974e4d4ea1ef488679f1c7c078f3b2bd226ca8eee51fc11ed7774425eea27903f7891556ca29ee0bd1ae46c51";
+ sha512 = "a4d8c6f01d0f51fc247df700aed8d19b3472e775feff089d06c320c96a2bc1a13a033ca839aa7e5f4fa4c2705a7fb6d70d189b9f0add202ab5157483d22148ae";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/es-MX/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/es-MX/firefox-58.0b15.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha512 = "43f3362e18b1f67f73c2cec0646f6d96e6a57a55707d7146b8a1a7974601a4c59379059ad76c6f74daf02241afee2c0ee673e9d8fb02998f0f2eef8ae9c77cc7";
+ sha512 = "d6fa67f36d1c80224cacba3d95536a82c690b6cc09b6caa8791d4f0500bac4b77d74e8c6461d1e626d4f7c81e2284b270a5fcd734ccfd6e4011ba1a69c69f8be";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/et/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/et/firefox-58.0b15.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha512 = "8b71d6a4ea77714852084b7ab27301caedf646901e8aab58ee32f1d5fba54332440ce3129d0b298f0b9fe9233433078a49798d834ba4e9e90aefc23b63090069";
+ sha512 = "56df0cb1be0d862f0b3c5f2a5c7d00eef39bdd86cc7c4c2ef6f91ac5814d07f9a03d0218a8304056b5d5457ef248a4c2c7b211cacb70bef6c4c5e9c25294ed75";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/eu/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/eu/firefox-58.0b15.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha512 = "76dcd315555ae398a594e28a443cacba5077ec7a2747f249ef2558cb69a970fb7b3195ab1589dc3610b8bc172bac34672ae2846b5d9acb5e33cd26d5834791d0";
+ sha512 = "844ba990bf98b4650e44b386d4d620ead2e049d954b9f74ed3f8d2b6544c304b2afbff794865db0a41aa5749ab6d6e69c3907a000dd46e2582a00527091d0c7f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/fa/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/fa/firefox-58.0b15.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha512 = "71f49c27778473ba3ec25dce48787fd88ba36083e0313dba28e6c32c7fcc907f63b54d6d2676351e40b784267dbe7111860a7d05e4600856eaac796fc869e425";
+ sha512 = "3925f349e9b67233b034888f6c2d37e4830ca4bf3fd9810fc7585f6af6318c4f743a1e6691bac44559ce53bef599eb22e54d8c36f10bafa7a21e57325b25ad36";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/ff/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/ff/firefox-58.0b15.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha512 = "8ce6fd45ad4dd4987e7b4d59431bfae2a89460665ab3e5797b3d2855d90aafcab33f44ba4579ae0968428e98a1c0cd45dec33d86c7975724816675c5f7eb2c7f";
+ sha512 = "e31047b7420650a30136310587cd4d66089b99dbfa6291ac15f03377d37abaa3ccbbbd9f5fc1937fe70e4cbc38dbec24f1358ec2da2db54b5ce1af4871d32ac8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/fi/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/fi/firefox-58.0b15.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha512 = "30c08c8a6bbd5cc4f7812133e87967fd6347dec159f0f54a9826a3aca753091d7152015548e84bdd959f3cb0a9baaed8f6be15e1cfbe9bba3dae06bb94fd8a8e";
+ sha512 = "287f2e50c912aadb35238a6a1f5a32851b5cac1c3061c6f641022baa8dcc03e7b0f738df9bcbc9b82c9f89fd67828f3b0bc949eef2e25be8920065d402e9a45d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/fr/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/fr/firefox-58.0b15.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha512 = "cec0bc3a0973a8319ba4551d988a5372f32da697c7f4acff7321fe8780f51a465378cff218497772ea0dc3f981ff6a9d71b773f8c14ea950145971a31f7ab942";
+ sha512 = "2b21101b761ec0a8974e3782e9210983612126a2ed42e2020e256b2a4352406ea310dc62f54ec1069bf5b66853207bab024f1fd3ec06ea205336100766626014";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/fy-NL/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/fy-NL/firefox-58.0b15.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha512 = "da95f899461b6a794a32a4ea28643c856d8496d2256b29e33a22435602f06293e3ce8e0756960ea752440030147c1044c112ff7b5f0e793d1ab11555fa1cae64";
+ sha512 = "3e25c7b274235adc0d59106bd662d9c8710863c7e95738b6afa2973df999d7c8c01eb2c465473b26cdc2869cf2f9f4a05deaf88aecd125e2338a77a3602bd042";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/ga-IE/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/ga-IE/firefox-58.0b15.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha512 = "e7704282593eb5bae1975de9ba423d53be4cc57824c96b8457abe204a7f563719cfa80dfa6edd5db6433904083e60079510f3e03c03871c6feff168d7e83c349";
+ sha512 = "c301e3e3facaf2dba4ca4ed17318a7f21350a9d190235ca99bbcdefd4460e53d984d3c91a05564fba56f4cc76795742659b0882ae116de166a46ef6e6b0dd2c1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/gd/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/gd/firefox-58.0b15.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha512 = "b33bb4630a397a53a0872a801a9662640f3dd985df174658bd3bde118c55f0890e8b9984597b27c7c0921e3ec92b39a0f560e8f3f650524c3a669cf3c16ce411";
+ sha512 = "6252be06dcc137835059318dcc32af9bec179e57378b9f8e03eba8284f8f48cf79b40f3eb76bf6b0f46e78a5cafd765763985f4f375024b189818f5bd85c67b9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/gl/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/gl/firefox-58.0b15.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha512 = "32761dab5c83088fabf18a8e9b803fce43641debab68bab5f7395c56fac5ff721db691492f2323cda2735e0b124201a47b76663b2a93a6db745ac839ec53e27e";
+ sha512 = "b1640a8ed2a8d2452affdbd33eeed8160ee0b76d7fb99bd7258e38c17f1e22b63210f167c266db00fea65ae0b2233d49f057065d1fdfeb023e479804f1dc670e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/gn/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/gn/firefox-58.0b15.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha512 = "3c8f0699ef2794d84421696efe543ea0fbbfc4e95ca8b82840af00f7774884eb90301b0f0f43ef930cea5b83bf56cf6818e1c6f8cc7c808db193a5ee47ffcdf0";
+ sha512 = "6cc98743312f1b92a66f4e514ebab0851eacc7c19cec7581116c01f4450194d9f1c81b822f4dcd5841c68e9bb786e93dc7f00aceffa4888e42329bfdec951776";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/gu-IN/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/gu-IN/firefox-58.0b15.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha512 = "dc5d788b3a821fabf51bd6e6efbdd7998618d8057ef1568787426ef833c68cd5fd961143c6892f5fce24aeec66c6cc4ae14035ce5e6ac847433be82d54eadccc";
+ sha512 = "be4beccf01a95245eb2dd6d587f2cd70e6eb0050f5dd65eb24c723f3a4979ba1de1d8e87aaad44b67aa216f69f7f3785391f279f9e657eb10d808891e182033f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/he/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/he/firefox-58.0b15.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha512 = "e9339246e997c0b06a10c47209ac677a08fe4e288fb844b79ad48743c7e21a1ae0d38ba6e6cc7227760699d61c58d75fdf39c61a7ad72daea0e44f8593745364";
+ sha512 = "fadbce135e17f62edc2ce5004ef12ffae5a4a18d7c80b785f85d49da9640a874ac41eb1fb15423257dbd7fda9fb14d19e5740e6b1796b15cfae62e13c471046f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/hi-IN/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/hi-IN/firefox-58.0b15.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha512 = "5b991acadb7fa0d2e0c2156f9e6ca6eca0ac8cc0bd601c20fbf4cbad2bf4fbec834f671846e7df50e96857df2a72893f03a02a0b2c57a0051813230179afe56e";
+ sha512 = "f00f0ad1d2b2c1d1451167b8877db6c0fef26d00fa7673ca462cc673a34e6e5f6134912f1e655b39d8fd657faed41e627db0c6d713aecb374b2680d6fd6f3669";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/hr/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/hr/firefox-58.0b15.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha512 = "7cda125f1b2ad172d8c23fc8b71b240ea5838041345184fec0e4219b922036a285f8c3678104b52d6d1d48cf818c9cce5c6f568445792267c85daaa2de170c5b";
+ sha512 = "014ef528395616b30dafc7e1527c7465a6d6eb2764830d06e62fcb2c9e0a72b9f9707718d92205cfb8e0d917516fbee3d01e27d33a59fc2b90ed45cb940c384e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/hsb/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/hsb/firefox-58.0b15.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha512 = "6dde50394e80b215a219cc439538177a64e2ee0c8e73b2a094e84ea7d88113ef7efcaf20ebf0015e7aa1a78dc6c8b9d948591680a9ed31cc7cab6fdbf78d2e92";
+ sha512 = "82aca0cfe0ba91391190a51183ad7cf9301079cd0ec4dfb86d952cc919967b7cad7e63c2b09931e94c52984b9a2547ee206ff86ecbaae064806a22125c0efb51";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/hu/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/hu/firefox-58.0b15.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha512 = "952daadafafd1e52272583c72e3a34cd54b9f426957d7eb2cbe18889d4afe12ba55c11cbb1ede5b338b0d34e83f1e9f79350d672c56092040f2baf1965468589";
+ sha512 = "0df88ca565fbc1826c757371ba8fb902d1c383b11e56fc28043764e0e6d6a10b99ac024066b0b194326e2dcc0ca174b80fec4a9116652c11ed7dbb1761baad5d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/hy-AM/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/hy-AM/firefox-58.0b15.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha512 = "dab726869c730af3a7b62c1dd3a7323ec092e82a494094c291c0852bcacb7334ff65880608463bc0ede6e75e62fb9de81c537d918018c525e9f210c766717b56";
+ sha512 = "59532269538fcac690dc26f3292986516284f7a2eb2094f8148eae16d4b4c98fbf5131d6a839b9fe1d5d432426811bf3352846c447c0f03c61cdbb414e5a5c91";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/id/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/id/firefox-58.0b15.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha512 = "7b61acc863c183e0c372b7456135ae0642301e647f080be4eb5d6e996fd3b41a697baef74dd04eaad9be1558da9d6a34a45a4a96ba0491658d5165dcaa15eb01";
+ sha512 = "0b528982ee68c523ab641c379cad911cbe4f7e3e3938cf4851ef53d087fa4f2c80bb1973214044d887bc27cd93cbf824a36d5a1107b7a421b0b4588095c1c981";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/is/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/is/firefox-58.0b15.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha512 = "3619c223e5bbc84ec8203482bf912f1f02075cf6d1e76041bab6e7a0d80f81eb556f2e0d09a34c8de86c058a9b466a104a18ae15a98f9debdb21196ba84e034b";
+ sha512 = "7b1ab16b5aeb9377bedec101447f7693a5c84ed1d4cc8a9e866ccc52274576ccfd74e74fc675c46f44f6651f82905161124d261e17fc05ad2ce223a1a953f439";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/it/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/it/firefox-58.0b15.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha512 = "0e6a2c84710afa1c7e47fdc66c21885b1bd3bbab355b70f611c499faadaebdf461c9cb8bd9dd61a11294b6bb2f782b95608edbaadce8ca9f8604992b9d779daf";
+ sha512 = "d266d71c691c8574d4031f81b9e4dda0c2dc1e411a434450c899377857ab571fa3c4ce32cae3bd025eeaf326ac937c9c5e7df79f4c0d7a31bf0f464e15d7a2bb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/ja/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/ja/firefox-58.0b15.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha512 = "802d6c96510fc1325a4d9bd419a63a85bae402faf2ec4fa211e68c2ffe869f5c184c46f6c1d1a7cd6482816ff6a2cf01ac8e5f15908b35fbe44df8b11caae140";
+ sha512 = "2100b5ed142f0f2b755c00573f2a5347cfff7cd17c1547058dc590627d07538ddcee8a8a0ca1e1afd0ec875a9ca11d44828b3f7aac54f03d9f24c7112bbe3936";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/ka/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/ka/firefox-58.0b15.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha512 = "4b2b066872341946ff53a58773ad6145ceae526242e19b488529582128e42388e9eeca73a4a5cbd87ba913c4cb1e5dec768bb615400ea367a371da6c507e0bf2";
+ sha512 = "9b2b5662ce1ec38d4c580aa2df99516333508b7b54cc15ca26f4ca9ddc21ffdff724d5cd952fe560bf89778b8a07d7b71233cb88a58007fe770bd6d060425d19";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/kab/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/kab/firefox-58.0b15.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha512 = "8544138682e31d51fd3841c1401772833b503ff81d3d8cc36d29428c22879828dff2d871dea3d4429031f2f4d96cd2252e399dde375fa372d1d2872f88e8f355";
+ sha512 = "4e4661c562037675177850f4da6192f7e15d08e0afd7c5302f9cf122f0b23db3c8cd33815d589202075b5b43abc1f4c161fb7b0b4155cb56cdf8e7666306350f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/kk/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/kk/firefox-58.0b15.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha512 = "e2bbaeef3c943123d4834d008e5ab2784029154d6d7badf5bab1c9ca467061cf16c96a25731d294d242f339886aef5fb228afd2d9b1bf9840e257795fca42dd6";
+ sha512 = "f3e08a21642564a25e7e2ebe8c8cd46da095898e86c85ec2b0fcb434af57e66f51d2eb9c0b2018bed0e80ad79da244f77eb48307f12bfe23464e0959d846d8dc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/km/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/km/firefox-58.0b15.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha512 = "75eaf02491bccbdb51b12d7125f8b87de99da0d7299db409a6c3a2ad8bbb06f011d7212c9ef20ec08bf89e6396f125925108da57b58b25d28dce6849fc458b95";
+ sha512 = "34771be4fdfd50a22d8cc9211e5240704bd8481b96af3bb8a2035d7acbc8c0b6fd16f54a76586469105b5bd35149936563a7a99ba394f09eb3e1ee80fe02b0c0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/kn/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/kn/firefox-58.0b15.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha512 = "b42cadaf16c599a7006ecd4b1660ece01381c8c0a5eda2e03525497d682e663f55926c92e189514019067d4e832b7a56b72d8e1f463a8a6803b00ae3ed836c0a";
+ sha512 = "4d6847ac04a6dbdaee05add22341837f9b2a6feadf1df8c4287804d8a4ec4d06016920fad35a7c3b8da2a1ba5c6e32ee0e3eb0086ff8606a420cdc6fa763f860";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/ko/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/ko/firefox-58.0b15.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha512 = "d9871a012c55425cbecc6db31862774b082ed3d9295f2675c4465d5b301cb61870f06330b0eb0a38f3eec69fd6adfe9f4b84b65a24d0509fc59a9f500884eca2";
+ sha512 = "7a8ed93baeb9d1927a8cac124a8ed70c4c47075e5b35f06116ef975504a11b4054c580f12ad34f14f76adf7ff70094f3b39fbf2b48f5dfc0c1e94f383746fc4f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/lij/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/lij/firefox-58.0b15.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha512 = "3b26556d53e935ae5ae02a9555226282ebf552e5caa15c77bc4c0249a3f158324e108602e2b253fcd64205d20b7a116b3ef0423296d62106e772e254edc18a28";
+ sha512 = "37c4fe4de38926120f77bc7b926dacd31de5ac490177498dc6cf6eba59150cf67a29adbb224837cb17091c5539325507644c5ebe352d2da2c42c75a62b0302a2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/lt/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/lt/firefox-58.0b15.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha512 = "9512c5ea9cbfadff84c23434547f3500f1a5add614652dfe21e6bb107cedb58606f90e4511b0bb843a9811d5df36e3c4b3d72290dfd177fe9c8df9a0d7d2e19d";
+ sha512 = "033735df43d8c8bf84bad8e32a71852462c4d305f9e768b845a2d9ca917692b2bba48a0ed416c19132f89e7044f166577f85737f07ef65699cfea7b6e6b2207f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/lv/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/lv/firefox-58.0b15.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha512 = "57d14db83f4ebc4cef05bd0d63c480665e95223a277a1357f5a311be0d95be822d48a99c4df72d82dac79d1625ac5f3eec195ca04cb835ed853350f40bf1583e";
+ sha512 = "c91e2303c67d87cb9d15a789321e55d29f232f1c165c8852ed3650edb466ec7fffa10a19ac260c9a95a76f40beb575228c6ca9eae50aec3d62653c33a7b6b1fc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/mai/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/mai/firefox-58.0b15.tar.bz2";
locale = "mai";
arch = "linux-i686";
- sha512 = "d7c49cb93e06d8a623d9537cb8e529d0b14e0aa97b15d8d924ec5341ff58bcfb29e7395d50712ebe98f8d4396b9e089308f85585ac3de07101add7aa5075b882";
+ sha512 = "5fbc1bef91b528b8cfc2660a79ab17dc9c1ac97aec061508caff5e7fef1e976b3cacc3490f3d9600a9990f24bd5b0334f6745cd4c2a4ed1c9b3ccaa9764c6090";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/mk/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/mk/firefox-58.0b15.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha512 = "cba52bd2eba6d0f6e3f8f18fb35c8ae95ae3d90a55607982bf02b0b84621ded98836a2fe7230ee05969885cf9e980b5da735ef5999e2d3745ae744c7957ff628";
+ sha512 = "582cafa6ffe662ea12bb12d08b6491a837643f63569ff50bddaade14fc544843d482b08541a1dc349647ca82ad3a8f185984108ba6876c0aa9b7bce791aa8b7f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/ml/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/ml/firefox-58.0b15.tar.bz2";
locale = "ml";
arch = "linux-i686";
- sha512 = "2ae1b940673166766aa250a7dc27e25cd64878b38620764735a68d748bf9bc8ab6d5fbe9504b5160d331ffac3283a16bed0e65d57c2283b7f36956d4fe536fd1";
+ sha512 = "4cf3e39bb4ba34a32799ec5a229fb16b8b0a7d8cac77a0a93004569d7cb0f662b8a9ea9903d0aab07784272324e25ccc6c246a3e873a7a422c00451ed1cc8e8b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/mr/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/mr/firefox-58.0b15.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha512 = "0a9d2e71476330c7964690bbeff9c79c3a81f5087e9714cc91529daf48806cf4b7e0ae0477eedeb7c4a026e38ae715a188d779e4ae3d7753cc0c06ea06ad7f90";
+ sha512 = "d5e95e2d0aaf5a9a91a68f2fa219bdbcaf77ea4d9770032db5f6a890b4c936354392b41dc9f9a04754e67c9fe124d06d1ed2085562d3d5c6f37d8709f01a7e3c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/ms/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/ms/firefox-58.0b15.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha512 = "a79e5d7978df3df564019367b83ba8229c6eb6dd6c4e8dfe8083ca4bbbfc14c3b7b23a681e418fc99e86a80ef54081de02aa3074a3d183f5548ba63b7d24b415";
+ sha512 = "5ff77e3680ffe601af02b1a8f58d6676d1bb4870ca51d928eb9cf5f3cb3ea6ee483812b9af3603f3ed13ba22a50cd8b22991afa57c5979b9265a98861f261a89";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/my/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/my/firefox-58.0b15.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha512 = "ab8d928d5a842982e2dd2a6ac91f009982350ce0660b0dd06650d482b31b450a44b3c2059beeba6d27fbd73718617168539e95037e821fde56a94969618d35d5";
+ sha512 = "0ea1bc7848c0c3264db529441431ebaa8e2009f9f0ea42682e35999b9ab972a8ed5526b84ac23104ab9fc5e4940a62d34522c2eae7d7321cffffadc966121c90";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/nb-NO/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/nb-NO/firefox-58.0b15.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha512 = "e322595f370879fb86de879cc726080bcea5cb0e437963cf4ede716e6185517b9709142cb9f63809af47065fe76e7c08f7e981594aabefe55db9a797bb164f37";
+ sha512 = "0d53378a740955f7ef2edc8cb9c48a394b447d8909e6cb4d1dc13ebf9985df99a95347021d1060e8df44884d6b96cb41dd08be0d204ab5ddce31b12eed7b65ca";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/ne-NP/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/ne-NP/firefox-58.0b15.tar.bz2";
locale = "ne-NP";
arch = "linux-i686";
- sha512 = "f35f333916bd04a1a19b15e1609e1e7cdad3b83af4d0da6d5f4a819c0a6abc269db1eb09fd91392c1141d9ffe8bb7008dd0784227637f07edc0c84e61a752c22";
+ sha512 = "9003e5b525f50a1f5f6838f63f8e8be25aba8f80c02af4d32ed125416ac81ad79605c7d15c42e809485be5f490a2363d9ba7cb8ded31e2862c4fabf526cbf870";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/nl/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/nl/firefox-58.0b15.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha512 = "4c5f6f8215142db4c609206e1bbaa00c63a7c32e594b4fae4b083a58bf759c0b49206e97cbbed60d0bcb48433fbe842e6361937f10c301add3312e90c9ac4add";
+ sha512 = "126600e3b1f8689f426c8f50a40a8ce4e81d37d4715a9a52628c14c8b9163eecf7f8dc87bec09d876a2cd73438aa0ef8e2d049d10a8e58a09d509f6d0daae3f1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/nn-NO/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/nn-NO/firefox-58.0b15.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha512 = "726e9a725317fa9b802f43cce56a46e33a091b39b0eb8803234ad491b1b708618da7d771c6e885c82f55b259d901dbcfdd4cd445ca7f5ae8a841d77cd364c2e8";
+ sha512 = "9890964178203055ce3db56d2b6b3b271b951f29598bb97a86e88ec58d1e0b9f6d71c20e6e129e5294a1023b5fd0ca54b669b8e8684d888687bfdecf1f729ece";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/or/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/or/firefox-58.0b15.tar.bz2";
locale = "or";
arch = "linux-i686";
- sha512 = "723bdc3a6aaa3edc5a81a52175b2d0abd57a9ea4c2edece31b0a408aad527ffcc42721ba4152a31f2be2975197d66da12a5c97db37421c9d821d122ef1d512a5";
+ sha512 = "5fae0bfd002c36f260bcd1ee868b10d422c55afd59012389897b9bcfb573c97669af838c43985cf4013448ce3db17ac9f8289a152edabcbaf4de48ab05dce8bf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/pa-IN/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/pa-IN/firefox-58.0b15.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha512 = "ba5d3556eb972dc7aa5bc380160bd040fcd15d3785c9169b594118ac6bf6a4b17d131ba2ae9eb0866b504ad342cce1f982506ba72194db2e6b3c5b5c363cf6f5";
+ sha512 = "10dbea6ae21ea10dae7846f16ed5530466bb30bd8bc864e6a81e2dd9d2918dc589138989938c4781a31983a14fb3fa23460c3555fe35deec36f20c73eb1bbc5b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/pl/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/pl/firefox-58.0b15.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha512 = "7339214b75c8407df9fd53b4022c8989c78e1f4cc033c6d7c9b1e59ba15d0db7b7c0d96c0d534a146d9c6522a60988b9e52970723bb9ca70e704b3cbf0e7080f";
+ sha512 = "39c25f849d01942c3c457e3da71f201abbd7f0d6de44dd6526e63ac4e27d1dc58833363b9cb1f2160abdee3856653baf6dcf35853923742d0ed90d4e8ec673f9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/pt-BR/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/pt-BR/firefox-58.0b15.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha512 = "02056e9df5826d4b61af90c85a040f7eb7e04879c4388a44bf428c81ef867683dd7f25a3eb6618d00014ae334475d8ce87e42f3f76d22e11ad90c4440ddc4bc6";
+ sha512 = "5cd3c37463cdafc8b56bebaf0d4ca1a592af9f366d9a418b5f2ab6dbdbe59427474b3e8fb489706444fca07a13ab27a10d9781ec30278e4d87193ae9fec12a31";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/pt-PT/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/pt-PT/firefox-58.0b15.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha512 = "834a1c81bf6bdcce54bd9d03a60e3c5ca732036d792a01a9dabeb74d91a7d7b3069e6a7a47c4c17e49beaef2487cb1dffdf335d64c2e17755320831f0bfc1af1";
+ sha512 = "d9ed06e17293216dfc23b064524d64fc7c6776843d3be89278b4edcb979c11cfd517daf82021fa31bf69b1c9678b1b41be5c535eaa46e3f29c02fcf2c392757f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/rm/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/rm/firefox-58.0b15.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha512 = "52da3e8177e85929e29358d24810ff906d0919aea3d8714686179eccff0ede8ecfcd296d16093ba8effce91b787c4cc778495d4fc5dda37eeda6156db1efc310";
+ sha512 = "8f2680d27eba876f2075e471c9b5b4625833f58829ce5ff3e61e9ab9bc269d7350dc95b6725f85e17b02ac36afe435fd4882c42ecce42b23089c645c1ca28262";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/ro/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/ro/firefox-58.0b15.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha512 = "e2bc8229a07bcfbe1688ae747b5a86c1a08cf2a28e2b60a66bead92f3a6044e2545c2a3aea48b9adda53874d75095b3c6c799d8ef0e105daebf8332ad754aefe";
+ sha512 = "e37b53786083c851c7996e6b936be908a03c26716e8697699c9980ea5da96c242d10b1d1da23df43e77c417f32bcd302b645ac0cb146389908dea8aa51d007c4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/ru/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/ru/firefox-58.0b15.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha512 = "bbe2647f02f7ea4c13b85dbe093fd6262391b371e8662ee4248f76cc473fdaa8197e900949a99c4e74ddae97fd53ee297ee7b44c984b2ca536c0f91d0c615d4b";
+ sha512 = "66c7933ea20f122159faea020959d016e75b1c3a5be1de406fe14a6ff285218f1ddaafe4ae8348e4fe3bbdb918e13564480f9f5ef5661f26667e2f7908931c62";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/si/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/si/firefox-58.0b15.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha512 = "2244b5df74eed93c9b5efdecf32528e8da35efba75005371884137ba67f4716c09dddb40855d725a3c04f32c6d9bc2c9f7063fc26f280f9f3e6bcdaabb212aa1";
+ sha512 = "2f468691aadd1d324eb83130cfa7d5853907aa5bfd0a00b628257ff5fd91c18b80328b546419746fed8726976430ded774de6fb37e02b1fa9f954eb65f20f94f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/sk/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/sk/firefox-58.0b15.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha512 = "fcbe3b310044eab2ed333b3119e269b97267a94367e374c6219ee73ea0861e8f7013d9289704a79f687a15926516fee1ceb478419fec417754c901fdd440aa51";
+ sha512 = "85914a2ea3d5c6a432665503454f70943c2aee893a9d4f62a45e3a3141c23e5aee9d5e04bbb7b2588921cd649b5e55b88df693689cf97144bf806b017718c809";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/sl/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/sl/firefox-58.0b15.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha512 = "242435a769bbab34f3a20ff870fb9c156217973e8194b07cc0031a1b8b9ef0bbca33b3a65e6534662d21e34170944e2602ae8fba8357a42d09ff76ddbdb83711";
+ sha512 = "63c749783d06259127dcd29f95e404fe7b59810ee0ec6a4d53385197aca8c2b58425e3a74791f9ee3b2d157e25d5a0063a11c8be716584c4c1989d31bc3dc0fe";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/son/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/son/firefox-58.0b15.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha512 = "dda8473e2f42dd804bdd1e45fef7fe795f71c61fe45c495d29f8c19b274054537fbeaa4cebb970030a19b3f11599d3e5f1361f4a43c86c7a800b29a3adc33027";
+ sha512 = "e7eed20a0b10d7e6a6d6f29262781f1228d5212581270ffcbda601c7f2ecbdda89c983347d5674aba7a0f4ba6edbb401bdab870ca80438ec9064042c693d3282";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/sq/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/sq/firefox-58.0b15.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha512 = "c11d427280dc9a82cbca357bf356ce12f1f5d08e1d2bfffddcf3547396b7f198ad51936c999223424afca5d952b474a9306f8b8a4e0f3e885d6ca1efb28757dc";
+ sha512 = "4957b51cf2cf3cb889674137e7b5482fac02889a5982a9d26c7dc422317a47f3e973ddbe09f9973ee2fa6cbc0f4468d937d57ea2238f36a339fee3826d13d723";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/sr/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/sr/firefox-58.0b15.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha512 = "00f5d6131437443acecb2046f580913427c7495b12474d20e08935bb0b1553018c65fedf035c733d557a5368ff7f926eb0461236397cfa5f05d9b22bd516554f";
+ sha512 = "5e38cdcde20b5ffa32f546d122eb68e704ab83c8e631bbc332a049f18c7713c12e87a077038e1f8d4f1c9b393d4765e3052eb5a2932832ff11ad5d0c59e7476f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/sv-SE/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/sv-SE/firefox-58.0b15.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha512 = "0427a9f50c9e965de50ee60a169e18d9fab6a4c6eef501d97a7a6dac4b41f0ca44e088a3d40b147134856375d31077d837faddd73fb29595a4ea2329bdb9fa44";
+ sha512 = "aa938c6e3fde146d2daaf54a73cdd71b9ab3c2a0bd5ec93af0dc5f5dd2d6f21dbe1ee2081df32922509d043801cf81164e58f10aea5bf1dfc440a656828213d9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/ta/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/ta/firefox-58.0b15.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha512 = "2020ea9d45bec7bf45ea6edb5dd4449f0a06cd6e136d6632b7b62ca2f4b16b74b8c563e25fce5d0632c5b6d6c302564c5c9110f51203a95a46924aaec14593f6";
+ sha512 = "fe67d505b86d4baf8cb7ecd7fedbdd76b04838854c163f0f85fb61f3d48e8f43fc0b8e30595aef6094cf399c6b9450f056ee52dcc6af1a967befcf291cd24cd5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/te/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/te/firefox-58.0b15.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha512 = "91198bd9c6a75eabbd5d2e6e8b2bcae9fa6ff95c2c96cb53b2659a3340c2cb4355abce05db307fa10734ef5dfb5bce5a6b8738f5ca1e9f45de35604ba745d256";
+ sha512 = "ab5618e77cb8d81f01cf18d1aaa4a5cc56f7ef5b0311631dbf7fc3d65bfd191d692f6bf163ba55cbae495a14cc4472a66fca6a21c839b80cb295f87730de0256";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/th/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/th/firefox-58.0b15.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha512 = "d266ea6b688e7b1174a5a1b2300f51177ac62fb45dfa8f6dd2b9ff80febb6587aad39122a5a26ca61b0f647e259adf31a771d08ae96a863f2e476ec00717a91a";
+ sha512 = "e4af930d960eb69edff3e00b8e1d38b358dc5881f5a41b1216098c13b64524cd8dde62fd30f8b8dcb52a71a6c245a2b02e253e79675c09b1525501ec105ab370";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/tr/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/tr/firefox-58.0b15.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha512 = "f5450e6b6aaeb15e207e585110412136e2a222b3353ff1f5d34c2c9e1e05146711f8d383bf7dd6c1b32309f4a4c79cf5fdedebc7e1b26269a5b46da6f1bcca28";
+ sha512 = "882b5a340a31f936243dcc4c995f87c4f9a0b232c693b52b4e18a39adc0665788161520880a51c521941bdcd7356b15bf12bc32bb60301e40f160130cb56bc13";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/uk/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/uk/firefox-58.0b15.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha512 = "4a79223c3eaaac901870ee4057f9e06c96d21c0ba56576006650eaf470704040b8ce1e3202478797edf3f11175f6a9c369fcd39437770c30ef6eb2a851a83c2e";
+ sha512 = "7273f65835638020452ebe07bf6ad0b6582cc1b6e9abbc48a0a6848e388b374ba466b7632e7f2ab127cbb6bddd0dd016c585bc9847b48fcc75c05f500f6ba400";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/ur/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/ur/firefox-58.0b15.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha512 = "6701f250564f33603a52a93efe71b13e0233b2b4097ee7c76b5b575702c6b664a226e9da5434198cee3bae9168279ecf2718f6a9df4382c4a87a7673e930b711";
+ sha512 = "cdb12e5f42880c360bc727642e9ef1e4a874d93a67ffdb804cddcf77500f0d448bff8e8da4647ca649f4a568fc54f6fef1a462ed423f4f8f58eef36b2aab1916";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/uz/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/uz/firefox-58.0b15.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha512 = "7c99ae0618aeb2618e3aec1685cc76f965b9a101fccdd4cce2c6d9dc05be17f1e61f5651a8ae3e9b128b90a53452e6e5de066c2c6386dc27ac921212dbb66130";
+ sha512 = "db698d0a807f8e42b45325ef2c8ce91752e223de967b69fdc03bd681a92b2fb4aaffe83ced210a2bd9486d025d5bac5982c9018a7ecb85bd7fe1c1f98aeb2317";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/vi/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/vi/firefox-58.0b15.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha512 = "13bf63bf2fa35e5a1590fbfcdb4eec5b82da52467222a77dfea46a046c5f8c5a2a1431c7998d83ff2c17e9b9efae1813ea0a0f815933cd72c3e5f5d420c98822";
+ sha512 = "c33667f93a1bb20844d1ab4e94328356a2187881dcb66084ff52d2c284c5ab6cddf7fe1ad281ff03a5fec45dc8defe77710985add796d879e7a3d66c180d5cec";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/xh/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/xh/firefox-58.0b15.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha512 = "7d1ca71659c864e8b9b6ebd755fac0092dec587d8270fe47a74e71d94d79e03dd503a5d465112092cd42405f2ce57aba0d3c7dc79bc64fce84be3264801e7094";
+ sha512 = "ba5f855be2cc56385cf821ceabee45eafbb528e1f7900ba24719fb68ed0bcb82a1b54566b82df6af05cfac6886e999588ddfaf2d952527eb092af685273cea2f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/zh-CN/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/zh-CN/firefox-58.0b15.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha512 = "c3bb1b02e625d232a00591a651acc2f375f01fb0f0481141315ea1b9e93473ea85cea25a1154077b76f6e408330595d7053268c2048dc08802a89537eea3102c";
+ sha512 = "b4a5984c8043f1c2156f241bea5fabf20a878cc3b437b4c42fe7cd8f220526569a8d13a0d69ed8d4bff77b13037080264a6684118c462cdf4af756accdbc5e55";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b8/linux-i686/zh-TW/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/zh-TW/firefox-58.0b15.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha512 = "e22f9478666e677036ecd2fb3febde4f12727794a49b12a55456132d67f0ed735c3bea3ee0486c81fed8f432ad0f57d301c1dd245f324d785d5e368494165018";
+ sha512 = "62cb4b3e2d80387a01d3ce380f0c11e60058180a8d31b462612bd3c0a254a4cc7a54b0c3aa1f2cbcf6082421a142cc3ac7d224853aa763dfe592f790ada4e4fa";
}
];
}
diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index 751abf3d755bc1df3184788250dbecf04b031b8b..6188997f7c53d25b62c102416530b936a96161a8 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,965 +1,965 @@
{
- version = "58.0b8";
+ version = "58.0b15";
sources = [
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/ach/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/ach/firefox-58.0b15.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha512 = "374faea01685a09e506c68649c15990fc8f3b274e2e0c9e8ba6d939e7ce32adae3ce9ff98a5f853b6b3b61b21fb0cb30dc340241a439990d70282ce55c07d2c4";
+ sha512 = "5f45451e3c6bda0a244fba3165336e63356d8d1328a111caeaf87fee565d6f4349e6dee4a6f12e10f350a351adc16d5b7c02807528cd2a1d700bc12fa82f5f94";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/af/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/af/firefox-58.0b15.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha512 = "1dedf4685c2ee74b6389654172308c92c0054666010e54920d98194a3a37b40f19254f6502eab7c5ca3152475c9dcefd242f8ef2b016494ff8afd1692c45aad9";
+ sha512 = "0766f3ebd914c2c9090bdb4308034919b73d448b63bf3af6ff0758c0fdc8727ff0894fbfd5aa90bd6179fa07fe6483eabda1a23a8b480aec06bc016e30ac5004";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/an/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/an/firefox-58.0b15.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha512 = "bac65ad1954e171393aa9c5cdec78d753b5699707b79ea0225ca045f36d341802e9481fac996e4fe153a81ad8f0b0f4c31ddf3b2b1b2773e90e5c1ab1e473802";
+ sha512 = "cb0b48aceb07f6963ff2c3cef2488c7fc3c13db9b142da555ffe7e7535e3d4bebad102eee515968163db72238d6ae182ead1cf06d023070f3d7e758256ea317a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/ar/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/ar/firefox-58.0b15.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha512 = "6cacd3d76eb0307ad612e8e7eaafd16a4166c53508cb6b2abc04fda258f5435a20240db03529d5791afa0494ea5b68bb206454ad0abb23d64c83d1acfa6eb84c";
+ sha512 = "1728cc93196e1d3bc1f6894faacf522c84ec5c6a1b6ee92e1d3b2216344c7e8e836a43b224267676999b8953d7c947b181688f7edbb093626978ad64e120ec8a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/as/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/as/firefox-58.0b15.tar.bz2";
locale = "as";
arch = "linux-x86_64";
- sha512 = "e49d8f97842c7b23e066b3085215463df6aaeb6cc5ae8459648aa06ac81964f071c71c4702969f83e2b6ddf67167e2d920e2051cd919943b38775fa66b707315";
+ sha512 = "31f649a7aa494c6503129c5cf84917d6cf5bcab3aca7258d654b1ca451144fe77962e85f96515dfb6640b53db02b39bede04f9554b53beb82ba7c8876b2fac11";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/ast/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/ast/firefox-58.0b15.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha512 = "151b6c5f9126dbfb9bdddf8cce3b86fe11764a0294531740a68b547e4dde1da5152b4a61f3cb0b40c25e638788af6adbb939087e08355a0a4cb9b67b0ce3fd30";
+ sha512 = "8dec2578c4fa48dd54d3348aa0141434335e2b3723c107d38f52f77a9f6ed9f591753a3db133d2e806c9c5ae1e26560cd8fce3adea253af21950aff0d70faaf6";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/az/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/az/firefox-58.0b15.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha512 = "f55b86f87f54aafce4a53e5c5e833c900a8e1e368c0a923f9767e13c401931b3fdcda27b19dd6b8686368a06dfc61cf922515643e1d2c02aeb7472c371a76b75";
+ sha512 = "857a83e79b80509012554577c84fbefd471929ced8328938246bfc8521c2064fa806d1dad500012e9d4a5827ebf19ecf7d4b525fcb12468779a8dbb98fd2a64a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/be/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/be/firefox-58.0b15.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha512 = "b72099047fe2b814bf6ba37a261627678009f1627f16235365c669ef92d6ebc007b8fe94484fdcaed0a5c7a0fdcbb23743bd50b0242fb416d2ff92775aad64b5";
+ sha512 = "bb156950372b518c92c6c46e8c99eecdbdf0639780a9f73985a3070562cd1f9690b278fa5acbd710330f5de47b799a38eaea45e9f99d2801bc3f156852b7ff9f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/bg/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/bg/firefox-58.0b15.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha512 = "13e44eb7e4db8e8e63c52d50318fe484691436bb96f8ab202370a4e521d75059c3f836c8c25cd95a29fdf368b819e8a7d67b80c5ba23821ffc7ff3f932e9cb3a";
+ sha512 = "1b25f238754ea4c4798b1270874a7a8d33c35adc011a55187e82f8b77d290e3fc5bf97430622aba8ea155faccab83c99d4d2c66b49f4f2304293260604879aa3";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/bn-BD/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/bn-BD/firefox-58.0b15.tar.bz2";
locale = "bn-BD";
arch = "linux-x86_64";
- sha512 = "b5456db45f852b8da545a66eb697793a59527083bdffce50d520aecab650d909bc37d24ac461ac8cbd45980bcddc9d27d8eb1346151fbefd10fc4d6821323ab9";
+ sha512 = "372978404f4c60dee651d31d7ed62d08629d9c71f774f52845af62ccea4c53ef9b6346acd59e0b2dda0e874378324c87de1f298e3c83318c73710bb9015f2588";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/bn-IN/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/bn-IN/firefox-58.0b15.tar.bz2";
locale = "bn-IN";
arch = "linux-x86_64";
- sha512 = "2db1811f35f64341a9840812eac61dfa7687cf030044441ccca94ffabc10b8acaceee47e5b6b2498ab2ac8bdcbad43837b28466b8e332783ab5dc25ea42ca8e3";
+ sha512 = "b49a4e86e59a425e02e02f916285fa8004e6bca3badfa269a4ebe25b4548c053ec32b195c59eac6cff2b9d34c966e46df0d51d79f0a95e2366991c10e02f4a38";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/br/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/br/firefox-58.0b15.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha512 = "373deebbe9778c3f8007baed0e1b0816174c98c1f08a5a1c8deabad0ac61aa1bd7d568254feaa8ff7ec250d4c8fc56fdfb30d8d7c758276d16e982eb641f8eea";
+ sha512 = "151120faf5408a4e6ac7d4513ad4094e3e816d8b2ccbf71880cc5381f0ed5db2442a5e915809121a37663a726ffc7cd7d708138ad064ee34a01e8b4dcd46a2d5";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/bs/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/bs/firefox-58.0b15.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha512 = "8a8370537e076452bfb31817375ea13841722c2125c30af6df732f12455ec590e0d6eacaa7d04dca1b4e46b02d2d051d4d83825b5ecf69048f5c706232be2393";
+ sha512 = "efecbe8eb985fb8dc670f495928bba2bd14fe90f3961f2ceaccc7ccc0f95428c7895422433392c0197907918db8a47525d3978716ee98d9e28c905c86611cc9b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/ca/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/ca/firefox-58.0b15.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha512 = "75d0c63a7176bfc26dc19735a0540d0f65b5e8d06af94163f39e588186f713510ed6b3788e3229b9135dc28f200f4116bdf0028452d4146a3cfbc36a11d8a0d0";
+ sha512 = "8344243260a556097b39151c7a30ca9a3995464a7714c59a29f6e4c8d403747c1c42b3599e2119a0d95beee57b16ecf5d5b0617ed9c01ac4c1d9a3ca99cbbabe";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/cak/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/cak/firefox-58.0b15.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha512 = "c7d8776a1521bc7183c7d988bb8d2539902a93bfecf931ba51a33336920c7c20be87cfb8fcba310f3f8970567053d98b134e28c9bcbdcc1050f54e47fee731e4";
+ sha512 = "59410e166e2bc7e6b33cd7dfb4874afb10c1370b5111c8eddc2a1b8f850a758b5069c96a9f8a9ef2b3a8542f5f2bee1e9317f9de348d9cef71d7b3afbeec7f64";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/cs/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/cs/firefox-58.0b15.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha512 = "2f20f2c1d6d45fc70b132909fee29551cd52624b7bae5984ce32c9f138b01dd4a591d982d6e25da69a9c812c7ec0e5e940d5b8bef17c2ae4edf44a6f0c77b23f";
+ sha512 = "36ae810e289df49c7f7510c53e0bfb271b9db8911f3bb035d5c6f3c6a05b3086311267987a0ff1b26f65df8f712c3088225cd8da403ede3872b160b20dc7d8f6";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/cy/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/cy/firefox-58.0b15.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha512 = "6f6a75f9464126d03cfbd1978ab1eb5bd447762f580b688b2fd1df8813cb95725393c982191da67943df743c5083e3bc1aa79db3961fc9d1fbf7cf00a1dfd224";
+ sha512 = "3c0bafbdf540788fcb6853b983fb1f333288364565ea4a521439e011687c4eaede93433fa11e156592b3bc665ba30987e74a99792af642a08a526d3364112f47";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/da/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/da/firefox-58.0b15.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha512 = "aced21c9628cac4da0c8441da22ac63f6958f3499bdf4c10a18f5b826cad0a4c165ed5e4465e6d56b319e0002b8f13da86de0874d38ff08644490eee22b685e1";
+ sha512 = "9881bb8fe03243c876b12e84561d92b9b44455b4a533eae382101d052a76012be5ffedcf978bb26f5bc1fd16bd51dba8d7d8e2fb63577824fe654e3010b0f600";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/de/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/de/firefox-58.0b15.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha512 = "74ea14fe715b6f618431a59207d1758b2aa80843a6e476989342c16c8fac03d6a79c13310bd81128e40c4c9de352f1271ac2260ab99517fa685e0313e6f121c1";
+ sha512 = "ca0d7bec2d061d7d199394f4a91671eae4a39242b839045dbe2423943b5b5547c1f71145aee4b4661bacd58df30e7128ef54a4ccfd3262de81b4e7b28e747cef";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/dsb/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/dsb/firefox-58.0b15.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha512 = "bf2f10ebb34cb5741b417b1537fe3023ab896bf6e6654bdb8feffd4a0e5377b4027e6dc550da4ecd0e51c03ece13923501bc7eb9aa6102056757f2dc9dfadfd1";
+ sha512 = "8e94787316bfe887def6a6147b2eabd2840d3908eb24b6fdbc5d3d18432fc331144b895dafb2152a20bde11f45c3ed961bf57143a7ff0d65bf205fee5a0d882f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/el/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/el/firefox-58.0b15.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha512 = "32ad277d0b5403028c6b7ae3da8bada79d7b6eef9475332f98555eb10ffe5ed2a9a4b3c49789528563b180876224d48c594601844ba048158daed8e23bfdad24";
+ sha512 = "d216e8c19e805bf7bc3bed1a0e2be4677c6ac1bcf478ac9ed483555fb930775f2e75fa5a24ddb7298ae0f0ce3387bbab65d9ed18c6422a574d688c48801c31e2";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/en-GB/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/en-GB/firefox-58.0b15.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha512 = "fcd070e453e7fe95aaccc6478ad1ae120231ad5b44628b7926ee23c239af8b03fec70c7fafe6669d19f0c3c5649104cdc31420f6c8dacc6077aba6939e64502b";
+ sha512 = "db5eba83f1e360f4a328cc44932589efdead7bb9dac03d3e24244ee5134456b149d879510bbbd762d5a64dbe2a965a39a7e2e10d8517a9276ad6f0e430101387";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/en-US/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/en-US/firefox-58.0b15.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha512 = "24f90c33ebf850f55574547ca696d46ef05fea3257d563e838f3b6d0c37f3b0c3a7c470e36c35784167bfe3666bc20c35ed56155ce5f037468896b2885a02179";
+ sha512 = "92c7745f480aa31141d47fdea7efaa67488add079b406f9f8f8b9f5a6cb066763dad197fc9bac4f31fe395c0d8c4870cd82b3f3fbd67dfadb811cf16ec6cae6b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/en-ZA/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/en-ZA/firefox-58.0b15.tar.bz2";
locale = "en-ZA";
arch = "linux-x86_64";
- sha512 = "eb796022cf608001a75871ca71402027ef4d8e0299d878fb0d72c63a51f6a6eb7bc7411230351446a0e43c7911464765f704aae93364d46454ef72f2375bf930";
+ sha512 = "74ed9e4e0f19818a909b60b1d9ac6e4339c55e4be2d1ff69c68e9efe35619e775fd8fe9675df3b7d32b2fceaac4e4b7828c3e0c219284da712c50e097d6e6ce6";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/eo/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/eo/firefox-58.0b15.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha512 = "ae0710bc6e5aae7485825bfd5e361ea3b79e77d8134b0a2886ac43e9c0a5e8971cc8ee925a0f93a8047d58dc6e4d821730054f375f62fe449430e2d4de6ae485";
+ sha512 = "24f181bd168cffcfbd100f1e8e0a653e87f6558b2bb86740acbc1cb572899b23c96d36d05297420cb7fe691180eb2eb5ce27f44a7d7566c43da499a81f294d59";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/es-AR/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/es-AR/firefox-58.0b15.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha512 = "5c2be15711edecf69a741aefc94ab0f537991ad30991a2b5bcb4c349532a6af319b3400b6b0d2e9bbefd70c2497584f10595de0a428c59f5cc6f6d09a9eafdca";
+ sha512 = "ae9a27c1bd1029881b8c671621573a3567524d90ad908ed41bec01fdf20633c779a4d5d7071d6adb46ad9dfeeffda24fe1fec68043d61325af4b54ae69a4c7ef";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/es-CL/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/es-CL/firefox-58.0b15.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha512 = "76d46741a0649526df0f952458e1681dfab814824a849b949f3d863e99f053d456b2f3c6507c40536e9feb2ab0c34438be6636ee55fb61056eb5de6faf5b20ac";
+ sha512 = "1b83ea05e646fc9cce6680f6213d7fda11bb215cbfcffb3a658b86400d532f87ff2634ef9ce41800f9c2e52f996d043db24568eec2e1bd600e3269a1a594f3e0";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/es-ES/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/es-ES/firefox-58.0b15.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha512 = "b8deadffe58e187bb4ffd690bc8394a41ec7c4d1d38046108a16890404ff2a7c2b70fd38499e62e5949f8d31d33d9222200217ad487d6414b5658c87c928edd0";
+ sha512 = "fb71902fd787c132a796928235e5c5d9f2a5321c1d0d39796560df7ec5de4c4b9afd2b8fb8fc110231ba48b90ceaa2435d27b9e0a4901b7ec0fe311637bd667b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/es-MX/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/es-MX/firefox-58.0b15.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha512 = "deec9e5d9e290d69aceb76d7b38f958cf4bbfc64f64bce865d46bb04b35d516780abe3b53bb984c496218f0d834932d9b87e3ce2dd5e224e6eaa08114ebc4af1";
+ sha512 = "bf2fa28f6236fe3d0412184281dbeafee1312c73c7e4e8198dea6826bb02104f6612de2cee58dd06892b97545ed21806222cb3dd1c6376cbc84c0614617ba062";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/et/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/et/firefox-58.0b15.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha512 = "5587499ee0cdf1f6dc70477c9bff0e74c5817e7fe49ca998af74e385bb6d9a8362542169c4d34d8bc6911687ebce9a0bb4992aead8a85de82a0b290c82622873";
+ sha512 = "42de2023547ffcb44b523da8dd6b03882508a4afdc2958cd652895517679d2b87e153120de501dfc9898f7ddebf99e9807ddbf74c874c0182d3c0b0de3c9bf2f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/eu/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/eu/firefox-58.0b15.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha512 = "dee02859040e8da81deb5498e6a5a5d9814b08ba0f73f0772d41f8641fd0887917c979c3cc2ffcf354842043b03b9fe2e844e5524103e55962d85cd6ed0fba06";
+ sha512 = "5920709355e1873c8c809ecabac2a5435050fb4449d1bd6efb565f0a3b0f54b80792e31ee4edccb5c280fa19a673ce0ab5f54ee7267856b19ecc1e6df0b48b97";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/fa/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/fa/firefox-58.0b15.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha512 = "bdf707d278d68031ee2e490401a357161c07eb178f65babfbe5a7df2a8ecf4660ba2e2cc4c46f01c092948a8c5d8917805a6c1bdf4dfc3f66482abe31e00ec08";
+ sha512 = "70ca3fa3345c551bb64f1d5dc8aa536d8879eb3bdfc089ed58603401550fefa479d13451c134a797f779cecb63d8d2e2e8e5c5d32115284c5f715e933a9a9a6d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/ff/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/ff/firefox-58.0b15.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha512 = "2f7e1e7e989a26c185e8c7a25c83c3f138c24c035aacc1b68ced1304e87842813f6366003c9b5cfcea775a4e0e9672f994dacdb07b5ae9b72d7e296c77a80dc4";
+ sha512 = "7edd5c4a088d9d546a070385d2fc06231792150e3079722c24d3936b84899ca15b548bf47528a7e5795470447716ca4e7457c252f0338e87f93180d1fdf055b6";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/fi/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/fi/firefox-58.0b15.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha512 = "49b04a1dcfd25571227e2df5008658460223ce5a99e838040f9b708e4787a54842ac2e0847c7a2fa5d03175eadb6b1b99ed42a1557cfdc87b2b765773d4fff4c";
+ sha512 = "01e080b851846efe29583f5e5feef0474d24b44072007cb7336a639b0b590388e80aa7213db3a2ddec2a019722c606d26398711c4516f97bff5af4b33ecf72bd";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/fr/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/fr/firefox-58.0b15.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha512 = "63d68d7cfd59fa6280ad5f4eb98d19714ee37abab9d7480509f836ab59dfb82dd8eb35ea40019eea2dff3569da0e4db499494acd81c4d854954dc829c38ae614";
+ sha512 = "8cd3b3f21bc16dd125d74073a83095111972d963bce5f0c46e53dbb82124ae27b13d18f75269a8e689e0ddb95bae8042e412ef5ffe85257cd46f098cde811ba5";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/fy-NL/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/fy-NL/firefox-58.0b15.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha512 = "c5aabebd94ee53dc1be189f34874a3739b959cf68de3e580684ff8c34f3d8b85408bc76000d026445b5e68ac01dd1c82b12adb7c1ab64b6cd6ef56559e578508";
+ sha512 = "b55dcc12e3b7d8c7227fa490a87375de279df2053847c9609dc168a89a1012aff268373011fac397c655fff39f2bd47d0634f0086adc2d1f6a26ce4b2aa45a59";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/ga-IE/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/ga-IE/firefox-58.0b15.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha512 = "b920d3e352848a6bce70288a01cdb5065679e3db6613adb86853de5be42ccafa525c7d00ce143119572b7717411250ebc7e1ca71382d0f47918df9e239e8ba97";
+ sha512 = "8563b91045395bbf2b267b7c1821b5a413802d1b738f769a10cb1d962c6b7e43ef8d3119fa17aae69d2833403d027bdda09f1766757717575f74d89b72106b42";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/gd/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/gd/firefox-58.0b15.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha512 = "9e236bdf7a23c6bacfacadf3f0413e67a00c6efaeac065d99bc865a75b888c14d37660fce6e6a9fb1e01789f429dad69c0fede66c89e215e0380918118ed2b24";
+ sha512 = "da416b1433044d32e3d935ba20fda52b10eccd3074f1015e17e7f3acd68d1993e8bcab39dabbb4d5dd820aca9838f2646b669ab027a75f6cb4cad1d442889ff4";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/gl/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/gl/firefox-58.0b15.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha512 = "53e52194563e58328ba587adbf3e9dbe897ab207fc3c3ad00263bb09380b335591a00f0633f6efb8e25ccb48dc72041f01b1e384d7552514e76337c1fbc487d5";
+ sha512 = "ea61a7d5e2b5ca4f6dc84aaccf9121aad5809eedac424d6c960724ba742708e17805ead7b567b3522ad4c8517c7632e05afe0afd39de61a4344ec3dc415d03f2";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/gn/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/gn/firefox-58.0b15.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha512 = "a2ac0d6c8c295c7c3f4f306d1ac4b55007a70090fb693d2e6b873057734d6b7fbeb2c0624ca42c466182656025b815f42bd16f22bbd9f4d7884cb2959559aeb1";
+ sha512 = "5cf347e0ea276634114dcd35bf49b47c57d86fc8bfe3f1a87b2eef93fddf272f35113e76a65340f61f03b525f01782aef42e2539d9db9a3fc55d6a3582127892";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/gu-IN/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/gu-IN/firefox-58.0b15.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha512 = "9002e67486e672ccc4602e3915f351b91c3ad62e5ff04ae008c04f5116fe7ec1c9cd98acf037a0e7a7a11b48ce0a327e43ad2e49e12b361084cd445837fab47a";
+ sha512 = "7d54b897c513a1ab865cf663dff5a1722b0b73715c4c195e41102c0165bc55e4fe1ea0c5f5438d719a2c6fc334876c055201b01c04e4072d5df5e2ea65e5de0c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/he/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/he/firefox-58.0b15.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha512 = "a4d8a61f6709b37ebf2e0077146496af69a7dd54002f2261eb896539d24194ef3bae321d2ae4261b2cfbe68f06468d6e7cccd9e9ab1c748e44bb7b69aa45dab4";
+ sha512 = "1963638a0d39db6b60cfe7d8a9e0556ca4923307469c1ff75c6603ae8a528fb57efe74d239ab730b8602d4e974b91d9af5cbab9fac06b6fd6d7fe7b0646f5cd2";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/hi-IN/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/hi-IN/firefox-58.0b15.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha512 = "33d014b4ce41d63e0a28b41feb37d07a8088dd105f7bcf2006fef4069735aff64abc126b627754a1290691ec8d5a6e716254d06cd4983a04fdeefde801b03e05";
+ sha512 = "e3f8d5de30533e2c4054d7716b6742906f648059b5718e2efc7d4f1c7b78c6a68eefe9ed96326c5580a2faa499349f3a96e3abde0a0a841d39c13488ede701e8";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/hr/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/hr/firefox-58.0b15.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha512 = "9fe426d0cc38794a1a08df2b14bfd893348798d699e1861ec977bd2131f72790c5aeefa5c3576a2a6f3bd460e3f5800d33ef4ac867828bd32e5a2c3cbb8eb5ed";
+ sha512 = "f2018fb0b5ba5001c63ecd0ef6074e8a1b7016425c1f1bb03e2ecc394e6c2c5e8961b5a53810ed1ea6e1a1e2329653a2d810bc996f786084d1b1381114e94eff";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/hsb/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/hsb/firefox-58.0b15.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha512 = "19bce4bf9c6a8c33519e4943f0ca2874538e9d5da86790329973f970817b54a36b9a2a0474267340ac29c6c3433da700a122dd07b0b72939c83d258dcc320c94";
+ sha512 = "5e87e5fcaf378d5e25421e05315d6e20482670c1c6d659acced5a5db26078ae36f8de8c1a5c5efae35a5658ff7137930292506daa56fc6511ff592be621ede0f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/hu/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/hu/firefox-58.0b15.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha512 = "707b6866b17393d74117fbd9cbf779f4f41d5f79372aa96ee894299218f2454fd06d5286f1057571eebed474b06614fe52347df9f27bf47f23c432d234976964";
+ sha512 = "b1bd4af70370b4af4a43b383805d492699746cdb07501e56f078800e4913eff2df641c775b850b1e3bebb8338eb91b5d6306f9ac1dc16965c139a1aa4a379f72";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/hy-AM/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/hy-AM/firefox-58.0b15.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha512 = "9dc546d19d77daf0092acad3ef48c7699d1a46270284448056d3793fa68e409d8335d92a105b3cd3219a6dcef5b11583cc45f5a4a8d27761c0e2475eaa101a4f";
+ sha512 = "b2d563bb7814db8bd0b6191832d5fa525b32821bfdc28a759c7245999fc7df70484bb22013dc1f40e467c24dac752c6a6bc8616af0c226c9983f24877ceffc40";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/id/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/id/firefox-58.0b15.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha512 = "3c080d50966d5821b24acd6181443fe4c5095a8dbd1b2cc7cf550c5e5a191a2ba1a78f02a9c1323045445ddd88e28cc3e3328fb07e08ae0ccf40f2335b1205c9";
+ sha512 = "5b62d1040b77ce3c2e0a5fee2a4216a0272c4cefd7ab2b8377133375a633b87ab29c06a481294acb0cd0976bf8d61382aa183c078f3b762137a6750eee9fddf9";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/is/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/is/firefox-58.0b15.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha512 = "30b3a169fa8dfbc7ebe1402f7a28c7104c0b03ec5f038596257a5344649b35579cea31f7649203e1db95755903bfed81b095de622aa18f5901c4b3f8ba64bcc7";
+ sha512 = "5d30ef6381800fc14e71d101f612be404fd3ea4696ec19a62fa7fbfe3ea3b729169120cfb625bc3ca49f698238aea37131e2bc8a056942b79d026cbcacce5525";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/it/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/it/firefox-58.0b15.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha512 = "f39586f05c3d696a2c22c183e37d498d4192af0b33fe0ae4f534a304d7fe03a745000b6b2686ffc21bfd7dd2abec1f68927515959a2f90ec29186b4050b459f5";
+ sha512 = "ee435c2c9bc9c5eb69077832ee2119792db3c3845d37fbe3df47f3c93cd7772eebc65439286c55f76b9820fe97184218cb2370a436c9f2873698ff6e53491fe3";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/ja/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/ja/firefox-58.0b15.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha512 = "81e9d91d20d547436060f5ac048d7445aae010843d2d91a60489c05f193a6da82d0acd198ecf76afea76e62c56972d420041ef716cf0f6799f1a77f7ff766556";
+ sha512 = "44681aa65715dca2a05aace26bcc3b05e8152b07f44017314caf11cf0bef9c017f4522880b85c1c859a684d92b6f653e0c822358635344949ed9964add31e4f8";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/ka/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/ka/firefox-58.0b15.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha512 = "f43e6203a352632d040a7bea1744ab8c5c02e027b4d07286616d612474ae8addee8ed5e70242f15e8a3e1e309d25b047e462e498bc98a50bcada1572e99f8fc3";
+ sha512 = "e2f9069563f433c6b8c96158821336090c513121d117705e07511b27565a159bef17eca62c82394c0fbda40e6e1d330fb976492b96b7160c4ba797ed5162e435";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/kab/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/kab/firefox-58.0b15.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha512 = "bc6fc3920ed2cd1a16291c3ccc198035f1a98bc900088224b4341a1a720e172288a6fc74f587d39c2f2aa74e791b4b814c1f73b09886b93ecbf70dfee164491f";
+ sha512 = "7447556d7e0b24a693bcbd2deacda7acd55bc2b8d3e1ae50eba1b099fc9371438ff177629cac10fda9a071d0c4cfb3d5a9247a9a26e9983287a004cfd9759538";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/kk/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/kk/firefox-58.0b15.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha512 = "46aca65821be029de46698bba961a761994ca657a965896c199fa7f6c43666de30f3997094d373d5c42e74afb5b440390198cdb3b9ff6d50a51968ad083c88c1";
+ sha512 = "0d51d10675e1e4bdfbb0d950e01765c4444ca321de8b4d4b9de5e491b092ff6228da38c104bd7aeb1313ef869b4e7f44e624ee5aadbda0181df17fb5fed7821e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/km/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/km/firefox-58.0b15.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha512 = "e7ada1b9746bdeaeeaa5250e00c72940c17b0a7e3b2c420a6e4b2aff29af4e2eecf2acaf6d9ab80ef7bf6d53e20e5a2e8d5ae4e66c50fc1275e5b0b045b5a73b";
+ sha512 = "39c765359fa3682e24e4274c8d57cbbf85757e46de0752a3fa245f25083d4696bd04bf0a3c77a909513223e71f98034706b8a430f1421f79bc8c5c45e9ee2c54";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/kn/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/kn/firefox-58.0b15.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha512 = "5125cfa77abfd6a40fc940e20e628d8f8af8efed989f2555a6353e56150beee54b0d6c4527853d974782c9017556c67d8c875b54d6e3955e7f610489ad7c005a";
+ sha512 = "4978c88d069114919049f6912d7992daee1c6d6c1e4c8badff395102a70a3b7bd287be952f1d13a17a338ed84fa2ce60c8c0c6af90d9f20717b0a13c4d982ae1";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/ko/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/ko/firefox-58.0b15.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha512 = "b3dd52fd00e4e5e46ca272982538c88c6698491a0cf66b2cefa83eadf5ed15bca946c75ca8a459965989b09b5910331a77a239213ea310f0368992c9467ae04e";
+ sha512 = "abbb991b9794b8b3ddd6f5ad6fee318917c3eaf983bee9314b57077e10843867f9ec51011af0a6f60698bd89a48a412c99480f5e8220e1f9290c5a894025a46b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/lij/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/lij/firefox-58.0b15.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha512 = "6c6009cb4eaa607e106adf5809e506cfbc7ec5ed742cf343c945ef89422595f41290e68ae272e73a403ab1d198c46527a05efe7cac2b72e2d83acc79af96657e";
+ sha512 = "56d4003a4a3cea35040caba319a12c8d651c8d3c2f78828e61da734d5b2c219283285b80d4a05ffd3879cc1082c91e8182ee8b02af5d278c23dbd930dbd19643";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/lt/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/lt/firefox-58.0b15.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha512 = "eccb0272b5b2bbc5679909ca2acff50f9c472505aa75f15d9df650c67a3f0f4a783b830a564e69b85cb846a30250586dd65189f9c7b27f02e67497fc8e4f51bc";
+ sha512 = "4b05b042c880e0ec84891545c8610c0dbb9a6b68a7f711226fbbc32f07dad8f6a2b58d74cac35fc70d8ba797771bb0d8de54f2b7fca6cf94efe2aa78d409a609";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/lv/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/lv/firefox-58.0b15.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha512 = "c97a68438fba75d3f254782ca569c62eef6cb03fa3334abb4dc4f9a2c80594af9511b1b43b5c787f11227e7203d20312a90e6b64049a89b9ae4ce0fab51958b5";
+ sha512 = "ed21534a306ee94b831c126be09d66a4716f03548af68db292bfc6d05620cbb08fc428f4c09b098b3544d7ac80275ad74302067064052b3e4873b3d96e9f2acd";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/mai/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/mai/firefox-58.0b15.tar.bz2";
locale = "mai";
arch = "linux-x86_64";
- sha512 = "2920d54db388ab2460c88998c0425e8bd0f0d34e42f935b3e2183f91a517d4d2ba447b2e23404377d4c7137287d8b052b66dcaf59f4bcbfba288d3b27608eeb4";
+ sha512 = "2c6869b152e7cf381e1dfe97e3b279eeec8aeb6e4270e0658ffdef8c4753620c92eeeb75892698f55c438191e4da6c0c34db82ae8f1148ff7ff3a3c3a35823bf";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/mk/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/mk/firefox-58.0b15.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha512 = "ae03a8d6bd67a2a0dc8368014a0fd1a19913473779b8de4b827c0784e003ba76971d4209e03641ab776b3b6ce1ca5e32a8cd6f6719dcd3a0f1d9875f7f3ae040";
+ sha512 = "a1f6342e77952dc98165ba6ddc5ecec0136010df94e4c8b56cba2c84ac98d9d3f2808a4aa22f62cfb6b82568b1079409e4a3a38f723238dd063a2c78c542f564";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/ml/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/ml/firefox-58.0b15.tar.bz2";
locale = "ml";
arch = "linux-x86_64";
- sha512 = "fc9a3ac3d78e79f2fa67cb0b62ffbe73fe640e51356d800c63b75a44f5722c20b4b79b19a37f6f374c5d8777201a7499fdcbde8466ab40e6d8bf1bcdb819df1e";
+ sha512 = "627e4d2e377b49aba9914ac0b9770e177b2d7f9cba2e31a69b4abe3cc0bd994a8f3c13ee1bce79dec41be933efcc80976356a92069559a3a17bc47060c23a3f0";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/mr/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/mr/firefox-58.0b15.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha512 = "1c7eca59d851aeedd98789625ff29de57cfdbac9b4a51c0416944178bef29777e32a3a04f29eba0cf91fdf5455c6315d314f75f2705e37332b0f83949977e167";
+ sha512 = "a3228719d54631e88cd7896c4dae4b224c151215130a406930792e65829ccff6370168c26b1cb1064a4904127518d7a6396e9f62a293d7599712cb0ef643e1ad";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/ms/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/ms/firefox-58.0b15.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha512 = "eb085583d536d6408435eb81ad28ca9c267671ae17a09ca388d290d633db2bc6108c43e2291fbf12d344ce246eae402349a7e606dc6ea35d1a87441ea6111a73";
+ sha512 = "113e85e78f3bb8f276aff510d4cd8940493d6933cd5c4ee1bfb3cfe9824a877185fcd6e2f21d916b29889387c01888a8d552868686ca5fc6290860fc14397e8b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/my/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/my/firefox-58.0b15.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha512 = "f29675503c1dac871f8870a891d52c180d1adc6ee66a5a6935d6db92f66ebd4ec8dd699d1625b5f5ce0eebdedd51aceb0060d1378ac2afd0364a7ba1de670848";
+ sha512 = "40e5686a312ff47d88668d1143fa579d44eca31003b08936b11560f4b399c859c569a461e45a537059ecef17409a5a161cc1b7ef0181f988b1ece49bfeccee0d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/nb-NO/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/nb-NO/firefox-58.0b15.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha512 = "78676ec7bbe66030f3b6e32b0a2d8f0f1feda446797eeb244ba2bd01bc595f53160321e9dcdae5b309c94c7cec542e44da3ba6820af86578f8a4203926ca07ce";
+ sha512 = "5cfe30e510299240023027864fc54e5ae0c6ea227feae118b2e68573b0a47b1f823057ecdddf887b0a9544972f7430b467e117d9dbcf75a712c6f704960d6f34";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/ne-NP/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/ne-NP/firefox-58.0b15.tar.bz2";
locale = "ne-NP";
arch = "linux-x86_64";
- sha512 = "4bbcafad86f06a72ea3c9e97ad86e7fcd6d0cb15813adae7ce1551f7bfad1919fb5fdec61a74886ca04fa01b4ddb74538d71134659ac0ba298eb399b43e8b8f6";
+ sha512 = "b5dcf09607b1307418df90868d1ef9ddec2a9a3f212caa9e10a1a0cadd16fc00591b275e7449a33c6cc527639d4d3244effc551d4dcdb8458a05c9544002ebdd";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/nl/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/nl/firefox-58.0b15.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha512 = "d9c98d3033ef409d9a0cbafe18f520cda798544b79eb276056f918990b85dfacf5b2a666b3068014d26726c7c5909cb7e6995cd8843e39fc18377f70c6d5f3dd";
+ sha512 = "5a7f2ed01833cab7c842c1ff769ca200579d02b24140e409203b039b3079d75a26faac85e6ed3d8b836808e2c0b78242657cc1d08d1a8837a26a3de599ffb5fc";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/nn-NO/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/nn-NO/firefox-58.0b15.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha512 = "5e25d90a50df3be1e1a5ad9fbdbf46f3f21a051a06175fb17025bf169be21dcf0ef9c8e76d95d8f1937104e458d81780d5d13da90ca378f3002a779e1117cd93";
+ sha512 = "9f9a1047c106c3a94693b62a953d3467592373776dfb65f2edd8d21e9ddc880ed1e653755f7cc3d7e828e77ade67399d6cd91eea21f216a69ffe1f7275f217cf";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/or/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/or/firefox-58.0b15.tar.bz2";
locale = "or";
arch = "linux-x86_64";
- sha512 = "92e9c1cec809ef3848c4eca34c3650ac48264c96d701c0751b932d9cb5e96d25db2e0bfefc180474cb0539bee8b3bb342f4f73b03792ff31a8b5bedda43bd043";
+ sha512 = "d2ff687eb536faa2c04c9c2329609ca2b8149fbba69104660fef1f2c983819da206d6f3976592175ea6a2f0debbf7c6f52dabd0f7d5ec4a0c4c79a34b99e56d1";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/pa-IN/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/pa-IN/firefox-58.0b15.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha512 = "449cf09182235406b72ef3658cec68a44b20a53eedc16d1798124c42138e788526db848822d2db05cb2cc43cc9cd4a00111f9872e74aaf1b4fdd20e94475ecb4";
+ sha512 = "2e1823126cb95ba1e397430c5cac4fedab93fa340c3c1b759bed8198abca37076dbe40ce5bc8e5901a307c4377cd9d6356984ed6e058f22048efbafb833fb76a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/pl/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/pl/firefox-58.0b15.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha512 = "e110aed2110edbf0746fd8af1365a176e1df84038c4fd5f6d31c555248af8abfed762a5f175e824330bd895140c6cfa0df1547a7cc0456bfca3bf67da7914fb6";
+ sha512 = "e6fa41fb0780acd1531f025b31fab48440b6e5b4b4aa2220a77a2ac2aa40e26adf6454b495f61dbb4fa19c30904533ec4beeb5e87bfd03fee5fb048c8a0632b1";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/pt-BR/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/pt-BR/firefox-58.0b15.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha512 = "e8bbffaaac4326d28bcacfbc50acd5e0ecd07620049676b2558012923f8614d3ca1edd38c63cf80803c675270db5a8936479e0baff032a04fbd1aa53b5c67592";
+ sha512 = "355dd4ebdd0c1e1e6af018607473869183a892d638e0e86124f5463fd2d25170b9edc3cd7bfcef672cdaaa74cef5700dd1c3868b6cd9019761a4a0d1065ac3a6";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/pt-PT/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/pt-PT/firefox-58.0b15.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha512 = "450e95b1adebac340ccad5473222701c80e01ca73fc34f216f150f58db87fee610185d4a9dce9dd6c02f9d9022ec685d793fb2919563cc252bb428100db38756";
+ sha512 = "afe2e095fc5bdce1a5637907523f9ac097695392aaf496f34d77438974262853273b9b122518d27d67e30330f5abd54b02cbad19afe4f254d6928f235cd77cb2";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/rm/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/rm/firefox-58.0b15.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha512 = "ee0260e50c8cbd8ab3685beea8283c1e3f1b14509ef117ff3a4d7cff6dbcba370cab5ab81714374e54332af7df696705bb8d72f998800d900b594ab2592c7fe5";
+ sha512 = "666e3ff130699c8ed50d06a43c82fc7c1afcd5336bc29738272914acdc5a9d3750977d45570c37ea58a6b117b772d7c2de1997272ad37630c8eaddcaf3a94492";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/ro/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/ro/firefox-58.0b15.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha512 = "bb012d26dc2e83c8fbf23fb1e006207802edd545243eca02934b424243441ef9f0cda77e044d203bbecabf29fce021e44dd697d8a23d78d312fe35b1fb7cb740";
+ sha512 = "bdafd6443acf92fb17295a140c3fe1ecf7c792d8d592745c271c710c1a7118185b4c0d40c8630a0f363e60acecba942448a7e07e018a869ab5381ded6c2abe3a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/ru/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/ru/firefox-58.0b15.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha512 = "153870f69b37e88827be0ac443957d4e5d3be8fceb45b90ab515ae8b1caff2d819c6505f9491b5f2b529020755c1f21f25b28fefda13467cee439ad86f8a22fa";
+ sha512 = "c11352e47be8b8492876c57535392e2cf5f9c3dd0ef0ab9792afcaf31cb5cc33fef38911c495369c1ab47b6ad331aa9df876401b57c010e6eb7f0fd3fc972930";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/si/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/si/firefox-58.0b15.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha512 = "68d0e175b8476cf90cf6314df86f454728cce0cfbbc7ee0a9dd7a7b27dcb8d92781b195fd2b7f8dafffd9b1beb127fbb854c5855c89119270e77dea7ae6901b7";
+ sha512 = "b84c48da9c61e5770fb231a632cc135aadae4e8631f13d93f46715633c510c75e9584de9892b02683471b40bbc33642da296242ad5560a708ef9e83258a5c9df";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/sk/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/sk/firefox-58.0b15.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha512 = "e3dc52dfd8f33aab4450fcd60843ef9c8c8e428bc29616b2e4219ae1501f12791a7eb8c4b3b89ee84bf1119d35d650e4a40326dda89e3e40054561c7a0826ddc";
+ sha512 = "5d5a6d4b95e44838d58178cc1854c2195bed7b1243b355b568d53d8ef9e88e8173e5e56bf68af1f9a050ea0a0f4b6396cacc158e86b3dbf60d3cb092ab9dcc97";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/sl/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/sl/firefox-58.0b15.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha512 = "b80036624f112a1726cc20c8cc116553f2eb8e1fd18165fae1b51b1299180027474f927ab54ac2cb54b62346132ef9ba6226e7d1c3f68128652c00c6e4c89574";
+ sha512 = "6c5132b3afde69ac5583ea8e36f513c718b2e79a7c0fe28d39a3cf44ba94ad5851088983806977f9035a26c2f56e1388f6d3ecc505abb023d1ecd82c027154bf";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/son/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/son/firefox-58.0b15.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha512 = "9da34f34b05d49df4fffd410df74ad3483f85717ee4ec8680d3ca9691cc1a6a7fc41c67f4b0f581f7295f4ee4f2bec2b586a2fb1d26b6c1a73d63330220cde0f";
+ sha512 = "7b6945574a142c73d2cedddc207d1ef9c2e49816f0bd9ebe278ef52e4340627fa17d317c70020872ff01f475ff641196f8c2c1a34b6438866e84eb6c5b1407d6";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/sq/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/sq/firefox-58.0b15.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha512 = "f313862c0b64513691cce8c83cdc62360c144abe54fd78b0f517e08dce6226452c6767f7901a6826c3c0be560b7a1ec3df2ea6326655f316f3f14776319c7c7a";
+ sha512 = "c738c5d3fe217e21ec8ee42c79b7dde9c12e948efd70298df75e720b2af380da301520f1aeb433270efc81dbcd61a38371601f0a30ad91bec04e4ac2c7c8700e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/sr/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/sr/firefox-58.0b15.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha512 = "3349bb915250fbfb48f1e6cb57efa3edd9d11ceb1a691bf0eb655120c1e0e74ca272857457d4768a319fa32f7e9e0e671045902aa9c8b4ceaedd6aa5c5c9a9b6";
+ sha512 = "09c3b2e3a46d69dff83f95babc31204af6bfa2360d6e970e2398ec22c6754fa6bbd4431ece822004a120c23b8a38c354e665dbad6b313c90013d36b216ccfb9a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/sv-SE/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/sv-SE/firefox-58.0b15.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha512 = "31140c5058ee05eab6af01f554e4a5dac5aa2cb28de0752b1a3a1b6e8c3283ffc74a0eea922f5466b145f025730adcefd7c971a686749ce5151f28d4f530f0f5";
+ sha512 = "7e10ccf0ee053128d81560549a9ae4a08fa4a02a79c233cbc1e3ab520cfe1f1ac75eec0535754dc43e4390ab32d889427004ea9edc78b9bfba14a66818372c48";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/ta/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/ta/firefox-58.0b15.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha512 = "b0812ce6f871921cbdb77330f0375bafa6ac6e96a9d518024e2658c5c60e6b3fb966c845a8e02a900ab81e9fa945d7a26b482be48bd90359f261edb3d7a50451";
+ sha512 = "3ba269ced4f8ada49cf88ab06a574f36da86c3c144b8fa9a4f687807688b7abc1e684016e34eb95cf31965fc6b427905bd717354e9d3ccd3349ce15f9f692f76";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/te/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/te/firefox-58.0b15.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha512 = "e3a225641b69aefc8382674209845901cc952846e132ca6a26d221ac2d82dbfe2716342fb2516c7cebdd75b21536dd1d5806970f450c7be517fab470e26d6db1";
+ sha512 = "9330e1c258b53a9ef9767e2b3a5874ef48815890a69d40c879dece79ac08e2d8f22a5fa2335329408520119b4c76c7642cadbf8378cf3c7bbc6f179da9c02228";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/th/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/th/firefox-58.0b15.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha512 = "430f4e2c2985fd7cbd22912821133d93a06e7cf1b34ed6d5adaa643d7446fe669928b3192503ed0fe6a91ff0b032551efb514caf4cd7af665e692224867d12b9";
+ sha512 = "541a504d4f672a25465d626059bd50423eaae443bdee0727e4d5c074f2d94adbe07d6dfa0997c3fde904ed136ed0db24be34d00c94ca50d23caf9414b8fd1c75";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/tr/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/tr/firefox-58.0b15.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha512 = "9b347dc72aa07fa2da560bdf2a06cb5202359a4be65f88ff68f93714a386f8d49783111972fc8635abba13f54bf32bfa321740dbc3b4e0250847c48aaa1f27aa";
+ sha512 = "bfb1a3096a12a28e6303c97d4d970e67eb5695faf5bc63f48edc89343106d1f6c7edb8f2b8e47ef50c0762de43767a6c1a2773a5a9eb749834eee064c1530d78";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/uk/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/uk/firefox-58.0b15.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha512 = "4e08a07529ed00fc9d0a48412c04a8007d6c5d96c7e1c133df9ee87c181203daa498606888156c16d67530e623dbc335c502ab95e088fa3728ed89f2cbc8a577";
+ sha512 = "e9c0257bdd73d4b7316cd2af2fef0619de7ebc35b7e296a6dbc3bba5a6f9083e1fd4746b54ff6b52e8327934de04f1afc29f0a2eaae2832602f0beea3c838b65";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/ur/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/ur/firefox-58.0b15.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha512 = "486ac7e11a1a3f01e27eecf5f642cd6bb86e0dbf40b098372b5c11fc067f0e445349fd79d4071a24ff64674b233c7bac86e26bac377feea3f1963282c4d2cee6";
+ sha512 = "218703e174c4e7a7ae9a2df094dfafc062b1b34408383f96ff57ae6098c9135a280e480884b17fdaf93194a55f9c830083f06e1741bf9db494e69455ad237d53";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/uz/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/uz/firefox-58.0b15.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha512 = "4c65d71de48f339d647002c8671970d7116ca8d6baa1a3cb84dcc960ca2eae68b794e570887242d90f825cf4f4b6da4a0c0ba42f755958cf29e871287e7e5953";
+ sha512 = "dbe9ffce9a7ea307d087ba914fc83cee5ba624b97cb68f5079f2951e7cedd42dddda2d0d139448506b9760e21ad0052993dd045072acb921277747e276a1ff0b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/vi/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/vi/firefox-58.0b15.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha512 = "075bdc79734d18d5ebd09e642b298c46fadf9734bc22bc40f497a3446cbefde70dca8fc70426f1424d1b655311b7d90708924e618a1333f977dd6fb78a372257";
+ sha512 = "3e44d51a2b071ad7103046af3d7d0fd4c17f7e57a67ce1e5547d8a817026d41360fbba5e9de8d2e234a9ce8a8c02fe5e868f14aa36ecc0ce6f2b42bc5137062a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/xh/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/xh/firefox-58.0b15.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha512 = "88b392f4c40b9130f317c614671c851f27aa7eeb5f38e89098dacb8e52775cc6dcd03c91da8c6b68be6acf4ce25b5a8f8dd5ee012633f2bdad9e604ccb016a1e";
+ sha512 = "5eb838d48f16fb16d08abe3eed4b17c24bdb2b8aa5d9e21c0f055f0353e0e567af4aec840291e7e882ed0b29bfd7c17a0cd20858a06bbd850a8b2e2c2f92feb2";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/zh-CN/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/zh-CN/firefox-58.0b15.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha512 = "ea160ce37ba24aad62e065a4988b57a6799b66a927f5599b7c82e8a483db2337968b44399f6b4f0feeb2b4effb654ec949c7a83f5643d619cb09b321d51617a6";
+ sha512 = "9c5769eee60e5506cd26278323541a4d12b6bc5cf1df43379ada8a6e3f6fd724c2acdb0fc157906ec8e5c25f7f8e8aea4757c9a0f4c4b3b39abdd583f3881d3a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-x86_64/zh-TW/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/zh-TW/firefox-58.0b15.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha512 = "5bb8293e1f5b2f70967e0147507fdffffcc0a8bc0c21725f37fcc268ac504cb8715f4409a91538db4381c480e482445dbd35bf0e8101d830726b466afd7c1106";
+ sha512 = "4fa81789df000057f25fc57bbc0aa5a9222a7e6727fd9b2226686b95072cb1f0e381e9dec0741b11199cf29c180e40e53bb405aad57a445e3f311a1d98ba7f8d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/ach/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/ach/firefox-58.0b15.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha512 = "7fce304767b6facfe05da980aa05537e9292e5552717061b9195a4443dc4d642d50ad81d2b4225385b85890f788c3aec392840601a59927d823ae8f194cb1199";
+ sha512 = "d0080a29b07af0ac0f97fa74a5baf5095050c9647181dc11cd2e11dc9dd11f21d4a70b3ed3cce97adca6ff33e541694c95373bb257957e447f269007edfb349b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/af/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/af/firefox-58.0b15.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha512 = "02a44569602c4ea62c529901b5873dce212f13657d9352062d19475e15a25fedf9a9ce3b7610f7b3a66c4f50b04125f4bb6bf2af310f859f08c3f7cef56cf46a";
+ sha512 = "7b717d6c776aa85ccadbde1c97197c6390319a9e52cc773500f1b2d9aeb4d87f8fb24cb40ec8a1cf03e07f37bb6c353991acceee8658ef6bde2727ca89797e18";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/an/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/an/firefox-58.0b15.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha512 = "f30ee1dde96b7a1c304b13666b28817261efb2b50d4d62be37eeb777b2b176596bc7c31e47a59be123254bc55fdcef270981906c6d50b8dd0eed22ed25780b5d";
+ sha512 = "182f472da76add125a45efa28aef4da9f8c0bde22eb8aeb1aa23d7e22f9beca7b8f013862fa6da61cdffda3764b57ef57262dff3d6ac7a8be97cf5a60a1d7fc5";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/ar/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/ar/firefox-58.0b15.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha512 = "a5ce815f6232b54c85e44ca749e65866326fbe92375380a578d5e1362d7d48d3dcb03da5e42f57b1941ee329749603288176e6bb6642d7cb25ef966f2a653386";
+ sha512 = "0363f67250087481702b535f4e6ba475fdbe87ea13bc8f3dbd324a5fec6fa0c3513902160f8a71fb7be8d7798bd37319827261de7f1199bda849b735a429cd7c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/as/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/as/firefox-58.0b15.tar.bz2";
locale = "as";
arch = "linux-i686";
- sha512 = "e633ea8f164b10d622f9859808c1b6b26267b7090bcf33aa3ba06f1c0e1fc1e40f38b598187ad9e51c6297018a5dc62d4e972451579e08396b7f2c3b7589f971";
+ sha512 = "19bac3ed7fb19378104bfcd8367beadad65a0e274bb631317114f8399119d8570cf8499ed28aec089438aa82a7fbbf868f9fbc4dac2594f83452923e898a4a04";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/ast/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/ast/firefox-58.0b15.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha512 = "51830b9577e626b250cd81cfe7aa629709b6e23247bdb2119e921e4be4a7e17d4d27bf8e469753a93795e0165c7096c3d7d8c01ab58d7f8f6f4d27108eaf80db";
+ sha512 = "b8cd86f8a698c1555181344babf8622dfc2581113abc83a793c76805141495a62f52ebba758fbd6f2026732e9234b3c677f59b9950a009d040353e24ab56f51d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/az/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/az/firefox-58.0b15.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha512 = "0a1e390daa07f02b021ba5d46f105b141b5abd4555c15ca90c31128d1bd4c0a5625a47a9dbf52e18ebdd1a16f023d1bda9fe530344fcb24bdc0e3ae975371a43";
+ sha512 = "f4f0d456680ba0978e0bde5547af4dc74747b7cd42a1b9276d68f6bf56ffdc66c6bdba7508f7b410493e47c71dfdd4ff2b87497575a388beac2dc0798ed8b3b2";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/be/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/be/firefox-58.0b15.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha512 = "e21c4b3127deb05dd118d22bf63443c248ab24657e315ccab798315b2ca407b7e1fbee771c4a98a63d3dd6d1784c3279ad111e044ec90557f7b4059cb5e20ad3";
+ sha512 = "31b117154f8304a98261a2103b1387b36c47badec3f4a0836d2d808bed6dc9ed39b956bed1b540918371d583d7ddaf0005e34f0a2d43d8dc548d5a68c19c5957";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/bg/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/bg/firefox-58.0b15.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha512 = "bdaaf9b02e1a3c6cbf624a59172b1efbc5c4e72d75044c5e73d049031fcd5133af7abe1ad9588c911fe44cc63e2ae12fb21c6dc675678ea264a33dfdecdbc3d8";
+ sha512 = "fbceeb960575eb0592c56f2dcf534e70f3a78a0a34efc004a982f642ce48491649fb267a3155e833b9a17d760e74035b8175c73beaa9b2b2440bd59b623e96c8";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/bn-BD/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/bn-BD/firefox-58.0b15.tar.bz2";
locale = "bn-BD";
arch = "linux-i686";
- sha512 = "d4ea8ac0f18e9254236d43b2f09c33d0e79e6dd0e321d2f005185092e818991ad2604e87b33a0650c4a1d50cb9937b7888df374d1fe2dc39cc5e00bf9f9d6244";
+ sha512 = "97da1cd550613370123ee4cf348b458b93c13d5fb5b53568bc0a85fe9c7894492755380b519bf43bb6f4125d4029274b6b960f369c13e277f797fbb8e6836cc8";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/bn-IN/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/bn-IN/firefox-58.0b15.tar.bz2";
locale = "bn-IN";
arch = "linux-i686";
- sha512 = "b3d207f402ca1163b252184b8d299139fdbae742a087d8c78b720b7ea9176748e0d0521a9992429902f5557b13313c1be3222a814e26063a2a36e5fa33a7d0cc";
+ sha512 = "fccf32b2d1bc54cf638a1c52a03efd3ba407277f704667906fae70d3a429ceca8307e576ab13c084bcfa11cab372ccb765c342128d9c9caf015757cc32632215";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/br/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/br/firefox-58.0b15.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha512 = "b824d31d7d1e4b1253bbd1b29d19af2d2dc0a683c4464b4e1c923f291f958515328fffb6daebb47a2046aba6482374e378b212c50356093d34767fe0e4791c39";
+ sha512 = "1cdbf2df7bf071a66bf4e3e9c7986fd38200d26106b7d8258fd434af477cd62e950243bf211d7fd613ec5aac20137a13a4e46e9ee38c38e427fa173dc2f8a02d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/bs/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/bs/firefox-58.0b15.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha512 = "b6edd609833be3a3f90026f29611e0d03eec7e6f0bb4b6ff829939e8d16fb1f76466af9a29cd82765cd0d96b680b82d27b69223d218783e2007e5c3787f98bd2";
+ sha512 = "4f2476835f57a96f069623b983b3a09ee48f043047c9778290d6756cedd4b87d6e9f95176a5a3910b69062ddfe4b37ec122d35c27cb612a70cc8093bff191821";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/ca/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/ca/firefox-58.0b15.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha512 = "6740794258c3d5c643badeceaa29826cc6f2dee2185ad50d681669a3f9dbacfccfe4b6c98a8082909dd93212fb8a55e959263dbb46033e14d8fb3641f1199c0a";
+ sha512 = "c95813a496f6693e721d51834ba73a8153bb123639645bc2fd21921850774973c3eeda187fa5893802b38630f2f8f3c8a839c468a87a92ca2584f176f9962ab9";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/cak/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/cak/firefox-58.0b15.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha512 = "69d46516de61aab66add21637415621a6dca7fddb599124375f158c6bbcf838da3560fa643d21b1347b1fb2d87720a4c991805ceba8ce2958a41eefd8f76c39e";
+ sha512 = "c3f20e2d74d032c9b2c8d90e4988730ce8eace5e8adf9c5643541ca23a1bf9500e28edb18b1b2a14d219edf5b6561701c17bb38f98e3ef778a78b4d3e52846c5";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/cs/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/cs/firefox-58.0b15.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha512 = "38506b02c175d199f3c86c1573e81476334c063806c49d2b5815538ae50d1d47c3e649d2a701288dfc88eadd07ea71e6a7ab56ddacaa1844f0fd0403bbc76927";
+ sha512 = "a2624eff32c09ea55a46951422df4a42a12c3f81db8c14c4661b76c4dbd353bcb68b42b8ded349b32b99b04fce4d0143ccdff7c58972cec098ed46d3c334c5f0";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/cy/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/cy/firefox-58.0b15.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha512 = "aa3af4704b08c3e9dc7680d83968254d6df5fa27974dcc60ee35e43bd4be8314126fbfb4617d9fe4897dfb6dc3968e2e45cad3e1cb4389331b27af8047ebc1ff";
+ sha512 = "f8890e21bb3c771cd635dca89789abd2315cad1dfa9459c46694e59acc09e274195aa0f9c267450ac09fafab5f6d7a30fbca7b2430c717206f8cddb0203f89c2";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/da/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/da/firefox-58.0b15.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha512 = "995e0c8eea4836bbcaa9566e99c753d7f7e7b86a4038bab652a3a911621f6bbd967a7f1006296579d95dd24beb80eb5a36f2c7fc44129acd2a8fd0ac2f867c93";
+ sha512 = "752567ce90e3b832bd33a990f743d92995856bee9edfe0de92f7bacf2188f1714bbfb13c88a2eed03b9ab928f5923c33065933b5a71a14da113f179abe8a64f8";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/de/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/de/firefox-58.0b15.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha512 = "307e32b542150247e9a5c82bfac481d9d7ff04b13a3533154f427cdce8598edf0e540c9348c110a1326bb25636aadcc626da09834b6c02e2fe304db4ff5ab973";
+ sha512 = "5704fe4279251a58434ddcf43d3a4e84d2b773adf82c865dc553df9e13a3f645aa5ede0290eaaba4c5f86d55fda0b8ae92ce52f9af7a3777a3adf1d997314fe5";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/dsb/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/dsb/firefox-58.0b15.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha512 = "a5abd9031b76ad734f8ffacece37a474454d2d1ef3fc434258645087e5b76c8f1b699254919b6ad1f6c386467e80ba49e58a81a8481874d30ef80a9a64770afb";
+ sha512 = "a3a540ee34cd22ea0bba8091ba65ce635799404e88ed1adee9d89e0aa632edc70688fc28307b538b61cb32bd376137f129007f932aed32d4a4967d145d39572c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/el/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/el/firefox-58.0b15.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha512 = "9e044abb0b6dc02f1e7ac5e1a34252223fb73e0bb5adf33ad3dfa2a8543e5061e831a7543e8071cf7f0f958e7f12d86c9fa9839c75446750ba1b42f3c15a97f4";
+ sha512 = "a23afba5a1400bb877dd98631912ed005e8006805c0c0d10fca1bd8f47c704a398f4cba7b52bd2f6815246c067fc89d18213ec6ff2e353e71db8af22646cbb94";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/en-GB/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/en-GB/firefox-58.0b15.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha512 = "6e008a305467832697d0918de1fb0199ef33909771a07ff7523c9183efac8ce3e7caa09d9de041dcb5fb2bdc2d8e9a9f6c4aad00ec631173d9862e191dd3176d";
+ sha512 = "ad1a216d2f05ec9c5d69b335f3c9cc2f0c36cb1a5882ca344e74d5cfaf80c5a0fe4e020b957a3623d5430913859a6301f602b3104f2b91dc11b1783cb7c33c3e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/en-US/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/en-US/firefox-58.0b15.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha512 = "c30763c3e918bbcf78a060c68115d96a575d10084e7375069229598e60b47460ff91fe052423782307eb145e8e77dcc30dbd55a5681bc8db6c7f1a12390dacd8";
+ sha512 = "942f87d29a4c599ac7fb68bf5ba558f8dfc220f766c0103becf319dee1465b40f81d47833390fa004e38c57bff7a2202aae40c787c7a59072c4423b9ae33aa15";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/en-ZA/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/en-ZA/firefox-58.0b15.tar.bz2";
locale = "en-ZA";
arch = "linux-i686";
- sha512 = "982fe322f95e89bf77477ebc09dc3a8730b11b27a886b9907dcbd722645d8000d8ce9e7d02c008d494efb23d29c8be50605619f4be1d3c29ab3c4f710bb03257";
+ sha512 = "4526bdcadfb31701d82145c96edf8bced38ebe4248fb952c3482e30f1e9e673f300a9c3c2f8f4c21ce32b16f9ed471ce6e63d67483c1c9c5e52a27c421e6267b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/eo/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/eo/firefox-58.0b15.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha512 = "ed4584bcfc1da9ecfdde42fa187aa3bbf0b7bc6d1ce59e2710d99ad5312523511a362b71c6c44501df23fa2b58cae505eb231e7a73ad9996ee9a431342a5d81e";
+ sha512 = "b75e5a1dadeee3104de6467806196f6eba4dca12eacdbc3bd1de9c6aecc922a89fba081a931a6655ff24f0087945397a8c0ff89e82bc4ce1359ed9d124be8163";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/es-AR/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/es-AR/firefox-58.0b15.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha512 = "3fe479a5bac3145fad6e435df5a56348015b34edb5bbddad7cd127c6b901a42481267d6174a27e3a36f63a24f76026cd85509c2f46001233f2969f9cbc220cd0";
+ sha512 = "a4b11acea9dc2105cb9e14d8714f9a66cabcd6e0a34684f74b27e004b42dea33a549e4d6ba427a7e65a5119c722ede3616d04d08660ae5b8eff4aa8b8a4d5b6c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/es-CL/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/es-CL/firefox-58.0b15.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha512 = "d22b201f29c727c0d2b77f135e7361d236ea80265641c42bff39427b83f9fce38b604a4d9f4ae3c354620ded5af7156bfd6e7bbdb69ed8c4f5fc7c19b6e80b22";
+ sha512 = "4f493a379dfbb53bf46e9724da396ce03460ed803eb12752453b11f7149d11aa5873efbc9f3ef22fa17f026dbf591861af8374de349bef91dbc1777468157f26";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/es-ES/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/es-ES/firefox-58.0b15.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha512 = "cd7e6cb57ef8026a18a0afc761181da08b7a85677f0f188fc333a80533ca10873817d2cf712222bf453fe654a45ecfb959614f31043316006ddb19a8cd89e3f2";
+ sha512 = "f76995efaca241ada26d2e5e87f45a86197e0230baa15e26271fcfedb05bceef94e4bb2980a3911b877b1bdef8de4aa060df1758729b31fcb3b80767b65cbd9b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/es-MX/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/es-MX/firefox-58.0b15.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha512 = "986f52e6f316e2241243d1b5c5a5f1ab092e3ed1e0f8e979fe3dd260bbe588d7ed8259c2925a0834d579dae83d7b77d14746e36692f3de0a99d56e60f0e6bfe4";
+ sha512 = "a9d2e7187746ea3a970987caf2e31b949080a9a66f3baf472ce75f3bd81979a7f936ffc43915fad9bcd4914853adc6b0bd509d23413814ee32be31f254ff27d4";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/et/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/et/firefox-58.0b15.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha512 = "ef2552aa3cc790d52aa8efd108a324f6c7e9778ebc2e23db860a43607e8df4104035f312017f5b2662f6b7cde57d5f71924e27241920de0ebd492e4347ccbc10";
+ sha512 = "7dfced36d543e99fb027caa1df40fcc0859be2c0e48759d25b9d66fe0729242acc8d5df15e21fa6c55ae7b1d7bcdf6a57ef0698ba1c83bc44cc6502d6c1e7b27";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/eu/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/eu/firefox-58.0b15.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha512 = "587001cf35189fef0bb334bd20e5e48ccab185ec661a8a0510c2dbd199be297d853a243238ac74d50be63d63049432935b2e0c692ba019770a94a02e90cc90d9";
+ sha512 = "0b9de898cfaaf162ccbb0c4563df00243d11888d4143726d2b68aa53c5bbd32916958ba0f712ab02007d476bc466791cd257769a18d7106c958b6cadeddc5eca";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/fa/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/fa/firefox-58.0b15.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha512 = "feb046ef7b75a530aefa83dde1ae6cb6b0ef814fddffc138117c3fa441a8cdd8115c070835d5633d9464ef1586e33e349404894f391d48a8c7401779d52de296";
+ sha512 = "629e52dc8f1470cb7613b679465ea5db5152bc35fbe4fcdd054dde862ddcc2c65434d99d53416ae348c4f00e0404636cbbc557842267060e4b4a2b3b6b3d26f6";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/ff/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/ff/firefox-58.0b15.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha512 = "902b90793fb917c2aabbdabdfe3296b4c22dedf4953bd1e5be7db5a78d17341c4cfd03dcd3f58c9ea41725a96af7db0b629b43fb70adb24950a4f4a1c99e5902";
+ sha512 = "c370338497641010b7cfcd59518c87726bd74252837c1bd28d978a56fc65c411ee243d620e010e3b5331242943eb4e7b0d5b620123685d469380d897e9fb5604";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/fi/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/fi/firefox-58.0b15.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha512 = "3ab3c17534ecd1472a17ce27282740cb13975ef80bcee27d23bd34bd955a56e538896f0738fc3dcdba6aa7537cc63276c573ffc0dd93d3661c445ea11cd52029";
+ sha512 = "602ce02a962083eb1d8b67b3e271febfd16e3a01bac50a037a44a79223836b70f66cbec9329a31eda7c8fe72dc5b6ed582166ee1bb910a1eac7fc638185896fb";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/fr/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/fr/firefox-58.0b15.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha512 = "dbeb851bf96f41e0e4b32267fa1f7e3a1b560f8f54073356062157b14db958277f34ae30261e7d778933c9b61988ef6af351d1292b84b2721ec8fc2fa80ed82e";
+ sha512 = "81211cce231f674d2fc01c4b6a775892abea8fc5285ec6f7b50cde63d0448a1e7e60ac6526c9e51ce0decff5b4708b6cbbf3e31b495396a4a6b87611b903711f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/fy-NL/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/fy-NL/firefox-58.0b15.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha512 = "222745250b976a2c885f6c9a8f23d7d0d9cb457b0f53338bfb805d1446d0e18b79b8f17b70335ada01ed8825a0ea557896bad842efed4bcee7e2c9f76e7ef6ad";
+ sha512 = "8c7d8347177e8d57a6c93be6fca4d98e62ed0edbffd48bbd8c1b2bb688f6cd5d861990942359b8ddd4841cfff78c14c783252f55a2c9d9c70fa7e6f7806f6a4e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/ga-IE/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/ga-IE/firefox-58.0b15.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha512 = "e6dbe4b2a680a0994ef80f1c319b8f9aab815507f7e27e23d77e05e7c8831f03b9cf60ecb5c13921c14c9bae1f6931b1cc159e97b075293788f60266820cc92b";
+ sha512 = "85661d0aea3cf181a27e07269242752d712ae73b5e172fc762f9bf7a75aaabb767450bf6da05304810048d3f4604f1a62372f73f59ac41b7cd6f6a377de8d7b4";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/gd/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/gd/firefox-58.0b15.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha512 = "662ee89e75d95214fe8e2363264decfe99d3de26bb5586a06c87680d6504f3c95554c9d686c692af73156e0e370b3c5e048bad4a53e13a237a529ed2d58822e1";
+ sha512 = "ce5fc8a2532a3a7648e4029dec08be5cdca5d5c7b1b146b1c1ebe89a7f4b5737cc103ae37dda9a39f41099e33cdd5bb02b98dbf342bf7504a7cfb7f07b371881";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/gl/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/gl/firefox-58.0b15.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha512 = "05074492e5f713fa3860342ff4d35e5d73ed866eb4137dd3c2eae8abb34642c5c6c0f631bcb78801ce3e21e1cfcaee566615971876a46a00859eeab7cf64bf72";
+ sha512 = "e0b578e746409cf5615578bdd12187b2835276d385bbc8f6616d9acea3e170c606f590c83380e22436df10cc8ee750e26844e19117ee5287492530725bb03083";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/gn/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/gn/firefox-58.0b15.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha512 = "9b699be162abd7b3a8f2555cb59cf5ef9b2563260c3f8a29dd89a2bb34c6cbe2894d958169f0598af027d1769d3c13ef1489b9e226f79da3a6cdaf62d7908322";
+ sha512 = "4caa21cf4abc8377b900f4a860afb634affe5af96492a71c820bf6cdc47362d729626f4d3e61999dc479bae6aac2262820e89a0c6347bc9a1bc42c3c3b90ee54";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/gu-IN/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/gu-IN/firefox-58.0b15.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha512 = "77768a2e05f6050deb3f91059aeebc6c5c60309e215583c5d6089340237844794d21dd8357cacd9028fb30bff37ba465c3922e6186bb944d30296ed7a4f6a0dc";
+ sha512 = "c8d0a2538e0e7fe0a89d2fbf78bb8d7c238d3cb0205a014a5ffd86b193a08f8aeea69d326af75421968770a02bc7c42e2cc9eb45c2d864ff75296976c2579639";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/he/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/he/firefox-58.0b15.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha512 = "0c54279050f11a2ab4e1956e628eeae4bca37a4cca98d2e4b5eb6eeaf168ef73860ba33ca4596f29118d061da1842d6e93f41248fba344172ea95148e696e9f0";
+ sha512 = "2935084bc4325774aa0c2019c905920c265b569c75eab883e5bb22765deffe1d5bd1ca5affd92fc8c2375f32b969072c247f821e6675911d6df3b9f6ca46dbc2";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/hi-IN/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/hi-IN/firefox-58.0b15.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha512 = "ee4338f5b1753e7d34f53fa2cb5d512788c24721d31c03830b43f8e454b86bba19af18f5eca7dd7adbcb3022e9d86d780823764b48201093373f1f56f575ad06";
+ sha512 = "6b86451451357a03b1f317266f7ea9e31850e3dabe4d9b163098837fd02bb8ea3259b9d8455880bc5277e79657f6d803aa001abac5840c1f2f476b27088477cd";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/hr/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/hr/firefox-58.0b15.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha512 = "75d83bf8dcb8218f1e47d5c5c7c8bfc88dfcd320286f98ab8209afbd7b6da78e5951c05d3756c55c5b2960b8a7cbda86c741d0174b0db47016ee7dc004cb7301";
+ sha512 = "a2339794b3ec17a9f77ce4fc51cee56508ce0b3002ffe1e9f2dba5e9f0c154b75e2f9b0728d2fc1775e031ab364f754f225eea018f22bc5ef002214a4dc80e1a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/hsb/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/hsb/firefox-58.0b15.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha512 = "60458900ff198445c9b39a2aed75a2544ea50a5c4e5733dab7c37147ee95ee109ec0e9736358870b21d4ed4c88a8b7ba216e8e1cf1ba709b71badaa61d639f0a";
+ sha512 = "dad69a26aa1a9976bd436c2964250d0e6ef2cea32a4880324ac44079c9884b2d7128ca7e9efc87e8f031621e19f76bb244f669e6de29be8df2e7e20c5f5cd4d8";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/hu/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/hu/firefox-58.0b15.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha512 = "8a5820924873af45a203637255fb82882f52f07fe4c17e7b1b1eb3bc3c58440a85adf57bd2419f9511472247d397030b0d9cb65fe37621ffbbe31df22213676f";
+ sha512 = "6e12ba7ba5fbd54e523162722b7000e00bba63ec9c905067dd4a2812fa1d480d78f8d6fa5624f08c94819c597a7757c43ca88736160c3e62a19e0c36b7144e3a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/hy-AM/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/hy-AM/firefox-58.0b15.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha512 = "0892145b190bfdacb88b64020b51bcb158b71f70d9a0b2b88e938262cd833db3301fabbd2ead90d1fa31193573a4378a36a898f1a30cb993849567e3739966cf";
+ sha512 = "8b94251356906404aeb35b317f43153b4474bbe0f53e7c2e4441fc9a2dc2234fb8c6997dc39420017a25f18ee2d8ac3d28c9106753f72e8082e3a40af0f717c5";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/id/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/id/firefox-58.0b15.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha512 = "4408d3333ccccc3306b0afca9473352fd8e6c8d426541b8950fe8500dfce97ad3d6274aa1b5421d46c79cc323c3616482d75dbec528b394f12a80b63ab9781d3";
+ sha512 = "a88ecdafdb7fb61d0b477deca2e608df16dfc1fb52a0ae34d0571ae4195e9c2b633db19c78e7aa254cd48e9184706844c02a22c553f9d721a5ebc48392335535";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/is/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/is/firefox-58.0b15.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha512 = "0e7ce993d73b99d081248bbd3e8c7cfa72a1b760d2bdc2bd2b6f16bca0e024db53bea5fc04f0deb338c1a0be25bd9bb37200fbfbaabeaed6bfe68ef526d5694a";
+ sha512 = "0f91699f4c94b17a8ab855b5b0c1723305d4c397bb17394235d916ad80911db6bced2c6acc62634accdba913621cab4b99dbf87bc8e0f0249015b2d3a5eab495";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/it/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/it/firefox-58.0b15.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha512 = "829b917bc196380e13ca0983f5d11fa932c99b5f8e17adcbe9504730f5ef5fc90c0e9e26b3f9c23e8e970693d3726ed02ac7c294a7a3e2394aac1a64d65b62cb";
+ sha512 = "696ef6f4e71e72a79fa9472d32c33fc71d021bc25812829b53a4e67f61b833046e637af263c6177ba356aac9218a7375ef01f75a87a9f040ec7c5b15c3aa7b07";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/ja/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/ja/firefox-58.0b15.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha512 = "c082f40d3a6b563948b262d7690396e6de3fca21c83dcc0206a6251db08e66563bd957de29e8e38b0a7d70062565c796f238fccb21fc8a757eef46d3d8922459";
+ sha512 = "bbf682c758c8e900c8fbf566933537d3b893b56d2948302f44531a9929738d3308bf9ca99bf40d02b2b2e3a53b460694ff36d81abb29a652c7bb4e5314daf462";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/ka/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/ka/firefox-58.0b15.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha512 = "8bf2d31f2d19b946d70a7b317064697e053744f206a1e83e209542a110616c5a258d2ce71e3279dcabba8f0326e3d7609d17f77c96271717fa85834b409d1572";
+ sha512 = "6d55eee1b9e297a062e5eda6cc9a6c420b1539138001a01458cebe6b650c18bbe52f5eeef7397b90ead2ddeed045d9e670d701062ee4126a2b3e29542bdd460e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/kab/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/kab/firefox-58.0b15.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha512 = "b578eab0eadaa5d360e949d6aeff519aa3624b43c227c0daddd0c622d032ee64c38d9b1a98cefbda76a02ebc43200c306dffece36fa779b2bd711191149c186a";
+ sha512 = "c2b1bcda181a1b26a5ba10653f6e3a88a80bceef4fdf5a77e1a57499d1d768fa52c9793dbe04fa1e7208e4274db80f270929f8d3e2d3f45238e05e7c3cdc5f94";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/kk/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/kk/firefox-58.0b15.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha512 = "9e6fb9b330009621ab52957d45bed20d4230ebe24fca2a08713908130031a9c9eb2d24c8bc915787a058fb407ce0208195ac7901f848137f5482ff267c69fa69";
+ sha512 = "b28fc41e8d91a7088d1e526ca7d6ddd415629f1ad16635e2dc029ed76e16d837b4862696a38336cf258540584657adf9be1c6245007bad84f6eee90c104f047d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/km/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/km/firefox-58.0b15.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha512 = "dd461641d80fc997d4521064d821ddb69de2366555f2155d499b251781ed684616e8c74e80780e27ebddb746c5372af656b95dd121b0ba8fdd6c563fd5542ece";
+ sha512 = "866ece013c86f0fc7d7bb6a6d9026ac64587d2f41551c9303cdb6a58622482b2412146a37acd80679c979efcd5ef8e17e18775df2fe4b480074317f0d43a4820";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/kn/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/kn/firefox-58.0b15.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha512 = "52990812004f6c6791cc1634e39056cf4e1d20678019ce7ec031bbad2ef6099ec4a467ba5d7a1eb9e8ff2ade22d2784595af6a880e9aa1c75425ce6694134e97";
+ sha512 = "fded1e77fafbd2075ba60f80269dbbbba07e35296f8298664c06c6dfe0787baee3538584c31781e87666b1ef073004074590339d2a61bc1ae4f23992dcb35ff3";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/ko/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/ko/firefox-58.0b15.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha512 = "52c4e48950f40e98ec56c856a2c286a77e23a1a68bce09d7659c4405afdc162a6dfde71a41ffe1ed66c05ec45be0f6535cc9661e288fa6f0dcf58d1e3cd8cfc7";
+ sha512 = "40be6d5b4e2358e0d08c4d651ba2b91f94bf94c9cd768ca4d147a07581b928d9d4aa5e66d8dab68a7fbad38b252f48677958c6a66e206045f9ae94fbf0932486";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/lij/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/lij/firefox-58.0b15.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha512 = "e47252c7d8d632f29d9d17ac418b274927a298098bd18538aa02675cc5aaea9355ada2d7028571c04deb56378240de8ceeeb7738861404316cfb31a07278d0c7";
+ sha512 = "b991ca90152d8e423042b268dc88bd8f35515a27aac6ab5b642b901fc03b02365edf7d0a58a939deea696368ff2769c15b45c98769be27edce561f22094e5dec";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/lt/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/lt/firefox-58.0b15.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha512 = "34ac3613499d2c15919319eb7de3727789a0090ed6d2aaaaeba1e3d52216be8f166f058c3fafe27c653101e2189ad26a19253be21241bc28f77232094ae5d6c7";
+ sha512 = "73f020b0b3958cb7f6db3da70f976dc8ef64828f7cae29d1994c04f4542885fa6389239d5a7c41f8beccd90cdcccd14dc42036cac5e34a3cbf812296edf6d49b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/lv/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/lv/firefox-58.0b15.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha512 = "4ca180448670e8b89912102a93bee7f61aa3ac8fdf9478df0e16dcb0e9079c8a51caa303ff645d56adc496c47f262f644f82d31b26446d63077b82929a2d8217";
+ sha512 = "35f0aa92ead5ebed9d38688adc6ab2a9e8c9945f46bc29adccb6ba6d7007980f60343869ba65a997e04bd9fbe68b6ef78719ca771359144b73514e6d23e457f2";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/mai/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/mai/firefox-58.0b15.tar.bz2";
locale = "mai";
arch = "linux-i686";
- sha512 = "e1c9c019499ca17d1d8b506337c89fbce52c02300dea831ac7827e366a318feee526998d8e87ad7572022dd0608c92ef9fabc88e6e21bea1e9b41465a4877e5a";
+ sha512 = "79ffb596ae7afa9ab68923b4782efea6701d61463f4d200e93db9cdbd9cc13a20ba4fabdafc3f734a9d84df4c2a88400d976f77411adc22de3e11a8fc202eb20";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/mk/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/mk/firefox-58.0b15.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha512 = "90b989e803f087915ff6012747587038c134638131065c3f4ea76da96afe34553c6cf39e59e13a071d744822d080aa54a77a8461cc978278c8a0a94da59f8816";
+ sha512 = "077715dd9bd5b1dd6135816449f21ba8c0d4e4812c847604e92ba103aa009e6eaaea9b12a2adeac753cea1175a1fdc0100b63d2748451c52d8aeedb8af0ccb2b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/ml/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/ml/firefox-58.0b15.tar.bz2";
locale = "ml";
arch = "linux-i686";
- sha512 = "6556704d29e990655a14abc0dc60fe74f4f21a380f04b1877d1ae0259c40b47badff06ead1f4903ddb0e576add5a9daf2da99e4ccf332c80d62b5966cc8fbafb";
+ sha512 = "0294862b42dbc96d66f5095bed5aa7439f79a58bff7051bd7182e27c4a73b6f101c3bf2b6966d0b525eab1433973d9972f01a33f3074f318464596af31712a55";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/mr/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/mr/firefox-58.0b15.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha512 = "1ee03a9f3596ed3368cfbfa784e48adb85939e422f5b2790f645332625cd675585849d9d08a1bbf7b2594e68ee79b6dfe5e6e5abb7f0c8d375ac5b9502637ef9";
+ sha512 = "05c8c0d20f303854ce062c5a1696a5b94e796f97a4e4ac45971ee7bea6177418e54281077e962366fa95fcb77d35a5d1aac014d27c9fc1aa28c90c2fbd8bfe95";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/ms/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/ms/firefox-58.0b15.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha512 = "ae9724e6d7d283bf53e2f8cca4bb98562a3a48011d47f2cac3dd46e2f96f68db219f44ea6e93aaf0d6728d839c7d7b307ac2448a88d0bfd96e8cf8f772e77388";
+ sha512 = "7a9fb16b6ecd9722eb79a09015b33e6c15683cccee8b2a278acc177e988da1eb4686324cdecd47bede2913a9b0e88640654338d92252213825c0ae2b6bc8e12b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/my/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/my/firefox-58.0b15.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha512 = "775336ef849c4536447a847a2cb0a3a0383f1e00d894383d47de1d4d8e5f1e87452b614688da2ad921790998cef10c49f2250d58855141fd5bb6c7c13fa682c1";
+ sha512 = "5e4e9715cd7e9b5d2cb59da9828c0dbc38263373af15c64faadfe160cbc0400596b899cbbf7b8721044f2c279e7a328074ea95044848ca818a3507bb63640e0d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/nb-NO/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/nb-NO/firefox-58.0b15.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha512 = "51c1e9f27b64637c01eb5fcb19f3dcb25ec9441e657d02f41da14213dd786dc1ddda35f0f5e72f435a005c923bd8017e2f880e616d496237ae69d6a7cd5bc8ad";
+ sha512 = "da6c123ae24be4b20048fb57746391add06ab9d856c0e4a76d5e0dbfa427f356937ee624e0f1f9158d3451c5ea9b0ecb02422860e0b0f7b214db92207d7a7863";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/ne-NP/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/ne-NP/firefox-58.0b15.tar.bz2";
locale = "ne-NP";
arch = "linux-i686";
- sha512 = "0135f4224f3b357fd665f316ecf19155b0b0daaa3f2603c83735b19be75518434b24427c902fd8a0b0485ba467ffdaf92d75d944ad0447efa76ec0b930fb58c4";
+ sha512 = "2fbf5fa855537303fc0b97ee7a97647f47b554fe3f96754c43ce4ca426e310bc34a1afc87823898cf840cc28a6be91f9200b90e0db5ec7c258ffaca1f9526dff";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/nl/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/nl/firefox-58.0b15.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha512 = "0e056465a51e3bfa5d2014d7ed39e5a1cae8922c7c0706b158fe187b9fc4897d0c21d927508a6d72b5b6c58d0e95e1c12020e826ccf84d74acfae541074e9f58";
+ sha512 = "44c6c8b927c311c797571eb7003a426403d7162af50d35b41d001a36d4e058497229415faa296466c53c4921906ef5399e8b4215f5d967ee5764fbdd37ac4473";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/nn-NO/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/nn-NO/firefox-58.0b15.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha512 = "885eae50ccf5d2185e195f1f17d09c70914a5472781b93867515ba784468c91e7ce86428696552d6451eff846c6dfc3486ffd88f16dab4a28e91119ef5e0b77c";
+ sha512 = "2c5e2402aa1d39e51660154d6a6b596b577e54b81fe9c348b90649a4cb22288239c848bf7cf484f3f85e7afe868c5f8d613a95dfca812afc59b1bec91e299ee1";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/or/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/or/firefox-58.0b15.tar.bz2";
locale = "or";
arch = "linux-i686";
- sha512 = "f95da946fbb6e334a14ac7af863d004ba06c6ce3e202e26587783aaaaf55eb12a2fafa5e07b76706cf1042c7dc258a4774eb5fafaf94039367dde8387da88b98";
+ sha512 = "5626ce9e7ceb5d0e70dfb5f549f8bf4ab4398edf96e4adfeff06f85c307daad21e075c48df849bcc242dec52ff3a64da12f8af05b0aa475b50a3e9637832d3ab";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/pa-IN/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/pa-IN/firefox-58.0b15.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha512 = "694e6148d330fb83d4a763980813e720afcba7323eb5e07acb5f3cee7964422dee722471538cc2c6f094532446fdfdf4ec79942cc91636690c997c68abb21613";
+ sha512 = "8e0aeedc13e102ef9b4a2aa7858b5b88ef4a21ca00882f1cd3e86506449e4b2e1e1f036d587987be8002b59ae459acfb5f884c53428540261019341f63b86a0f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/pl/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/pl/firefox-58.0b15.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha512 = "7180e587c52f1c4a1b0ec7dc09c1e450f0f4395f445180d0bca110613f2675f9c6be6ed46a604eee27a316e82a7749e89ccba7fae02ca46074f99adea38e291a";
+ sha512 = "f9f9cad94ca986d67b17bd894d6b5ca5de564da3642abca8b66a1263d5ebfc3ec3462eb8a3a397c6f6667677885d9351ef81a7d1c55e15b7404cd3e3b2dcef49";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/pt-BR/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/pt-BR/firefox-58.0b15.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha512 = "fbc966148be235c9c1df7487575d7853148e792395f7e6650034224bb06764567569af9646a929a1b844325f38703e8544f35b60c5e74f173287d03b8de6cb85";
+ sha512 = "4f385b8af555fd701c3bc93514a8712939b70b4fcb8d0a08c4cc9c514e68cad63033d1c4516751a6c79d622971e1dd22ae16bc26dd5471a216f6e2d0447a4695";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/pt-PT/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/pt-PT/firefox-58.0b15.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha512 = "55ad79f74fc4fb704cc38a417bc0f4973e70ab2948753206ccde71ba54db7889f1080c00db54c95ab84caa8e4691c4558ddcaa5f7f995123637f0d1ac62cfddf";
+ sha512 = "d469ba354fb6127e8321664889683821f8c5e41318c5dc6346021c4f0137dd9a8810b8bf4134c808f2a91a50f05d4a0eaca1b52ccc9f691cd5c694ef6fc856b6";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/rm/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/rm/firefox-58.0b15.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha512 = "ca0a8dd18d5dbab7fcbd01ccd5bee10d563426758c71cbb9bbd2c5799ba83cc3560480ae1db2a422d158d8a31ae75278ae00cc12feff8437ec85eb49f77e67f5";
+ sha512 = "aaa079966f9396da2771c8f04c2990854677085c872bb57d9b605c2c61be0e0917020916469db4e4e1b7e082529cdb4dba046e282cfc64345f59c1c11980aeb2";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/ro/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/ro/firefox-58.0b15.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha512 = "c46c6f08ff9b4b5a4fd0c156e4881b4ad9071237c9e082c0b1bc5df14b38a16e6aba25c9211d35a7450d88de4131d088af60d5fef6017292a60940e596d334fb";
+ sha512 = "67aa56b44b75412371151524bcb5564eeb0a3b1e47068435a08f9ed4ab5b593e4e5e051a18b84fefc19996942aa8ad729ad5fbbe671b52ac84907d1a2898c8d1";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/ru/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/ru/firefox-58.0b15.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha512 = "7fdd19072f73a9dc06e15fe2df53387810731ff43e6b42debf242d1150bb883891e84a48c584e7da426585cc389fcf8ee45f0f993c7d33a74e92cd995c909d5f";
+ sha512 = "9d86946969beddba87dd75fef29214ec3ef3f1d6880b408c49905859bb4ca2e86b89bb06c842cd1b798677ce621a898dfad18d1d121bfae835f4c143a495ad0f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/si/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/si/firefox-58.0b15.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha512 = "fe7368ca563ece56d2c490bd81ce025dc38f7911f171045f7347cb0ee4499476b0abe7b05e7a4cabe0337d2c84d79f401b8b0a6142f5b9112179f3bc896093ec";
+ sha512 = "2e307742bec245219eddb26f213306462dddb8ec9b590bb21cfd4c7452b89e763f6408cc4ac1d37abc99ba8ecc2185429a4273ffeb694a11acab7427b3930216";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/sk/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/sk/firefox-58.0b15.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha512 = "f3ff69bbf62fb392d0f5471e0b58c59e8e1c0fe012c7c6c008b57937c378cd49943d4570e595f0b81ffc15f07e3275a34bfd3435ade2862e4d1c4d1a2d51465a";
+ sha512 = "d00816519c0cc00e9223446ff00a2c5eb7b23d24b3b5da6c6c1729fb5c4f333e1195a4a9c13f59b46a22666984e38c56e0d9d22963133441cd76322fbb3c7adf";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/sl/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/sl/firefox-58.0b15.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha512 = "7dfbc29f33c617f032b40ba1bee3432638423c9dacf7a7b5d7ed8db4aaaf6493be732a69089de72c47cab96d3b0d9a87fc09ddb69b1f80022c1a899ed4c2fe40";
+ sha512 = "bcc84e96c1a1d4f2635fd9148b3a3320410b52a54ed2fd292052fc8d642a8ad38eff3d89909fe37230d9587771f28395f39599d5f8ab8b9d00b2c8b2935974e9";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/son/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/son/firefox-58.0b15.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha512 = "a102f6ec429cc6975a601cfdc409a616bee1eca92a809a3c290ce082f392dde4f070771f746830a98c9c31f59032466ae031f8934ef85ce7aa47391cc4044379";
+ sha512 = "c9ec2407ddd109bfa059dcff2340a76d04d40021d3cc180966133894e567b54a9feed823ad13e7a4d8e5aba2b85e955a7a48d574a98eac0b26b53d0864d56145";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/sq/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/sq/firefox-58.0b15.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha512 = "71cbad5d4a5fa9f984a6ac678614bb354e64c207f7c92da7b5104f96d5c1ae4397a1c2b97be279bd6d284f143ef8071c12625631c85ad704de193ab33e33944b";
+ sha512 = "7f459584f85b0d9791bd48a29663567f0303753dc388f1b2f46566efe71ed9bff120c25f97dd840437f148c7af6a829d7bd1379b22d636249955d571f8ead721";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/sr/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/sr/firefox-58.0b15.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha512 = "c033e14e76d1a81b28fa52f3ee2b9981f3fb6cd5611a20e4a420c4dec8f41c266be2610aa59002f595bd8d2f0d93c0ee2324abb4a8da7b1763aa979896497391";
+ sha512 = "3122fc1479fdab93fc0e10b6973dc0a48f38e3b114af471236ec795b4a69f4f4822314f77d71d891f0463e02fa4ee2bd7acbbc68a0af3cbd2c37e12965b09132";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/sv-SE/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/sv-SE/firefox-58.0b15.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha512 = "69ec3be256ff406552b7d2e0af2fb8f7dad5dc7e4b40d8019f4c68638cb1e00ca3c0884a85a3e4072382c2c328e247ef327e4bfcba1f4718eec265eae59da0b4";
+ sha512 = "7e522a556353f4838090866c0ad8e2957e0b027fb61dcb749d036a231e478427d6702628d273ddd30d233187a5d1ca1e827bf638dd7f913d48755170802d839f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/ta/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/ta/firefox-58.0b15.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha512 = "358ad3f50a99dc4dcd67b9a05096e9d329b27d57f571f3c2c8fb6b2025f63a2c73613e5e6b6c45aea9e3f8ba6e0205d960859fbdefcf417f17ec04e3154e96d2";
+ sha512 = "bf6fc95a9dde89fe99865726d9c54615093d09f1684e493b248cbed9876cd7088ec8f967d9dc90d8592073d6c7f7ddf11bbc7ce528fa624853ef53e31576af48";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/te/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/te/firefox-58.0b15.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha512 = "8345d466d13fbdb85c0a015a5ce938ef2895b8974ea822846723af3442cf554e18f68864b27ffb24f38b22b2539222e571f6920bbebb8939e282e2944ae9d47a";
+ sha512 = "dbba2f55271ed55734834a0f661ba7ebba4619128b117d7e5792c3bfd21abca7b817dd11052d2d26a4c21e7af4bb41cb4abb163dfe13c0b3703d1bc352185ffb";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/th/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/th/firefox-58.0b15.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha512 = "f224c6b77a9cfa5db2d02752847b46f136e83e226e91e72043737088bd0291a87cb6717dcbe1c78f19b41a418a3ab98faf4e868bf6f544775b983f302e937fec";
+ sha512 = "f45281dd8ad0daf82d630e446c6a87947c860c27a05faa201292acc3169b296410263394bc4faa21328319d4309bda6b36fad7bb74ab16ee920597e12cee56de";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/tr/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/tr/firefox-58.0b15.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha512 = "b041be8eae147a5cfbeebd31448daebb4d9a7256438875ca177f64c7bbcf636393c0f2b1ffb152c13c737e26d4252881e3b0db06c891d2e87db0003e69573449";
+ sha512 = "486d03fb17ce51edc8b805395e3b837f19e8de2b21d504b6c53209badddc01144398dba93b1dc83c8ea75b14b1284d708f7f70e870453ac30179c6ba66e46ae5";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/uk/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/uk/firefox-58.0b15.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha512 = "0be0b5d572890f1d31011814316c33af826d11fcf6de7634112dd14a1aeda1035a0211603f2cbeb773267d32b1658c7a97c9d78d251a8382bc8e96a5adb019d0";
+ sha512 = "4b050532e8bf7ee04fea4ec9190ffa59fae5969e75b5287b4cc036d68061a9892aa99cd9f5527563206b79bf4527684d85a82e80891d190f391c64c236a22222";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/ur/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/ur/firefox-58.0b15.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha512 = "80540f2298ac600216f254046c17964aab5347f187207a5b99ddaf7482bccf565fb901e829e368c163065ee0b900aba12386eac0323a26290e99ced4fd5329e6";
+ sha512 = "060e555027a13fad246e2ca01f590c0b4ecc886949e4592ff9438aad529d21f0ca1d00dd4671c2d76efaf4285f5938ea27600b9aa5c4f9273c57dd286de21701";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/uz/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/uz/firefox-58.0b15.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha512 = "91c77ab033c34d4a5f075faf3cd3f89d5e0d5e5951942196cd231a1b9dfb54013b332c70ab513eb4cf1160da3cb794583892a1e07a232c45c2cc233ed6d89b29";
+ sha512 = "73841dc4be445337bf80a4bfcb74c681c997d69d053d453121ece75a5a91bbfb474ddc3c232d707833a5b39722bbd4b83c319066f73a9493908e77ac87723aa0";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/vi/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/vi/firefox-58.0b15.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha512 = "af409ea05056919f79b22a6604f010d70e7b5fe16abda639176eac1d82077a460ea0621657ca80414402c5dd1b734e00dfc93b47806657b3a04d8834c4602dfb";
+ sha512 = "e866cd2d760899f42e818cb5ca68cc3770d71eac92b30adabdef1fcabee1794f36f5687a2ef2350a987686c2a6ce644c820640825fa26ce604b636235bd99b2d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/xh/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/xh/firefox-58.0b15.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha512 = "5170e4b062aaa6023a68f04725c65a4209aed0863f801a99bf89e09d32a55bd4847e193b173ebdf51902cbcb5e4139b56be3724dee1ebb05a36d0420cfc5ea64";
+ sha512 = "9e7bedb054fa367ed8ece1c43d66b70d2184bcf759d344457bece9d515325d0b22f3359b85bbcbc72889a72b39397a94f0f48e730da8f0e779f8cf9fe97147ab";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/zh-CN/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/zh-CN/firefox-58.0b15.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha512 = "0112299c1f1b4707dc29b1849483c4786f6242eb146cf42f0c4d79f3df73175e5f55266257a2e8c22d3419c9585c7311023ee16bc2fbc2ac7a690b4625153295";
+ sha512 = "14d3ba252d92777a8e8a935091b4d1288f561d19ce94f0220c70c1327276e2f230abe99983bf2de8e8043cfb101f6698aa64bc701e29f666792b733e0dadcbd5";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b8/linux-i686/zh-TW/firefox-58.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/zh-TW/firefox-58.0b15.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha512 = "74ba02d4069d5c47c1c1d4e66fc364f7136c86e4c144c5bbe6d8cbbc243bce9a1bec4ab56facb1378a7d7ee32e79657cb23a28a12dc69a56b74a9d6c2aa08957";
+ sha512 = "78bac26c0d360f3e60a3b0cd2b7c9b4642d0351f47322d20adc4df815fb466149fd98710314c38c9681115a30a9226f792049bf00b1b8020abeb665e1729d89e";
}
];
}
diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 274fb8f13447614771e8679b2f1805ee49f97bc8..c56d30a3ccb8c32204c888542bd7f3a92b120892 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 = "57.0.1";
+ version = "57.0.4";
sources = [
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/ach/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ach/firefox-57.0.4.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha512 = "b98a06b55d43f7a8e8c6acc9ca303bfcb9fc331929199ccff1eafcc9be486ea2848fdca977bebfcd999c81bab7cede0d85edd0f3d3c0147958fda318b4259de0";
+ sha512 = "44b5cd0112f6d6a8577b831b55bff2df34ed86e7ba6e16f54d2ec8a738453b27fcd4cb0d2f1c6d64ebdf9492ab2d0dedf15e3a50c16eb1701e24ed7293708ae9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/af/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/af/firefox-57.0.4.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha512 = "e414c270ee2213577dd9049ab711e33f151dd87a3e3345ddd5abd16e413f4b510c6beecce5837908e2221894ad86d1bc3f22c1c5a67a606a8d112a24f0eee089";
+ sha512 = "734b6f164ec97e366f5e747c2bdd104f48c33d39f4467438da9eb9483d285688040cd508e864d9e451a9cae3907b4cbf0738489c3697ea38dfbf5d8186b85068";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/an/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/an/firefox-57.0.4.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha512 = "2766735ef82c7a2df8e822a1e433789f6e5708f42f7b4bcea008f7926b7312bc44860fb4c6a90afd1b2ad8de251d49139ecbe05b8900d60a0c58f29caffa62ab";
+ sha512 = "1be1776853195dd56b83ed4e35ba96f263a72ba009311c48e59ed42b3206a3b9052805fa7573f7064307763396a3b10b44744dc38f11d767ea67c450aa33e129";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/ar/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ar/firefox-57.0.4.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha512 = "e3ac3271fa93d8f05a0a953cc127e4d3bcf1f032168c372938b3eeba72fe070bc4d67f0027af690559232b6078337d48b3ec0426d3063df1316f669c9763f1be";
+ sha512 = "87ead011bce9035004af52e6f25b1606d3061cd425c0deb19de91f166ac793b0d8689440aab6e45f469426ee4deddcfc5a9f4872f92121e404c4e69cc50eb22e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/as/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/as/firefox-57.0.4.tar.bz2";
locale = "as";
arch = "linux-x86_64";
- sha512 = "e41bb2bfb0335355b3d09929df578c3081277cf08d7e1390d47ac88480c966160064eb1d55395845a000e88c5cec32450ea24c8c440a7d6d7ce284c2833964e0";
+ sha512 = "0cef33747c17bf4646aec1d231269ca2198009038ac2b666edabe2b85333c375c18e249402ce201683d5145292057ee38082ef81d92304ce34d8fb31e5d240cd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/ast/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ast/firefox-57.0.4.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha512 = "2da56588bf6d6cbb54d20a46b95f36ab75edfc98b74bd0bb13cabce7758c396e5c3bb4e0c1fa4400a0248c7415a0848b823b83b8231c9fcd11e66c00ad9608ef";
+ sha512 = "ee98e03759f85a3a52571b83c4fd9eb43bc655bb17735197a6cf30b894f1875ca1905e5807cdece521f24d7ded98118ac0c157b9c981720d80bba208d67f423b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/az/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/az/firefox-57.0.4.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha512 = "e4e3058c415c65bba21fca8b0fe078782631e4f8c3ff3aad91cd0b461bb76d614fa89880b51dfc698236b397195922138d9b5bc79e81bab4fa689e850514be9d";
+ sha512 = "78fdbdeb6ac24450f0c6a52e308edbb31f1cc2c6950fc25295315c4be953cf35e3ba220c8f8b9994be055d963f6a2f55775b743161c71e24552fd5882dcf0b57";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/be/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/be/firefox-57.0.4.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha512 = "3299c58454a9b31a70beb5e2a422ea067d58655eeead6ff9c03edc224a369dc5cd7cf165e9821d6d9cc5a18eb3ddf28829728308cdf7e7345e9d77159b99380f";
+ sha512 = "07248a7ddf23657647d6e3f154be6325e04cc30b02a724a0b4c2c159060b7c11c2ebe4d7c4bd09313d1b37eea7e1bc45c666b9e19ae7d01e8e10f6392a70aa04";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/bg/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/bg/firefox-57.0.4.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha512 = "091410e6edcd21f3cb2858b3b56908cd8c490bcbe4bc97298c0a5a0abf44f88a05968164511302aac866665045e5bb0fd21ff9d26f52f0ffec4a68312aa440d0";
+ sha512 = "6a05d69ec9e607bd1c7e48b882e90f2069522f99b8397c4daffe70d7e0ac2012287db2cf78d71df1a7e4f20ceaea1de86c61b857986cd3f785b4c55574346340";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/bn-BD/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/bn-BD/firefox-57.0.4.tar.bz2";
locale = "bn-BD";
arch = "linux-x86_64";
- sha512 = "572bc4cb51992645fd6343bb43b1b32ecc10354250bd68952e519e8c5f1c174e9d5edf3d7e1edc5a080de0b479cb6c8871dca8f8536791d999f1de00379cfd77";
+ sha512 = "441f56cc7eb513e20a89732745c1d3f56d82bccf09f2903d9f07547a018ec31fc95bf5b56b9875cba08f44bf5d9af0afb6314f72c5c4eb0f6546e06a6115fb4c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/bn-IN/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/bn-IN/firefox-57.0.4.tar.bz2";
locale = "bn-IN";
arch = "linux-x86_64";
- sha512 = "3f8ee9adc708fdbb30a996f17bcc9e05ca99c0cc65eabcae3c77440d909cee88151269cb9c7bd03117a71371ace7ad09dad0d0c71a6bbb70a366f5a427c5527b";
+ sha512 = "eded452d957d9bcc6c65e716e1271cc130ac76897a166f2507628e99b50d99dd970265e4e5ff276d509fcf2026d3c95f4ddbd7b0b09144495bd483af724c9636";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/br/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/br/firefox-57.0.4.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha512 = "6421a181eb95d6510d4e81d4dde5b5dfa1f52065ea8aae2074978e22310bcd1ee97d1133021022e4cdebe12cc8aad0e440bdc4baa752504e48dd42e77235a572";
+ sha512 = "7ccf63c946299241612875d220c613887dbd4cfe5db019db4a2626df2ad6de8c00564bcf28aba66566eb26cdaa5cd7ae15eb5c6a37d7959663609581c617dd0e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/bs/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/bs/firefox-57.0.4.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha512 = "99b45a418aea334c58ef3e6ea520c1b0376a7fb12da2d635b35117052c40b3d603f52165b88ad00b7c647554939dcada70b8771f60c76cada729e1a864b9ad7d";
+ sha512 = "de319c64ef4a008d30dd1bd26e32c17a7fc5ed73a74af2029807004ee98393adeaba06ac9f02687e359ea0c41a5ec176630fc1cec1b87fbf789d2da68549dd35";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/ca/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ca/firefox-57.0.4.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha512 = "845e4de26819bae1cfb327c44c8e15aa5f96e0d3502e8ca9f3820d6a3f92be3c26adc5728d36d14991812e94207abd3e2a59801006defb59a0c362082838efd7";
+ sha512 = "f90f57a74a082e1015d04e4992d3137d6cd92d15ad304a2eedd3c293babba3c4a2f352512c0d3971478cd3df353d29f9ae3b1fc09ffed19cc3c7ab4475129371";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/cak/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/cak/firefox-57.0.4.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha512 = "91c595b26f4f8c7505d760b88d2c194a5fcff3f15ef7f5de6bbe69094e6e8144e0d27075eefa7d5c0850e9bde9b76cdcf50e251dd82c7d3ea743e5408886d24c";
+ sha512 = "0bf057c37cb1bfbad87dc79386dc13eca311399ddf1deaa625ba920c72f690f01e20ce3cf0d7d1afeb016e2f27c96dff405c1b168aa83bed0615e55f1eb259c8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/cs/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/cs/firefox-57.0.4.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha512 = "c293daccd96a4d5f41ea38e18ce9119624b58ee6f6fb3fd1ec78e78cb440a58010368024bde08a209b65bf7e7f24303c967572f89db0abd9451bcf02d730bc87";
+ sha512 = "609d94b2e7e920a70c2774c3ac9531c7b97492401a7860e43c3a8b0ff8870d9c51955dcc0eb9ab4f12eece415338e6a8a1f08f55f4c5ce5f15def081d03d783b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/cy/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/cy/firefox-57.0.4.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha512 = "0f0b41d26323659c412c718bbb6bb493fe71a6d61a52eee17754ae4c7ad462a0cb5f56106854454e82a2521adf5fd65801f15b4eda17664c6ea81a79611ca8e8";
+ sha512 = "c77903916d9cbb55eaaf6220dd8a1a101c90a338fc3c9b289cbdb1c0e2080dd9a839b00575e38014ddce4478f53711cd31834d6dc94deb517b0a3e8e674df7e1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/da/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/da/firefox-57.0.4.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha512 = "799428869a6b1ae2ead7aa8fdc4c2bfdfd596abda537812e28f48847481851f0d5d4fb457ef99ec32791a430c0a1754bb9955eb8be748211ebb1a935adac503b";
+ sha512 = "69486cfe520e313485eec89f64b446de50a87d5f94ff6bc76412c61c898177b0f7ff969bbcd7daca3bbde648394e2f82b2cd50be933f5ab6168157d18156d8da";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/de/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/de/firefox-57.0.4.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha512 = "1f826477c733bfb4b1e7b8e490edc4d17e0ff607217857c089faca68f1e4cfd045cddcb108b4aeb19f64111299e662003ed8db9eb3a842b7ed87238166094c7c";
+ sha512 = "c85ac2270f30c9516df4a1331df5fe4a28c79787a12e306185b78c30a0b74d655c1cfa3e2b17ea17acb5ae28e47dc1235948deb6eba1a8d744f6a3864806c869";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/dsb/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/dsb/firefox-57.0.4.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha512 = "0a6c1a7811aa7796dfa75249336f8b1c10ed6768cc92f573a8684c7b256a9f274cf10b3f466924800c9f78f480eba3744564472a9ad7636e286809d19b39cd57";
+ sha512 = "24b96b1db0e5f5f1a20e63d80dc69e309daaccddc0327b40fc8aae20a2e18f2698bfa50d3dbbd8268b54d3e92ab5a07ce1fa04de8c4dee31dc261109274728cb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/el/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/el/firefox-57.0.4.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha512 = "bcdf4e2c8dba0157eed7fbb27110ee177c129c5c5c54884d064b1c19ddcdcc53e6c8e22165ee13cda3ba7a35d3679a09e019d44738d20a25272ec2a849403010";
+ sha512 = "f22348ac3448a39472e427714136c51648f5bbf6979a402838b0c11dedb090b4c16397841cee5b2dc142fe942517386db0063ddc0e4b317e911110548a7805a5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/en-GB/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/en-GB/firefox-57.0.4.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha512 = "1987c0598885adcbd292bfca5d79bb107724e5dcda92416e06d01635c54ae55283547a65fa1bc0c0df9534b09c2da9fdee42617c4afc608b1d519064e9d4184c";
+ sha512 = "6f53f1aa5f788f4b05135b610e117fb368c100053620f8283d39a9bad6e9710978b7ebc638514a04fbb3025407fe728b3be4a80d2708ba0aadfa11485e012e30";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/en-US/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/en-US/firefox-57.0.4.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha512 = "44abb10806a486a58aac7d97fc5d2c36bb93a4a2a5350f121b08828ab7a01831162703c3e623d2b550956de287c9dcc6417aaf0e68ea7124c30483a3ab103fd9";
+ sha512 = "c6e9841fa901f78593d5bd60c3c4616e9a8dff696a5b812bcc4fed52287fe7db6c7bfef85a7433f08b3b940de6418aaf1c7c90dde6cff1cc6c7e0efe439e0ddd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/en-ZA/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/en-ZA/firefox-57.0.4.tar.bz2";
locale = "en-ZA";
arch = "linux-x86_64";
- sha512 = "efffecd63430f61d94e8e06436ee0831a502849ace4991109c0520fabd053fbc81f16dd63d499c2b225c2dd7a71fdc51d68a1efaa8b90dfa96a65b89165bffd1";
+ sha512 = "a980707b6b773c0e34f385ddce1be8c4ef3d5a378601ba3aa40890fb247a666cb8253aad8a64859527a7becc9925124c9eac1e13a19a932158aaa953bbe158ce";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/eo/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/eo/firefox-57.0.4.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha512 = "60f713c6d739c2602c9699b356b645481e347f43a76adaa4836756b03bf536f1d359c7f6e025deeddd457007a44ea5bad9b1ead90af9ab5a2467703cd30a8ade";
+ sha512 = "6b23c8ddcd84c96993b4cf7f256df3485871e170068db563e5d0c649abd8e3b5869cbe8732d3a97e1927f45c7c8c18d697fdebab4ec1bef7de78496d06c1c0f9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/es-AR/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/es-AR/firefox-57.0.4.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha512 = "e4dc9a067a5cdfad9e1528be6071e67e425fdc7ad0d395d4e86f19db6356bae3191b7d3be32c43ddc7fe3a887a0242e26a6072c7a1bab37020ec49f9f5cca245";
+ sha512 = "985149e873bdeccffd6be63b35a56b3f93d3dc35cf04b055af8dafff68ce82bfb752a0d48e3ab43a9b197d15cc11748243bd2e9537a42f59c27a7868c2b95546";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/es-CL/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/es-CL/firefox-57.0.4.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha512 = "739670dad0bf99bb4adf2437bd76d87f9099e724edd2ce97a76835b980b5390bd72a3e77aa261e3787846a1e2a046c27dee912386a0ff5d6710ff9d2bf6b2d08";
+ sha512 = "4ec591554411410fb90215dfa229fe207bc3303a1bc68c4fc8894390386c07ebf958fcc894f2d17a9876c2da9b8424a00a62fd828921fa575ce0b0aeb037ea4d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/es-ES/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/es-ES/firefox-57.0.4.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha512 = "5c0a3a5e047792edf0f98d3b3c5a7ce0af0a47df0bdee82a2c20b684d6802c0f33a3f5be436747647acfbbd9984378a7a81f4e82455ca4ac971cdb2a65da3858";
+ sha512 = "751741292c0794916be2636b42d03671d408b5e1675544c44238cb28131e64eae07b9524b57e5cebcd491ac80960d2d60619a641f94d333b5622ab8cda812e8e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/es-MX/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/es-MX/firefox-57.0.4.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha512 = "57060bbc7cc53d8b11df426a98fa887197c9a4ff0b3377119ab3ae6b7042428109660e02ff2002476bdea6ef53a8417665e9d5150b3be7ec7bd312895c1fb07a";
+ sha512 = "b54419f6cd1d7bbbcee875cdcfc06b9b6d053a1f320e47ef575c6d11ee3dcdef0937adcd6889e0b45c592e51547b66e09ceaa9ddbbd901aac6fdba0aa09df9e2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/et/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/et/firefox-57.0.4.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha512 = "eeeacd6e9ba7a698c7644489af9bf39b32a1b1eb99cb5a714e331962b8852f10f4db0bf95554778853c8c56fd1f6fda74d5677e3548252f1c822c531e66f9c13";
+ sha512 = "fcbf4c77a053abbcf0e071edeec310db34a195c9b1d07fe75ada0dbee71854631756a148b9fb36aba96865c462b3efb6c5c6689cf094430c6b9704a2e3e57294";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/eu/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/eu/firefox-57.0.4.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha512 = "c67ca8a2448e54b1b55c797a08d0d6c1c99709038077ab5497d322a4754dc41dbfce1c46ad26ad9ce8113a608eb7354fba441ecd747beb097c31a00fd7d869ed";
+ sha512 = "6930dd5dba3b9d75d1ed998ee079a06b4222e130b7456851b2be8353d29bfc883439617a0bdbfadbf027a1c14d987b5ef4e15419190cc67c54d88d942f2ada42";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/fa/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/fa/firefox-57.0.4.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha512 = "3ab647639452291bc353824322edbf25720b05378769f6ad038f7e2012f148d158e916aef067befcc471c56495061c8e429c07867c704d71e1bda864d60e0adc";
+ sha512 = "967abdce15e37d3cad52a5eb6a3e929b0ef0c6c8e43d803c88c20b649dfae3ecc980ba64f0ebdf140938627e857a86d1cd4884a4db682bdb4c9601e6cf1b3efa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/ff/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ff/firefox-57.0.4.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha512 = "a336ae6bde99dc668f62e3910419e7916f439a7ddaeaeffc650723ac20218dbff7a8929622fff43c1d409c7e54db6047034b53cf937f819fbdac018e3e461a71";
+ sha512 = "28ee8f395cd3d214cc67068a1421b466dfba935cc63f9156c258556c89ec74ca70d21bcaa627f4ed7bbe372fd1577b77e03230b2f031ff26e72c87b8889cad93";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/fi/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/fi/firefox-57.0.4.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha512 = "8697094c8bffdfde8c921e12617aa1b493962ed1794aaf9d15ea53943244b4aea007fe3a54c28f5e2b611f3d11635f4fb0b7391f6c8a3d23eb8d3c3945b72455";
+ sha512 = "bb3eff25215b09cd7789e80161b06c7a6e3929036895a9bd9d949b94233bfa98056ba2123602f06b2d7572857371390bb887c50c2c1a37c641b20e250b083a5d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/fr/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/fr/firefox-57.0.4.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha512 = "b1eb6b13b204d9273c14302e5486dff516b00d67b2c40bd8cbd13abf2d8925fd2429adbf650c89c0106dd3d74ef145a073ff69bd587524a373ddf3e0caa072de";
+ sha512 = "facac474073bcfceae7f1a1b8554e807136c277f31abc999b2abe33f2dd6f365cbe6549a5f9542982c3f5b80f42fc1c7e361a5402f74e359170c24570671802f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/fy-NL/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/fy-NL/firefox-57.0.4.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha512 = "f900630803facb35837054d2134a1e6bc72fab5fe57e68d8e34c9436f8ce9acf34041f64140d2bed3a6214b7a6eadb3d34d4a91408db729f6e466a89a751850a";
+ sha512 = "84deb0e23a3d6a56cb2e52958c7ec4a650ed32a0302d51ba0f9b02f9f6d7f974402c7445d51a7be4cb22be0bf582af377653e2944829cc075a01804727bf0387";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/ga-IE/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ga-IE/firefox-57.0.4.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha512 = "2b6afdb01faedd8456a6e76911ee28909cd6e5f0ad9406c540645867c9080fcf0df3f5d41b39d5d28cf329ec9dbb44e2f57044a7c9db6bbfb608cd7ed25b4cb4";
+ sha512 = "41ca5151a5d76314255a9f772ae7483d8c67df84a5511ad78cb951c6d11c8b0b78d43f19d3047ddd8add13706303335058adc4be7779dbe3bfa5b3b60a1929ce";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/gd/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/gd/firefox-57.0.4.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha512 = "5a643a7cdbc9a3b97aa78cc6bcf815f78820fe03edc14c8c0cb960a8023a4805ebd44d5a26f64163e265facf3e41b5496c488f4b0735154704747034b11a4913";
+ sha512 = "020921ef0e372eb1a9cff8c71133668f6a708436027a5d163188b8d2928fc8a264ffe5f7a1cbc40e109a711ed4a8bec26c333c29c84d4cef6c1985fdfa54a0f0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/gl/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/gl/firefox-57.0.4.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha512 = "53cb8814f1a1984e4ec19d89cf9a15b5f3438904c0346cf68288cd30a3dcfaae5095f29a38b85fcbf89f65ce6f9dc707c9c289c5619500e6ca0333f7c06045cd";
+ sha512 = "40d1131d2f2a365bfa0432b8deefa8c705b508419ae3e1b764500fbe67cbe38ed9a9813031e37ccae2e835d1f9d6b6c18edab829bb24f0658a6885f197d108d2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/gn/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/gn/firefox-57.0.4.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha512 = "c760e2f00d8f444024c6e8ca6125f1aa348f4207a8d43a2dd2bf03fe014236ad6eb5f781cd5e475acb73390e93f3c6d9ce66add2acd02a42913115d417c6ca34";
+ sha512 = "fc16f7ae512a49f5af381e3952b9af0772393c1e0b917d3d946a8565733dd8ae9187bb1101bd9604a4e860b8e4d001ad3bbd8c3ec023207cca28e91f6ead19bc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/gu-IN/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/gu-IN/firefox-57.0.4.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha512 = "911019fe7509cef2f1af15536db0a6fda5570a369c48b778960971f6c85ce5c6957765b2475a3f078e8ef674a8dafe74f44383f2fc77579d436313a408010067";
+ sha512 = "693dca0183d8dc7962a4505925abb40d286b86fae206ad2c88153ceff02138e756a61615d9043bd65fe9a60ab990d5a79f2bd0fcce784c361488c3047282be17";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/he/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/he/firefox-57.0.4.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha512 = "098f14d72c2524f205022ea7b76c36396cd9f7fc64b46a7ffd1d1a8a7511ae89ced577651d69caa4a92e2e800d72243b0516c52e50cf852f34f44a6942eb7e23";
+ sha512 = "75c52bd15a6c3b7254981b82f9d5f0b9aaa43d2346bd1376913f6974b63d9f6929ef92fda0916103c643ecaa7f235b4268ecd956a4194ae41048d794029605d1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/hi-IN/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/hi-IN/firefox-57.0.4.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha512 = "7676ec73396ad6c110ed97a23a90f9b2ef9336bf819615bf947e5c46d728fcf8e4073754b5560fd25133092de56be30c9cffcb00765415fcc6e22c4fde621b17";
+ sha512 = "752852c1295153ceea9d55e49afcdd185ca34f31d38dc2a85252f5ef2b0dacd9a6b3a1828ed0d88314574241157dd90d1da33c6d19fe25d1180ee959bbd8ccf5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/hr/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/hr/firefox-57.0.4.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha512 = "6beb75b752cd51ea9dd96358709e982f504d1424ccde6e5ab0a9cca2e1e99282e6ac2e3d5a768c3bcb15f4eff316d32201db23d07321e0824d0de8793c0cb949";
+ sha512 = "01b29494db80f9483334bfe23d62859aa16dcd918b1acf308d765b9864304616182195d2c10e6ced4c7f1709ab2d5a3c5485614506ce727fefb2187b82a28895";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/hsb/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/hsb/firefox-57.0.4.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha512 = "8d3cb7c80c4f0b2abdaed55dc7a3053a9425804a9ea325f582c185583166113362dd064a411e48074925855677b4c093d7f45d1b7665ba977c8d4f802aa03881";
+ sha512 = "efb189a9daa8335e8d2b2b31194d808edcfc0f8b607a227daf0b74ae456600b7ecfc9fdb1340a17cdb6913735ade2eaccd552603737c4c9bf3abdd99bf438d63";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/hu/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/hu/firefox-57.0.4.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha512 = "78f278cef9217d9e9a87d404c89279af348558538ba59079db00969e6ad5e38573ce26474c3a53edfa838f023d83ec39c8e0a2c8f6b176b45d439e32b0328a82";
+ sha512 = "4d6a08d3ea1cf72261aaffb7c1887fac28ee68f6e1bb5a540967164a4f7294f0a378b0cfe3dba867a5adfd21e4df3478a9bd5be057ce923c53fee39fdcbced4c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/hy-AM/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/hy-AM/firefox-57.0.4.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha512 = "a59eeb602b1dff769919f0c1f588bcf4c71c487e3c6d68f86dca5a03d9ae63fa5e0cab1ad884f2ffad7a6eca1e8c47d4309a065131b9c0fdae961f585819a22d";
+ sha512 = "c68660b7e1482e46ad66c86623d9252466b15eaa3d2c848392985db2932624e3d953ee48d6eab39c42dcafda174713fa148aab41cf04ff63db38eba563303c96";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/id/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/id/firefox-57.0.4.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha512 = "e79f42b028fe2c291f9d405564fde0b4b9571b7a3985eac56028c684b455a3c627a596ca7c4820a53a9c1131713e7658990aaaf47c77f7ec6d850c55a033a1ac";
+ sha512 = "c93a02327cb8679b65c9770d6105bfdb6ad3bca90191f3d0fb1a5a35d3bfb1d4616ea54f3af5aeb76449de973d4acad0873e37674524d90010cb830247189652";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/is/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/is/firefox-57.0.4.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha512 = "1b505648ba5459e1df251f676c2c55b656f6c879119a8c64a46954d0597cd11b4de8f8f52b9a995ff689573feaeec808300cf9a49379cc2e7184339035958a20";
+ sha512 = "b7961afc123a574e656e98eb7b6f819517d3658a36303af89d36f03c9a32137984e047e4021d30d137294f41930645a62f5dfc06456ade330942a880aa4381a1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/it/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/it/firefox-57.0.4.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha512 = "f0a399c409db1e8f787b657ab801db9aa2f47f57e98437177a6a38ece6279371e610a3d83e5311f23d021d3f5a67d0d4bc61c9dee63d20240699410206028731";
+ sha512 = "7ee154c376146c40828375072f0c5ecc652eff04f8df644a25f106963fb1ba6973aaa7e7d5b27918672fa42069d91d4207e8f779d684cb342c29d56a1a020ce0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/ja/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ja/firefox-57.0.4.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha512 = "8d77723a2212c38fd1fc0671984f25ba1b8d1fbf877ae4cece67d528a5ba29e0281b7a8c4ab00150b47f21f63651ee5c187819ee14048c76aa728924ae644f36";
+ sha512 = "ff5ccae9fedb3366319a6ee2afeb849720ef9aab9a25700e15871b01addb1bd18d6a1ce655e0ef0adf4a1f826f81b85ee2a3e21161e554b5a2e9050f72c13786";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/ka/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ka/firefox-57.0.4.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha512 = "695aadfb2918f3bbd1317d8fc6aa36dd7a938e9bc790a89494a5a49848116836aade5c7df4c845aac6c465c44fdff42c5ad0904c9189caa5ee82009b53840582";
+ sha512 = "fe165e0c5d4204209ee9a647272c73c28344bd16343338ae6b8261dca2b5ae4d05b7fc6cbd3a7b3871e693706b7e73a3b7ef3dcf40ee4dceabaeac12d5398a22";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/kab/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/kab/firefox-57.0.4.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha512 = "baacebdde792367f36d0fb62d3c5d65360704b178ade590089fd46b3972d7e5757f5c18bbf2c810b12cdf7ebaf61e7520f437b4e36f02f010385efd59da9f75b";
+ sha512 = "294d0980cc5f9d7feb628c797d260024d786e919d2872f3f5695ba7e4fbabdbfbe9bf5c7327645ad99771aae8902fb3fa6d6e5de1eb56746b32b36a24564501c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/kk/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/kk/firefox-57.0.4.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha512 = "544d96b4d18d3f5a86f0e4dbb3bbfaca80a2595c49edaf843dc4120044fd9b0b632ccbd4a0412889c4077913f3afd2e807372b56116a6f73dd7a035080e16e87";
+ sha512 = "221497e9d38f2068f38ab37efd8818cfcb3f6281ada16436d7ed22be0c02806a0188ba5be52220ee632e575989e76fbf57263182281bf0bf736f203f6a048bd3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/km/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/km/firefox-57.0.4.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha512 = "fc5f1b62e91eb2ef33f0fab875956cf5d386420d08d56261aa9724ac209c474a233eaa6f30708090de3eae0baa6c5b2577cfd98f94eaf4a044dd2174407d13f4";
+ sha512 = "cce416868cfc51aaa334bc1fa5d7102177024bec64d98cc1034fd1741290876d4ab2244bb49befaaf7e198a4401e43b3010894226fbdf838aa3b8b8282577ff1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/kn/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/kn/firefox-57.0.4.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha512 = "1d444fa0eee8493d425c4f18d0b8f935650a9c3e8ba662552e2469e14ddb49e2e42a7ce313c79f5ad857f063cffff1493b76138c6719d075752b55188c60d1f6";
+ sha512 = "6f1039c079af325b6190e1a0396192270adc3aba374e7cfe2cb2deb39b86fe07d605c9a3d3b063c91abb8ec6348c324c419c212bcb79735ce8ccdb7ce4608fbd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/ko/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ko/firefox-57.0.4.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha512 = "ad7ebabeaa0ffc5231f2aba35c96a8aa7e05ea085782799807a4c96b01598814d96d1ecdb40984bdfa946a2b0400039b81cb8eb33f42caed80a60a99b931df8f";
+ sha512 = "425b023e7eecb9f550fdf96c544faf21aadd04388a4b57fc28cf9e43f82d58dd957983046399592b21099039bb5976d691512a93f4c1a94bc384126b8667e19f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/lij/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/lij/firefox-57.0.4.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha512 = "0ad6eafc2fba94d1333688ac3433eb2f08bbd7733f9db9a633af00800a3a27f7f987cfeefd949b26335f617e769450140ec939614f378b1fc6a1a95ca1812b99";
+ sha512 = "2410a21d6158314076474318c2be450cb3b3397ffc5a9e9e8391218b16116371e2816c6fb1684b3fc3589a7a9834874bec01a2af39331dd592fe9fe54a3f90f4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/lt/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/lt/firefox-57.0.4.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha512 = "0563b0494e7a0ddd506f3d5500127f130dd170643ac77aeb38cb5855c4d9f39f27882bac594054d89346ae9db4bbb1b7d89a56888de9d15fb8649d00991cfc02";
+ sha512 = "78ec1d96aeee8f610c2637be20284fe85913cd885a46ecd3965ee0a8f62770307200e33505bbe67e192c38769d4614682536394186ad488b51593a7f6c7151f3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/lv/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/lv/firefox-57.0.4.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha512 = "0bfe9edf3f372cb0c3106e728a123acb76169dff80cbc55b450191c0d07df201698469fe56df92b068d0fe6ac308e302695bc96ac06dba5c9214bf8246e93744";
+ sha512 = "9a257cc93498e256c9b0a12ad8b8922cf749fdda789197285f0d1910eb50b3d601da46806dd50a4510ea3b3fb8e8f4e494ef87d1e5db2208993a9e3ed59e57e5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/mai/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/mai/firefox-57.0.4.tar.bz2";
locale = "mai";
arch = "linux-x86_64";
- sha512 = "24f332802f6ebde8efb28de1390f9036eb5a226247b8e11ef0b7c06e2d7299cd1b4770837d197a0aa98872985194cb13498c045813d362e32853d990e3f6d27c";
+ sha512 = "bfd02ab5efb92205dc649afb65263b15ff46e7fd0d32c560ec3977ea18d420c89782fae63596571155ae7a77a59a5c2e9d25a41d18b845e502784bfa264638a7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/mk/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/mk/firefox-57.0.4.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha512 = "3cc4da8c95dd51d1a4f996edc6b408e7b3231809d0e7b6fbc1abf7fddad6337d898319e57c2282042ca4968c804e5d7c572f2101a5065fe9a158dd394fd539e9";
+ sha512 = "29d5b2edae82aeea218625ed9175455bd3a3928886035e55f60b6d5fb717d632769ed57023b4e6d944d22e03c5169eb2887c09ee4c682a6882a5bf298ee0af23";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/ml/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ml/firefox-57.0.4.tar.bz2";
locale = "ml";
arch = "linux-x86_64";
- sha512 = "f7c19e1b1cc7328f5dc9f2f468ee948c4b8f93515b527f805a981eb55edb0c4554940297eec9b8138f0437fde10624a048a7f24a0195d13d7ffc661d54d2a37d";
+ sha512 = "f247d859982459d3438310fd9d3c86ad1cb7448238a71dd81f0c8712b31da1fe27adf1821e7e91d52e68212d70826d11bd3728ad3642a206574cd278df734b05";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/mr/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/mr/firefox-57.0.4.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha512 = "144b404bb7b7511008a48ed88ea87bfbed2b2befad7a885c74c0213c0ebc9bbfcf9b5f44607cb6a11c58d9dd033bf7ca2b7f8358896896a47e59245781b80af1";
+ sha512 = "63654388432e076ae5d28cffb969213cf875894b94354f652d40891d63dd0a25e6175c3b51417ba5b760a85584bce85457d742829603dee9084c4c21469aa02e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/ms/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ms/firefox-57.0.4.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha512 = "68ea8dfdc0dc60085f9c59ba25738f8a28fc1ff7bf5055f6e60706184dbeeab5ab777a9b8278e6cedb8fcfce3ac8542566c9e5f1905021a279e7afc7bfda7e75";
+ sha512 = "bbaeecbb9d2f6d7a881f219120d9f3769abd5713a8d38a1cffac2dc3dcd7849b49098df20dcd84812bf4f3a55e70ca1199cc15e67ab248f4c5ab9d2ea91cfcc2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/my/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/my/firefox-57.0.4.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha512 = "b74ad06a52d973e906c6e4b96c4fd6ededa3db34bb9dce373178729c77eb53ebc8dd452075ad7ba5f57780dddeaca5bd0021743dcda4f7cc570d8626835dac72";
+ sha512 = "882e00804181821783617db75170650d5d8f36db1d32fa183a7d1ffbf04dbd7a7b2c9405520bc09973af800f8d5aa9859ead7f298fb9a18c2c0ffb0f18ab3542";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/nb-NO/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/nb-NO/firefox-57.0.4.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha512 = "68a8762950b04f0c24462df6b2b0567742cad591d26e86f5a7656712ed71e04afcb190bb6d190a38734ee3df5f2735ac4713e6e3a7015d0bf4b5226c23039182";
+ sha512 = "5203d4a39f9a3ea14d262ca13d2e940d8381337cbb1e9d92773d3ae086d9853bb3b5e9d9bee550655b15ac2cd6f0fbb3d6ee52a836e94cf6b133f6924d6eee83";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/nl/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/nl/firefox-57.0.4.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha512 = "1fa33fb50a11a570f5a4207c797f79df28740f9b811c02517240c981518526bcc2614cb65f9c68745648009482e8e40087c5774401c00ead9da37e94c7cbdfd7";
+ sha512 = "4ec42e236d0fd252300d2785f865e9d1991ba5230a5621798c74bd2802220ddaeacdb43ae44fdd365dee79e7e4b97cb50597713acc603c72c630aa0f409cc5c4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/nn-NO/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/nn-NO/firefox-57.0.4.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha512 = "cc15f9bf97d99907f51bb060faea940eb4ac89081d3eea3bfd619a385e9e1dc9e0fc66f354676dc0066b5000a9ec5edb676a9cd5dade0cd88bc7139e62bbf25c";
+ sha512 = "4a50223708c6a45869981bebdeb8b5192b3541eb54e57e29e60671d436e12ce688943936761a9033b03d069a3c09ee1cd5a2265c0173c30f581710a35f559e89";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/or/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/or/firefox-57.0.4.tar.bz2";
locale = "or";
arch = "linux-x86_64";
- sha512 = "0996fae40051db7e587ec4bacae0c30311676e837534d52c2cab793925ec2724038497d2c6005df6c2466bafef507ab6de562f177c99ea4a19f0d3669de173ea";
+ sha512 = "6439073c29b4d930a0b2365824bfdda5e1ae3ceadde8f1949c4eba55e9aee9f15a22ec7293e1c8dd7a5f0ec63914f8054d688dd3fafbbd70e6e9473821a482f1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/pa-IN/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/pa-IN/firefox-57.0.4.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha512 = "442e86074d56f595bcdf3d7956a71fcfeba673aeaad9bb441faa4d235922503f2ea89b987731dacd3b1d7747b658e62efd8356f4e005b950d580badf90fadcd8";
+ sha512 = "ee2ba2085c389d70312390926f523e9e39d030d5b0b261088fe9b0dcd752fc1560b80817844d60835a38ddc49df315aa9575cd5091ce346a97e5634f810ff4e2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/pl/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/pl/firefox-57.0.4.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha512 = "2d3554aa3403fa8b8c7ed972432bc1a78d47c054aafc3acd3c7d78d716bec3851c8d8c17b548053f705c9b62b0cdebbf7514fa6ff18bf6fe744093bdfb525e55";
+ sha512 = "b2c4b4ac6b2b70834787efab3bf6670ba4b9e378a3ea7a206877778a32a7acc51efc32376d8f358adf9f7756e0c784e436003b8f16366741c6c7f346344352c8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/pt-BR/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/pt-BR/firefox-57.0.4.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha512 = "100cf68e95f4b9e67db063a9ff50107fb57e8d6872a1259e85944320bed4604d236ac066d60e8ebda46195207290e251d5a5be88be894bddf6f3b8f0887e52e1";
+ sha512 = "3acee98821d5f24f8ead9f27233fa22372e2b5d36bad52616b5a59705992f816ef6b4cec3e2add96a76f3e50fbffca762fc88445b5fba12f058ba06fb3c7ba6b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/pt-PT/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/pt-PT/firefox-57.0.4.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha512 = "b0be537f63a19ffd1afe5f3c08a890b2d7e9799a8dfb3a06e3bab1ea8c36c6bca6d62d83de1774f78073886b63f6dcc51cab1039efbf34a40b48ff195e470bbd";
+ sha512 = "16ba9337bf8de3061d2d7fc9b609b02a61e7e33e5bacf5dc31f2b76bb281f8b298534f68b8bce4d5adfe87b0a18b660f71bf81bf556625b35a118630f2ef0d23";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/rm/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/rm/firefox-57.0.4.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha512 = "973211fc29e85643e4e0657793404e86bf9e0045db8504a547d5ae10f0f0373ebdfac78243342b966dd7e33827e537c13d566cf9b38d9c6ba0a7b65fa22207e0";
+ sha512 = "433b965bb97d00e81071d1732941021166088b55bada961f8dfb1bb1c8831f0df7f2b89879e52f992c781b33ed68e2fb6058c9ae71fc6827459ea3a854ff7af6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/ro/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ro/firefox-57.0.4.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha512 = "dbad9d651eb5ce4140ee2fffb10189c238d055eceadd31ee8321bef86ea4aacbe1ace3e33c72ce4a25b8ea81e8d6bcb1e7703cb076fa746c3c0c6d00feaf83ea";
+ sha512 = "749c7351f99abe43f073eaf32fec454ff27e725e28eb6f2cb094570d1bde4fd772cca4f05ad3ca83803542c3d85dd2fe60c274c92a8339ab1b619e7fdfda7675";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/ru/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ru/firefox-57.0.4.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha512 = "ab0dc0e12f8334ec076379a1831209434a7c232ee8a63442d55d3cb63505fb9760268a4fcfafab9fe802b38a37faebdda67493cbd769521f80208532dcbdc253";
+ sha512 = "430c7afe325707be3618d717bff3d9e5b39edf82b786d0060fe6f6df18d8c9145848f4a1e1daf61b4da83b548dc95d4e5766ec4c882a2cd016e934d7c179791e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/si/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/si/firefox-57.0.4.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha512 = "28667037738047daf790f0ca029ba4a5edf2a84372f982cb738c31e5a5dcc3c85fa84d952ceb0e07fffe4654623b547889d30ca932cc03529daa9beef21822bc";
+ sha512 = "452c3fcc5466e49c6e56192476d0957aeb60328ac2d5b9284204f50b07dee7a4835f287cc86a52476160da38f68212ad2508aa4599b8c2824190017fe3567764";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/sk/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/sk/firefox-57.0.4.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha512 = "651ff7ee6173ce9deba68d9e9327e56933cf32be8e07268e744bc8cb1954d90162b83d20fb2b10d380ab0a78669d9b23216b4a3e23672077b7f222db3f9367db";
+ sha512 = "cb67db6707e32c44eba532323ea16c55146a53621ed1c37a50f963ac3b4e66040a028defc175a16a0d4c0986fe67c966c56b5ee19db042e1aa93c92517e42761";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/sl/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/sl/firefox-57.0.4.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha512 = "f621e765b44175a447486db5c3934a15274ead2721ad01ce9ad1a502a515954a64f670ba6e245d9f3f168e67e10c3193ab6baf498c1eda187761e4eb9c486aec";
+ sha512 = "f0269fbb62113370d23ef2ac9e26e602ec6457991e4b98335ddbb2df1e632604bccee27420ec4ff7910f936ac7518f7320ddc875c0bb3b95634ffed3cae5121a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/son/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/son/firefox-57.0.4.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha512 = "4dec9f2d9581cfd88cc49a3855a0cee3b8ed2db95252c6c872a7a538bb50c4db11e51a55b1e443f7af13035ff18cbc8d7df21d80e9cdb1587a6d5298720bce73";
+ sha512 = "1b5c3c0d2cb42eb985d6c05ea6454b5880c2cf33a6c46d7993ea8793027a9d1414373a14cd756f2e991d2f744ff87972cf7c050390dd4dd7a497e5ead3ef29c6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/sq/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/sq/firefox-57.0.4.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha512 = "36fe9146c47098496f433816f4e3928b883d5ca308284b1d70db2998d8f1df28baf50cbd9f071a0e6c7faeda9862037267999ff8fc1194da05bd15ccbe0ab055";
+ sha512 = "646bccefc4e52e823d099521b75d6796905d1ae1241ca2f0066996ca4e3a70fae901c8f890b821694699f101dfbcfcfea1cb7c7cb6de048bd896a62ea20e1348";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/sr/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/sr/firefox-57.0.4.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha512 = "ca83d9c745eb6aae3e66b3388c7068e8bd82ca0628d4c9e202cb98732c2986bec50d580371f672c36750b5d13d790a1d44fc9c5fc0ad8602ffe53ec73c5d5554";
+ sha512 = "15ae853a20c97c380f3f6280d370a821461c462b2af5496416c81fcb1c47a0cbd0bcb80eaa0f017dabcf630f42a886dd72e6d5738305b599f24c5320180650e4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/sv-SE/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/sv-SE/firefox-57.0.4.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha512 = "39a802072d0afbc6140b28d6738a9d0e15b949d6a59f48b59a3e028b3bcaef82cbef519580213169ac14cbd85302fc5da10ca224cfc435c6c5f5eb7136f7cbc8";
+ sha512 = "2dc41cfc4cacebdaee4ebda94064bf9e2cf7e66a95b57e66936b69c7420302d0c3100c5101646b91438493016521b45fa378913b463fc55abc7681a34e24c4d6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/ta/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ta/firefox-57.0.4.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha512 = "a76568bd01cd7e03df7cb7dbf6e3ecc0a115d4a91cba5d3278bb9f5ce39141ae272aa5064cd77a8767a8e76ab433973130c80efed6e77ab122cbedac1cbe9e63";
+ sha512 = "9f1fb4fef04e8a5944bed3293b190845e668431bf6fe214166ec3bd2dd7dbe328ab8ff904627788b80a0c1d663f37662c47a07c5f8a3818a8d2a509a4648b72c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/te/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/te/firefox-57.0.4.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha512 = "0a518b4b23bb554b389c96c60e4689905b85dfece7f085abb7205dc25e191526d96b0879b8bd98760424c17ea267108fb87bd8c3e4129f45e3ac5815c9c83f5f";
+ sha512 = "a874ea926cf495a26fd1fd621686f0a123e3cbd67e51699c34e4e5874c30c98f6e36739f2b214d6abbc483bdc0fa202a1d5153078fe69fe9d20b4a3a517dcd91";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/th/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/th/firefox-57.0.4.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha512 = "85acc9fd795f5d27ec6cfaa73b5a5a8cf76a6955fb35ca3721864f2ad06736d3bc3b24388a4ff861e3c8102561dace4c3f5dedc352a83c1c916d254ac28f74af";
+ sha512 = "dca7e779ca59b49f51198860541a6e0034ab132de0781ae76cbb0688ed0b9d4277ba6200d22020720abf0bab25326783eda0560f1c2fa0b912a50cb9afbf5ce5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/tr/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/tr/firefox-57.0.4.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha512 = "b1ab6744adce98723fafc28200ec8e37249cfcd524391cdfde548a6d5f9daec25e60367c49f923cdb6f620edbfcf6d82d49049f865807b76c5d654fd412595ba";
+ sha512 = "459051cee1bd3df7d9f2606006edcc134d701e9bae614b2baba6538b2fb738da5e671b7b79e65ee6996e5a35df45d285d9e354b635b12d860c926e0a167bf20e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/uk/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/uk/firefox-57.0.4.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha512 = "fd529013373900280e69832f07d3bd91808c30ba10d1b2d2978e0bbfda9963a1a239bbf08ab8ba65c6e9c313ca7abe4adccea778cdff34a5e07d521a96814452";
+ sha512 = "f3354ce8c703a3d204ebb1370aa561be7fd1fabcc7361a8f270156ca62863c04f74ef2acd25f56adb5c50a19f0256f1956a2cb38c25402ba046cc59b1096d35c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/ur/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ur/firefox-57.0.4.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha512 = "c246b71729e6182d2c400bb0389e47c56fb64ad32363f381a28da1648f8d923c79c0305c2d177336c720b8421209565d7744041a503e8959816090ab153b9cf0";
+ sha512 = "42f0d747bd8c5b3fe53a436472ccbd223ab9a23782065af2d4784e5ed075caf95cc0c4eb060fa1a2b11ade6dc12b99dc4ab497eba1339e2b8ddd99dbb5d286f0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/uz/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/uz/firefox-57.0.4.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha512 = "d9b2a157897ade2657f268fefe5a77daecbebb1f4c038405be5945d79a249c54a1f2a4e0b5a035116b10947decc59228adf2c0b1bb5497fd27da91fe967b4883";
+ sha512 = "476a632365c53ce0c72503bfb7dfe9166c6a4cc389dc7b174823b9dff1717c9ffa91f95eb975ecbe13135d39b90c3f18d96a5a08501eaf32ceafba0c2203b990";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/vi/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/vi/firefox-57.0.4.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha512 = "18f117aba4161b155ed33baa00f48d41752bc1c0438d6ce1c3b773b4c817adb611b2e0fba25fa5dd957c78df9e97e2af65adad5e63418ca5279e66995a1d7a00";
+ sha512 = "8f8146925562109cc1e21a6146203b16306931f03fd1451f679f3d345e589626669f35d5028b4189d175cec3b7c652a3d863cebbb521b72d9a04dd77e65a2c35";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/xh/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/xh/firefox-57.0.4.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha512 = "c4c061b60e73424371a0d7b58e923c2687c6de8c48c5517edd7f0ea84bee8b4d1786cf2141bad0c289619c31e52ee0685708f4279f4de3684e775e8b9a95fb07";
+ sha512 = "b382942e20e4188b4ade8417d5e1d036e81dba87ad0e5250c0fd3e43fcac5134b11f02e4220ecafd5b1fcf2a7fd12d44efb595251fe8e9a9b48a93400f264632";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/zh-CN/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/zh-CN/firefox-57.0.4.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha512 = "cb3918d0f69a40eacf8b0cf525b7a58952c73fa6de113a02b7e3941f53579440d97f6888363a15a17673aeffdf16df124661053e2df3b560b97208871750a61e";
+ sha512 = "9fabab7faff2a166a001c91d65953c6dc80150ab6548c72bc180dcb87aba485b2d06efebf5518f43b740909616b1ac04de57e17bd60fc3e7843e4c7e54b63259";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-x86_64/zh-TW/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/zh-TW/firefox-57.0.4.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha512 = "f9f596bedef10fc958b1d8c99b5120c72da014ca561c6942bc7ae99baed9e59200257f8f1bb9b39613f02b2f7c45ff26009814459fa8834bbf5f11b3c82502f5";
+ sha512 = "a334f4904ff329ddea28cf1eb4416d0c665a8099b20673d40792f2bb653fa09f60b6efc09b6d22c25f8bbafc0aa1e1aed6615f1377da37f6f843adade51d881b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/ach/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ach/firefox-57.0.4.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha512 = "f5b5bb281aa4221e781032b571e36fdf5caf7a713bb7856cb4257532fbe955037b31598854f0cd8ba1485fb28142d5c85755f129cb6ff18b3f33601f32414e5a";
+ sha512 = "1bf24191ae24fb8bd553c97d2ce2bd9599f84b2b6d57162a5619821c3312e7671aa04fefece26aeb0786c48d5fb934b79adab513f3ab382ec1e71f44d7a3835e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/af/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/af/firefox-57.0.4.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha512 = "4658bfe340cea1300fe523574917639cfbfd0d3bd1429b2af30b6894d3924784df35d0d27ff9085f07ea698685206f9c08bd1d7bf1ec84d4b8d136bed679e819";
+ sha512 = "6fa02d454c375af8661826b23c0220d9dc402331c8739a8b09e2e4583dbc0d9d6e742f65509f69bdad2882265c51a956892a04b8d75f3885b722b0688eb87ab8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/an/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/an/firefox-57.0.4.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha512 = "f92b3e572f24b7ab858d55e972a184359569504084e542829d44b4c868789ba372934f00022fd05489242b5c9571d9284d263b7f4276ba24ac04c7e1930d1c22";
+ sha512 = "c75a7318937244cd8f227f05b8cd8b13c948312fd692040125fea3bf3b8100e7c0912e0f4edd67ac7c9425e4a333ad091a8ddcd29acb9f045d4a0459f9d35342";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/ar/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ar/firefox-57.0.4.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha512 = "0500e6d73b68c248c4cebed4a5df1e44b137b972f03ce67098dc8f46dc5067c7b7572031d0599acc4b840ae0bb9f1f1fd49fb051c16067fc4c267c22b45b3401";
+ sha512 = "baa36a5936edea572d6ffad24c968538baf5ec888be09c8ee8179993f0088f661fc9f275edf2b848fc17beb3799b50fd8ca5a5a76bb4d52360b9c1a2ad38b76d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/as/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/as/firefox-57.0.4.tar.bz2";
locale = "as";
arch = "linux-i686";
- sha512 = "d5885e26ca8e6caddcfa33800785e18f1b86ed96310709fba96bb977fdba81216d843cef4f30e0072e011801836ad5d64aec9280006d07088e0dda577f9c508c";
+ sha512 = "8094dff31f7ac1de02f5e8af06bf64d8fda669c68556faba2f30de63f3954b3aa18ee130c76c6acea8e59fcd532cffac0ed822d3bbdce737ea4e01e9f2abc7b8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/ast/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ast/firefox-57.0.4.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha512 = "5f05e368129f721783d40f84d096e3dccac2180ddfeba3b5757f5997c1c8b9bb275edc1073394d7bd9cba09df38092239bc88869ce9cb850edd2ec776382f43d";
+ sha512 = "0a5953952051dbf0aeb872593eb6efedc557d8e518393a4672d2fed5a327f2c56720c2c50f31ea64b0799722b30202c3df4c46bf4c8dd227333c42a9fcd2fbaf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/az/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/az/firefox-57.0.4.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha512 = "2c14741b737007757268ab9adf5fe4f2e11640f48aff4c7cd09d8b0880c4e16d2ab67bc19003e36ef91df0fb89e5cedff34223e176cd1068821d43d647817264";
+ sha512 = "0eaa6a6d139868933b345b8ca62df9cd378c68053cca98d40f2cd83daf46bd9ac0dce4e91900eb447d1ab0ec8f76de293a65bd99913b560bd2f5b6794c565018";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/be/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/be/firefox-57.0.4.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha512 = "a4658676505846fa1efb67c2f92d1e2642d0af2508dc85b91c023ed58aeeab4c816967aa6289caf1cd69c05f94a3d21510cee57b818fe48b14a222f34d4abc2c";
+ sha512 = "b76736401d8f20d9638e9808b7acb41f46a51f29eeac9eb7d7850a8b3c32974982e946f679c98f8e71b548e87589edf5c7127a20f7108e4e42deb0e0ed71fc1f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/bg/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/bg/firefox-57.0.4.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha512 = "0c47c4a2d6037f21e062451f35d265016ddc0f39d128c662ab265c19d4d310f8788b71b8fffc28797ab61f57bd4db2691454aba90ee726ff15dab5fa2d967719";
+ sha512 = "7a47b07dd0791f1cbab7f02645e1b97173630ebc44fb81b2308ceb539d92f0197e8a9aa24f640ddba6fa888fb71a979837d6bd19d0315cc8c8eb2a8cbf99af15";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/bn-BD/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/bn-BD/firefox-57.0.4.tar.bz2";
locale = "bn-BD";
arch = "linux-i686";
- sha512 = "cc971011f4b7264bad96514eae76bc12bb5be038b69689bb7426f42888f8d3b23ff8307eeaf765a7f31b57ab7edb0a8df21da8dbbeaf90d30677bc7d413f1ac9";
+ sha512 = "15ece8585166d99b9d52b1de03a909d1c38cceccae5547dc13267da223026f4be4fcbc2cb42a7c225a4a74147b014ad19173635fe4c3249f4180169b4a503bfc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/bn-IN/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/bn-IN/firefox-57.0.4.tar.bz2";
locale = "bn-IN";
arch = "linux-i686";
- sha512 = "f8d7ff7faa81392d6b62c1fcd38ccee6221aa953a7aa2f382e6cef5da9e4fc0e5ca71eaac4468ad07211acbeb2a64b174b1a950daa4a266538007d159dea00ec";
+ sha512 = "72df101c9d0c602542e65da9235dc63d17c220ff56d2d1008c285fc6c10e090bf343ef968e60a36664d0dec72d7bccfe016af542b014ab116c0f243920aae93d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/br/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/br/firefox-57.0.4.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha512 = "2febd7b6a803d5471b840e9e9c7c5fc266ba1c34326153d99ed04f461ab403f75165dfb0133af738fb0d3b40b76aad88915711a2c34ba702ad10351450b197c3";
+ sha512 = "d0830fa2a0e4159d46c24e048767ac5c032910c6e73858eabff4a1ca0006189b3a4978c3e4822242883e6fb3abe639122ed76afeda5d9d2d5391806ea07f6796";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/bs/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/bs/firefox-57.0.4.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha512 = "2b1875db4da17c2ff8fac8f10fbfa415d1d99e65d9a7082632d385a50185419bdf1e7176e0c97789ae71a3b791a2b8d359a931022f148d8104929fc564335814";
+ sha512 = "cf93ea42460de4e9c13392eb1bbe4c6053c049a18cfd7038d99c658cf076d9989648abbcc006e345fdb2fc66f56ff8abd044b527ca0ae29accd2b0f52dfcc2a1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/ca/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ca/firefox-57.0.4.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha512 = "e18a60d9c53bcf6843a469110694f7dcc1a84cce5b92702266319a21866859c6e518de88eac5f3bbd1df87f386eb9b66e8a377c0e35dc8d88cd796c0acb6f849";
+ sha512 = "3fbbfc5973384a0a6d65e02d5b82a6b5591ea8d610fec2ece24aa423550eebac1b25fd7d0080bae4300f64ae1955fc6dc881816f10edf33b07e0cb308260a4cb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/cak/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/cak/firefox-57.0.4.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha512 = "a87c412478a291383b42e36bd85bb0b9970e6e75648f0a46345b648c30f1177d021b75134ff18aa1a37df7ff2a3fead32e52fb7bab9d6895fed0f66318a8676d";
+ sha512 = "0cf301895b2dab45cf487e41ba093e547bb4d42b997a9c7a90da2fbfcdb044e654cfc23e4bfb6de7065ecdb8e4923434f98e8b58313cd9ee7cf64dd5435951a5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/cs/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/cs/firefox-57.0.4.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha512 = "71a32e068c0843bb907789e9ee5c77fa0aaf81f21b92fa63eb7882237c22dffbcf2de60eff8e2b84fe5834dc5ae2234f1ec4d7e4cf3347cd04c64637ba49dc97";
+ sha512 = "20011fd4567fb3112a75a07ae181ab7d3a85702b9583efeb007dfe7a3009c34f8632db631710105dd68ca579b44a83f53d84bd4768f0030ed106bbe12eda8f16";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/cy/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/cy/firefox-57.0.4.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha512 = "10c1da2f33b568b0ad8e28fc38c9b1684d20a7bd006db6eca9baadf2394351c1b467851b46c0cdade0aea0ed6a185903d95e7711f0839323a11fba85df5486c7";
+ sha512 = "1f9b31e5e36a581ba51737e5e1f85a2d6ce804de854585ad2919f7070305567883724fad9368529ebd98d3f428eeb36c555d2f7ccefcfedb877227969688f896";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/da/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/da/firefox-57.0.4.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha512 = "83c329c5b6be5c966beb24f38e99521d0a5be168d027030740778141afcc7850f242645f308dc3cdf1827e7cdf66bc44a7bcb4a0e5feb1eae13e6238875ad75c";
+ sha512 = "a919e582953660fff4f438d58c8814cd5437f13fc42af9ddb383db163485754fac667b4e830e68cc827d7646436760bd6760ac4b2d7fca2a951c1d5f7d43be59";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/de/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/de/firefox-57.0.4.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha512 = "4f422bb6f6da9f79e62073ca0fa6a0de79aab7ad9530d9c2aa5c3a2364f8aa62442f10698966c121011dd0c0e67d39d0628969423de3868fa631fb79c9e094a7";
+ sha512 = "c5f844f17a3201a7a62e1e9c9dab3ede7042ca33bc8d388d9677858ab289d1f0a823594701e7eedcf1f9ee015c2ff16cdb0d9bc0e6861701f065827c69204f90";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/dsb/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/dsb/firefox-57.0.4.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha512 = "54d124b325cd95f6024c2c5c948b37d81a2efbe5aaee68030f0aa116dfcb3d3dae963968c67a33c8a906243ee27d75c9d909cc57e010fb760da1219f04441ae3";
+ sha512 = "fda1a2b51a3ae8d0d28629141575fe14263baef7d68f3bafed89a744a493382faba2bc7d263648d8ed809eca274dbaf0e1669b534a23281944135195593f0616";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/el/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/el/firefox-57.0.4.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha512 = "e98c7c71a0cf3db4bcbe0c69b3427f0f822dff1cdd3e397b7082af2cdd129349c3b37a4c420b7906470bbd0e921453ae517360d39c827218aba99e2562f6c825";
+ sha512 = "0c48e342f0ec141f4a7512c0f1cb4826b9dfe77cf315d22365e4f3eee090f067a35215798ace57eaa38a80a5b62dde257992eed2084737dcd85b1d4d3f46740c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/en-GB/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/en-GB/firefox-57.0.4.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha512 = "331643e1566e6878d448972f9485f2e9df898a830c87fd8fd52b7d8024aaa637a611d8c5145ccb6b1406f283e0d3a88c5c12bd418a9916a2d446e7230b0b9272";
+ sha512 = "d9d24a97b0257bcd1a1b468e6f986ff4fe8d26ced92e3878123d8667957ab187d87bb01e8d389da6fbffde66e1714fe81a9e926a9f3f5c52ea5d38a8eb961d00";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/en-US/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/en-US/firefox-57.0.4.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha512 = "1d0d0c2632338f1a319d86251e54c5e8582082e48429fe5b8e62e663c65cc9439094ce7415f2e4643c0ba3f244b8177685b5f112b244c7232d2585bf7a2b4fd4";
+ sha512 = "b641a671d7390c505577fa956bc1452f58f6cc8418b3ccaf25eb8b5bb08799a3a2e1e7113525ad720f710d7022b18901c5234be1a1c372881e4908d2ae419743";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/en-ZA/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/en-ZA/firefox-57.0.4.tar.bz2";
locale = "en-ZA";
arch = "linux-i686";
- sha512 = "63f3ba0bfea21f7630b93174d399894fb3d4e1683fad0d0e5dad5d078d15fdffc06ed292a07c95244ab509b30496a81ee868ecb4917ea8f925fb590a2e6b3e17";
+ sha512 = "605b7027a57c75e90d8e7004c50415ebdd2e2e111ac679d6bb87f1c55f0ca022aa4b77394a04ed94aa634d9b05359d9384e428f8f9dd000ddb2da755bb5d797a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/eo/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/eo/firefox-57.0.4.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha512 = "b1bf24b6ff3cfa938af300a13641dc76910369aa0628b09dadf84817d9f315a0ff1d68b9fd1cfd7be02eec6c31966ae491b856d6c8a5b8088b6c97cb38d2bf0c";
+ sha512 = "d5e81e82ffccb2538d94be4752d8bde9e5e84eaf06c5c29a34e0e16b13cc8df62ae17c88a50cdd846dc2ddf35c76355db39f39d74d1d9aac19c962d823d2a5d3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/es-AR/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/es-AR/firefox-57.0.4.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha512 = "678dfe1d784f6caabdc06d1cfe6fd6691335f6f66d30fc3e7320f3f7b3fdcfdd907f2de3963e0b60951fb99983aad135dbdcf70216a093139583ef992499a069";
+ sha512 = "27ad3f34bdb4f94a08043c699f2c9ce2a5de2cd297e9dc2edf777b78656902dcde7aeebe17463e3f7125d58a2cb5ac7de671695d46852bf15225cf201541eaf3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/es-CL/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/es-CL/firefox-57.0.4.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha512 = "cc507767b5191fba46204e7918318bda7aa6ecd5eab20bc51efdc92910f0b059bc5ddcf7b29aeada82e93188c4ddeeef64ec6d2ec6d8f0e138fb257e10ddfeec";
+ sha512 = "e65607bb7e1f08a2f0aea512e384d44b7d219939c82cb98cdd8a3697b5d43e7fba7036d4529c102a2ddbdf660baac45e8f9358692293d0a5d0869f72c8ca677c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/es-ES/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/es-ES/firefox-57.0.4.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha512 = "a6404c78d8fcd6a329230e24961feaea347807abeacc5edcb329fe40c99517c355671fb788e121aecfa88cf1796049a4bc843fb35cc4bc12afe30d7c7162d739";
+ sha512 = "f486c0f40cd610540743546a188c434bf16c2482d88145841ec90974a819e7f82952cc6f9e8c8787665f28f47f1e8b7def418f0b08f9fbce73f9d1aabe62e91e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/es-MX/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/es-MX/firefox-57.0.4.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha512 = "7ccbb080ffad4b21987172df3e23e1707a52f9d500ee696a0d0bc2efca0821b9c03f5541dcc2414fe9eb578e82f0af8090d3f8e99ef4f325fccc732fc159ac86";
+ sha512 = "c4e45e86b5680cb9580948bf8db29c5f3a13d2b2c6a73753872ab2c77715ecb64f756522d4c1e50009d783cd4f589ae39e3bedf771ebb4b03ea6930506210a06";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/et/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/et/firefox-57.0.4.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha512 = "32ade01760afb5b46428fc11f4ac3cf59211fd2fd3ee5627b02254129527b2a89d380ad92e8b56ddb426bc0306f1c3f4b41ad3a849877da9181814d0a16865c1";
+ sha512 = "181772128d6eb85141169208c283caa0f4658e3ef627b92f723694fa5f38be7fa8e4c6591901971cfbfb760cffd693a285589089436bb25e72ff95fad36c632d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/eu/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/eu/firefox-57.0.4.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha512 = "6fe9ce65476475b548ad06dc13f6f8e8e845675d4797db0067001498e5bbe167d27538aefcbe740be9587b9d29b7e4cdaef6e0f41856e236b070a5f52d549a30";
+ sha512 = "e582332c908c98b6eddefa04b223366442e61e231e9039e237e5d15007113d7986a0759e8b927262370ae61b103e749f96160a2596a7b79d2e7321a5416fa0b0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/fa/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/fa/firefox-57.0.4.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha512 = "462514e0392f8ad90c73c3755033a5035926fa6a151e7a7d31ba6d71ad4e8d050c2ee374ff614ed3d428fcba1074eeaddbfbab98730fc470f0c9653cb4a366a2";
+ sha512 = "118684887c685acf3fd2a9f0ab1b63bee19c29e285e1817d013202a9fb722b17a3e774db3afa4056618172d4ce741aa78952bf806752d52fda4b651a633139d8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/ff/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ff/firefox-57.0.4.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha512 = "a553ae8fbe9c43ff99139bd6720c31e1919861094d8a540696c63804750c8d235caa5cab7cd471f9b80169128e5639ffadaf5e95143c92c3ea9038b317294fc6";
+ sha512 = "d4917fd09f789ae2ec456b4cef807ba17fd1e2a80f1cf9dd635c18dcebf87c9c5ccaa5937df7846ec24de943c8c58ba4a0c9282ed586958bb3275234fc9bd27c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/fi/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/fi/firefox-57.0.4.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha512 = "ce6c5261ebff909d5691072012d4544d43652daaaea6ce38b47cb13fa236681da0e0c527f28cc307c6b9de3f3f76c1688c1d35629aef6469fe41c4ce3bcb2b24";
+ sha512 = "891c8a01940d9896dba75de258ba7da71b5e1b03697fcc04c5919b6570fa8b7164d9f8fba6f5a52614e637c5fe859f59da7fba34d4387c9763b82e7dd4e4ffd0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/fr/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/fr/firefox-57.0.4.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha512 = "8afbc7d3b56184b41877a6f901a6e60d4f8e55f8955fd64bb1f07acaf14f45c0fc0f4c6512c3ae52de37d66b548525bc4be1f2795b9f8e6ada8a267ede0f6bcf";
+ sha512 = "cb6bf51bd4362b21416dc82a2c52cbecf0afb2aa88d6ab96affac7668d3ff0d7f81f345ce3440b04e0b4df0740505c204efa0d7eaf43af0b5c99294e0170a357";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/fy-NL/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/fy-NL/firefox-57.0.4.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha512 = "195c6b307c30ba134b4a86b5f241317c39cc846372a0f53be8214f57b192fc24a507ca44fa7606cafe13343e2782f48c97cf16587be64dd49296524b6800abd6";
+ sha512 = "17e3030507c7cd0dccb2b94bb36414ad9e4c8248b671f438dce27ec849c06a2a98343520bd457b9157813e11f9360a1e38cd9dc3dda49ee039ed2757168e5d26";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/ga-IE/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ga-IE/firefox-57.0.4.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha512 = "cd9521ffe984186097c77f3330b610bd61622f0447568c23bf06fb64ba616c48708c5dba2f7caf4b1b79d0ef7ab3113356e28e1d56d29688bdd09879b417f956";
+ sha512 = "18bf7782acd20cb9972e419ddd62be4c9b0d18d2f545bf728f1729f2a63e9f69353cf47b8e2fdf8525829fafa3c87cecc6bc272e899a2df6dd1ae4cf11b5bed4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/gd/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/gd/firefox-57.0.4.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha512 = "92e9252c285ab20bd727b9cf8ddf60196997f6b8fb29acc6fb81edaa3ec8d9863f8aef4fcbe7a6b8e7016ef08a0b018b6cb9194c48d487120494bf3192c4599f";
+ sha512 = "27d56b6d98b4478821e1697398aa0b39ed51123eb72a18f06f03bcca53c7017b4c55fbd32af626a52a74b5c53c9efbd7a20bb265af1d43140189f6f5d03168d7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/gl/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/gl/firefox-57.0.4.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha512 = "82693a4432cbec96483718c6eb00a45419f223ea9e47432dbf1690249339e2f139cd59a8e77c60acbf2ca45ec77e0218b98195398d3649f46d3087f527ff05fd";
+ sha512 = "5a7c2e1faee64d224c8dcd822d0e3f0b064f4aa5617944aa048d32335fb2a45caefe7f6971058368493c483a5ac107808794289c68530d97f85d0e2438285a4c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/gn/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/gn/firefox-57.0.4.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha512 = "4676bbd543dbd3898345097657192e0eafe679e21f75d5a51bc6edeffbcfbfa85e8e23016e64beac5803c01cea7be8614904bce81bf34848d8717a7410159330";
+ sha512 = "5c05eb1d50d0de7f7e25bc0821767ec916ff17a3499ed4cbbe53cb7d833fd43edaf3ec1c1c2db02b76523bad8a78043d7ac25be4d1a4076da942b09097949dd9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/gu-IN/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/gu-IN/firefox-57.0.4.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha512 = "19814fb917e4d0405ea53555f70bfd50d26673a852ab6b4fbc158b8330274445431cba9e49cde1a0b469a32e3a97a1b64faa125f4ac4e962c8120e76a922a587";
+ sha512 = "43eaf8f5ff8f921ead14cc2a2a5d9a98ca674af49087407dff37afe4acd9c22a4d83e96750bb50e8e6fd4219beab08c8bf52831fe15b8320b5858d6c93c611f5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/he/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/he/firefox-57.0.4.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha512 = "f8900c98ff45c27f4c66676607ce544b25bc20ed45682e67315a9cbed0260e9e6b8104f8f4d022a5b272ec9c4e6d3fd4775a79e2c264f03bdd1629073c6b7969";
+ sha512 = "9573f5d24af9f89abad0d46d99750b9380ce77c4c017143236178f3fbbfb2e43d1c1f1ae2223ae0d4c81b22688fc7da8c1fc2a19cb5619bdd42ca03ea7ef810e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/hi-IN/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/hi-IN/firefox-57.0.4.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha512 = "63bf09e0a984d9cde04cf2a7887668b453b8998931ca4c1b0bbd13ad7dc8106756732c37779e0a1d84d1f842871e63226e196d3d738320f520f8b88ce6999a66";
+ sha512 = "ac0d13b6d935f8b51379287f5ad5e434bec58eee0e29fdc786e43e7d7e270afea094b8af27c779e0f0c11e3f3582f84e2cac4e01fc69339aa569830d180fca6f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/hr/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/hr/firefox-57.0.4.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha512 = "dce713a45a83b67ba237b04481b66e2a3066b9ae7ab00824df03d2f9769ff14d426c7e3cf723aedb3ac1e1108147707b39680c5328f703e5fc849d8d1e51adcd";
+ sha512 = "3f17557b50fff4334a27885358cd1c91fcfbaab4394b5cb9a571c47a24bd45a2b807534c6645b58220b65285aef5014582ec6e1a04e57e54f7cdc5cbc4d0e1ff";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/hsb/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/hsb/firefox-57.0.4.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha512 = "8f6ab7afd6d10b781e0c9a083c72dee3069dfd9c91a500c24f76fc41e9ced3cfeaa47908efdede2d6adbeeecc4ade89a1644c4f5eda79046f1762c35cd2234e4";
+ sha512 = "ea3cc8998fa736c27469efaa6aeef4263c1c23d62804721ef577d020295100bd99e6690336c29a0af7f274f8c0fd554d16ce39638b8c9de2132dc0fabe21b91e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/hu/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/hu/firefox-57.0.4.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha512 = "41149404d276b28a35ba04f19d96ba0c1112f6615207fa8eb65ebf36f0e87115ec2775f374f785f6ad23470cf8f0fd49f1701975bbec218eef2ba9540dc9cd71";
+ sha512 = "988721816865e6db32a4e874d7bcc67c0e7bfcf621bc9e8d6a8aa8732ac448930646891a53a6f66bdf64d625b1607ffcca4141ba8b011ec2b69803fb0eca32c1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/hy-AM/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/hy-AM/firefox-57.0.4.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha512 = "4270951b388b5cc34227391f00d4e756a293e3116a9f43827aaf1d27a0b81d255e1fd2021e6fe8b8ba137779eec679bd19e559d767321d0ac2ac6610d06e80a2";
+ sha512 = "214105d839762ba56f8f30f9fd4e2b706ba2ab0ff4f76826661745505d2bf7b85481b17782182ee5250d82f0f233b9f3c7123669c2475d33bec40aa270cb83bb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/id/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/id/firefox-57.0.4.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha512 = "69348643ae4fcd209155a1c308d1a5eb29786c37b5719d694f977c0e47f77a9696e156ed50e26b8436bc56f3d63e78d3c44287a49d7e48d7521df84a15130d8f";
+ sha512 = "60af8126c39ee9b7bd9f9c06048677ce5e9ac1b4da28176c965064e6d937df3218d01c923fe6bda822ac9fcfd95904e4f01438b88e0659b7df6c5a4b7b475330";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/is/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/is/firefox-57.0.4.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha512 = "c9a217076b1e52f78846d5898d62c2cb3ba33d4a7d04505b7934a89832cd7ce69fefcbea0f8ee46faa4f1db08c3c3c50a41889f18fedf25cadff76501bdb0ef7";
+ sha512 = "07230ab55805e4bc26c6aa427d43daef7d799115780d712db5b358a8d731296abb06baa8e21a200310922ac81e23a1e33584c1a25a76031c03a849e33aaabf0f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/it/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/it/firefox-57.0.4.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha512 = "9cb2e8921cbe99b63bf488490e1e3c2e309ad5b5c499cfc08965b23275582491801534af37cd1ec07a6c58aeb8adf730e942a6e363a12e6064e2e6b6b3cfc551";
+ sha512 = "4e80d7f042dec9c9752a81f434520b4ea2605319fdbe26a4ffee8e01ff60163a9df9100f154d45690ea4a492953f09a9b602609b88a350250dd71b2f66029713";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/ja/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ja/firefox-57.0.4.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha512 = "d2436d7e024b06f4a16e39a89a99797f0eab66f007334574d7d81ba1d3b4937b3bb9be46a4b5cdd929aac6e1a764e8ed531927a471d0890a5f6ca0755735350f";
+ sha512 = "a14fdbc6e2fb341d78878bbed3df456d3906a6f9721ed80764f8747faa82407ceb48a4a6e8b6c90c4164fcf231208b3f4f147d6465bc434496e991613c7cf250";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/ka/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ka/firefox-57.0.4.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha512 = "69cbf913f02dbf4f2c97ba5fe8ad4eaf744a3b1b3d75d975175b88b9f5cb516af49ffdb54b8102e5f3f1be14980bceb9d15a819ec3544e692b7edb0dfb55669c";
+ sha512 = "e411fd39ee928f4e66937f55589f7a7d77eb9ee64abb30d49622e18b20d2ed2eecc34a54bb32a40d28a83b43e822b526494227b7b1a8b3cef831dbe8d5573dcf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/kab/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/kab/firefox-57.0.4.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha512 = "1f8da18abbdabadfff995b37aabcc6b5413d891a089e15a0f23e9d04bbee0c749efb592c633aeed749b78e4b16a63dd91b089aa1a72795d0e28cc89fbfceb357";
+ sha512 = "b430ee1803556d791fdd19ffa21aa32d8245421c2e8a7dda7cda10d751cf9be125bc089de9149fe8b858db663397827b2e511a54a56053827c405b0fa2e17ad3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/kk/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/kk/firefox-57.0.4.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha512 = "5316ee63bf10c43ce30e64caf2dab766c63fe6605bb672496689f43c14649638844a9381c632a42af108fac2039c78943cd0cd657d7fb0fdb7b33884a51bc856";
+ sha512 = "24f142f4c9b85cefb404905317d1afcfb37868fa4061b5e4c659a3e172d86f2fd9d7c07672fc4a78283da27c534e2f0639d1c567350740d698aae6fa50846772";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/km/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/km/firefox-57.0.4.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha512 = "4ed2754dde6d9d6040fc52fe099876f0a26d6ae21aa2ba382187d6d5689bdf5db5217bf40e70d1de566d56ccdf0ea9d1883f44c8c7de497514530bddbcbb12ca";
+ sha512 = "226fa56eec9704baacf04e54a5f74ed4a6fb01eab2020badd61542f2059f47ddac605f69117d23635fe0562c02d86a088d695ee1a15071315ebe5e19100b965c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/kn/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/kn/firefox-57.0.4.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha512 = "2f4ec84174ace361a2d5efbd7ebaf788479d11364d75fffe46b0a9d10f2189893d5eb828064d338e5fdf6993e1a9938ea96a8828a941493b3eb579e339d55601";
+ sha512 = "c0c5eb6887ab1e3fe7f8669ff1c09cb5cea4fdad9c8fa488412bb3aef33b7252526ce5069e1dc8a2186c0ab4aa48a6d223487ef62554f90a022287aaed31d09e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/ko/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ko/firefox-57.0.4.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha512 = "b1e8758428a69ea72edfb7fe52f92e0144c541114ac546f1c5295da280ed2454bf755a276dd3b53bb1f75b37a5a13c49813279a92138412acb1cdb571da7aeec";
+ sha512 = "397063d49b248302df350e01bc87fbb691e63681371fd9b2180edd8cffa9d00ddaa68de320165e0414bdf89dba037ebf8decdc6801ae0f5134dfe81cbb3c7052";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/lij/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/lij/firefox-57.0.4.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha512 = "3eabdd5de44ae2a3063f76a1175287820c417a01b225c0798b4ca6685e4b0dd2515eff7895d1ab3e0b4a071841419c9bdce6102156faa570c48ffa02e5fd00e5";
+ sha512 = "0c47e5568f5776829163ee5823c512d91e795478049ca0aa6239afc66c2ec0af940aaa32fb70473f41ddac3755c0dd32cd5b68207e94f095a033bf5accbe9675";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/lt/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/lt/firefox-57.0.4.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha512 = "7e1d702b92b81d2656734bbd2c2e61db7bd02905b9d276627bf32c908ab5bac1da2888453efbd4282e5b26b2fb0f03c682265081f93c538569c8f47325f2bd1e";
+ sha512 = "3a18a2209fcc5adcfe4426b8acfafc7e6e781c01b7562d35cd02001f8469d93e1db4db400ba34844ad5296ac40a3540ebad5341457fcf00b7d33b9b672514a27";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/lv/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/lv/firefox-57.0.4.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha512 = "3847065c8573b1f37b584581aef3ba4c6a4666c9d937e36f0f434addfb7a0cbfb36f500afbecbbf061b885d4f5689a647fb0d2e487bd53d4e9bd689bd5cc7aed";
+ sha512 = "ec9938c819e98f3d1b7979b6e207cdf798af6e0f937f9ad7f23ceae9968272fb44c6d2d28c066b20d6aafcb7edddedb299fa32d0bba29f17e3c50db7bbbf6cc8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/mai/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/mai/firefox-57.0.4.tar.bz2";
locale = "mai";
arch = "linux-i686";
- sha512 = "459ed2d8fa1fd6ec45e00af73eb23c53a438f179dda349fc434269d737ec3679812c18804ed306f156b2f8f30ab026a0398817dbf5e8c1339302dac4c9bf0454";
+ sha512 = "ea5cce55b13cb8eaa652aef1cdc2883720397f872d63728c781805000835c41bbac1c2bef035700c72d1dff79ccb6a8d4980d6485f0774b3aa8c0424e94a3ce1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/mk/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/mk/firefox-57.0.4.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha512 = "b0c9b7a06eea66f603ed79c36784dc641b2d2791368040522ca464942f6b4a6828dac0c6c098b5251b696d14ef5a8a795fb31d1fa5a5bc6660c77cde452af555";
+ sha512 = "653d8d32d776fbc08126a25fa8a70b3826302e9cce01b8bb6f8abe958a79456df7cdfb8ae09a74b560594c29c515e50afc77bbc1ee260980028d1b1f10cfc1a8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/ml/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ml/firefox-57.0.4.tar.bz2";
locale = "ml";
arch = "linux-i686";
- sha512 = "8005d32b1c41b7deb18305c381f64ca02395e30e468cbc7b4d014af4868477aa7c5af5a4f36111e89def0a4e46e78d6be137c573b72b2f5eb27c1cfe109a44cb";
+ sha512 = "e99a9acba626060fe8eea88a478879f3be751ba224ff1e1cfe28ae6c9eedc2d672329f67773f71edbb58d6c3e71be26f57b53504474c67dd65e7ffac79767fc9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/mr/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/mr/firefox-57.0.4.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha512 = "3ccf8f3357ff9f559f237c8901f26f8ea54b437bd2a34015a5738af5c97b0cbd882f069ae5c306de3f46d7ccb951f06ed225869ab5d31c82112fdb7da0c2714d";
+ sha512 = "6f64740c424e77ce62270b80594915d3e2eb4cc2d3606791e6c9e3c8d3d8bd362ea4d46ed742b13aa427389150fe1a97af782ddd05190b0a5a84e8dfae04563f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/ms/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ms/firefox-57.0.4.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha512 = "29102828e4fff49774580d4d0214ffe7fa7e38ba7cd90d09423b0d1ebd175a057221b6d2d374d4c7cc9b2d054ef449e5ca49ce12c971c15179f1f06523c517d1";
+ sha512 = "f3d2450ef0770ccac86b11e84a27c2e58d8a1c4133e874f9ae1cb7524ddb5f104d4bd42ca1fc37c20a8a3b297b386a1df0d2fb348616cbe9ef5d01c59b43ae3f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/my/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/my/firefox-57.0.4.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha512 = "b01f3e667887e268fca6f72bb2046461d45fc5f21eb12a760eb61b5ece393de2b4d824000edfe13eb9c680b8f5fb95bcd39b58ba6f3124ac7e179d47f3c221f3";
+ sha512 = "8398627bba83a1d0bb4929d1fd15c135bd35c8e8d0560ca804a49a0e36a083fe377652cdded198eef2b8ec1492cd1d7a33d6c660cf72081d090d40ea8b4cf7f3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/nb-NO/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/nb-NO/firefox-57.0.4.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha512 = "680273b4636e1bc00ffdefc5c264bb6466cbf6ef577ab382ef5c28cfa731de8b51f7d83ea3695d7e7e01d93041b3b8464ad9442b43aeaa866b29f60761d3e849";
+ sha512 = "123552055f7838ea2215a379f97c82b5d2e4085dc8e2a9cfc12f0ef5f3550f7247c4f3e70c806baf7eb12e031ff8b857eee721366d480e959dc1acae1d9453cc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/nl/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/nl/firefox-57.0.4.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha512 = "a2409928f939401e530f0e1124f0573ea0cb24ccca0046b170cff8353bc3f82fc9c172088760b4e74055984780debd3e0915187d79802192b5c9a2405a8ab198";
+ sha512 = "179c634792a96d8b3f5537273bff06d962cf5faf2ae7e299fa3e11aa4e5b08aba10759e17eaf656fb373c9a9a807590656f905b477c79a5f7da385b66f17a55a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/nn-NO/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/nn-NO/firefox-57.0.4.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha512 = "f01a149c8a9623bc03dee85e0890019aae858c828c5b4a2609cbd084bc178c15b0aa6677d9d5b2d51edbb75748447a58598e2cb2d6f6ceeed979995a2c1b108a";
+ sha512 = "b71efed9fe95408710ef4a4e8d7040ddd2c3f9979567211c5ccb48dabc2eecc609f29c2bdae59ef96913d54f0c52ae432a2bec265cc5d7a9ed1b683cc83379a9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/or/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/or/firefox-57.0.4.tar.bz2";
locale = "or";
arch = "linux-i686";
- sha512 = "55f30387f08e43dd965778de0b18a3cf1584e2ffd5ee732e56c7a53e8092ab25f01dccfc12982d0c8650e32eebac82c50fb0b1e60848d06fce89ea3eb414813c";
+ sha512 = "998b2d7a6c215a4634209d1f2e04f5e80858a4172276afe5f3440416212351093c1083e19c116dcf2480a09287749e55adb3d522f62ea4170bfa2610e3884e4b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/pa-IN/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/pa-IN/firefox-57.0.4.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha512 = "fc32d024176ecfe7e5802fbeb61d5bae7eeefd985336456949f364d98ce80dc0d02e5c60d1dc98d960c455036e2006f8936571e00852b2714ab6c7064eb15e2a";
+ sha512 = "f15b76ba3fed7604b96315343e04b11823bcd9b1407c10678fb5a57193b37ca365bab3a41106f1113f2487ee5b81a14068a083243cb4a298aa53105c814b8b22";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/pl/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/pl/firefox-57.0.4.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha512 = "701b4652eb5f98b43b9cb8c07152f61af51e158eda425712e79f38d64f73a9fa0ece935de0ca0bce383591cbd238ed8d372e7cec732d5c0c4bc8009954f37e6b";
+ sha512 = "cf10e29d8daee0ccca0a3260b97abc4c61f13716b209babed7dbac72809645a05f12ee0baa5ceb02a2b8cf283f27796697eb72bdaaeab5adb07cd89525da924c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/pt-BR/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/pt-BR/firefox-57.0.4.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha512 = "175264c1ef2bfe0f2a87fa2bfe391cd6140fd9602bcfe7c690ed2690f32d4baff8387aff58784f04acb4b08a8199a845026116782311608a89d61d18fb226150";
+ sha512 = "0bcc63288bb18b5dcaf382857a65e408d802da8e703cbc376be828e512fe66ed6f12b5e3a46db8c5f883000dd0ce152ab387d25642878abc2660d4d3782c5a0e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/pt-PT/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/pt-PT/firefox-57.0.4.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha512 = "6fea73a5d2b095cfeeaf9e86078ca67273506612224a0d800b4866da7ab79a5ea21ff21ee1131627856453a6536e84b627b6c5bec45b13b414046f4f094d88d1";
+ sha512 = "79969af79356540c274935741e00a0507ec2d7d7047bd03ab5420246daa0329b51320f0f2e92250e8e1c11491cd500a3112bcc7d4c61acebe079ffac8284e0ff";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/rm/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/rm/firefox-57.0.4.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha512 = "bec7875fd7151e9175c6d9e0e354c718e61e83893ba050d2555cdd88dc4c6b782c75a3f6b3f92db8bc15bd3fc2a2dbf9007f5d6d33fa9660acbfbc36dfe8f5bb";
+ sha512 = "5ba523ff6ce9cf291b6d16c56eaa9688f8bab2fc43eb00d1c496cac9909187e781e0436a0afe47d8cd3808533a1f762e0e7dd417428ac7e5958487271b3e6d5f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/ro/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ro/firefox-57.0.4.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha512 = "95ae533eafc0a3d83127bac3abb4f17e14d25dda534a486e85e0d7750b6bcfca120479cbdda5a7a34b6222f7a4e894c614853c96df4ffb52cb86c170d703d0b8";
+ sha512 = "9575744e3f62b7803a93524e24baf9838488067df5dcdcbce2031fd735fa25223869f22de807d33217f8b541d2185a4a6dd62ada6bd37bf6386f1d6f6b776ff7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/ru/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ru/firefox-57.0.4.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha512 = "5a8f11444d2a72c36bd51b0d60911636a34312e7a2ed467eaf4d5cf21992f412ea36f0990634ee7330555d6cfa56139b567d465dee7e696d7b4a394971665b7e";
+ sha512 = "7529dc04a413c7ad5db86b199318bdf8bba0e8837b3f5e50840326301ebd84562d2a3cae2ae352e2625db85d652675bec20dad2de5db46ec520853789fc930f9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/si/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/si/firefox-57.0.4.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha512 = "0c5dc876dcc8bfa56e9bc7ed5bb629ba7a6d9206fc3586f311b994f2d006ead19bdb0ba015669f547043c9a73202fa9c3c90c9f171f2756f108d45520544b6f1";
+ sha512 = "7ec9f3b071ca4b7436b81c81c847acc915d8cc6e4d147587cde63527ba5b3f7d177857af308c0d4dc4566e53b3e4cc2398b3dfd367cc4ceae6eb90582027dda4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/sk/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/sk/firefox-57.0.4.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha512 = "79003a5848287fc6974df32365bb8379b3ad3329d2a3d1d351cc3a61b28229e931b2d53384b5d46961687a928090a6f304b87d80a72cb322d0f39e0bb357f7a1";
+ sha512 = "9fa5dc5cd172388bc61719e03fe7df5a2a6e56cd49ad3c7afd9622aca64ba25fbbe83f834431dc4c2a26b2873d80026769e7712c78dce550077cad4d84559dab";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/sl/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/sl/firefox-57.0.4.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha512 = "989d8be27ea47441bc4b9b42006cb34b99a2b2f4982b4f9758af8725a2955aa472ec19241fdb4adccb2e99f3b0dd245159de2a36286d2b96c44ef60607f51d81";
+ sha512 = "3e142ce6878e9b01ee34e9a18152e4c869fdb9902a8f78810293d854e4196c8e0a43a8bfb7f7354dd27f2547792a48ac957bec96751aca050a3d65dc5e227f5b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/son/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/son/firefox-57.0.4.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha512 = "d4c840680599cdda340b50e91ec348db31e6b896c1fd92587ac938603edcada7973bec0e049a9a1aca73a527867704f51a482e92e3dc5d0d39b74b150b3d772c";
+ sha512 = "b0bda73680d788b55526763306477504430b49b4ce465f091b5d3aa62f5e56618f8d6125cc1a68dc4b5403dbe28ae2c1dfa9e7d85e0bde9f06dc8735083d159d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/sq/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/sq/firefox-57.0.4.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha512 = "eff9704444512c3a9e63f40b71a41ab595d71be6f83ebe678de46a301f55f561b24cd28804416c254cd36c38f03b587da3ac4aefe0d5fad2035437d8159a0580";
+ sha512 = "285d6f4b2f27c14642bd44c572776c49c80d4360a635da1e92161f665a6714b011bd0be2b37f3ec1b2c1726ea6627eb7a21879e2af72bb4c04560a1f701770a3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/sr/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/sr/firefox-57.0.4.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha512 = "44d9071fc069670459f8cd468474d45d83574ded3a647abea358e65cacebdb89cd26cb903cffe279c6a3d72af9377659433d03c542e13dee3b7e20ecd32b137b";
+ sha512 = "14c451f7a3237e43bbd6f5fd9370224452a401f97732901c9796e40d313f4542d635984b5feaaba9d44be77e6e3e65a6c191d4081bc5d2d1b57bae12d432c414";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/sv-SE/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/sv-SE/firefox-57.0.4.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha512 = "b9d1654f6a1f9323d0e27bb743bb8e650aabe9978ed9fc818a425377a41cf17b03e3c054945a9cae8e796ad32197f244a5299812cebc602e9bdb67451c234b65";
+ sha512 = "70eb6083426d6e382934e7734718d6eaa4884a9ac24e36b1fd87a9c9405dce16353e8f6058912adc4fac0cb4ddecf7e2fdc8428e088b44d56508bc47f6c55abc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/ta/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ta/firefox-57.0.4.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha512 = "22e5a751419d5cd332724f09cdea8ab135117b2d7272570622ac8e9b51dfcf61c1a423e78bf4d211d18ce3e4bd652aa6e0b33a02467f011021d23fb0b14179ac";
+ sha512 = "615d3727a9efc2e14fefe093678cb83f83e1efaab9053a98391b7613754e40fa7929e4fa3de34da7aaef8053ea752e6ca00f83d114c90c1769f708742f492db5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/te/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/te/firefox-57.0.4.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha512 = "718ca2e72a8beb1a423bba10919faa1a1949e76c3e6aa0a261d7c5a8d611da7c5b73d2a209078f204b8c2f3c9d09c0949260bebe66d52257ee0eafe9b34105f1";
+ sha512 = "246c2699bbd27a318778f5517d62bc7c96dd6fdba0a8291f291b0e803d2a68710d96c4a11118fd105d00e4489924a62195c7752edc403b5b42a8a06a36962571";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/th/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/th/firefox-57.0.4.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha512 = "fbcbeae74fb96b8dc8116db5c16f3f9cbc8d0dd074f179ec50b00dd6b6e68d977d968b5b308d5c6fa8303d247d5c30f49b0db9d4d6e13567e7818234375399b3";
+ sha512 = "3b34c97e9e3b0ec436e299c45e4913fcb90c9a565687d587774adef2fb10bacf9fd8c576a15a5c8100e2f82cec2d3c4353e645acc9c20245e6fb6e2b73213011";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/tr/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/tr/firefox-57.0.4.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha512 = "31f12bc63b65b455bd7335482d1b45483e8472874f0ee5c32d686f770d063109adb40d4f0b3e54f7bb45da43828de1844e06818da0b6b5aa514bd304c394df0a";
+ sha512 = "184b6e4f5a88fd7606868bba6860718d2dec0a6db123222195ea9bafd5ff3a391ee34a911591eff58c5ae7bc90b171aa1866d3d872349d4057ce72a709eea0b8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/uk/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/uk/firefox-57.0.4.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha512 = "1cb4b91e8e693f2306247164ba049003dd4543ec19afdfb39531626d0ef83793bff85c5e26b4016a608b01699d36e5fbe936d6c974db9222e5fe22361fd13f0d";
+ sha512 = "bb343353890e94526ae5dab5c2dca510ddda25d0d808decdd5ed628af174e60e584f1a883e19f33be2b316e423ed1be7e8c30916eb10ed11c618a015beaa538c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/ur/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ur/firefox-57.0.4.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha512 = "ab777f897db855234c1db88a4d1c3f2a2534b926a0abeb9e55094c99b513ef97f13d36188656ed82015044a4cdd45519e4ad20dc465394108cd2f85ded9c6e19";
+ sha512 = "f54e1cb54992436bc78b1491214978aa7986153564bc93f9da2c64e038f4bbb77dbf3f44ab4cece5a02e1ff8e1c0d4bf5ed64815817fc908482f9ef203689cc3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/uz/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/uz/firefox-57.0.4.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha512 = "eb03e3901f5a98b7198c677227830531cce3ab89e1e5e9cfa8a74f344871ec976b14373c337d3113b2a517eb3e80eb91c6239e7e85a2483e5e35d643007a131c";
+ sha512 = "832c7b687c1db9545ac9fd81ecf95d29eb329518dad9386541073f6834ba88e80ad9bc70d6ab7e12d820e8430064f638d1558c0559d6b410a8ebd81a7a82b245";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/vi/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/vi/firefox-57.0.4.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha512 = "cb4a7f6ea792e3504d4c6577ee2f616dde7090a020d6bac38bb13a442297ffa279b795ac3aa6cb06c34e739c346dfb1a22fe4a7eaaed832e8c0d387f900dca26";
+ sha512 = "e60023cc021263b402ffe829b24ec00f0c0e2e782fb0acba23b3527f612aed710a1c8c65cc28bcb03bbfa54a4450085adeff36be69bb21bbb175bddf4c5894c1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/xh/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xh/firefox-57.0.4.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha512 = "6fb867d59393e57f85b597fefafd73d88410b6b8a338882be43c97a8359a6c6fe6542979f280f0b27c50d3c13302be55e16054339bcbb3e2fe0071830bc5ea21";
+ sha512 = "94ba86099376c14900fadef25a77b9b4422d8f50d26bcc3bf024dc5d6a35f4c08f897cb5dc1c94232798d9fff11e7b018c90ff7808bc7ee9c861e57f425e96e5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/zh-CN/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/zh-CN/firefox-57.0.4.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha512 = "2e055fb920fc33e40cdd0976881cf3187694f5967b87d28ddb385df1913db1f66f2f481c2879919a6fa0cebf893d15a88bc077be8f5a21c07cfdc11cd70aa476";
+ sha512 = "a6cdd0d0553e84a727da33e8f06afe004f4a95d726982b32dc7f74f36182e8bd2b186dfd7f3a90760ab7b01f932fdfc8de4d1b154c5133151f29b7a4d78a409f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.1/linux-i686/zh-TW/firefox-57.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/zh-TW/firefox-57.0.4.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha512 = "78bd8081a84d7088b776f0091154e1a88fd5b39e01d8a3380d375a43e94118460c183fad77e801827144dafecffb74fcb4093320205d0143ddc3835652de66b7";
+ sha512 = "a6ecdee1aefeb29b51861b011334346acf9816971c8b40196a06969c3e21e1a8ed96f1393f25e558f6fc6e5cf35b5a497de91df4764ad30c52d7ce06bd7d6732";
}
];
}
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index ccf762afbec3222e17a82187984b2b7756ea3c51..aeae471ce5bb6af23abd316c138f57e4f81f9dfb 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -29,9 +29,11 @@
# Set to `privacySupport` or `false`.
, webrtcSupport ? !privacySupport
-, googleAPISupport ? !privacySupport
+, geolocationSupport ? !privacySupport
+, googleAPISupport ? geolocationSupport
, crashreporterSupport ? false
+, safeBrowsingSupport ? false
, drmSupport ? false
## other
@@ -133,6 +135,9 @@ stdenv.mkDerivation (rec {
"--with-libclang-path=${llvmPackages.clang-unwrapped}/lib"
"--with-clang-path=${llvmPackages.clang}/bin/clang"
]
+ ++ lib.optionals (stdenv.lib.versionAtLeast version "57") [
+ "--enable-webrender=build"
+ ]
# TorBrowser patches these
++ lib.optionals (!isTorBrowserLike) [
@@ -141,7 +146,7 @@ stdenv.mkDerivation (rec {
]
# and wants these
- ++ lib.optionals isTorBrowserLike [
+ ++ lib.optionals isTorBrowserLike ([
"--with-tor-browser-version=${version}"
"--enable-signmar"
"--enable-verify-mar"
@@ -151,7 +156,9 @@ stdenv.mkDerivation (rec {
# possibilities on other platforms.
# Lets save some space instead.
"--with-system-nspr"
- ]
+ ] ++ flag geolocationSupport "mozril-geoloc"
+ ++ flag safeBrowsingSupport "safe-browsing"
+ )
++ flag alsaSupport "alsa"
++ flag pulseaudioSupport "pulseaudio"
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index c08e7aca2853fa11b99b59521621b52b2f4739d5..7a01978f7d968425ac58fa9847b8a7c0eed080dd 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -6,10 +6,10 @@ rec {
firefox = common rec {
pname = "firefox";
- version = "57.0.1";
+ version = "57.0.4";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
- sha512 = "8cbfe0ad2c0f935dbc3a0ac4e855c489c83bf8c4506815dbae6e27f5d6a262ecf19ac82b6e81d52782559834fa14403116ecbf3acc8e3bc56b6c319e68316edd";
+ sha512 = "58846037aebbf14b85e6b3a46dbe617c780c6916e437ea4ee32a2502a6b55e3689921a0be28b920dedf2f966195df04ac8e45411caeb2601a168ec08b4827cf0";
};
patches =
@@ -32,10 +32,10 @@ rec {
firefox-esr = common rec {
pname = "firefox-esr";
- version = "52.5.1esr";
+ version = "52.5.3esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
- sha512 = "37318a9f82fa36fe390b85f536f26be9a6950a5143e74a218477adaffb89c77c1ffe17add4b79b26e320bb3138d418ccbb1371ca11e086d140143ba075947dc0";
+ sha512 = "7b9c87905c53bc681dc6475e05596449fed88850f9dc07c8223d0d3edd2dd9d8a0dd88ebae1cd59eced2165696df9370de5e85cc03cded58ec4d0f622634417f";
};
patches =
@@ -109,7 +109,7 @@ in rec {
src = fetchFromGitHub {
owner = "SLNOS";
repo = "tor-browser";
- # branch "tor-browser-45.8.0esr-6.5-2"
+ # branch "tor-browser-45.8.0esr-6.5-2-slnos"
rev = "e4140ea01b9906934f0347e95f860cec207ea824";
sha256 = "0a1qk3a9a3xxrl56bp4zbknbchv5x17k1w5kgcf4j3vklcv6av60";
};
@@ -128,8 +128,9 @@ in rec {
src = fetchFromGitHub {
owner = "SLNOS";
repo = "tor-browser";
- rev = "tor-browser-52.3.0esr-7.0-1-slnos";
- sha256 = "0szbf8gjbl4dnrb4igy4mq5858i1y6ki4skhdw63iqqdd8w9v4yv";
+ # branch "tor-browser-52.5.0esr-7.0-1-slnos";
+ rev = "830ff8d622ef20345d83f386174f790b0fc2440d";
+ sha256 = "169mjkr0bp80yv9nzza7kay7y2k03lpnx71h4ybcv9ygxgzdgax5";
};
patches =
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 4c3647bd448169a05862706cb27eef0bbab9f900..dd4cb439c1fadfada60b75b3656008a81939c91a 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -3,7 +3,7 @@
## various stuff that can be plugged in
, flashplayer, hal-flash
, MPlayerPlugin, ffmpeg, gst_all, xorg, libpulseaudio, libcanberra_gtk2
-, supportsJDK, jrePlugin, icedtea_web
+, jrePlugin, icedtea_web
, trezor-bridge, bluejeans, djview4, adobe-reader
, google_talk_plugin, fribid, gnome3/*.gnome_shell*/
, esteidfirefoxplugin
@@ -36,6 +36,11 @@ let
gssSupport = browser.gssSupport or false;
jre = cfg.jre or false;
icedtea = cfg.icedtea or false;
+ supportsJDK =
+ stdenv.system == "i686-linux" ||
+ stdenv.system == "x86_64-linux" ||
+ stdenv.system == "armv7l-linux" ||
+ stdenv.system == "aarch64-linux";
plugins =
assert !(jre && icedtea);
diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix
index 9a4d90701b28ff0b01a6c6f60fdffee0d6cebcd3..b868c434e2342bc45e4613fd1be51d8bd430823c 100644
--- a/pkgs/applications/networking/browsers/google-chrome/default.nix
+++ b/pkgs/applications/networking/browsers/google-chrome/default.nix
@@ -4,7 +4,7 @@
, glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr
, libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb
, alsaLib, libXdamage, libXtst, libXrandr, expat, cups
-, dbus_libs, gtk2, gtk3, gdk_pixbuf, gcc-unwrapped
+, dbus_libs, gtk2, gtk3, gdk_pixbuf, gcc-unwrapped, at_spi2_atk
# command line arguments which are always set e.g "--disable-gpu"
, commandLineArgs ? ""
@@ -57,7 +57,7 @@ let
libexif
liberation_ttf curl utillinux xdg_utils wget
flac harfbuzz icu libpng opusWithCustomModes snappy speechd
- bzip2 libcap
+ bzip2 libcap at_spi2_atk
] ++ optional pulseSupport libpulseaudio
++ [ gtk ];
@@ -139,6 +139,6 @@ in stdenv.mkDerivation rec {
homepage = https://www.google.com/chrome/browser/;
license = licenses.unfree;
maintainers = [ maintainers.msteen ];
- platforms = platforms.linux;
+ platforms = [ "x86_64-linux" ];
};
}
diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix
index 0f6c4ed36d40ad12f54d0cd9fbebd06025a76dd7..9cad2838a39b20e9e1f71584c6689528dfba99b2 100644
--- a/pkgs/applications/networking/browsers/lynx/default.nix
+++ b/pkgs/applications/networking/browsers/lynx/default.nix
@@ -12,7 +12,10 @@ stdenv.mkDerivation rec {
version = "2.8.9dev.16";
src = fetchurl {
- url = "http://invisible-mirror.net/archives/lynx/tarballs/lynx${version}.tar.bz2";
+ urls = [
+ "ftp://ftp.invisible-island.net/lynx/tarballs/lynx${version}.tar.bz2"
+ "https://invisible-mirror.net/archives/lynx/tarballs/lynx${version}.tar.bz2"
+ ];
sha256 = "1j0vx871ghkm7fgrafnvd2ml3ywcl8d3gyhq02fhfb851c88lc84";
};
@@ -22,9 +25,9 @@ stdenv.mkDerivation rec {
configureFlags = [ "--enable-widec" ] ++ stdenv.lib.optional sslSupport "--with-ssl";
- nativeBuildInputs = stdenv.lib.optional sslSupport pkgconfig
- ++ stdenv.lib.optional (hostPlatform != buildPlatform) buildPackages.stdenv.cc
- ++ [ nukeReferences ];
+ depsBuildBuild = [ buildPackages.stdenv.cc ];
+ nativeBuildInputs = [ nukeReferences ]
+ ++ stdenv.lib.optional sslSupport pkgconfig;
buildInputs = [ ncurses gzip ] ++ stdenv.lib.optional sslSupport openssl.dev;
diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix
index ce9ac961c92a8f97e29b55bcb87bb6834e854d47..cea6d5dbeea46da0e598379823e9209e4be3bf0a 100644
--- a/pkgs/applications/networking/browsers/midori/default.nix
+++ b/pkgs/applications/networking/browsers/midori/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkgconfig, intltool, vala_0_23, wrapGAppsHook
+{ stdenv, fetchurl, cmake, pkgconfig, intltool, vala_0_34, wrapGAppsHook
, gtk3, webkitgtk, librsvg, libnotify, sqlite
, glib_networking, gsettings_desktop_schemas, libsoup, pcre, gnome3
, libxcb, libpthreadstubs, libXdmcp, libxkbcommon, epoxy, at_spi2_core
@@ -29,11 +29,10 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
- pkgconfig wrapGAppsHook cmake intltool
+ pkgconfig wrapGAppsHook cmake intltool vala_0_34
];
buildInputs = [
- vala_0_23
gtk3 webkitgtk librsvg libnotify sqlite gsettings_desktop_schemas pcre gnome3.gcr
libxcb libpthreadstubs libXdmcp libxkbcommon epoxy at_spi2_core
(libsoup.override {gnomeSupport = true; valaSupport = true;})
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
index ecd4026821a856faffb761a907cb4a121b7c364f..614f55d01d6d4fedbc967f65a90ba091b45cf929 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
@@ -73,25 +73,25 @@ let
in
stdenv.mkDerivation rec {
name = "flashplayer-${version}";
- version = "27.0.0.187";
+ version = "28.0.0.137";
src = fetchurl {
url =
if debug then
- "https://fpdownload.macromedia.com/pub/flashplayer/updaters/27/flash_player_npapi_linux_debug.${arch}.tar.gz"
+ "https://fpdownload.macromedia.com/pub/flashplayer/updaters/28/flash_player_npapi_linux_debug.${arch}.tar.gz"
else
"https://fpdownload.adobe.com/get/flashplayer/pdc/${version}/flash_player_npapi_linux.${arch}.tar.gz";
sha256 =
if debug then
if arch == "x86_64" then
- "1ii97fa1diyggarh1gkg43ia42ws7x84hpjzvrdhxcf6s47lh2ld"
+ "1hj3sfrspdkhq967fmnpgamgiq90k263cqfas94gp3dzslmkingw"
else
- "1gphlgy64ddzn4bbgr2k1kh8xwq9ghf0z0c6zilry0nq33i64xa1"
+ "1v4k6hzngm23xwxnh6ngplp2m0ga480sbcm668bpcj61krmi6xy4"
else
if arch == "x86_64" then
- "1hfcphcvdam62k983rm6r42mnkih4nfwyrnx0v88z3nw14mjr4c3"
+ "0ijmrk6262a1xcf98g94vdlqxnik9f7igjy08j3a2i4b5bikq479"
else
- "06jb4jd5840w125wd4l35f0b1iqjak07ajy02k9j8srglwi0ffmw";
+ "10a17dba4zy29padvi3fnv2s8v71q698ffqjp8ggsla42pjyhvkh";
};
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 92e73e475581cf52ebce3b861e51369222dcaea7..d5c4f993d8ba7679abf114f35bed78e30c851bc8 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
@@ -55,19 +55,19 @@ let
in
stdenv.mkDerivation rec {
name = "flashplayer-standalone-${version}";
- version = "27.0.0.187";
+ version = "28.0.0.137";
src = fetchurl {
url =
if debug then
- "https://fpdownload.macromedia.com/pub/flashplayer/updaters/27/flash_player_sa_linux_debug.x86_64.tar.gz"
+ "https://fpdownload.macromedia.com/pub/flashplayer/updaters/28/flash_player_sa_linux_debug.x86_64.tar.gz"
else
- "https://fpdownload.macromedia.com/pub/flashplayer/updaters/27/flash_player_sa_linux.x86_64.tar.gz";
+ "https://fpdownload.macromedia.com/pub/flashplayer/updaters/28/flash_player_sa_linux.x86_64.tar.gz";
sha256 =
if debug then
- "1857g4yy62pj02pnw7p9bpqazp98jf17yv2xdh1fkqiibzahjc6m"
+ "0xr3hf828sm0xdnmk2kavxmvzc6m0mw369khrxyfwrbxvdsibwn8"
else
- "0kywx7c3qb1hfljc14ddzm1cyhvwygbbdfxp1rdhqw8s3b6ns0hw";
+ "1wr0avjpshrj51svb1sfnshz39xxla1brqs8pbcgfgyqjh350rgn";
};
nativeBuildInputs = [ unzip ];
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix
index 008c359648322826e709ead570417f195966cf8f..fa455eb0b7a418fd0d0585831cc7c8becc47cb30 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
description = ''A wrapper to run browser plugins out-of-process'';
homepage = http://nspluginwrapper.org/;
license = stdenv.lib.licenses.gpl2;
- platforms = stdenv.lib.platforms.linux;
+ platforms = [ "x64_64-linux" "i686-linux" ];
maintainers = [ stdenv.lib.maintainers.raskin ];
inherit (srcData) version;
};
diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix
index 0852b5c9d43490064b57fc603b46ae5c3b0ef00f..b98d1d415c665564995f986b01020df5baddb59e 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 = "48.0.2685.52";
+ version = "50.0.2762.45";
rpath = stdenv.lib.makeLibraryPath [
@@ -89,7 +89,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb";
- sha256 = "027njqh2as4d0xsnvzamqiplghb8cxqnc19y0vqkvjnsw57v828p";
+ sha256 = "1ajdr6yzqc9xkvdcgkps6j5996n60ibjhj518gmminx90da6x5dy";
};
unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc .";
diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix
index 736011a13ebabbc420747fbfc42f9113f5a49788..9187e7d002a58e489467afd65d754c9bf55ba294 100644
--- a/pkgs/applications/networking/browsers/palemoon/default.nix
+++ b/pkgs/applications/networking/browsers/palemoon/default.nix
@@ -59,12 +59,18 @@ stdenv.mkDerivation rec {
echo > $MOZ_CONFIG "
. $src/build/mozconfig.common
ac_add_options --prefix=$out
+ ac_add_options --with-pthreads
ac_add_options --enable-application=browser
ac_add_options --enable-official-branding
ac_add_options --enable-optimize="-O2"
+ ac_add_options --enable-release
+ ac_add_options --enable-devtools
ac_add_options --enable-jemalloc
ac_add_options --enable-shared-js
+ ac_add_options --enable-strip
ac_add_options --disable-tests
+ ac_add_options --disable-installer
+ ac_add_options --disable-updaters
"
'';
diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 4f0e891dc496bf353a46df22020376cbe6ab9e22..fb8c16abd53290ea2c59f8e22c605c88db74b13b 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -1,41 +1,40 @@
-{ stdenv, lib, fetchurl, unzip, buildPythonApplication, makeWrapper, wrapGAppsHook
-, 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 ? null
-, attrs
+{ stdenv, lib, fetchurl, fetchzip, python3Packages
+, makeWrapper, wrapGAppsHook, qtbase, glib_networking
+, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2
+, libxslt, gst_all_1 ? null
+, withPdfReader ? true
+, withMediaPlayback ? true
, withWebEngineDefault ? true
}:
-assert (! withWebEngineDefault) -> qtwebkit-plugins != null;
+assert withMediaPlayback -> gst_all_1 != null;
let
pdfjs = stdenv.mkDerivation rec {
name = "pdfjs-${version}";
version = "1.7.225";
- src = fetchurl {
+ src = fetchzip {
url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/${name}-dist.zip";
- sha256 = "1n8ylmv60r0qbw2vilp640a87l4lgnrsi15z3iihcs6dj1n1yy67";
+ sha256 = "0bsmbz7bbh0zpd70dlhss4fjdw7zq356091wld9s7kxnb2rixqd8";
+ stripRoot = false;
};
- nativeBuildInputs = [ unzip ];
-
buildCommand = ''
mkdir $out
- unzip -d $out $src
+ cp -r $src $out
'';
};
-in buildPythonApplication rec {
- name = "qutebrowser-${version}${fix_postfix}";
- fix_postfix = "-1";
- version = "1.0.3";
+in python3Packages.buildPythonApplication rec {
+ name = "qutebrowser-${version}${versionPostfix}";
namePrefix = "";
+ version = "1.0.4";
+ versionPostfix = "";
src = fetchurl {
url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${name}.tar.gz";
- sha256 = "04d6hg2yf2wjwn0sd05bpx3zngnb93g7rizbdq17bbpmnwxchzap";
+ sha256 = "0z8zrgr914bfmimqk3l17dxyc7gzh42sw8lfp041zzvj6fxw3lkr";
};
# Needs tox
@@ -43,21 +42,25 @@ in buildPythonApplication rec {
buildInputs = [
qtbase
- gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav
glib_networking
- ]
- ++ lib.optional (! withWebEngineDefault) qtwebkit-plugins;
+ ] ++ lib.optionals withMediaPlayback (with gst_all_1; [
+ gst-plugins-base gst-plugins-good
+ gst-plugins-bad gst-plugins-ugly gst-libav
+ ]) ++ lib.optional (!withWebEngineDefault) python3Packages.qtwebkit-plugins;
nativeBuildInputs = [
- makeWrapper wrapGAppsHook asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt
+ makeWrapper wrapGAppsHook asciidoc
+ docbook_xml_dtd_45 docbook_xsl libxml2 libxslt
];
- propagatedBuildInputs = [
- pyyaml pyqt5 jinja2 pygments pypeg2 cssutils pyopengl attrs
+ propagatedBuildInputs = with python3Packages; [
+ pyyaml pyqt5 jinja2 pygments
+ pypeg2 cssutils pyopengl attrs
];
postPatch = ''
sed -i "s,/usr/share/qutebrowser,$out/share/qutebrowser,g" qutebrowser/utils/standarddir.py
+ '' + lib.optionalString withPdfReader ''
sed -i "s,/usr/share/pdf.js,${pdfjs},g" qutebrowser/browser/pdfjs.py
'';
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 1b6bf2ac30028c695d07394475249bb9e078441f..8f22045578d7f27f574c2e291f7a65414621fcda 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.10";
+ version = "7.0.11";
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 = "0d1yvb1gmswlzyivr53xxfbd58bvr7nyangd85j36kar4bzbzvhh";
+ sha256 = "0i42jxdka0sq8fp6lj64n0az6m4g72il9qhdn63p0h7y4204i2v4";
};
"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 = "0mjw8z76pbm1hshz875shkmjmxqhpan5la52r3y20v6rc0gfd9p5";
+ sha256 = "1p9s6wqghpkml662vnp5194i8gb9bkqxdr96fmw0fh305cyk25k0";
};
};
in
diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix
index c654723f4c2c0fecd7a05af378aa7ef76922dd98..ce06dea7010586e43497e5443a62b096cb3b5405 100644
--- a/pkgs/applications/networking/browsers/vimb/default.nix
+++ b/pkgs/applications/networking/browsers/vimb/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
editor and also easily configurable during runtime. Vimb is mostly
keyboard driven and does not detract you from your daily work.
'';
- homepage = http://fanglingsu.github.io/vimb/;
+ homepage = https://fanglingsu.github.io/vimb/;
license = stdenv.lib.licenses.gpl3;
maintainers = [ stdenv.lib.maintainers.rickynils ];
platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index 410e886636083c7567c4d7855d90683cd1199546..00db16a8cf1600ff495e6ce85b774c221b6efa54 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -13,11 +13,11 @@
stdenv.mkDerivation rec {
name = "${product}-${version}";
product = "vivaldi";
- version = "1.12.955.38-1";
+ version = "1.13.1008.34-1";
src = fetchurl {
url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb";
- sha256 = "1bq1ss6vkpr6rw5n0sw9zipxx19vficvxys1lra9symcxk1b4gqw";
+ sha256 = "18p5n87n5rkd6dhdsf2lvcyhg6ipn0k4p6a79dy93vsgjmk4bvw2";
};
unpackPhase = ''
diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/pkgs/applications/networking/cluster/flink/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..bc8684da76799bcc1e07aa4fa54dcc502d288610
--- /dev/null
+++ b/pkgs/applications/networking/cluster/flink/default.nix
@@ -0,0 +1,51 @@
+{ stdenv, fetchurl, makeWrapper, jre
+, version ? "1.3" }:
+
+let
+ versionMap = {
+ "1.3" = {
+ flinkVersion = "1.3.2";
+ scalaVersion = "2.11";
+ sha256 = "0mf4qz0963bflzidgslvwpdlvj9za9sj20dfybplw9lhd4sf52rp";
+ };
+ };
+in
+
+with versionMap.${version};
+
+stdenv.mkDerivation rec {
+ name = "flink-${flinkVersion}";
+
+ src = fetchurl {
+ url = "mirror://apache/flink/${name}/${name}-bin-hadoop27-scala_${scalaVersion}.tgz";
+ inherit sha256;
+ };
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ buildInputs = [ jre ];
+
+ installPhase = ''
+ rm bin/*.bat
+
+ mkdir -p $out/bin $out/opt/flink
+ mv * $out/opt/flink/
+ makeWrapper $out/opt/flink/bin/flink $out/bin/flink \
+ --prefix PATH : ${jre}/bin
+
+ cat <> $out/opt/flink/conf/flink-conf.yaml
+ env.java.home: ${jre}"
+ env.log.dir: /tmp/flink-logs
+ EOF
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A distributed stream processing framework";
+ homepage = https://flink.apache.org;
+ downloadPage = https://flink.apache.org/downloads.html;
+ license = licenses.asl20;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ mbode ];
+ repositories.git = git://git.apache.org/flink.git;
+ };
+}
diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index 6767a0bd724064e648a9a96e753e4b410e0dd510..408019eeb4b2a17c3400bfe23b471226e76d03a7 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -4,10 +4,10 @@ let
then "linux-amd64"
else "darwin-amd64";
checksum = if stdenv.isLinux
- then "1i22givr52kgr76dd2azcg9avgh70wiw5dcpmmyychms2ynxi42y"
- else "0phhy3si86ilc6051zfgn8jnniy5lygf1r2gysjpcyfbrc5pw3hj";
+ then "9f04c4824fc751d6c932ae5b93f7336eae06e78315352aa80241066aa1d66c49"
+ else "5058142bcd6e16b7e01695a8f258d27ae0b6469caf227ddf6aa2181405e6aa8e";
pname = "helm";
- version = "2.6.1";
+ version = "2.7.2";
in
stdenv.mkDerivation {
name = "${pname}-${version}";
diff --git a/pkgs/applications/networking/cluster/kontemplate/default.nix b/pkgs/applications/networking/cluster/kontemplate/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..aa5f86633318d0a19ef9422da84cad7e284d981f
--- /dev/null
+++ b/pkgs/applications/networking/cluster/kontemplate/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+ name = "kontemplate-${version}";
+ version = "1.3.0";
+
+ goPackagePath = "github.com/tazjin/kontemplate";
+
+ src = fetchFromGitHub {
+ rev = "v${version}";
+ owner = "tazjin";
+ repo = "kontemplate";
+ sha256 = "0g9hs9gwwkng9vbnv07ibhll0kggdprffpmhlbz9nmv81w2z3myi";
+ };
+
+ goDeps = ./deps.nix;
+
+ meta = with stdenv.lib; {
+ description = "Extremely simple Kubernetes resource templates";
+ homepage = http://kontemplate.works;
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ mbode ];
+ platforms = platforms.unix;
+ repositories.git = git://github.com/tazjin/kontemplate.git;
+ };
+}
diff --git a/pkgs/applications/networking/cluster/kontemplate/deps.nix b/pkgs/applications/networking/cluster/kontemplate/deps.nix
new file mode 100644
index 0000000000000000000000000000000000000000..1d6dfb3e64f55749e6ac0c8ec4a859e1ae087a11
--- /dev/null
+++ b/pkgs/applications/networking/cluster/kontemplate/deps.nix
@@ -0,0 +1,120 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+ {
+ goPackagePath = "github.com/Masterminds/semver";
+ fetch = {
+ type = "git";
+ url = "https://github.com/Masterminds/semver";
+ rev = "15d8430ab86497c5c0da827b748823945e1cf1e1";
+ sha256 = "0q5w6mjr1zws04z7x1ax1hp1zxdc4mbm9zsikgd6fv0c9ndnjr3q";
+ };
+ }
+ {
+ goPackagePath = "github.com/Masterminds/sprig";
+ fetch = {
+ type = "git";
+ url = "https://github.com/Masterminds/sprig";
+ rev = "b217b9c388de2cacde4354c536e520c52c055563";
+ sha256 = "1f41v3c8c7zagc4qjhcb6nwkvi8nzvf70f89a7ss2m6krkxz0m2a";
+ };
+ }
+ {
+ goPackagePath = "github.com/alecthomas/template";
+ fetch = {
+ type = "git";
+ url = "https://github.com/alecthomas/template";
+ rev = "a0175ee3bccc567396460bf5acd36800cb10c49c";
+ sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj";
+ };
+ }
+ {
+ goPackagePath = "github.com/alecthomas/units";
+ fetch = {
+ type = "git";
+ url = "https://github.com/alecthomas/units";
+ rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a";
+ sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
+ };
+ }
+ {
+ goPackagePath = "github.com/aokoli/goutils";
+ fetch = {
+ type = "git";
+ url = "https://github.com/aokoli/goutils";
+ rev = "3391d3790d23d03408670993e957e8f408993c34";
+ sha256 = "1yj4yjfwylica31sgj69ygb04p9xxi22kgfxd0j5f58zr8vwww2n";
+ };
+ }
+ {
+ goPackagePath = "github.com/ghodss/yaml";
+ fetch = {
+ type = "git";
+ url = "https://github.com/ghodss/yaml";
+ rev = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7";
+ sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g";
+ };
+ }
+ {
+ goPackagePath = "github.com/huandu/xstrings";
+ fetch = {
+ type = "git";
+ url = "https://github.com/huandu/xstrings";
+ rev = "37469d0c81a7910b49d64a0d308ded4823e90937";
+ sha256 = "18c2b4h7phdm71mn66x8bsmghjr1b2lpg07zcbgmab37y36bjl20";
+ };
+ }
+ {
+ goPackagePath = "github.com/imdario/mergo";
+ fetch = {
+ type = "git";
+ url = "https://github.com/imdario/mergo";
+ rev = "7fe0c75c13abdee74b09fcacef5ea1c6bba6a874";
+ sha256 = "1hclh5kpg25s2llpk7j7sm3vf66xci5jchn8wzdcr5fj372ghsbd";
+ };
+ }
+ {
+ goPackagePath = "github.com/polydawn/meep";
+ fetch = {
+ type = "git";
+ url = "https://github.com/polydawn/meep";
+ rev = "eaf1db2168fe380b4da17a35f0adddb5ae15a651";
+ sha256 = "12n134fb2imnj67xkbznzm0gqkg36hdxwr960y91qb5s2q2krxir";
+ };
+ }
+ {
+ goPackagePath = "github.com/satori/go.uuid";
+ fetch = {
+ type = "git";
+ url = "https://github.com/satori/go.uuid";
+ rev = "5bf94b69c6b68ee1b541973bb8e1144db23a194b";
+ sha256 = "0l782l4srv36pj8pfgn61996d0vjifld4a569rbjwq5h14pd0c07";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/crypto";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/crypto";
+ rev = "94eea52f7b742c7cbe0b03b22f0c4c8631ece122";
+ sha256 = "095zyvjb0m2pz382500miqadhk7w3nis8z3j941z8cq4rdafijvi";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/alecthomas/kingpin.v2";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/alecthomas/kingpin.v2";
+ rev = "1087e65c9441605df944fb12c33f0fe7072d18ca";
+ sha256 = "18llqzkdqf62qbqcv2fd3j0igl6cwwn4dissf5skkvxrcxjcmmj0";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/yaml.v2";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/yaml.v2";
+ rev = "287cf08546ab5e7e37d55a84f7ed3fd1db036de5";
+ sha256 = "15502klds9wwv567vclb9kx95gs8lnyzn4ybsk6l9fc7a67lk831";
+ };
+ }
+]
diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix
index ff7cb245ae2a083aaa1ae63690a5854aa1fb0ea4..41099192176cd2e46ec2813056aacb20379056f1 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.7.1";
+ version = "1.8.0";
goPackagePath = "k8s.io/kops";
@@ -10,7 +10,7 @@ buildGoPackage rec {
rev = version;
owner = "kubernetes";
repo = "kops";
- sha256 = "0wii6w6hs9hjz3vvgqwa5ilwdi8a3qknmqsg3izazmgmnhl712wd";
+ sha256 = "0vaa18vhwk132fv7i896513isp66wnz9gn0b5613n3x28q0gvkmg";
};
buildInputs = [go-bindata];
diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index a3b30a5ef405c1f90206833145f57cc4857b247a..f69b0e5eca9ba5b76895f9e547d4221fb43a35c2 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -23,7 +23,7 @@ let
in buildGoPackage rec {
pname = "minikube";
name = "${pname}-${version}";
- version = "0.23.0";
+ version = "0.24.1";
goPackagePath = "k8s.io/minikube";
@@ -31,7 +31,7 @@ in buildGoPackage rec {
owner = "kubernetes";
repo = "minikube";
rev = "v${version}";
- sha256 = "1f7kjn26y7knmab5avj8spb40ny1y0jix5j5p0dqfjvg9climl0h";
+ sha256 = "18b5ic4lcn84hq2ji5alyx58x9vi0b03544i5xzfgn3h2k78kynk";
};
patches = [
@@ -65,6 +65,8 @@ in buildGoPackage rec {
postInstall = ''
mkdir -p $bin/share/bash-completion/completions/
MINIKUBE_WANTUPDATENOTIFICATION=false HOME=$PWD $bin/bin/minikube completion bash > $bin/share/bash-completion/completions/minikube
+ mkdir -p $bin/share/zsh/site-functions/
+ MINIKUBE_WANTUPDATENOTIFICATION=false HOME=$PWD $bin/bin/minikube completion zsh > $bin/share/zsh/site-functions/_minikube
'';
postFixup = "wrapProgram $bin/bin/${pname} --prefix PATH : ${stdenv.lib.makeBinPath binPath}";
diff --git a/pkgs/applications/networking/cluster/minikube/localkube.patch b/pkgs/applications/networking/cluster/minikube/localkube.patch
index 08ec85813a3effe25f87dab1139fab905e4a4588..2d69cded555f928017d9dc1b5598edec908e516e 100644
--- a/pkgs/applications/networking/cluster/minikube/localkube.patch
+++ b/pkgs/applications/networking/cluster/minikube/localkube.patch
@@ -14,7 +14,7 @@ index 1c4b5000..c9f120d4 100644
- if err != nil {
- return errors.Wrap(err, "Error updating localkube from uri")
- }
-+ localkubeFile = assets.NewBinDataAsset("out/localkube", "/", "localkube", "0777")
++ localkubeFile = assets.NewBinDataAsset("out/localkube", "/usr/local/bin/", "localkube", "0777")
copyableFiles = append(copyableFiles, localkubeFile)
// user added files
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 1fce0695bfd44b5204080857f48a95fb9e200142..54a54b37cadb58dabbce3d2e8bcc5bcb6f014566 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -72,7 +72,7 @@ let
in withPlugins (_: []);
plugins = import ./providers { inherit stdenv lib buildGoPackage fetchFromGitHub; };
-in {
+in rec {
terraform_0_8_5 = generic {
version = "0.8.5";
sha256 = "1cxwv3652fpsbm2zk1akw356cd7w7vhny1623ighgbz9ha8gvg09";
@@ -97,10 +97,14 @@ in {
passthru = { inherit plugins; };
});
+ terraform_0_10-full = terraform_0_10.withPlugins lib.attrValues;
+
terraform_0_11 = pluggable (generic {
- version = "0.11.0";
- sha256 = "0qsydg6bn7k6d68pd1y4j5iys9i66c690yq21axcpnjfibxgqyff";
+ version = "0.11.1";
+ sha256 = "04qyhlif3b3kjs3m6c3mx45sgr5r13x55aic638zzlrhbpmqiih1";
patches = [ ./provider-path.patch ];
passthru = { inherit plugins; };
});
+
+ terraform_0_11-full = terraform_0_11.withPlugins lib.attrValues;
}
diff --git a/pkgs/applications/networking/cluster/terraform/providers/data.nix b/pkgs/applications/networking/cluster/terraform/providers/data.nix
index 675e3f768ebf44ef92fb7f588eeade22559bba33..fb778b4c221bcab89c9535ce7ad5d675031a52fe 100644
--- a/pkgs/applications/networking/cluster/terraform/providers/data.nix
+++ b/pkgs/applications/networking/cluster/terraform/providers/data.nix
@@ -4,8 +4,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-alicloud";
- version = "0.1.0";
- sha256 = "199zrpmi1hqy80nrvdhh5pn7vlcvpjcsf0hpwgzb1r9vnydpz7cj";
+ version = "1.2.0";
+ sha256 = "0v3ji83igjf3b7lp8525j42jxwlvbxws1d7q72v20xlnbyz03h3x";
};
archive =
{
@@ -32,8 +32,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-aws";
- version = "1.3.1";
- sha256 = "0vsvvw1qdjb69jilhjl5g8h7dn82n0n23k2v67dqywhinilafcmv";
+ version = "1.5.0";
+ sha256 = "1c1mkb3299ahf3w58zkk7ilkasflwj2n1kqgddaylqqfcjykblyj";
};
azure =
{
@@ -46,15 +46,15 @@
{
owner = "terraform-providers";
repo = "terraform-provider-azurerm";
- version = "0.3.3";
- sha256 = "0qq10gjwka0268ylzx5r7qhj0xpjh8fxrjr1fwbiq8sp6i1jb7sa";
+ version = "1.0.0";
+ sha256 = "0grpc7apfn03slkkily8agl8pv6mc0j58ch8fa6jgqcqy6dbd0kh";
};
bitbucket =
{
owner = "terraform-providers";
repo = "terraform-provider-bitbucket";
- version = "0.1.0";
- sha256 = "0c5aiq0p425h7c600wg5h3601l40airwz6cs724lc72fycbb4s43";
+ version = "1.0.0";
+ sha256 = "0gi8p1q0y8x5y8lqihijkpqs3v152h0q7icv7ixk33xsdcvb418y";
};
chef =
{
@@ -116,15 +116,15 @@
{
owner = "terraform-providers";
repo = "terraform-provider-datadog";
- version = "1.0.0";
- sha256 = "1kabjhq7xl2mhh0gvg87a9zh8y2k0h5ghcmb86xzvx25j3jdqfg6";
+ version = "1.0.1";
+ sha256 = "1a5acwxqwasckkyj9h33kgn1cmnmn14x4fg19kz742zwfyjmncwj";
};
digitalocean =
{
owner = "terraform-providers";
repo = "terraform-provider-digitalocean";
- version = "0.1.2";
- sha256 = "0wn2bx9zk0fqvrn7a76rffin7f1b70p66h5bs9073szhr3zph7hg";
+ version = "0.1.3";
+ sha256 = "10crxciw7y2gnm8vqp007vw0k7c1a1xk2z2zsjr5rksk6qlnri4k";
};
dme =
{
@@ -193,8 +193,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-google";
- version = "1.2.0";
- sha256 = "1q3ypacsjc8779v1k81z0vs3kx6i340fa4mz26gscf85rx8bghim";
+ version = "1.4.0";
+ sha256 = "0nlm02ibp2w4m38pvmw6r29807863h23y8k00ywmkcr7yiy1zilr";
};
grafana =
{
@@ -298,8 +298,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-nomad";
- version = "1.0.0";
- sha256 = "01fvw7yw8dhjclipnn9h1blagbp2849ahmnqj3ysh13i0x1qbq4r";
+ version = "1.1.0";
+ sha256 = "0n3bd9fiablhb2zxmlqnidahdqlpj3i7701vi62zds04kcgdkxw8";
};
ns1 =
{
@@ -333,8 +333,15 @@
{
owner = "terraform-providers";
repo = "terraform-provider-openstack";
+ version = "1.1.0";
+ sha256 = "1w747qbk24b18v6x7l4n08pxnwak395fq1grajpxf3qw6afchjdj";
+ };
+ opentelekomcloud =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-opentelekomcloud";
version = "1.0.0";
- sha256 = "0ddy62psapajbgnf7f998cnwiyak3lnk43vj0rl230dhnma9crpm";
+ sha256 = "1wra9a6cjgsyvbfldvi2xnjk6y9zqv3y06pbq8c8dyjzssd5j591";
};
opsgenie =
{
@@ -403,8 +410,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-random";
- version = "1.0.0";
- sha256 = "0im4dsnbpbc9qln92lxcrygm9d705bvlhigpx492172cq1fqnw61";
+ version = "1.1.0";
+ sha256 = "1mal0pg37a99q0sjqbccwc2ipwvxm8lqp93lg8i96f868hiv4yzl";
};
rundeck =
{
@@ -494,7 +501,7 @@
{
owner = "terraform-providers";
repo = "terraform-provider-vsphere";
- version = "0.4.2";
- sha256 = "0k9mndxfiq5drcz2qhqasc7cqra0mfdwwwblb1m6lyg7flg7dli0";
+ version = "1.1.1";
+ sha256 = "1y209bwkk79ycxjl3b6c20n0z2g5d6njna85w68a0w6npk88zva9";
};
}
diff --git a/pkgs/applications/networking/cluster/terraform/providers/update-all b/pkgs/applications/networking/cluster/terraform/providers/update-all
index d857e4f187003d340287c9ff41e9cc58a748cbfa..16eb6004e3eef324f19745f512cfc9f036f3c8f6 100755
--- a/pkgs/applications/networking/cluster/terraform/providers/update-all
+++ b/pkgs/applications/networking/cluster/terraform/providers/update-all
@@ -71,7 +71,7 @@ fi
org=terraform-providers
-repos=$(get_org_repos "$org" | grep terraform-provider- | sort)
+repos=$(get_org_repos "$org" | grep terraform-provider- | grep -v terraform-provider-scaffolding | sort)
# Get all the providers with index
diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index adbe2ab5a54f4fbe615b82c2fc17d8ae08cef7d4..576daa88127a4e3ae21d9b5f336aa97fc768ca5c 100644
--- a/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "terragrunt-${version}";
- version = "0.13.0";
+ version = "0.13.23";
goPackagePath = "github.com/gruntwork-io/terragrunt";
@@ -10,7 +10,7 @@ buildGoPackage rec {
rev = "v${version}";
owner = "gruntwork-io";
repo = "terragrunt";
- sha256 = "18jbz3vchdp5f3f4grl968k706fdcvj71syf7qmriwdyw4ns83wv";
+ sha256 = "1xx3kw38vr563x3bn0rrg1iq4r51rl0qci2magwwng62cgh3zaiy";
};
goDeps = ./deps.nix;
diff --git a/pkgs/applications/networking/cluster/terragrunt/deps.nix b/pkgs/applications/networking/cluster/terragrunt/deps.nix
index ac6bae693952f41e17757a56f845ce236b1ecad9..c371c756a152a1663012dafa249e44e48055d856 100644
--- a/pkgs/applications/networking/cluster/terragrunt/deps.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/deps.nix
@@ -5,8 +5,8 @@
fetch = {
type = "git";
url = "https://github.com/aws/aws-sdk-go";
- rev = "df374c20d53ed082b8cf0d0da52b1a181abf387b";
- sha256 = "0my26kjx1inh0ajh85n34wrl18mizx627cl0xhxlhcyw01p24792";
+ rev = "d0cb8551ac28d362e77ea475e5b7b2ebaec06b6b";
+ sha256 = "1546kb49wb1qjx6pz7aj4iygmqsjps70npb5csm5q08wxk63vhls";
};
}
{
@@ -23,8 +23,17 @@
fetch = {
type = "git";
url = "https://github.com/go-errors/errors";
- rev = "8fa88b06e5974e97fbf9899a7f86a344bfd1f105";
- sha256 = "02mvb2clbmfcqb4yclv5zhs4clkk9jxi2hiawsynl5fwmgn0d3xa";
+ rev = "3afebba5a48dbc89b574d890b6b34d9ee10b4785";
+ sha256 = "1vwgczqzd5i6bx12g9ln5cqfsbc7g0f8cz8yvcrasss2injpndi0";
+ };
+ }
+ {
+ goPackagePath = "github.com/hashicorp/go-cleanhttp";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hashicorp/go-cleanhttp";
+ rev = "d5fe4b57a186c716b0e00b8c301cbd9b4182694d";
+ sha256 = "1m20y90syky4xr81sm3980jpil81nnpzmi6kv0vjr6p584gl1hn8";
};
}
{
@@ -32,8 +41,8 @@
fetch = {
type = "git";
url = "https://github.com/hashicorp/go-getter";
- rev = "6aae8e4e2dee8131187c6a54b52664796e5a02b0";
- sha256 = "0hxjwph0ghx0732xq62bszk18wb18hdq6vzb6b6bdn3rsdva1d68";
+ rev = "994f50a6f071b07cfbea9eca9618c9674091ca51";
+ sha256 = "1v2whvi9rnrkz4ji3b3sinvv3ahr5s4iyzchz00wjw0q2kdvj1zj";
};
}
{
@@ -41,8 +50,8 @@
fetch = {
type = "git";
url = "https://github.com/hashicorp/go-version";
- rev = "03c5bf6be031b6dd45afec16b1cf94fc8938bc77";
- sha256 = "0sjq57gpfznaqdrbyb2p0bn90g9h661cvr0jrk6ngags4pbw14ik";
+ rev = "4fe82ae3040f80a03d04d2cccb5606a626b8e1ee";
+ sha256 = "0gq4207s1yf2nq4c2ir3bsai29svzz4830g1vbvzdrpis58r1x4m";
};
}
{
@@ -50,8 +59,8 @@
fetch = {
type = "git";
url = "https://github.com/hashicorp/hcl";
- rev = "392dba7d905ed5d04a5794ba89f558b27e2ba1ca";
- sha256 = "1rfm67kma2hpakabf7hxlj196jags4rpjpcirwg4kan4g9b6j0kb";
+ rev = "23c074d0eceb2b8a5bfdbb271ab780cde70f05a8";
+ sha256 = "0db4lpqb5m130rmfy3s3gjjf4dxllypmyrzxv6ggqhkmwmc7w4mc";
};
}
{
@@ -59,8 +68,8 @@
fetch = {
type = "git";
url = "https://github.com/mattn/go-zglob";
- rev = "95345c4e1c0ebc9d16a3284177f09360f4d20fab";
- sha256 = "012hrd67v4gp3b621rykg2kp6a7iq4dr585qavragbif0z1whckx";
+ rev = "4b74c24375b3b1ee226867156e01996f4e19a8d6";
+ sha256 = "1qc502an4q3wgvrd9zw6zprgm28d90d2f98bdamdf4js03jj22xn";
};
}
{
@@ -77,8 +86,8 @@
fetch = {
type = "git";
url = "https://github.com/mitchellh/go-testing-interface";
- rev = "9a441910b16872f7b8283682619b3761a9aa2222";
- sha256 = "0gfi97m6sadrwbq56as3d368c3ipcn3wz8pxqkk7kkba0h5wjc7v";
+ rev = "a61a99592b77c9ba629d254a693acffaeb4b7e28";
+ sha256 = "139hq835jpgk9pjg94br9d08nka8bfm7zyw92zxlwrkska4pgigx";
};
}
{
@@ -86,8 +95,8 @@
fetch = {
type = "git";
url = "https://github.com/mitchellh/mapstructure";
- rev = "d0303fe809921458f417bcf828397a65db30a7e4";
- sha256 = "1fjwi5ghc1ibyx93apz31n4hj6gcq1hzismpdfbg2qxwshyg0ya8";
+ rev = "06020f85339e21b2478f756a78e295255ffa4d6a";
+ sha256 = "12zb5jh7ri4vna3f24y9g10nzrnz9wbvwnk29wjk3vg0ljia64s9";
};
}
{
@@ -95,8 +104,8 @@
fetch = {
type = "git";
url = "https://github.com/stretchr/testify";
- rev = "05e8a0eda380579888eb53c394909df027f06991";
- sha256 = "03l83nrgpbyc2hxxfi928gayj16fsclbr88dja6r9kikq19a6yhv";
+ rev = "2aa2c176b9dab406a6970f6a55f513e8a8c8b18f";
+ sha256 = "1j92x4291flz3i4pk6bi3y59nnsi6lj34zmyfp7axf68fd8vm5ml";
};
}
{
@@ -113,8 +122,8 @@
fetch = {
type = "git";
url = "https://github.com/urfave/cli";
- rev = "4b90d79a682b4bf685762c7452db20f2a676ecb2";
- sha256 = "0ls3lfmbfwirm9j95b6yrw41wgh72lfkp1cvs873zw04si4yvaqr";
+ rev = "39908eb08fee7c10d842622a114a5c133fb0a3c6";
+ sha256 = "1s0whq54xmcljdg94g6sghpf6mkhf6fdxxb18zg0yzzj6fz9yj8j";
};
}
]
diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index e9d6c5f306f07c52963c45505291fe5cbc346ed4..5bafb8e7c4c8277500396f50eab8f7d72361a673 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -7,7 +7,7 @@ assert lib.elem stdenv.system platforms;
# Dropbox client to bootstrap installation.
# The client is self-updating, so the actual version may be newer.
let
- version = "38.4.27";
+ version = "40.4.46";
arch = {
"x86_64-linux" = "x86_64";
@@ -54,7 +54,7 @@ buildFHSUserEnv {
do_install=1
else
installed_version=$(cat "$HOME/.dropbox-dist/VERSION")
- latest_version=$(printf "${version}\n$installed_version\n" | sort -V | head -n 1)
+ latest_version=$(printf "${version}\n$installed_version\n" | sort -rV | head -n 1)
if [ "x$installed_version" != "x$latest_version" ]; then
do_install=1
fi
diff --git a/pkgs/applications/networking/errbot/default.nix b/pkgs/applications/networking/errbot/default.nix
index 7d815c8fad0813cc2ddf74822588a0da8d48343a..611d7904991a5dc2486339814262f534dc0ee40c 100644
--- a/pkgs/applications/networking/errbot/default.nix
+++ b/pkgs/applications/networking/errbot/default.nix
@@ -24,7 +24,7 @@ pythonPackages.buildPythonApplication rec {
buildInputs = [ glibcLocales ];
propagatedBuildInputs = with pythonPackages; [
webtest bottle threadpool rocket-errbot requests jinja2
- pyopenssl colorlog Yapsy markdown ansi pygments dns pep8
+ pyopenssl colorlog Yapsy markdown ansi pygments dnspython pep8
daemonize pygments-markdown-lexer telegram irc slackclient
sleekxmpp hypchat pytest
];
diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix
index b7bc2c6c67a0e9ec40c0f66a4da6f9d19bfbca38..80984208460b20523066e361d88dcdb1444ab049 100644
--- a/pkgs/applications/networking/esniper/default.nix
+++ b/pkgs/applications/networking/esniper/default.nix
@@ -1,11 +1,13 @@
-{ stdenv, fetchurl, openssl, curl, coreutils, gawk, bash, which }:
+{ stdenv, fetchFromGitHub, openssl, curl, coreutils, gawk, bash, which }:
stdenv.mkDerivation rec {
- name = "esniper-2.33.0";
+ name = "esniper-2.33.0.2017-11-06";
- src = fetchurl {
- url = "mirror://sourceforge/esniper/${stdenv.lib.replaceStrings ["."] ["-"] name}.tgz";
- sha256 = "1pck2x7mp7ip0b21v2sjvq86fz12gzw6kig4vvbrghz5xw5b3f69";
+ src = fetchFromGitHub {
+ owner = "yhfudev";
+ repo = "esniper";
+ rev = "c95140d376db3c991300a7462e6c172b0ccf3eb5";
+ sha256 = "1dfb5hmcrvm3yg9ask362c6s5ylxs21szw23dm737a94br37j890";
};
buildInputs = [ openssl curl ];
diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..22f9f7822ddfc85fc97d9b40556a1fe738f0f2ea
--- /dev/null
+++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, stfl, sqlite, curl, gettext, pkgconfig, libxml2, json_c, ncurses
+, asciidoc, docbook_xml_dtd_45, libxslt, docbook_xml_xslt, makeWrapper }:
+
+stdenv.mkDerivation rec {
+ name = "newsboat-${version}";
+ version = "2.10.2";
+
+ src = fetchurl {
+ url = "https://newsboat.org/releases/${version}/${name}.tar.xz";
+ sha256 = "1x4nxx1kvmrcm8jy73dvg56h4z15y3sach2vr13cw8rsbi7v99px";
+ };
+
+ prePatch = ''
+ substituteInPlace Makefile --replace "|| true" ""
+ '';
+
+ nativeBuildInputs = [ pkgconfig asciidoc docbook_xml_dtd_45 libxslt docbook_xml_xslt ]
+ ++ stdenv.lib.optional stdenv.isDarwin makeWrapper;
+
+ buildInputs = [ stfl sqlite curl gettext libxml2 json_c ncurses ];
+
+ installFlags = [ "DESTDIR=$(out)" "prefix=" ];
+
+ postInstall = 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 = https://newsboat.org/;
+ description = "A fork of Newsbeuter, an RSS/Atom feed reader for the text console.";
+ maintainers = with maintainers; [ dotlambda ];
+ license = licenses.mit;
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix
index b25d4e109ebc5d2566cb2c98fa9b7feb977b580d..0a89ec6023bec88713f1bbdfeb6ba034f53cf82d 100644
--- a/pkgs/applications/networking/feedreaders/rssguard/default.nix
+++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix
@@ -1,22 +1,27 @@
-{ stdenv, fetchgit, qmake, qtwebengine, qttools, wrapGAppsHook }:
+{ stdenv, fetchFromGitHub, qmake, qtwebengine, qttools, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "rssguard-${version}";
- version = "3.4.2";
+ name = "${pname}-${version}";
+ pname = "rssguard";
+ version = "3.5.5";
- src = fetchgit {
- url = https://github.com/martinrotter/rssguard;
- rev = "refs/tags/${version}";
- sha256 = "0iy0fd3qr2dm0pc6xr7sin6cjfxfa0pxhxiwzs55dhsdk9zir62s";
- # Submodules are required only for Windows (and one of them is a huge binary
- # package ~400MB). See project wiki for more details.
- fetchSubmodules = false;
+ src = fetchFromGitHub {
+ owner = "martinrotter";
+ repo = pname;
+ rev = version;
+ sha256 = "0swjh664y1yqr1rn3ym2kicyx7r97ypr4qf7qrjl4a5q1spzsv48";
};
buildInputs = [ qtwebengine qttools ];
nativeBuildInputs = [ qmake wrapGAppsHook ];
qmakeFlags = [ "CONFIG+=release" ];
+ # FIXME: This shouldn't be needed after 3.5.5.
+ # See: https://github.com/martinrotter/rssguard/issues/175
+ preConfigure = ''
+ lrelease rssguard.pro
+ '';
+
meta = with stdenv.lib; {
description = "Simple RSS/Atom feed reader with online synchronization";
longDescription = ''
diff --git a/pkgs/applications/networking/gmailieer/default.nix b/pkgs/applications/networking/gmailieer/default.nix
index 26a05151d1cffe637c26620708d1e46f3e129e51..e56dbe0817e72a936babc4fd785b31ab18f3076f 100644
--- a/pkgs/applications/networking/gmailieer/default.nix
+++ b/pkgs/applications/networking/gmailieer/default.nix
@@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
name = "gmailieer";
- version = "0.4";
+ version = "0.5";
src = fetchFromGitHub {
owner = "gauteh";
repo = "gmailieer";
rev = "v${version}";
- sha256 = "0vpc8nrh3cx91pcw45jjr2jllkqbx6w2khq7nyqv59gc4q5mz0p2";
+ sha256 = "152ky06k1wc3jffb48c6zh7c7pr732m9f4g1i316zaa4nx2ynfsa";
};
propagatedBuildInputs = with python3Packages; [
diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix
index 72ffbb6e6d3a135909022f2553e65e61892ea252..627b6aac29cbb2cca8b3b28cc000b62d201144c0 100644
--- a/pkgs/applications/networking/gns3/default.nix
+++ b/pkgs/applications/networking/gns3/default.nix
@@ -1,8 +1,8 @@
{ callPackage, stdenv }:
let
- stableVersion = "2.1.0";
- previewVersion = "2.1.0rc4"; # == 2.1.0
+ stableVersion = "2.1.2";
+ previewVersion = "2.1.2";
addVersion = args:
let version = if args.stable then stableVersion else previewVersion;
branch = if args.stable then "stable" else "preview";
@@ -12,19 +12,19 @@ let
in {
guiStable = mkGui {
stable = true;
- sha256Hash = "0fms8469daa8jhmsdqnadm18gc27g18q4m974wjfpz9n1rn78sjk";
+ sha256Hash = "1p3z1dlank0nzj5yyap2n2gv1xa66x9iqi4q7vvy0xcxbqzmqszk";
};
guiPreview = mkGui {
stable = false;
- sha256Hash = "10p8i45n6qsf431d0xpy5dk3g5qh6zdlnfj82jn9xdyccgxs4x3s";
+ sha256Hash = "1p3z1dlank0nzj5yyap2n2gv1xa66x9iqi4q7vvy0xcxbqzmqszk";
};
serverStable = mkServer {
stable = true;
- sha256Hash = "1s66qnkhd9rqak13m57i266bgrk8f1ky2wxdha1jj0q9gxdsqa39";
+ sha256Hash = "0nd7j33ns94hh65b9j0m177b7h25slpny74ga8qppghvv2iqsbp8";
};
serverPreview = mkServer {
stable = false;
- sha256Hash = "1z8a3s90k86vmi4rwsd3v74gwvml68ci6f3zgxaji3z1sm22zcyd";
+ sha256Hash = "0nd7j33ns94hh65b9j0m177b7h25slpny74ga8qppghvv2iqsbp8";
};
}
diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix
index 59380cf6965e0b1c6a0c7be20d382da7924921c8..5a201dfc4074e83015e3d081aba2bacbc9f81482 100644
--- a/pkgs/applications/networking/gns3/server.nix
+++ b/pkgs/applications/networking/gns3/server.nix
@@ -24,19 +24,21 @@ let
aiohttp = (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 ]);
}));
aiohttp-cors = (stdenv.lib.overrideDerivation pythonPackages.aiohttp-cors
(oldAttrs:
- { propagatedBuildInputs = [ aiohttp ]; }));
+ rec {
+ pname = "aiohttp-cors";
+ version = "0.5.3";
+ name = "${pname}-${version}";
+ src = pythonPackages.fetchPypi {
+ inherit pname version;
+ sha256 = "11b51mhr7wjfiikvj3nc5s8c7miin2zdhl3yrzcga4mbpkj892in";
+ };
+ propagatedBuildInputs = [ aiohttp ];
+ }));
in pythonPackages.buildPythonPackage rec {
name = "${pname}-${version}";
pname = "gns3-server";
@@ -48,7 +50,7 @@ in pythonPackages.buildPythonPackage rec {
sha256 = sha256Hash;
};
- propagatedBuildInputs = [ yarl aiohttp aiohttp-cors ]
+ propagatedBuildInputs = [ yarl aiohttp aiohttp-cors multidict_3_1_3 ]
++ (with pythonPackages; [
jinja2 psutil zipstream raven jsonschema typing
prompt_toolkit
@@ -62,7 +64,7 @@ in pythonPackages.buildPythonPackage rec {
doCheck = false;
postInstall = ''
- rm $out/bin/gns3loopback # For windows only
+ rm $out/bin/gns3loopback # For Windows only
'';
meta = with stdenv.lib; {
description = "Graphical Network Simulator 3 server (${branch} release)";
diff --git a/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix b/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..9ec9a3451befd0a7edeba1835c6841b807c7104a
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, cmake, boost }:
+
+stdenv.mkDerivation rec {
+ name = "SkypeExport-${version}";
+ version = "1.4.0";
+
+ src = fetchFromGitHub {
+ owner = "Temptin";
+ repo = "SkypeExport";
+ rev = "v${version}";
+ sha256 = "1ilkh0s3dz5cp83wwgmscnfmnyck5qcwqg1yxp9zv6s356dxnbak";
+ };
+
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ boost ];
+
+ preConfigure = "cd src/SkypeExport/_gccbuild/linux";
+ installPhase = "install -Dt $out/bin SkypeExport";
+
+ meta = with stdenv.lib; {
+ description = "Export Skype history to HTML";
+ homepage = https://github.com/Temptin/SkypeExport;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ yegortimoshenko ];
+ };
+}
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix
index fd05948864c0d24c8323a523a06685c954688d26..1477d0674642971f7701aab88d87479cf0464c9a 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix
@@ -2,13 +2,14 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "bitlbee-steam-2015-09-10";
+ version = "1.4.2";
+ name = "bitlbee-steam-${version}";
src = fetchFromGitHub {
- rev = "011375b2d3c67c15d51ca203de0ecaab3b4b7587";
- owner = "jgeboski";
+ rev = "v${version}";
+ owner = "bitlbee";
repo = "bitlbee-steam";
- sha256 = "1m91x3208z9zxppz998i6060alcalfly9ix9jxismj45xyp6mdx7";
+ sha256 = "121r92mgwv445wwxzh35n19fs5k81ihr0j19k256ia5502b1xxaq";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix
index 80e6af9c1ef53956cf502b60e4cf09ee02a8b3bf..bfe4e9708e3dd696e2bdbd79b62effb26311be45 100644
--- a/pkgs/applications/networking/instant-messengers/dino/default.nix
+++ b/pkgs/applications/networking/instant-messengers/dino/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub
-, vala, cmake, wrapGAppsHook, pkgconfig, gettext
+, vala, cmake, ninja, wrapGAppsHook, pkgconfig, gettext
, gobjectIntrospection, gnome3, glib, gdk_pixbuf, gtk3, glib_networking
, xorg, libXdmcp, libxkbcommon
, libnotify, libsoup
@@ -13,19 +13,20 @@
}:
stdenv.mkDerivation rec {
- name = "dino-unstable-2017-09-26";
+ name = "dino-unstable-2017-12-03";
src = fetchFromGitHub {
owner = "dino";
repo = "dino";
- rev = "9d8e1e88ec61403659a8cc410d5c4414e3bd3a96";
- sha256 = "1p8sda99n8zsb49qd6wzwb8hddlgrzr2hp7il5v7yqxjjm2vgqfl";
+ rev = "cee39b0117c1620d852d50c14ca6f06db4e2956b";
+ sha256 = "15cm6y2rgj6fcw8sciygd1wvcw7k9fgf69ji1abfwybzydflj7ny";
fetchSubmodules = true;
};
nativeBuildInputs = [
vala
cmake
+ ninja
pkgconfig
wrapGAppsHook
];
diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 853a6c96a7a481b0c999c8885b8c6e62f29399e7..5ccdd887c8eb2eb10f8b340abfe57df8a6a996ef 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -7,12 +7,12 @@
stdenv.mkDerivation rec {
pname = "discord";
- version = "0.0.2";
+ version = "0.0.4";
name = "${pname}-${version}";
src = fetchurl {
url = "https://cdn.discordapp.com/apps/linux/${version}/${pname}-${version}.tar.gz";
- sha256 = "0sb7l0rrpqxzn4fndjr50r5xfiid1f81p22gda4mz943yv37mhfz";
+ sha256 = "1alw9rkv1vv0s1w33hd9ab1cgj7iqd7ad9kvn1d55gyki28f8qlb";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix
index 6545b90980e326b24ef414fdd1e48b6d8ab2aef9..32e7c877614a77aa28ef57ddd9f3be9b451a4986 100644
--- a/pkgs/applications/networking/instant-messengers/jackline/default.nix
+++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix
@@ -1,28 +1,27 @@
-{stdenv, fetchFromGitHub, ocamlPackages, opam}:
+{ stdenv, fetchFromGitHub, ocamlPackages }:
assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.02.2";
stdenv.mkDerivation rec {
- version = "2017-08-17";
+ version = "2017-12-24";
name = "jackline-${version}";
src = fetchFromGitHub {
owner = "hannesm";
repo = "jackline";
- rev = "26688f07c3edc3b83e7aa0b9136cd1e9dcb58ed5";
- sha256 = "0yspgjhp7zy9rzvwl4pxppf5wkpa07y0122s7n09kvr0fzsh6aqf";
+ rev = "8678e8a1a06e641218a31ae25150040202f89289";
+ sha256 = "05z9kvd7gwr59ic7hnmbayhwyyqd41xxz01cvdlcgplk3z7zlwg5";
};
buildInputs = with ocamlPackages; [
ocaml ocamlbuild findlib topkg ppx_sexp_conv
erm_xmpp_0_3 tls nocrypto x509 ocaml_lwt otr astring
- ptime notty sexplib_p4 hex uutf opam
+ ptime notty sexplib hex uutf
];
- buildPhase = with ocamlPackages;
- "ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib pkg/pkg.ml build --pinned true";
+ buildPhase = "${ocamlPackages.topkg.run} build --pinned true";
- installPhase = "opam-installer --prefix=$out --script | sh";
+ inherit (ocamlPackages.topkg) installPhase;
meta = with stdenv.lib; {
homepage = https://github.com/hannesm/jackline;
diff --git a/pkgs/applications/networking/instant-messengers/kadu/cmake.patch b/pkgs/applications/networking/instant-messengers/kadu/cmake.patch
deleted file mode 100644
index bb2d2d39d25a5c8d64e4b6f73fffb2a97418324b..0000000000000000000000000000000000000000
--- a/pkgs/applications/networking/instant-messengers/kadu/cmake.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ru kadu-0.12.2.orig/plugins/jabber_protocol/3rdparty/CMakeLists.txt kadu-0.12.2/plugins/jabber_protocol/3rdparty/CMakeLists.txt
---- kadu-0.12.2.orig/plugins/jabber_protocol/3rdparty/CMakeLists.txt 2012-08-30 16:13:17.000000000 +0200
-+++ kadu-0.12.2/plugins/jabber_protocol/3rdparty/CMakeLists.txt 2014-02-15 10:20:33.368716013 +0100
-@@ -26,7 +26,7 @@
- get_filename_component (_basename ${_current_MOC} NAME_WE)
- set (_header ${_abs_FILE})
- set (_moc ${_abs_PATH}/${_current_MOC})
-- QT4_CREATE_MOC_COMMAND (${_header} ${_moc} "${_moc_INCS}" "")
-+ QT4_CREATE_MOC_COMMAND (${_header} ${_moc} "${_moc_INCS}" "" "")
- MACRO_ADD_FILE_DEPENDENCIES (${_abs_FILE} ${_moc})
- endforeach (_current_MOC_INC)
- endif (_match)
-Only in kadu-0.12.2/plugins/jabber_protocol/3rdparty: CMakeLists.txt~
diff --git a/pkgs/applications/networking/instant-messengers/kadu/default.nix b/pkgs/applications/networking/instant-messengers/kadu/default.nix
deleted file mode 100644
index d5595fc85aff01ae76d5955ce952c5fe5895908b..0000000000000000000000000000000000000000
--- a/pkgs/applications/networking/instant-messengers/kadu/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ stdenv, fetchurl, cmake, qt4, libgadu, libXScrnSaver, libsndfile, libX11,
- alsaLib, aspell, libidn, qca2, phonon, pkgconfig }:
-
-stdenv.mkDerivation {
-
- name = "kadu-0.12.3";
-
- src = fetchurl {
- url = http://download.kadu.im/stable/kadu-0.12.3.tar.bz2;
- sha256 = "1a5q5b8pm253cwg6ahahjdm8jxj0pv41apyi1nvvy08bs38bn1yn";
- };
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ cmake qt4 libgadu libXScrnSaver libsndfile libX11 alsaLib aspell libidn qca2 phonon
- ];
-
- configureFlags = "CPPFLAGS=-DQT_NO_DEBUG";
-
- preConfigure = ''
- export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${phonon}/lib64/pkgconfig:${phonon}/lib32/pkgconfig"
- '';
-
- cmakeFlags = "-DENABLE_AUTODOWNLOAD=OFF -DBUILD_DESCRIPTION='NixOS'";
-
- prePatch = ''
- patchShebangs .
- '';
-
- # Disable the kadu plugins I wasn't able to get to work
- patchPhase = ''
- sed -i -e '/mpd_mediaplayer/d' \
- -e '/encryption_ng/d' \
- -e '/encryption_ng_simlite/d' Plugins.cmake
- patch -p1 < ${./cmake.patch}
- '';
-
- NIX_LDFLAGS="-lX11";
-
- meta = {
- description = "An instant-messenger client for the gadu-gadu network (most popular polish IM network)";
- homepage = http://www.kadu.net/w/English:Main_Page;
- license = stdenv.lib.licenses.gpl2;
- platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.piotr ];
- };
-}
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
index cf1893b198e566977685db3b145d4626cf2a3a7e..bd3fc82f7cba20d0cca588fda921962467db3556 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
@@ -3,6 +3,7 @@
, perl, perlXMLParser, libxml2, nss, nspr, farstream
, libXScrnSaver, ncurses, avahi, dbus, dbus_glib, intltool, libidn
, lib, python, libICE, libXext, libSM
+, cyrus_sasl ? null
, openssl ? null
, gnutls ? null
, libgcrypt ? null
@@ -33,7 +34,7 @@ let unwrapped = stdenv.mkDerivation rec {
libxml2 nss nspr farstream
libXScrnSaver ncurses python
avahi dbus dbus_glib intltool libidn
- libICE libXext libSM
+ libICE libXext libSM cyrus_sasl
]
++ (lib.optional (openssl != null) openssl)
++ (lib.optional (gnutls != null) gnutls)
@@ -55,6 +56,7 @@ let unwrapped = stdenv.mkDerivation rec {
"--disable-nm"
"--disable-tcl"
]
+ ++ (lib.optionals (cyrus_sasl != null) [ "--enable-cyrus-sasl=yes" ])
++ (lib.optionals (gnutls != null) ["--enable-gnutls=yes" "--enable-nss=no"]);
enableParallelBuilding = true;
@@ -78,4 +80,3 @@ in if plugins == [] then unwrapped
inherit stdenv makeWrapper symlinkJoin plugins;
pidgin = unwrapped;
}
-
diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
index 8b2e35c2f0e8f3e2e1b6e33f5e0830b1812ea19b..768ab24c2f390c9c625b49ba90c1c3260ac6c35c 100644
--- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix
+++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
@@ -2,15 +2,15 @@
stdenv.mkDerivation rec {
name = "quaternion-${version}";
- version = "0.0.4";
+ version = "0.0.5";
- # libqmatrixclient doesn't support dynamic linking as of 0.1 so we simply pull in the source
+ # libqmatrixclient doesn't support dynamic linking as of 0.2 so we simply pull in the source
src = fetchFromGitHub {
owner = "QMatrixClient";
repo = "Quaternion";
rev = "v${version}";
- sha256 = "1nbxlflm94pb19gdwb95z92kzg4px97dmp8av3mj4imk1ysnyrvi";
+ sha256 = "14xmaq446aggqhpcilahrw2mr5gf2mlr1xzyp7r6amrnmnqsyxrd";
};
buildInputs = [ qtbase qtquickcontrols libqmatrixclient ];
diff --git a/pkgs/applications/networking/instant-messengers/rambox/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/bare.nix
index 543bf64252509d16f238bb3b15ac146fc0a714d4..594004fd2949b0d551b145cdb586f05214406e0e 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/bare.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/bare.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchFromGitHub, fetchNodeModules, nodejs-8_x, ruby, sencha, auth0ClientID, auth0Domain }:
+{ stdenv, fetchFromGitHub, fetchNodeModules, nodejs-8_x, ruby, sencha
+, auth0ClientID, auth0Domain, disableTooltips }:
stdenv.mkDerivation rec {
name = "rambox-bare-${version}";
@@ -20,7 +21,8 @@ stdenv.mkDerivation rec {
sha256 = "1y3q8ggyvfywxqi5hn9mvr1sjfylspis43iyf4b7snyr1a1br3r4";
};
- patches = [ ./hide-check-for-updates.patch ./isDev.patch ];
+ patches = [ ./hide-check-for-updates.patch ./isDev.patch ]
+ ++ stdenv.lib.optionals disableTooltips [ ./disable-tooltips.patch ];
configurePhase = ''
echo 'var auth0Cfg = { clientID: "${auth0ClientID}", domain: "${auth0Domain}" };' > env.js
diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix
index b6e9c9210251d29ddc6db6ef38b0d9ec65a129f4..a601db8c8da5d2d9f30d1b4a0a7e7eeeb074a64d 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix
@@ -1,13 +1,14 @@
{ stdenv, newScope, makeWrapper, electron, xdg_utils, makeDesktopItem
, auth0ClientID ? "0spuNKfIGeLAQ_Iki9t3fGxbfJl3k8SU"
-, auth0Domain ? "nixpkgs.auth0.com" }:
+, auth0Domain ? "nixpkgs.auth0.com"
+, disableTooltips ? false }:
let
callPackage = newScope self;
self = {
fetchNodeModules = callPackage ./fetchNodeModules.nix {};
rambox-bare = callPackage ./bare.nix {
- inherit auth0ClientID auth0Domain;
+ inherit auth0ClientID auth0Domain disableTooltips;
};
sencha = callPackage ./sencha {};
};
diff --git a/pkgs/applications/networking/instant-messengers/rambox/disable-tooltips.patch b/pkgs/applications/networking/instant-messengers/rambox/disable-tooltips.patch
new file mode 100644
index 0000000000000000000000000000000000000000..5ddaa9d51771b965ac98b07a5ecbbe2dc8b57179
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/rambox/disable-tooltips.patch
@@ -0,0 +1,19 @@
+--- index.html.orig 2017-12-16 20:06:03.401298402 +0300
++++ ./index.html 2017-12-16 20:06:21.474484436 +0300
+@@ -43,14 +43,14 @@
+
+
+
+- -->
+
+
+
diff --git a/pkgs/applications/networking/instant-messengers/ratox/default.nix b/pkgs/applications/networking/instant-messengers/ratox/default.nix
index 053e8a9c97399a812f3f644c749f20c679d4b971..5d004db60e3ad10dc51bb7383cbdbc9209d2a885 100644
--- a/pkgs/applications/networking/instant-messengers/ratox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ratox/default.nix
@@ -1,28 +1,34 @@
-{ stdenv, fetchurl, libtoxcore
+{ stdenv, fetchgit, libtoxcore
, conf ? null }:
with stdenv.lib;
+let
+ configFile = optionalString (conf!=null) (builtins.toFile "config.h" conf);
+in
+
stdenv.mkDerivation rec {
- name = "ratox-0.2.1";
+ name = "ratox-0.4";
- src = fetchurl {
- url = "http://git.2f30.org/ratox/snapshot/${name}.tar.gz";
- sha256 = "0xnw3zcz9frmcxqhwg38hhnsy1g5xl9yc19nl0vwi5awz8wqqy19";
+ src = fetchgit {
+ url = "git://git.2f30.org/ratox.git";
+ rev = "0db821b7bd566f6cfdc0cc5a7bbcc3e5e92adb4c";
+ sha256 = "0wmf8hydbcq4bkpsld9vnqw4zfzf3f04vhgwy17nd4p5p389fbl5";
};
+ patches = [ ./ldlibs.patch ];
+
buildInputs = [ libtoxcore ];
- configFile = optionalString (conf!=null) (builtins.toFile "config.h" conf);
preConfigure = optionalString (conf!=null) "cp ${configFile} config.def.h";
- preBuild = "makeFlags=PREFIX=$out";
+ makeFlags = [ "PREFIX=$(out)" ];
- meta =
- { description = "FIFO based tox client";
- homepage = http://ratox.2f30.org/;
- license = licenses.isc;
- maintainers = with maintainers; [ ehmry ];
- platforms = platforms.linux;
- };
+ meta = {
+ description = "FIFO based tox client";
+ homepage = http://ratox.2f30.org/;
+ license = licenses.isc;
+ maintainers = with maintainers; [ ehmry ];
+ platforms = platforms.linux;
+ };
}
diff --git a/pkgs/applications/networking/instant-messengers/ratox/ldlibs.patch b/pkgs/applications/networking/instant-messengers/ratox/ldlibs.patch
new file mode 100644
index 0000000000000000000000000000000000000000..1406e714310709085c440b3a779decf911b281b7
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/ratox/ldlibs.patch
@@ -0,0 +1,5 @@
+--- a/config.mk
++++ b/config.mk
+@@ -13 +13 @@ LDFLAGS = -L/usr/local/lib
+-LDLIBS = -ltoxcore -ltoxav -ltoxencryptsave -lsodium -lopus -lvpx -lm -lpthread
++LDLIBS = -ltoxcore -ltoxav -ltoxencryptsave -lm -lpthread
diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix
index 050eb7765906cd1c90f65df06393231f8d1a1b67..c99130f28a391c35f00a47bd669d33f7e93eea77 100644
--- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix
@@ -46,6 +46,9 @@ stdenv.mkDerivation rec {
cp icons/ricochet.png $out/share/pixmaps/ricochet.png
'';
+ # RCC: Error in 'translation/embedded.qrc': Cannot find file 'ricochet_en.qm'
+ enableParallelBuilding = false;
+
meta = with stdenv.lib; {
description = "Anonymous peer-to-peer instant messaging";
homepage = https://ricochet.im;
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
index 2965ce86cc9faf0b53c1234bc278b80a67d2e2bc..92960e3812333a7a85c75c7c10c8651bd35422ac 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name= "riot-web-${version}";
- version = "0.13.1";
+ version = "0.13.3";
src = fetchurl {
url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
- sha256 = "19g0d3wqmz4vj9flf7pfgfvm2qf2w3jhxp9qdyfbiwd670h5wjlv";
+ sha256 = "0acim3kad6lv5ni4blg75phb3njyk9s5h6x7fsn151h1pvsc5mmw";
};
installPhase = ''
diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/beta.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/beta.nix
new file mode 100644
index 0000000000000000000000000000000000000000..9876767b57ee66fbd34e157cb9a81b3397986aec
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/beta.nix
@@ -0,0 +1,87 @@
+{ 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.1.0-beta.5";
+
+ src =
+ if stdenv.system == "x86_64-linux" then
+ fetchurl {
+ url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb";
+ sha256 = "1kllym2iazp9i5afrh0vmsqqlh5b8i6f929p5yhl8bl4zd17zwpx";
+ }
+ 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
+ cp -R usr/share $out/share
+
+ chmod -R g-w $out
+
+ # Patch signal
+ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+ --set-rpath "${rpath}:$out/opt/Signal Beta" \
+ "$out/opt/Signal Beta/signal-desktop-beta"
+
+ # Symlink to bin
+ mkdir -p $out/bin
+ ln -s "$out/opt/Signal Beta/signal-desktop-beta" $out/bin/signal-desktop-beta
+
+ # Fix the desktop link
+ substituteInPlace $out/share/applications/signal-desktop-beta.desktop \
+ --replace "/opt/Signal Beta/signal-desktop-beta" $out/bin/signal-desktop-beta
+ '';
+
+ meta = {
+ description = "Signal Private Messenger for the Desktop (Beta version)";
+ homepage = https://signal.org/;
+ license = lib.licenses.gpl3;
+ maintainers = with lib.maintainers; [ ixmatus benley ];
+ platforms = [
+ "x86_64-linux"
+ ];
+ };
+ }
diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index bd0c03cf29d89ee5d76c90db0b18f005269d69b5..373adc42d22932ad357a47880a55d00b34d147cc 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -40,13 +40,13 @@ in
stdenv.mkDerivation rec {
name = "signal-desktop-${version}";
- version = "1.0.35";
+ version = "1.1.0";
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";
+ sha256 = "1v0ydfdgcnkh6rk7gmqbjrzpz56mw2gjmakz58gpn167ln7l1vkl";
}
else
throw "Signal for Desktop is not currently supported on ${stdenv.system}";
diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
index b92bf50b315be68ba0f2b9103888b135ff51c78b..11a1efec8abe4391040724b819b301f674127a40 100644
--- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
@@ -4,6 +4,8 @@
let
+ # Please keep the version x.y.0.z and do not update to x.y.76.z because the
+ # source of the latter disappears much faster.
version = "8.11.0.4";
rpath = stdenv.lib.makeLibraryPath [
@@ -55,7 +57,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 = "1dq7k4zlqqsx7786phialia5xbpc3cp1wrjhqrvga09yg4dl505c";
+ sha256 = "1chwc4rqcwwim03n6nski5dar33bb1gnadbvcjg6gln3xqr0ipib";
}
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 23a5d91f0d256af9e80cca75a0ff117e63c0b8f1..a32623c1c8489d22d972624ab3c33140e0f98c14 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.9.0";
+ version = "3.0.0";
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 = "1ddfvsy4lr7hcnzxbk4crczylj1qwm9av02xms4w2p0k0c8nhvvc";
+ sha256 = "17hq31x9k03rvj2sdsdfj6j75v30yrywlsbca4d56a0qsdzysxkw";
}
else
throw "Slack is not supported on ${stdenv.system}";
diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
index c14c9ade2dda886366c09481e7c75d0c6221ebc0..b7dfdb3e34134bbadb228e335de263702a0158bc 100644
--- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
@@ -31,7 +31,7 @@ in
stdenv.mkDerivation rec {
name = "teamspeak-client-${version}";
- version = "3.1.6";
+ version = "3.1.7";
src = fetchurl {
urls = [
@@ -39,8 +39,8 @@ stdenv.mkDerivation rec {
"http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run"
];
sha256 = if stdenv.is64bit
- then "0ncqs5ykk1zsn2lqarf7pr39rbp4h54vaqq1sgqi5irpj6yagzak"
- else "222e8abb24de9e3ea00fca10be32340ad88859a4d811afa644c5096aada4996d";
+ then "1ww20805b7iphkh1ra3py6f7l7s321cg70sfl9iw69n05l3313fn"
+ else "0yvhmbhliraakn9k4bij6rnai7hn50g4z6mfjsyliizf6437x4nr";
};
# grab the plugin sdk for the desktop icon
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
index 32266d7b42d5b98ab4958b729fddaab37de67b39..77645371359bd371b5fe4a1d6941e998008f9d34 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
@@ -2,11 +2,11 @@
, sqlite, libsoup, libnice, gnutls}:
stdenv.mkDerivation rec {
- name = "telepathy-gabble-0.18.2";
+ name = "telepathy-gabble-0.18.3";
src = fetchurl {
url = "${meta.homepage}/releases/telepathy-gabble/${name}.tar.gz";
- sha256 = "00ag32ccbj0hmy41rb0fg9gp40m7zbq45r4yijnyslk2mpkvg7c9";
+ sha256 = "1hl9k6jwn2afwwv7br16wfw5szdhwxqziba47xd8vjwvgrh19iwf";
};
nativeBuildInputs = [ pkgconfig libxslt ];
@@ -19,8 +19,9 @@ stdenv.mkDerivation rec {
doCheck = true;
meta = with stdenv.lib; {
- homepage = http://telepathy.freedesktop.org;
+ homepage = https://telepathy.freedesktop.org/components/telepathy-gabble/;
description = "Jabber/XMPP connection manager for the Telepathy framework";
+ license = licenses.lgpl21Plus;
platforms = stdenv.lib.platforms.gnu;
};
}
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
index 0bd6c2e5f2b5072694fd09f7b7777b9fe3ffbce2..9206aea5c54267821116f317005fe91438e4b207 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
@@ -3,18 +3,20 @@
stdenv.mkDerivation rec {
project = "telepathy-logger";
- name = "${project}-0.8.0";
+ name = "${project}-0.8.2";
src = fetchurl {
url = "http://telepathy.freedesktop.org/releases/${project}/${name}.tar.bz2";
sha256 = "18i00l8lnp5dghqmgmpxnn0is2a20pkisxy0sb78hnd2dz0z6xnl";
};
- NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0";
-
- nativeBuildInputs = [ makeWrapper pkgconfig ];
- buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib intltool libxslt
- gobjectIntrospection dbus_libs telepathy_glib.python (stdenv.lib.getLib gnome3.dconf) ];
+ nativeBuildInputs = [
+ makeWrapper pkgconfig intltool libxslt gobjectIntrospection
+ ];
+ buildInputs = [
+ dbus_glib libxml2 sqlite telepathy_glib
+ dbus_libs telepathy_glib.python
+ ];
configureFlags = "--enable-call";
@@ -24,10 +26,11 @@ stdenv.mkDerivation rec {
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
'';
- meta = {
+ meta = with stdenv.lib; {
description = "Logger service for Telepathy framework";
- homepage = http://telepathy.freedesktop.org/wiki/Logger ;
- maintainers = [ ];
- platforms = stdenv.lib.platforms.gnu; # Arbitrary choice
+ homepage = https://telepathy.freedesktop.org/components/telepathy-logger/;
+ license = licenses.lgpl21;
+ maintainers = with maintainers; [ jtojnar ];
+ platforms = platforms.gnu; # Arbitrary choice
};
}
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
index 87ae0210bdae48c918255b6dca908926eff97a56..82485de58fc1bf17cd574063e5c628ac27730c2a 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
@@ -1,18 +1,17 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, telepathy_glib, libxslt, makeWrapper, upower }:
+{ stdenv, fetchurl, pkgconfig, gnome3, telepathy_glib, libxslt, makeWrapper }:
stdenv.mkDerivation rec {
- name = "${pname}-5.16.3";
+ name = "${pname}-5.16.4";
pname = "telepathy-mission-control";
src = fetchurl {
url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
- sha256 = "0zcbx69k0d3p2pjh3g7sa3q2zkd5xchxkqsmlfn3fwxaz0pmsmvi";
+ sha256 = "1jz6wwgsfxixha6ys2hbzbk5faqnj9kh2m5qdlgx5anqgandsscp";
};
- buildInputs = [ telepathy_glib telepathy_glib.python makeWrapper /*upower*/ ]; # ToDo: optional stuff missing
- # 5.16.3 won't build with upower-0.99. Arch and Debian choose to disable it
+ buildInputs = [ telepathy_glib telepathy_glib.python ]; # ToDo: optional stuff missing
- nativeBuildInputs = [ pkgconfig libxslt ];
+ nativeBuildInputs = [ pkgconfig libxslt makeWrapper ];
doCheck = true;
@@ -24,8 +23,9 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "An account manager and channel dispatcher for the Telepathy framework";
- homepage = http://telepathy.freedesktop.org/wiki/;
+ homepage = https://telepathy.freedesktop.org/components/telepathy-mission-control/;
license = licenses.lgpl21;
+ maintainers = with maintainers; [ jtojnar ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/networking/irc/ii/default.nix b/pkgs/applications/networking/irc/ii/default.nix
index c6bb2479bfc1b1e8e25a34d3a797754cb14915db..5e65c0dfeaf82d8dc86960c3d1b1064c2cde1bf6 100644
--- a/pkgs/applications/networking/irc/ii/default.nix
+++ b/pkgs/applications/networking/irc/ii/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
'';
meta = {
- homepage = http://tools.suckless.org/ii/;
+ homepage = https://tools.suckless.org/ii/;
license = stdenv.lib.licenses.mit;
description = "Irc it, simple FIFO based irc client";
platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix
index 75c4f9ac5c930a79f40e723667ca8ffa04cc9b50..0e8c4849f3c7a82d1c1e52b9318f1f11d226fe49 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.5";
+ version = "1.0.6";
name = "irssi-${version}";
src = fetchurl {
url = "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz";
- sha256 = "1lasb8flic4qc1sd3pvfg9aig5skcxlyx6iy9bk73147r8vzaq75";
+ sha256 = "0iiz0x698bdlpssbj357ln5f7ccjwc1m1550xzy1g7kwcvdpp4mb";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/networking/irc/konversation/default.nix
index 5b86e79e99a19b8be073a223447760e9184f7ec3..96218ef87b5f2f03cdd3bce955b2197f082a5715 100644
--- a/pkgs/applications/networking/irc/konversation/default.nix
+++ b/pkgs/applications/networking/irc/konversation/default.nix
@@ -29,13 +29,13 @@
let
pname = "konversation";
- version = "1.7.2";
+ version = "1.7.4";
in mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
- sha256 = "0616h59bsw5c3y8lij56v3fhv9by0rwdfcaa83yfxqg4rs26xyaz";
+ sha256 = "0y4rj4fcl1wsi3y1fhnzad9nf4llwrnipfm9mfm55kqnx1zmpvqp";
};
buildInputs = [
diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix
index 78646f7a8b2f32257f71a86a22c2df7460500a67..7c685b9df6b9bf92fca6bc63b1adcd23be38858e 100644
--- a/pkgs/applications/networking/irc/quassel/default.nix
+++ b/pkgs/applications/networking/irc/quassel/default.nix
@@ -74,7 +74,7 @@ in with stdenv; mkDerivation rec {
'';
meta = with stdenv.lib; {
- homepage = http://quassel-irc.org/;
+ homepage = https://quassel-irc.org/;
description = "Qt/KDE distributed IRC client suppporting a remote daemon";
longDescription = ''
Quassel IRC is a cross-platform, distributed IRC client,
diff --git a/pkgs/applications/networking/irc/sic/default.nix b/pkgs/applications/networking/irc/sic/default.nix
index 6f48f44214cccf4462a9b5d43716c254b8d3cbd6..975715ed7fcd3802a7b1a46b08c048dc7610cd31 100644
--- a/pkgs/applications/networking/irc/sic/default.nix
+++ b/pkgs/applications/networking/irc/sic/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Simple IRC client";
- homepage = http://tools.suckless.org/sic/;
+ homepage = https://tools.suckless.org/sic/;
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.unix;
};
diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index 437cb23698542be3c55bcaa0c8ae9f74dd573535..cfed44c997aeaebe75bc40a7df4fa185f3b85af0 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -29,23 +29,14 @@ let
weechat =
assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
stdenv.mkDerivation rec {
- version = "1.9.1";
+ version = "2.0";
name = "weechat-${version}";
src = fetchurl {
url = "http://weechat.org/files/src/weechat-${version}.tar.bz2";
- sha256 = "1kgi079bq4n0wb7hc7mz8p7ay1b2m0a4wpvb92sfsxrnh10qr5m1";
+ sha256 = "0jd1l67k2k44xmfv0a71im3j4v0gss3a6bd5s84nj3f7lqnfmqdn";
};
- 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";
- })
- ];
-
outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins;
enableParallelBuilding = true;
diff --git a/pkgs/applications/networking/jmeter/default.nix b/pkgs/applications/networking/jmeter/default.nix
index db36c8dca6170f804b17950f1e8c4fa4c121db04..a89898c37392438f72425b5c55334d39e61e3f92 100644
--- a/pkgs/applications/networking/jmeter/default.nix
+++ b/pkgs/applications/networking/jmeter/default.nix
@@ -1,13 +1,17 @@
-{ fetchurl, stdenv, ant }:
+{ fetchurl, stdenv, jre }:
stdenv.mkDerivation rec {
- name = "jmeter-2.11";
+ name = "jmeter-3.3";
src = fetchurl {
url = "http://archive.apache.org/dist/jmeter/binaries/apache-${name}.tgz";
- sha256 = "1fr3sw06qncb6yygcf2lbnkxma4v1dbigpf39ajrm0isxbpyv944";
+ sha256 = "190k6yrh5casadphkv4azp4nvf4wf2q85mrfysw67r9d96nb9kk5";
};
+ buildInputs = [ jre ];
+
installPhase = ''
+ substituteInPlace ./bin/jmeter.sh --replace "java $ARGS" "${jre}/bin/java $ARGS"
+ substituteInPlace ./bin/jmeter --replace "java $ARGS" "${jre}/bin/java $ARGS"
mkdir $out
cp ./* $out/ -R
'';
diff --git a/pkgs/applications/networking/kget/default.nix b/pkgs/applications/networking/kget/default.nix
deleted file mode 100644
index 0dc37d10d1ae5914db361328563c836dea406150..0000000000000000000000000000000000000000
--- a/pkgs/applications/networking/kget/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- mkDerivation, lib, fetchFromGitHub,
- extra-cmake-modules, kdoctools, makeWrapper,
- kdelibs4support, libgcrypt, libktorrent, qca-qt5, qgpgme,
- kcmutils, kcompletion, kcoreaddons, knotifyconfig, kparts, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui
-}:
-
-let
- pname = "kget";
- version = "20170903";
-
-in mkDerivation {
- name = "${pname}-${version}";
- src = fetchFromGitHub {
- owner = "KDE";
- repo = pname;
- rev = "739c0b399faf5a393c7436c0771662596b840fdc";
- sha256 = "0rn6a4xd9zmf9sdjd5b4rh8yky6qm6ffjgjpn4snkdjsn6vm6y43";
- };
- nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
-
- buildInputs = [
- kdelibs4support libgcrypt libktorrent qca-qt5 qgpgme
- kcmutils kcompletion kcoreaddons knotifyconfig kparts kwallet kwidgetsaddons kwindowsystem kxmlgui
- ];
-
- enableParallelBuilding = true;
-
- meta = with lib; {
- license = licenses.gpl2;
- maintainers = with maintainers; [ peterhoeg ];
- };
-}
diff --git a/pkgs/applications/networking/mailreaders/mblaze/default.nix b/pkgs/applications/networking/mailreaders/mblaze/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..0d73f161249d1228d08155864be4b50b1fa9445f
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/mblaze/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ name = "mblaze-${version}";
+ version = "0.2";
+
+ src = fetchFromGitHub {
+ owner = "chneukirchen";
+ repo = "mblaze";
+ rev = "v${version}";
+ sha256 = "0p97zfl35ilrnrx9ynj82igsb698m9klikfaicw5jhjpf6qp2n3y";
+ };
+
+ makeFlags = "PREFIX=$(out)";
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/chneukirchen/mblaze;
+ description = "Unix utilities to deal with Maildir";
+ license = licenses.cc0;
+ platforms = platforms.all;
+ maintainers = [ maintainers.ajgrf ];
+ };
+}
diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix
index 5d0ab27840bbe590640a5b248eaa4a1a101c7343..d28bfb647e5b0c051c6ad5c357d0351936245a29 100644
--- a/pkgs/applications/networking/mailreaders/mutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/mutt/default.nix
@@ -27,11 +27,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "mutt-${version}";
- version = "1.9.1";
+ version = "1.9.2";
src = fetchurl {
url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz";
- sha256 = "1c8vv4anl555a03pbnwf8wnf0d8pcnd4p35y3q8f5ikkcflq76vl";
+ sha256 = "15kqxpx8bykqbyw4q33hkz0j2f65v6cl21sl5li2vw5vaaim5qd2";
};
patches = optional smimeSupport (fetchpatch {
diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix
index f72fdba52f8bbd365780c40333cd05b835e4928e..8704961270df2852cb8c631a5153af4bccf66bc1 100644
--- a/pkgs/applications/networking/mailreaders/neomutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix
@@ -15,14 +15,14 @@ let
'';
in stdenv.mkDerivation rec {
- version = "20171027";
+ version = "20171208";
name = "neomutt-${version}";
src = fetchFromGitHub {
owner = "neomutt";
repo = "neomutt";
rev = "neomutt-${version}";
- sha256 = "0pwc5zdxc9h23658dfkzndfj1ld3ijyvcxmsiv793y3i4dig0s3n";
+ sha256 = "1fn28q4akfz0nq3ysp8n53j8yqp2mx6yhbvb59c4zm6zgd4qzgp1";
};
buildInputs = [
diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index 6d268f69a7cec140cc0494c35642098eba96cb54..0c0f55e63370632a0b0a7e67bf007fbf7c81937a 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -12,7 +12,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- version = "0.25.2";
+ version = "0.26";
name = "notmuch-${version}";
passthru = {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://notmuchmail.org/releases/${name}.tar.gz";
- sha256 = "0ai6vbs9wzwfz7jcphgqsqpcbq137l34xhmcli4h5c8n82fvmdp4";
+ sha256 = "1pvn1n7giv8n3xlazi3wpscdqhd2yak0fgv68aj23myr5bnr9s6k";
};
nativeBuildInputs = [ pkgconfig ];
@@ -40,20 +40,14 @@ stdenv.mkDerivation rec {
++ optionals (!stdenv.isDarwin) [ gdb man ]; # test dependencies
postPatch = ''
- find test -type f -exec \
+ find test/ -type f -exec \
sed -i \
-e "1s|#!/usr/bin/env bash|#!${bash}/bin/bash|" \
- -e "s|gpg |${gnupg}/bin/gpg |" \
- -e "s| gpg| ${gnupg}/bin/gpg|" \
- -e "s|gpgsm |${gnupg}/bin/gpgsm |" \
- -e "s| gpgsm| ${gnupg}/bin/gpgsm|" \
- -e "s|crypto.gpg_path=gpg|crypto.gpg_path=${gnupg}/bin/gpg|" \
"{}" ";"
for src in \
- crypto.c \
- notmuch-config.c \
- emacs/notmuch-crypto.el
+ util/crypto.c \
+ notmuch-config.c
do
substituteInPlace "$src" \
--replace \"gpg\" \"${gnupg}/bin/gpg\"
@@ -102,7 +96,7 @@ stdenv.mkDerivation rec {
description = "Mail indexer";
homepage = https://notmuchmail.org/;
license = licenses.gpl3;
- maintainers = with maintainers; [ chaoflow garbas ];
+ maintainers = with maintainers; [ chaoflow flokli garbas the-kenny ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix
index 4c768325fee900cf9d6f378f7b47631f52dd882a..76231dc7abf2f010f26dc504f4e63632892b65e2 100644
--- a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
src =
if stdenv.system == "x86_64-linux" then
fetchurl {
- url = "https://edgehill.s3-us-west-2.amazonaws.com/${version}-${subVersion}/linux-deb/x64/NylasMail.deb";
+ url = "https://edgehill.s3.amazonaws.com/${version}-${subVersion}/linux-deb/x64/NylasMail.deb";
sha256 = "40060aa1dc3b5187b8ed4a07b9de3427e3c5a291df98c2c82395647fa2aa4ada";
}
else
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
index 1df72dbe5fcf8567566de9006d06f9ca67f5b05d..656c4f03c0e8a8f17b81023631427e2e69ba6152 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.5.0";
+ version = "52.5.2";
sources = [
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/ar/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/ar/thunderbird-52.5.2.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha512 = "e848c7a44222be7bc637dc2d0356028e67c4093f48e4eb9c66e0c02731f41b2e1f2d09cd7765ee984137fcef4d498aac8cfee39b31c0fe5187347107b2cd12a3";
+ sha512 = "637ca11b07a86b806ea274cf3cd9a47dc2d23a2700203c1ddfb25bac15bb4ed1eb4749f630021dd0f33f00c43539954d9fecc192d3582e752940ade0930422ef";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/ast/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/ast/thunderbird-52.5.2.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha512 = "a9f8888ab021e696c8460d75ba1f843f8b31555f3f6f95e9af7f9c6d910ea1c3d68bab3d5adc6c0f70e6d8d9227db4176a7db762d28c1ff19addc95e0a756826";
+ sha512 = "78c6da93f60134c9b033f270d04b983713dd84ba6af8cd1c0529471dbd3c860085491bc54f0fd37a8373dd5164b064653d9ae6ab12f7748a9722aa61472ed7cb";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/be/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/be/thunderbird-52.5.2.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha512 = "4d903b23dcaf17d41c6b9f3d7a3ec936ecc01f19b93ecba88a5fe826f715b606064a6e2737611697c072e887f3776cf10ddba7e26a66dc4b91c3658129171580";
+ sha512 = "7081fddbc88cdd0280bb35c7f16c33f8935d639d91e2ed4258e344565ea6f27d1ed8f2b5daa5d2e861e92357ba65c4c4b05260fab83f0bfaf6e2fa44ab081fbb";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/bg/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/bg/thunderbird-52.5.2.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha512 = "6d34b3c3e907a16125f26f5f6365b5c3f2127ccf725753e94495b5dafedf3c506e71017d2b4699b755f8940ad0ea4241d6cfc00e958d4642c928c68a7e278fdb";
+ sha512 = "d5d21dfea54ac7c75c515cd95f0140a21451a3b2c533cc95f0a519a13b950e01c6f1d17e2fdae3610b46fef7450e1d816158a71ae37e8813d8b9dbbde2fbb4e1";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/bn-BD/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/bn-BD/thunderbird-52.5.2.tar.bz2";
locale = "bn-BD";
arch = "linux-x86_64";
- sha512 = "74106efb92c5ba792a3f10dc0ea19d2fc38012f1f761c0e9b9753f8b067e2771a9c4691df55197a9b5e23024f73688bbc26d24357f0eef95b8b305bccad5d9f1";
+ sha512 = "c59b5b7381ce8fc65018bd70dce55488b12915d2c9fab7421433d7836cde95a409c2f5206323581bcf7af08b90e7ce8eb3c55b0a4f660734d3e159077ba60374";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/br/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/br/thunderbird-52.5.2.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha512 = "2477afe645f7c0e0005a4817a42d24075dfabfce2724446bcd4fce50b72b7408895261544537be0e3dbdf8323e1af07215ca277c9e69261d575cdf4fc1f242ca";
+ sha512 = "f3d5bea008f0849dc8834d51b6ba0529c2f803e5b059582076baf016fd9a02288d57851e1073c1df3f79f4fdb0f72ca8c707d25f75109d6b33ed60353180e80c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/ca/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/ca/thunderbird-52.5.2.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha512 = "810c5295bcde18217b77e2f147a70a5e94798b92c40d659c47f3f113624f049b788ba9fdcdc22608cc57719e8236372636e6ca46ce7fde309b70fc05e3036f47";
+ sha512 = "64d024e4c696cffd4d97566411f7412ae16e98f169101bd36e87efb027555bc163f38ea1898b29a772fe31e1667dd69cc5eb19a96e04982b01b0de3975654292";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/cs/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/cs/thunderbird-52.5.2.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha512 = "f8e033ed566d6b076213e33c489fcfcab520a0e1c3ce5c89c78c7443b360e55136e90b518428527a682854a24cb9b303a6c3475a59950d9546c1becd5db2a46a";
+ sha512 = "ecd78ba038a9133d8ecd0184ae44af661efd38d08e53184cb26b221d50101df38bc7833a0cd7c76d55a185288f055f5ac630b1da525a9008d878b4c5a3d9166c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/cy/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/cy/thunderbird-52.5.2.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha512 = "27ade0c53cee3fe125420eb7fdeb5b013771d34af735bacd59af6681836d81acddda3b3b9cefe3f8a05b70703c040d6692732c427db13e5dd971848c078ae7ab";
+ sha512 = "1aaef9550bb3e3e5a49ad220344a9b8e20db885e06eea182f87dc8ddeaac62b0cd2b94f58524b0c6d3afea054cea0d75cc96f80732e390cc47848da16cad3fba";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/da/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/da/thunderbird-52.5.2.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha512 = "11de17a749643d35bcee49ebb1aa62caeb6806fd0025125363f228593979e873fbf8a927bc451c2e4a5332f431937c00601ff380d74e48bed60cfea5399b891b";
+ sha512 = "fa501b4febbeefc90ff9ecf4c2dc4468c6fd2dd04559ac886d8e58ea3d4eaf003cb4577197b5b5c391f602b83defe158b8e3405b36edf2a6e48e48719849deeb";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/de/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/de/thunderbird-52.5.2.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha512 = "3d2408f523d55471f0bcdcb3a05e66381d390f56987b448a40118b1f0e3fb66cba8ed64cb3178694873f5ee0c7f5a74303ffa288eddf7192a4f519d537ecb65d";
+ sha512 = "e4c87e3736dcfbe4e8fcce8a101030844cacfe2c20209de4a21cce247b8e80de3e4646c9a84c36d6d73199ea5926c2777a678b8f2b83521078c0c3a10a752b32";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/dsb/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/dsb/thunderbird-52.5.2.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha512 = "d1f560111bd8d8eac360ed39b0ac741ca10c480ec528cad48e9bf6544d17e12fe2f41d4abe4caa3549b448fd1fb55416ed84fa864dd60fe0cabd91766e754992";
+ sha512 = "eb169f9d2e9836b83edfd8ef8f7af867ac27831bb5aadf5a75f6e652b507dd7c34ca135c278f95d8f967406732d296af3d42a18fa9e91c8ed18216da77824e11";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/el/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/el/thunderbird-52.5.2.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha512 = "22c3270759d095c4672694c0885d3960d87cb9f53eedcf7c030f8a38f204d4809914b3fe1cd144f32555508eded73999907c64df2d9ae9494c69ce879180278f";
+ sha512 = "dfd0160965fbebdffc217ed171bbb308902e1b0e89d91abe8167d7d26db991a8ce2b40b3161d623441102b2b6379a774b6af4a19bb39c27c59d76840351900b1";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/en-GB/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/en-GB/thunderbird-52.5.2.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha512 = "3e778e8f60101d2371ce7eb369c3f80c26fdc8164f5fcc78b8f65f2986288388e06d1413387b493ae479bd95b3af7fdd76f88365aa5803c4e9e3bb23e4f3aa59";
+ sha512 = "8c8506a8fe62e6ca55b1d99d8db9ec5fd224fa87ff63f9eae49656001f94124312110a414769d5d396574aa0e1f69a8f0a5298d6ad86146ba40912ebe68393a6";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/en-US/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/en-US/thunderbird-52.5.2.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha512 = "d4eb0d90d621b28cc706bca0f6884361b7fd53cb02dd9ecccfc3f6027634353cc8f4c911824ebe6bf1d7bbfb06318258daad32fd47687f2f3b930c90da4b8830";
+ sha512 = "73e15c04a11190e8968bc64226ae4c677fa00ab460fe3497aab861c92c07ff6a3814673a7773ffc4e735491ac338e9d190e0c7cd626416c2508826000e1df002";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/es-AR/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/es-AR/thunderbird-52.5.2.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha512 = "0088b0380aa533e4c2818e0b384f5edafeaa3c84256e81eefd0dff95f27adc32c8a22b3368576d13aa1276674f519333b5c3f4a825fcc38da1abd0751c48f996";
+ sha512 = "6b42efb1bd21fb9c9df67496a09fdba958145d56b185d10187256e45b8891dcf725cecbf1868c7cdba515397085f616328c111301ab1cce584158a17ae47b944";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/es-ES/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/es-ES/thunderbird-52.5.2.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha512 = "251cf4cba82dbc10bc38039348894843b8f5c76875be72ce5ea1cb26cf26939055350e61a86e8ed9f63964bb95e99aac5442389c87588829e45e9ef41709ac7b";
+ sha512 = "c1eaa597f18102f93b7621d50b5ebb54f9007ad01b5ce543e3f53cae88a42ce06c7d2332fb0e6b080ac2209403dfe06ce24a17f09c7ae3d5ace8d5e85e1ce603";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/et/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/et/thunderbird-52.5.2.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha512 = "609bfd8fd7f8dc17b52173de9916133e0cd52e41e66a488ee2bd1aea5078cb9e08084c10d0b20be36204bfc3f785574500e2bbf9a81f307394b169068ef3ff07";
+ sha512 = "b0386ef97662e21806c15342b68b2224ed3b41a8f1648f1b9869b527eb8b60951f9453a5abbc74e94905799953af5a7289b25c80fc370772368f39a048ef89bc";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/eu/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/eu/thunderbird-52.5.2.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha512 = "ebbc42c9d491f0f0e9ac5528d58c5d8604a913d77fb3d4548cb0127e356817c729c1ce87fd7874ae6f688268ab64b8b898611780b5c6b11707b455f529ab5f65";
+ sha512 = "d7070db2bac9aabbf5b020f60080d3beb9b1ecb4df73fb541f387435eb9ea80e2297c76a79910af0858ea42882298cfdd5c5016bd2049fdbe91dfe1f4bdb8b70";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/fi/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/fi/thunderbird-52.5.2.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha512 = "807b4fe85c2b751e815dd4ac19b0e80199f391f7a8fe7e7f5c1f7f75e896620ddc7b758aae076bd44f9cd7774b2020640f858e139db57b508919d78caa77d913";
+ sha512 = "2dc49e7ebb96cafb37b600490bbf49a40393ed00cd4889e1bda6331e9dbf377a4cd53cb6cd98e7fb2e7cdf0da75e69e38e9f3894ab289f3ba0894f499e4f83b3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/fr/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/fr/thunderbird-52.5.2.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha512 = "d2d6e92815ed9176a2743578c32ac82150d4097eee6bf31356a9bc1cc1ba649c86008d301654e291bf0bf5ae2d81c13d941c4203aaa9dd3c4110d36a34f28140";
+ sha512 = "2ece29dfad71788ee5bf98afa262edc3b9bfaf57a2ea07d669c1003b09c5a5fbefcdb028d4842c53e17c1a63cce16f9296e574b834631cd485d0737cb13b174c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/fy-NL/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/fy-NL/thunderbird-52.5.2.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha512 = "bb5e34f15d63abecc4b68a74cf818def59caa2de47c9ab71458ca79839fd29f3fc2476b5e38a95d5d5252acb03595f0e065bcba5eaba6ff2eba29be66607f417";
+ sha512 = "a84eab825c051666d606fff131542c71bcad7f204db19dc10d54166b499869e43951c9799d05b194f66ff40d5f307957c2d27de17da6ecac48ac24621da7287a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/ga-IE/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/ga-IE/thunderbird-52.5.2.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha512 = "e6f84323e42ad5a0df546307ba0a87be57d1ead7b7a807ffed4cb977b5b4c19c91ce8058794da07fb1ce678e4f8e59838454deb9a19232a5cd7d60c6cbbce74c";
+ sha512 = "181fcdb0bae1a2aed16ba61523ec90f89b884d907796e1d1c37c722f68b89dbbabf977446022af6c7050e3e26d995e33891880e875f28247653225479847acfb";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/gd/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/gd/thunderbird-52.5.2.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha512 = "1e28be9ff5c3ccefc320e020dbe574f9d5f8319eaa79e441ab7f1283557eca01501a2e0f4aca6af6e58157b4c1686422d70a258010657803ceb272b900ad3e3a";
+ sha512 = "cc91084f593788da76815f185e2b9a877409537cdf52566000953a008bcb2783c09cd8893cba9f387b731fd636b1d8e7b7208832623d1222b5fef72db8cb4541";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/gl/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/gl/thunderbird-52.5.2.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha512 = "db2d76733fb97558d05b3ccb963ad82ab6886d1db32923bb73e4a62bbd80353fb7d7cbe4e1a82fc9095d582e467fe9a045d82be0aeb319fddcdc88c530733381";
+ sha512 = "6491bf74093139c86a5809d02582b6d055ebdb3cbf29a1a24ff7529a6e8c2bb89e26c27e7f65bb588c379566741510d6f8372f7f2a11004350cc7e907a3a6d8d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/he/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/he/thunderbird-52.5.2.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha512 = "1b4640496d3a1acc7b8a146c8642f25dbc5dcccb7a164fb49a0ddad41e5a43d571936111154838b149bcee091205f0212926618ba5f233aaee051d5def345889";
+ sha512 = "4235dfe0f51f55dcb905453aadc01baec3b8033384e5085072abb600c71f777699df4b556233ffa9b07f5d62442aefbce6f1eef2a9d557b24b48d797cf03b026";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/hr/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/hr/thunderbird-52.5.2.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha512 = "5d4e361e7597b4dd0a896e38e31cf737dc1d51e87c09490a298147e4f0f395989567de2edff69f862fccc860dd0c18b24d2f91356736294c71429d22f47eab4d";
+ sha512 = "4236d464d704ba9c4c60323dd3518a37f71d24cd441404b6ae7a0e97ff17c839e2eff48d100211cf5ce9d3759336e7a0c29abe5f8390facedd769804adb8b956";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/hsb/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/hsb/thunderbird-52.5.2.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha512 = "40b51097b472a36078a7de4ed35446baf9a3a5806a92f13d49cb0024ca154e511195e6b470959b6084ba689c4475224acb81010f417618686a4e99efc624754d";
+ sha512 = "876a6c45e62c1025bf29ad3c626e3d2cbbc7d9d660e8e862b0fb586b73ed42a0bb58611dc69af727571c93f31dca450dd9156ba78b23b9a4a2116e561a8e3763";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/hu/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/hu/thunderbird-52.5.2.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha512 = "01a11e4e59c527e43d13c5c12dd95665bea7aad105d9ee9988e94671e394b7a55c2e85154e1bfb200d9290373de32d7c33ad1364e6cf2c189d8c9d8b52fb813a";
+ sha512 = "7bf7604f08e452f33154ba91cdef8aeda9905470f526f403dd76e19d1010f822cf2f3fb7c5f0525299bd0401139df1a12631f796d603e0ec3af4aa8df73ed0f2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/hy-AM/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/hy-AM/thunderbird-52.5.2.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha512 = "bc3c78d1d3da660c66b64930d295f3e79467684d178c831ae4f2eceb9d9c7753e5f1b60453fca674346da5e6eaf3c835df7340f0cdeb0e9040be546aa69d0cfc";
+ sha512 = "bd62aedb2c800265fc34c884f1605caa0040794cc49479189dfa4a959d49397ef023efaac0937c9573ef7a114cee16504b5a65f8f8f3f3d4d222f4a173707bfa";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/id/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/id/thunderbird-52.5.2.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha512 = "d377473cce2365f60aa5a65680daa2569716f3c331d20427f3d9002a72b42c0356e112f943db228a026f0d8cd5319168a9f718f3144b4c0a93ea3209c9003680";
+ sha512 = "1dd761bc1bdd865b5ebb494c00dede5e616a1bf7fbe6d7cf88d4f5362eb75435ae162d2e027fb7928783fe255179de00d28a29ab3d90350f75be7a1e4ad428a9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/is/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/is/thunderbird-52.5.2.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha512 = "bf41f55ef16c9ec322d732174a1076e5ab6a5db12f861891bb0ad1becf2b630b7504155505789e9ff7778b6c708642da55630aa20c0c18ccf11734572f62bab4";
+ sha512 = "12dbca26babd51739fc6505fdd36ad32b5827e1c3e439f3ae4c2c8e0f165528e693af537bec8630146c6c6bbc55b75d7c5bdd3bd84b5255cbf756d627beac2ce";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/it/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/it/thunderbird-52.5.2.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha512 = "eef60e791ffabfae57c4e9f4094a39c8cb5c61ad4a8296aa111c6ff4e14f05bd86d4f9e682859ba6ae4e8d0c10001403d21bf8fa54e7c5688ca9e0ff06b4d2fb";
+ sha512 = "9c9b77c70429436b1cb0030c92109343eba9357f58873c13399e9e64f44807e06fc0c429e0748ce9a11f68baf643bec7cf313fe79cbfd35e548ad579b0e6e108";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/ja/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/ja/thunderbird-52.5.2.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha512 = "43dfc61aebfd6b80651900b1bd066e3c731e06854bb375d2eba206733d4bffb42f9b0116fbea0853f2aa440a6873cbe9e188ed528cff25c8634d7afb59e9d3c2";
+ sha512 = "2f785ddcb2e16ee1970cb582852ce52e1f3f7cbd58e8f714a18a387019b510cddfa1927f593b61ccc4b662b6e65f3fe20135eed451ba07a1df45b5979743b20d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/kab/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/kab/thunderbird-52.5.2.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha512 = "e75c653e6dcaa6a3116aba962afc6196c29e9194235b726e3ba0b4fe050129512f6d67358a2ce9e2b6879f6f52c6ada583af10b70cddde7ee0b8fa72edacc40d";
+ sha512 = "1bbd7b2c79cce7b74614e6f09cd7235d58def667f74bf3276ec928df4f0084704654224f100f227cdb350f839a13e474cbc98e4614ae45cf00969b2706291076";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/ko/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/ko/thunderbird-52.5.2.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha512 = "52e29e6b2996a59dc4ffeee6f7a35f7a491e1d44af370ab1537d0a45c8d9ab8b1bf972a24f1f2efbcb6fa1d8e9b7b15c7b0c00d5aaf24546fe7860c7a6f97afb";
+ sha512 = "e176558707cda5570b020aa0fc3620deae7edc6e7e363e1ba4b51d6cad9f4a9e74a35be5f419fcc0e18dca31b6c887a62112f99b4a60d9026b8dc5f87de45f74";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/lt/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/lt/thunderbird-52.5.2.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha512 = "d935c882dd6a9a3ad5a6c5609047a6e3c2c4146b198e8c28657ad166d7b6ad826e6db0e4c88944214521f0cda0907281b50a6088432b574d1ee13e5c504c939a";
+ sha512 = "f431c57a74e0f8498a9a1ad36e6528d09dccf8b03aaf9e7ab66ddd503bbd78ddd15176a5e6c2358eeb616ee023f78414c30b67fd39c4c2f15f4e377df81759cf";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/nb-NO/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/nb-NO/thunderbird-52.5.2.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha512 = "bd607e451f2601483aa4d59cf6225318a3bf1b2066d0f6b76c64025de0b20a8c8d8211f95b953440505248905d5b4dac569cdc610fe4d9d658a6ecc124966b82";
+ sha512 = "5bfae55863550e32ea6581d0c24ae5374e2365d9e5e8f05f91856d0fd2760b761d183b12c9809668730efbba63e6c23408431f4616f6a7cc52ee465ccb939aba";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/nl/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/nl/thunderbird-52.5.2.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha512 = "4767403a33047512f301617dfdc779f92e001114a06f31244e5b9a648ed4a7a96c6fa16194a803682417d151f2f9d61da241065f15cdd2e5953eb5ef41220093";
+ sha512 = "fd7d35c0205610d868fb0676f3a8aaf328b1906dd1b174124e254ec8b08e5173741853938707dc99b10b4417df4a7010e20cb8a1038bf8f3258dee593cf788bb";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/nn-NO/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/nn-NO/thunderbird-52.5.2.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha512 = "f2fd66bc8a520f90fb65e5f737ea25e44f5e3270429cfcf878e4b128f1facfc3bd29282586aa6ba73478de04cb796322436d14580d86fb5861072b6722e2ef87";
+ sha512 = "1070fbd6c51d68e560fa0eeab66f2baa39d11752018d20d23a3577b12b504355f5729d0d961ffd20256521f54eda69d03fb8efef70f8254685e28b0164201354";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/pa-IN/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/pa-IN/thunderbird-52.5.2.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha512 = "8e4c38febf02e61b874f931b0cf03221781ed9543f9b7a392ca9122f101622c20135f0fd94e5ee7696d0741a9910e1d1031fad3c825941d54da1f56a2533b61f";
+ sha512 = "12293c8258f02403c8db220c73cf76b24315268324f2c6ac41dba7d77d9653cd1a21771a4994f7c6dc0db9948a601008e347d908c05dc59b7cf6ddcf95b2e86b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/pl/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/pl/thunderbird-52.5.2.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha512 = "3e6fda867feb132f37913a8b2bda2ff2736f4d804e274f01c306d387b3c48fe30aa04b6f85eb4a7fb444036bdd4b3fcd4f68cbb53244d85b5064aa36c3588cde";
+ sha512 = "331b81876aeb162e1f4e838cb00712e971310285febfa669bf7c6d245c1e8353be941b6d1236423e0d835feacaabf859077da1918cf2652f6b79de30c4beaa30";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/pt-BR/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/pt-BR/thunderbird-52.5.2.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha512 = "662e0616d12fcb7dcfcb98a4e07228509ae7ad731c93d2c90a7bb7ebc3bd0f9636563a70977db14733c832220258eede361526b01132dd02a4e44b16acc6a5e6";
+ sha512 = "d69fdae2048b738133fd07c6aa0ab6c264e555a3bc3a899d09fd7fe49435511fd544f3ef04e079c4efd320bc2abfa813f85a5f2a9e477af56aa47495466103b6";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/pt-PT/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/pt-PT/thunderbird-52.5.2.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha512 = "8037be03b26263f3a1e69c4971cb70db50f95356c97e3252f76f080f5a7961c1b2ac5aea09d2e142994c5fc91c91ab8db738e5a104795e8506a06c997977930a";
+ sha512 = "fa3286336d47b2216b0ec0c5fb6cba2421cb0cc81d1f815515c637a063b8de167cccfc3dd30b02636ae88e74efb34f8fde1b198924fe864b1fdc08d95b7f0f3d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/rm/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/rm/thunderbird-52.5.2.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha512 = "93a76b870c15b61a1135e405f76897a86674e1fad2dfa9b3a71cab83f99c9369b7363a395e813536492a25133548f227f5254795cd20de78f127c969fa3ff5aa";
+ sha512 = "b4affea897ac5af177c1fb6e4919f94f5f20860c3f492584c79664d803b7c2d092a96f1a3afe6b3212f689901a52d0ca74abab4910ba291280d52ecef2cf9a33";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/ro/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/ro/thunderbird-52.5.2.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha512 = "4a535aac1f6666d20c7aee65ee974bd545cd4aba56fd0ea2655d89a532b60bcbb174b8046792365041b431d3d3099e0c273c5ce83f1e1f3599a476028b482f37";
+ sha512 = "3cdcf374f33961484962a6294ad8fd654b006f3472ce6550936a8c00a28943088c9c61049fba278cd304381003b46903a5514ac340b5a85a959edfe17242eb4e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/ru/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/ru/thunderbird-52.5.2.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha512 = "ec56cb45428ce24497ad398716f99f49d6a5787a042855dd5839e5185d43763ea87b89090bf15c571841aa0526f5b4b0fec8958bd673a39ccf33ad5f2937b33a";
+ sha512 = "aa1d54fe356ef15d852a9ce3f269deee411d4815f4108c93c832def784c1afa104193e62fd9b47977d20ecfcf3057c05d76f39cc3abeb0341102b7e6e6639763";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/si/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/si/thunderbird-52.5.2.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha512 = "e1b19b27571cc833de579d1460d27629042529480546cf3de11a39608b8d599ffd19451ae3df96390009e95b87521f17e5843bc77251c923823d3b0529167f17";
+ sha512 = "543710116d67afb86e316dd17bf9a74a07ee5e3772381d9f0495af4d42075e96b6ff888ce0c3ce68ec779dc051f3ecb6105d51a6e4459cb4907a604662c933b7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/sk/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/sk/thunderbird-52.5.2.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha512 = "d20d0649426fbcc812b536d368ec5785b32def01b91d67776d5776a7fb45d9c723e1c455d20eedc7825370b03e484634ea42fb55dab5b3c860167cbeb8596c7b";
+ sha512 = "3ae5ab97172ff0f4d3eaea7a69fa54d9bcf639a8032ee2c5a3fcda2d8b30072d3386c54ef7e8c9bf5417a6030966c1097d69d41dd8c5355e82d048b783aef461";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/sl/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/sl/thunderbird-52.5.2.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha512 = "c37ecb24cc9bfe2d31459590d0882fd9cf196e822a18105b61150db4049bd52c31bad2a05ebfb710bf1d1d879a22b3e6fdca08ec81663e1c1735a4a2d157b4b2";
+ sha512 = "9f3e0724e837608cf4a64a2505af732e4cdf61928bd5dd1237e27d5222147a8ec52870e88c73653de8518e9ab81af4fb8916b067c780b1af25b8f6c208a10684";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/sq/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/sq/thunderbird-52.5.2.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha512 = "0ed120ba3b39f884784269a6098242b8e1298bb4287749b901c2702d06c6824f762942bfe05a0dc1966c19e883239b09312139ee7eeb2cb22995d47aa2d124cc";
+ sha512 = "0f2e10a8b9cae1185079af8e37ca9622d9ed29b6bb38377cc2db7523dded8da4969798941ab1e99cc70b36bf2fa59549567cf5c1e1cc40ee0131350d60f8239f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/sr/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/sr/thunderbird-52.5.2.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha512 = "5e83710d06507a40705ae5177e4749c31aed4e932efc0c51f8da6a4b30d598328601f8a53b9fc0dc35cadcc130bb637771454d9cf55e8dec2b934287213e17f8";
+ sha512 = "1f32b2705e4939c5e57f7a6a3eac29ccacbd90bb93361007b208a0eb1aea4f279b50fa17ffb86571cc2aa793742d3ff62caf28047b69c95ce358b6ec2cd24268";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/sv-SE/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/sv-SE/thunderbird-52.5.2.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha512 = "4cbb20b1d818f0238cb0d5235ea82a1984b8dd632467ca91e3f3f4e8ba58de904603d1135c8a7ea359188f1b01a6ffe8d654a2d0a73b4af1f3862011d697f755";
+ sha512 = "887176e1d4d9cb385ce0261a45f22bb67a87a125da737403c6965a6dd57ec7f0763b1245ea0d04b79aff5f41cd1ded3a06dc4ee301a17c01a9417ea2d515dcb0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/ta-LK/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/ta-LK/thunderbird-52.5.2.tar.bz2";
locale = "ta-LK";
arch = "linux-x86_64";
- sha512 = "3c2397e9b9e8abbbef10af15cd35ba086336daa5c317ba60d4489786b3ae4fee89457f2b34c0b42ea550000e8536ca3fee94032848b11dbb2c4cb6fe489efe6c";
+ sha512 = "fb981e6175b1f8fe79b65f2c324e376a89c7378074a6ead4cf3444516fd8d566591f942133642830caeef1f342ceb169d2e558171a5675ffc96a82deeca585a5";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/tr/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/tr/thunderbird-52.5.2.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha512 = "9360797bca24f5477120d93665f9b4aa1614463558b6646e2813b31fac5b5bf84d5e88a752696c28fb51613c288482e3d88197ded2310b66515582b11f81aeb0";
+ sha512 = "2ce313b74b8512eea958c2c3e303829a3d7452a48efc07afbfbe9ea783c6099e75693b679cddb65802fef5a47f98526b7ceaf4c1e7fdebf9357c91d5a306bd70";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/uk/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/uk/thunderbird-52.5.2.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha512 = "ee521d20fd5e7cc3f803f74ef5a9ecc4c1df8b149668489b28cc212ad2d5c765bda838904ad726b92b5e0e2eb35c2ba6fd4f48ac7c700e41e896e0e976fe2028";
+ sha512 = "dcf852d0c584c3959fe0f7ff72cdd45fa8497aa1ca44ca036e849c3395da470a52376343f4b6e37a343e2f2919245a52e63bb5dfb5651bbf749c72c35a8918b0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/vi/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/vi/thunderbird-52.5.2.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha512 = "3d7b7cd1f83e80290f460829b49b6893a73871456cd10ab22da482381ece0ac14fac3e5c0e2fdf1e61d463b7c211c33ec8d98120fc0bc17d2052bbbcd4e16af8";
+ sha512 = "2b3c262c1955045bbda194715f4e9fce97872054ca8cc6f7bca3c1c6da303ccda4715336c846d47bc204fadca003ba9f4efdb6798e55c9e928ca822544bfe152";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/zh-CN/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/zh-CN/thunderbird-52.5.2.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha512 = "c0f9902bacbb659f5f012f30b6190d4e3e53baa7e4473cf231da0b7c509beb98e49f0e4fd1ca3ed9917c54279609ce5fba1c51b80b12aeafedb82a83218856d2";
+ sha512 = "74e7d7f4039d38f6af9590303d173d7293046f897e5b23acf8ff16c7b1ecfc50d0e8896550ee371f19e73518432d137779cba26bad913e8deb9e4af1b0637edc";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-x86_64/zh-TW/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/zh-TW/thunderbird-52.5.2.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha512 = "64dbbbe05b3ade46901686fa4733cc7c25570d1f02b378a2b2855b75905e687db9f97db852bb53e2baaa1010a0ff365bbd90060eb7cec7db745faf014c5e5564";
+ sha512 = "914af708ab185b76a67e8a2a4c85c14f41bdc05bfbef66c56a8b28820e4eeb866dcb6d60b1b4b61d924af9a6ccfa9ec6a10afd6ffb74794487472d508807b417";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/ar/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/ar/thunderbird-52.5.2.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha512 = "1e6449d23bb937d07fd28049ef4e36b64c1f36edf3f4def640dfa6412d354ec6acd5b1642e0b266f18334f3ab7806a9cbb016946c0a36ec4222cfcae39339bcf";
+ sha512 = "b749fdc34c15b48bcc0b99af41ac0357fff3a9c4bf774de536caf1fa65b33dfc69a4a14a4cb0c06a82d41e222362cccafb9ff8f4ca64c128cf0a031c1161d74f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/ast/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/ast/thunderbird-52.5.2.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha512 = "38f0fddb28d8a894798e9811599e706e60ff80131b22568e3dc70ff7f43388acd6de5ee4485587c59fdba8f790b393f4f16cef6bcdd86b928f3fa1bfff7297e8";
+ sha512 = "f3ddb2b95237e8c505286328369c9f7613e5cb22ede50f8842e936c158aa6cbdb053de6c0f4ef0a9256b394b5510c1733ce0f8cc8423370581ec54b871f59b56";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/be/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/be/thunderbird-52.5.2.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha512 = "0966c3fdbf73a51d2c7776918abba4b77392dfe2308aee36970cffcbbc3e1de537625c0b5881a85eea74817b33055278d976af719773579885b3294746a3ae50";
+ sha512 = "d41e1bcb8460015876d784eccb37aabfeaa8a283f408e6606d84175f3e6b1e7428b8d277d30b250192cede4cb6bf2746945cf6fd4afa698fcb1b4230ee0f6d5b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/bg/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/bg/thunderbird-52.5.2.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha512 = "a0a792063a3eaad2d15f4b726c9ed170f59f99b1ba9c966fdcd6471865dcf2f25284ab5e4e28641a66fa8ddcb019f8b8f521d69f5ed5e8d1ebc2729abd9be8b0";
+ sha512 = "e07885f88953dab1a940d21142fc04c7b8b2f807fc424f69b99f90d4a8f5ed034fc00de92d76dd4fb858c669cf6c3e9cb82f93ac3a264ba71f7b644e99849fef";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/bn-BD/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/bn-BD/thunderbird-52.5.2.tar.bz2";
locale = "bn-BD";
arch = "linux-i686";
- sha512 = "ea583cbba8a0080a5529fb91988a0ee1c7aada1447b616e1ae43b6eff86dde87768cb4fe90fdede8454ad5240d266bc5e6ba9f1e5e05f2ad82cd3ef68ba374d3";
+ sha512 = "2cdab1cc1066ab51d8fd0787115568cf70f3d584d2fd5e3908eee0f64037ce61a80a3f19ae31dc8cabca8f05cee51221917c717ea535a5a8085dd3410fa56422";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/br/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/br/thunderbird-52.5.2.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha512 = "18060c8473e82554ff793ba495ba6760c7d7d8c2ccf8fdafbb41589c57474baa0a88808d154a29f6359c657bec40d9d164e53066d44bead78d4661b229522783";
+ sha512 = "0db76f3544b14360bdee64186b9f828dce717d72d23ab59d4568cf079dd1db138e5b79eb500bae6d0043550bb906a0558f07e3b5ac98d0ff67705578d04ebefb";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/ca/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/ca/thunderbird-52.5.2.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha512 = "f63dc5e923d8e60470fa4e4bc5adb8ef629a82dcca84a87a6e742e9d34a8709cd0946a85bf5822b19b5ff5c1c34b6e290439f3e3418e4ab86844a0ff54c2632a";
+ sha512 = "6229309d3e81f374f4f04071843e3a1e7e18ad8316359ba6badd0509284ef59c16085af9a52956a5a2f438bd9cf8c88400e15fb99bcb75001f08fb72c285b3ad";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/cs/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/cs/thunderbird-52.5.2.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha512 = "72e1a77e10105a757c51542bb236d10c417f96f58c3875b63112c71848ce023c8754971bcd34dc5d2a48719070939d3733df9dbe4d2218e7bae7e89049d067cd";
+ sha512 = "12a2df8d37d02076acf6cd2bc86bbc71e38e157e121b1729096c880481a82d23a0c1c8f1c8b1ff53193aefa1eebc64ffa49bebf38dcdee5fdbdf429bff5d9993";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/cy/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/cy/thunderbird-52.5.2.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha512 = "4901eb53235ac29cdf685dbee78db301abc1f088ea9df585e388814c8f48d81aa0daf816f927b0c7d6df7985d8dd1e64c0c1cc26026f3ad9625251a72b666692";
+ sha512 = "7c71ae8ce62dd271e0202b4e25b52ab9291ff83b920465b9a96c36d55c520ee87a5a348ab9d0ffd495744b787d424741ecf9e89ae4879281d0a6f2cb3742ae2b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/da/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/da/thunderbird-52.5.2.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha512 = "0f061a7ad1e3b113d7b954487d661b4ca57a0ae861770c44081257a069e324388ba506b27ef0123a240cd949edb4ae60f500712c0addeed146cb922c76bbdc32";
+ sha512 = "36861c719370036033286139f5e93d750eb8712afea42df7cc7f8bbfb9a00dde999e3ac4e38bc48b64a343a8091483163914cd362e9e30e0f9a98c6cf6a1783a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/de/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/de/thunderbird-52.5.2.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha512 = "12ecdd09f77035ece4161c97cf4ae8bffab6a7eb46c7b9a2f7323dbcbdcf4f3d1bfcf5fab4d40b2887fbf64b541c0d5bac54f1b8f73ce7e31bfa201e955077c0";
+ sha512 = "8571075c5435ab4763ac1c0f3904ca39b5ad1363390fd78eec9b73115caccb3eb3cc9f2e1a8c4119469ed5cc99d648fc905a8fb4d51c0bd10dc9ecb0338ad59b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/dsb/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/dsb/thunderbird-52.5.2.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha512 = "54fe7ff647565d5b82843d879ce3f791b2962bb034ec2ec2d5ea85cea3019ddae49f9f45384751d1a2d0f879aff4203a61687a4432ebdb948fd30569b6ddd7be";
+ sha512 = "1b873aa804d253786b37a8bd1e85884f12c48292c3703d9c04a9d370e8fff73b0d865495a65de7fe690e34f835220ea88810194385ef50f3b285e8237f3761bc";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/el/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/el/thunderbird-52.5.2.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha512 = "d667a2d4f3782c30b308cfa6dd13ad321f6b7108d95f05c68dabe085228de28439f8e851920205404e48849829e65a07601ddcc553f3c73b08e233175805f046";
+ sha512 = "8f6327796a1e937e0d43f2af23f25292ee3a56b9d173bcbad1bf1d7cd60ca464570ef4a9d8255d2f3897dc862680073146a6509944014d0abeb21395da8c0201";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/en-GB/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/en-GB/thunderbird-52.5.2.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha512 = "ed7d40db832e9abf89d0d1e497f1b276dec7836e494b616eee8db1557cddd33f6f700bc9f17db0324f7a3b191ea425a7701b7e2b10630c21ab07f3c709039312";
+ sha512 = "e27a9c743a1d439e3cda7f2924c01044c797f88bd4b90723face80a472c8e0854c747472e5cb72dfe10ab1018188044681e1ae633ea55f4a11aae6f62a3a891b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/en-US/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/en-US/thunderbird-52.5.2.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha512 = "9ffe74492c2fe29523a34b02ab869f9660aa1c33b16e45a026c4404e714b9cb6a5d2b24e73c7ac2f52e22f21e6e88e9a7686edbeb2c0876594054b17222d9ad5";
+ sha512 = "b20aeac366bbfe257e709133fafa59bc8fd784d33926a167adf24d2c90d2cf5adfb68815e2000de4837be7cf73258d890cef555be82112aaeaef2bcc244f634f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/es-AR/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/es-AR/thunderbird-52.5.2.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha512 = "9f154f4fcb465925d445cbaecad4495d12d6381f0afd502973c4869890dfcd77366fa90bba835016729343947e064772163529528bfa76d52fc87bba5e9af1d0";
+ sha512 = "a3547d8ea9675970dfe9dc40e1b763558fbb204b8d0940156b97212f2a5af00ca82ea2493f77fe896e257d7e0cb1ce7a1fe05a4c23aaa09222da43cc9b823e88";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/es-ES/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/es-ES/thunderbird-52.5.2.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha512 = "4dc72ba78d8de913ab2b3a76920e0f4e3bb75cd880c3a8a55af72cc38334906e5786b24feb0db7d1e12db845f995c28e3342b5bb1bd4600c70de6b9fba012194";
+ sha512 = "2ad8177608038799c2ea653ea056c599949972a51493a27a34d4aa0769814106cebc8eac3521c7d6186432fadbf8e17e7b9e5221bdd1bf70de4fa80de163e964";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/et/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/et/thunderbird-52.5.2.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha512 = "64279f558880cd6f6653e9387b479f08dcff440a23dc9a7bda664f09ca641cea05a268bea7cb7ee6495910fc67f1294f78bb163d09d70df06f335486d46d7ee9";
+ sha512 = "a68d4606e943a4b5841853b1c2d5165f5c97405690d467c0548ef0169fe472e76088c0387f9adabcd5837a3fba72287398453c4e149343bc9130348b5d62c682";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/eu/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/eu/thunderbird-52.5.2.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha512 = "90185fb2a72b648af46b83470b2c57ab8784baad2c75c32920a5e6e1d5e03b5fd3a5ffad04cd52ea73a942c4ccc9b02d71ef7ca4887d3d089ba8f13745087b79";
+ sha512 = "dfc826d722b7ff331df35b6fc9b82eae9714f8f8e75c1fe3119a3b449a5b2817a8641e939ddf32b4b6605406a7cfeb57de24493b5a4d0cf9992a3dc30f2558cc";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/fi/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/fi/thunderbird-52.5.2.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha512 = "3d8fbda9afd0bb82db6baba04d06682c5083a8a05cb941552c5ae2abfa0fd7e9ea9e020423877f3141922485a69c1af5d48235dda29fb4b583c1f4435a747f59";
+ sha512 = "2676d22c662a5d7b4b3eb32a71b032e76bb609b39a89381054b254ad7a966625af2166b2a5edd9c09ad8d9728933203c99a3c60e03c2fb031b748e94c16eba77";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/fr/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/fr/thunderbird-52.5.2.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha512 = "669723deede608bb8239ee5a04dcccfccf3680e32da494d28fe5380714b012a322caca38eb3b6ccb3c136a3a9742f917a5614f1183ee08b80d760fa5cb19493a";
+ sha512 = "b6ec3f6f2abb0f1ae8de3167e03d9d254959a93881b4cb8202db5880bade5569a53f1b5aaeaec10fb6fcfe453fcbe7cf0c090947c546ec62ae0f858dc0b251d8";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/fy-NL/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/fy-NL/thunderbird-52.5.2.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha512 = "c35371dc26545e5f1b30a1c866538380e8d6cd21456e1415260cfdcde3c37f6f301f1a5ebfcba4d6a5612ed3809f7a27e5a5470fd5f5b7146b923ab15a5046a7";
+ sha512 = "c0e2618f223f5b58d80283b23c38ce703d5fa019444dc2168d1ca88149780e458ed9c5414931457a0a3e7733407eb07b1fd38f3b40c381db2f012c5a1eec7eaf";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/ga-IE/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/ga-IE/thunderbird-52.5.2.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha512 = "1f5eaa4928e7b56ad27937b6a49f90fc5739149dfa8119563eb6153cd1d850243ce3a15e42d6e5a7a7c306401c97424b5ebbb6bbc7d20102aab09723c91925a5";
+ sha512 = "fb6e815a5690382f1608d20cecb596012677616cfe3de11ba8aacdf32c59314a5e61ade11151965fa4c5f310445700f9fe89e14734f8876ebad4dcde9f46535a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/gd/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/gd/thunderbird-52.5.2.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha512 = "61c1f4d9769981149a5961c096d9826e737ed356582b90d09efc437c38f93d9897ee84489f33e3fdc20787dd9d437ed58a5592bc5f586748d3e5897ddda38b20";
+ sha512 = "3edf7e424f7a21540225d6e30543bb39f395564a3effd5064f3471f7922c19e275fc7b20e1df929a93eb375e0b37937f5beb239003300bff0af8af0d2f7b203d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/gl/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/gl/thunderbird-52.5.2.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha512 = "cd23d74ddd303be4d86e4c63d5d2186ce3d0237caa62b0a48987b63c63322898f591e4b2c7a5fa5d219c49cb28070fde5cd933050dc0c0e6b9aefdd5f03e5b1d";
+ sha512 = "7afea0817603271e8ddfa01374102f8856fa1d090fb3a98ff9e3ef477aeb019f3860e68c6ea72659ea0b65c54967c68bfa0d84a040d7677469ece8460fbf93c3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/he/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/he/thunderbird-52.5.2.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha512 = "58d98ff08576c3cd3d5a8637b8ba8dbab1b7e61942f4dd772ca48e3fb447a2dbcefe2cb9ed8cd3e86ffd0d9f8ba33366dbe01d744a825bf513861ea870d69ecc";
+ sha512 = "546484c47f925bfb92bab962735cef6a74336d6b282881afce1054caaee559360e2df1d497d857a12ae76b99ce765ac985adf48d17f9a759b262f8b134e9adf0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/hr/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/hr/thunderbird-52.5.2.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha512 = "770a4a095993a9a84266b15e461645c4446ba6370092f1d0984d2ebcf836d24538276f63f9513dcaa537a4f016bb699169dafb14a68450f1e13050679800c5b3";
+ sha512 = "552ebbc20522633fdd27117a941a0541bc3195b4a650612e6bf9f5e341f09c39efe1a58dcb9b0bf3ebb4797c7cf49e7d8a8d7922d2f3cb83284f9a3dca7e6b68";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/hsb/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/hsb/thunderbird-52.5.2.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha512 = "35f0a061f152d871636723b4690d3a3ff7172abb5adf0644b02e44fd23583e9a9d8ea68890a5313d74d190a6d293798b5ae8969a38b1166cd942a3d17b0246f6";
+ sha512 = "f92450010bfb1d1620bd4819103d89f0d58af567231219ff106dbd48550e04af2900b362b93bd199482aaeb72a0ac88344e3767d754d6934d401cca13af4b718";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/hu/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/hu/thunderbird-52.5.2.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha512 = "a4e9dd6ad2295cde7d7e5bfa8efee3c68123ae11d7535f0c076e29b18b952320ef39e4c92e8ad4aa66f63d8490b5737ee849e425378db04df8c794bb64f5393e";
+ sha512 = "6a4d10925475f3fc499f49894f6c79de88bd394c9b3359efb326e55aa3e1af9b7d6ee2c853908bedd95e113d697ae3b25e612dff72d81d01addb1fbc39c6ea36";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/hy-AM/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/hy-AM/thunderbird-52.5.2.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha512 = "8006eedb925424458cc9e084b367d4b8f16f78a6245159c61f13b75455404adf13eba353b4141cc555d82d4d6060deae9f97633884ba6d3b18d88af8bf93c4c7";
+ sha512 = "ecf982393bfc9c826dd74ea6c0452788c34958f031636c4f70bf12388e966a3630cde159f3751540b3b917e52f0b64a2cd572d211ef3b61d97725a80f51b4f5e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/id/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/id/thunderbird-52.5.2.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha512 = "df166f9e33adadd2e38290d1ea92a035c9cd0d910c1b246906ed38181c8db12bba29e69b4a909594a79b8b3eccc23131f34236afb40d6746793cdbda3a195bcd";
+ sha512 = "a4d735acd212827ceea6205125e8d38f292b0994a5375738857b12531aaa947539033fe3be3e198eae82b77647d243227200a9fafb4ff2729bf4b0028868295f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/is/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/is/thunderbird-52.5.2.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha512 = "1a05df69389d95d9920e133e085a0d3a05eb917b1b28c24fe9d8cdce316e19319fe08aa7a3fec304153fa0f59a0b8a630f9c44fa1d9c0310de03fc102172dbc4";
+ sha512 = "8d4b0a3eef192d42ecc9c65eb692b5c35ead5c1a7ef17f575e96e06f8990a76607b31abafbb03cabbdd4385eefcb09bb0477c7a6cff1b5fc3a60bc9fb1d0518e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/it/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/it/thunderbird-52.5.2.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha512 = "c446fa3e15e9eb72aff880f928f5c8a0b2b0c96632c243db4f5c377bd2dab56ccfb569a8500e9778ac5a4459ca634dc6d2ec1ec0f05aaa2980d3f45109fa2ffa";
+ sha512 = "4f2d5c1bd7cc404bb8ab6097bc3dd40424a745f8a6cbc0e73722a28d68a582150acbdab83e02b89811c6617e63a2d56f5f02f6fc463092e8e959a91552a6f3d8";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/ja/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/ja/thunderbird-52.5.2.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha512 = "c7699f90c49fc4bca1580c749ccc446a95cb9f1a5a48cfee3b2a566ba13e073a4e405ba7b17ebff704f719639e323332f533db19f7c82007300322330f2b3983";
+ sha512 = "78445e5bb7211d7319609edb30e063c3584ed8c92eb4fb2953520720125306c28905e2248eb5825d6bc09399d38e35f37be57707e64edd3aae555b4ea748205f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/kab/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/kab/thunderbird-52.5.2.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha512 = "5c098954ce0e642c76c3597d419bcd5f286d62af96ccf2726bd00cefe12036708217cc6829c39cd669a21ed0cdfd8a6d511b8a55e8dafefa8c3940040e99d9a6";
+ sha512 = "7ad9d0213a2cd6297cf899f311ea3b8a7493f8596c352c351aa5aae3c7b0639c787dfda9d63adde7b2d920277c09d987b690506c762e24da16d86f985cb8f846";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/ko/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/ko/thunderbird-52.5.2.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha512 = "0a435742a13454634ef563b704d1618ce492a997814466ece1066e244160494e2092588b5cbbe5d1a7076b89c895b5f1a3288a377b547d454eb411960e3faeb4";
+ sha512 = "a76a8acadbf082a7fbaecae8798fbb3fec4d03515db2f0a7d2d10d15ef468c128329e79f68e9b0075c4a7767bf56de5d3f1f5521cfa7beaad2fa2026fecb43f2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/lt/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/lt/thunderbird-52.5.2.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha512 = "0ffbe8a40179cdce48423c70ce871ebbce066932cf9ab21560ba3107d2794198a7c8f5d5d3fefa58627beac4faa2ed398a09c429a47b261153f3045fe5779883";
+ sha512 = "cd8911a16d2662f5b80b76b04013113a8e9a231d25404afebe29852b5335d587a1dd22aaa74727c1b74ae5b26ffbd0f4723fc86ecef5c43397485a5199d65b71";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/nb-NO/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/nb-NO/thunderbird-52.5.2.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha512 = "d44ece21a5ce26df33d7ea04f56cf2a21dc67bb053212a71a2a30dbabb7894bc9cd5b8a07f86906c882fda29603d2c8ff16d675c8e8bef8ec362be8c824624a9";
+ sha512 = "3a82189796c1bbbe4633ef7beb054cd5f324504173678aae2763714b4ca25b04bce479eb63d89abe920c89ce7a4159eefa5e27b6e5959d2bea01a4cd53e13e58";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/nl/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/nl/thunderbird-52.5.2.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha512 = "8c2489dd4d860fc657893986f268746512cef54943b19f7c129013e5a6a8db8f4a8fb0ef22b1cfdc41306bbd63d1c81131989af7161d310cabe2427e21ab4702";
+ sha512 = "63e40217f5abea50375c0fc0060cab6c6291acb25d468edde8a14751c0693f0e9d751cbdee339a2c141269edad6c4ac87ec37f440257b5a78492bc43e66a9cd6";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/nn-NO/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/nn-NO/thunderbird-52.5.2.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha512 = "57270f4645bc1d82f3602a49aad11bb6261a2be39200b3284ee65082df363b5870b1cacbaeb3802a83f6ef1554a4d6a2c6e6b2720aa2b9d29b7a86208d676f6a";
+ sha512 = "bfa15dfb0606ca225ec370426b983a17c614dc850b665e40ba648504f5d9bf556a2f31ec20533fe739ff94f57f3eb5486f422972c7ed8c08d8cd7c8a023f9937";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/pa-IN/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/pa-IN/thunderbird-52.5.2.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha512 = "7a7464cbf08e418c56c979abba5ef7120f1202073ab630ef4ce070aa1b55520597dda0b0f31e7afc50e14c8c4fe0f33759a2278035d5db5f21edacb6d521672c";
+ sha512 = "6989775d3e36ec43aeccf3db32627d3f1be13021943a088385313fc7111d4288b8daa32ec37a9679353d68a9f15761fac2f7a4eb7dc1a60e3d15598296b11f82";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/pl/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/pl/thunderbird-52.5.2.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha512 = "ae0b8da805a3b055bbb64a3c0f1d3562f44fae08751026b8300c130f4a2629a1a17857d2be2468c9e2ddb2a082155d35a26b7b1f0c99369b2031a90b34aa2443";
+ sha512 = "05d252299552f987641be34e5f3462d56b08b01a66637b2d039d1a39f2fdb1b9b986ecd353bc69290bd64b5858b2e7fb7c928209cdbb98b27fca479ec8f959b4";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/pt-BR/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/pt-BR/thunderbird-52.5.2.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha512 = "f61d66c71c2144aba0781f82370318fcff0637d4bb28cda3703f099718691f13bbbc51eaa4252ef1fbd1dbe821032597e41adb80b1abec89a2bc50df043f5099";
+ sha512 = "b40deb4d5239e335f2c2e65d676cb6528c3320ee28bc9d83dd53bae2a486bcce2921726309754cc0bc155d3f8a0f56d69aa98e782bb4b8375cfcebfee5f58320";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/pt-PT/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/pt-PT/thunderbird-52.5.2.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha512 = "ad0d63ab9389e3c4cf6985835dc4277d3ac5cf79e09457331f87629c8f9a58e95ce7b68c2eec8973ab445cc8f8c50c0b01b78ebd0ada042f4fa6a2d2bc838241";
+ sha512 = "0afa965096f5a79b79b3e49af1758dc200ceb8161192a97d260313f9582f1c8b7a1d4e54e093cca6b9c92a9458dd38ba0493fdd1d6567f0505a90fc9bd97f09a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/rm/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/rm/thunderbird-52.5.2.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha512 = "5e5f96598101695ad0d16a7f3aea38c42d875b3d7b7e2eb529786f16cc008ca8b20bfcb24d2b975cdd2e114d00c1d17f8901f19fa84263f64506d9d75568e6be";
+ sha512 = "c9babc6d6e85936a251d4f7214991a06a3b92c6ae207a8012fe14cffb277a6b2468213a4ba94672a360bfdf9f4b817b8663cc15ceeafb79a63cbac13310e1aca";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/ro/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/ro/thunderbird-52.5.2.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha512 = "82a0324bc4724460d5aafa194a78d611c1d11cc347446d5c2203e9fb40a45f6c7ffb0e17aa87b603af8b3ae5847fa91cac529ae878a6981c9c754ea91b8b6b52";
+ sha512 = "86f303e7878cb988ee1773e6de2ea6b433028d4bfd40d9388384b14b5343b1de9b6b5084f92f1c95b4110ecc7fda669ed98d50dbb6266a775f4e058d5083e24a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/ru/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/ru/thunderbird-52.5.2.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha512 = "508d949263abd425ff805f417cfa60736d391e1dc99b53dca2243c4c93487ad2889ac6a9bd8beed59b4e09bc82ba31b9c5cbc9fe084ee3b5fde74baaa2720a7e";
+ sha512 = "d262ad2a73ab34bdecf6d180840922bfe16fdd4dc7097ccd900712d99ca915da648f2a196accbf6ff9946d9fc48c674e9eb0f0bafdfc94cd6f9069139cf0f036";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/si/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/si/thunderbird-52.5.2.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha512 = "e9869c86acbba32bab6b536f2542b498e9de0a306558b3115ffaf143f83c5a5010ead37573ed7ce9565c42b6306d98b4f92da866ba62f5c4042dd537f66e377e";
+ sha512 = "6b39cd9501b2dc44d033efe9524c5865cad8fdfd8224a51fb04679227e5306d67d05a9acaf4f5810cd67e6d10b1afc69ff80e63a7926616c35c79ecc3f02d93b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/sk/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/sk/thunderbird-52.5.2.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha512 = "1297d9a8ed5d062790766ee5cb66a1c3b67526326440b5d3f27b712440c0e3525ab2231774e02436bfad4b8ccf1006e5a16d2fce4be26bf2c757427228f7fed7";
+ sha512 = "356c86279387b023540fba86f73376b1be12413887f8ea2c3b706ccc268aad282d77b7eb863e58d6f15f66516dd4bd8f56a8f413815753dfd6496f81ee842aea";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/sl/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/sl/thunderbird-52.5.2.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha512 = "734d57ba493e160547953debc20b1d5565c31b0e6e5b486344f5da65aa4cbc77fa7790f49f4ad6322a633232fbcca2f21bdeae7f4abb2aa8cf13e5741519d706";
+ sha512 = "86d035a6b7108fab33582eb665afce9063e3d55b0c468b81569503cdde7ffe169de227024e94a60dd45e39073eaa3c3f313bf061c0ba492b66f75f79941c6100";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/sq/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/sq/thunderbird-52.5.2.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha512 = "e7a21ce516318f46d467f987dd244174ed2533bdeeeba41c2fff3a838ebb78047febabe6f3e86ab57bcc12f0b1418fb7ac195ca044a7c84eda404e152690b554";
+ sha512 = "f2dd5958774c81710aa59d7c9cf8543c86d82cd21da16b13ad1580cb2680df5caf973cf28a505fb994ad809264deeceea8806641fa27b9df5a7f26c725030515";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/sr/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/sr/thunderbird-52.5.2.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha512 = "132fbcd2a7890ac413dbc3b1651a02227b741a8a31e2406780f36415fd47ed75503968a93414ec31384f28ecf1e14753f0e1bb2988468d973dfac9ab45787519";
+ sha512 = "47a96a821fb825b6624262bbc0138027b842a9a69985af8903a7bfd435f6cbd3211e382899f3cc989cf716759aad927a8be22b2500f42f75362cfad09dbe67fe";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/sv-SE/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/sv-SE/thunderbird-52.5.2.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha512 = "6e07841987bba5fcd69f790fc8a292ad7a3d71bcd802d16081145f243a71d49c8c57c5b6ad60ebfe1a550d62b1c9713843a83066893a397889f925e8b88904ef";
+ sha512 = "978c8c41034137361663f2b12818477baac0e795e4c1ca7f7a013a8e1bb68534ef2a8a9d73e31c1ded7461bc5dc6298fc628dc6190b3657ce415f9687a3ed85e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/ta-LK/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/ta-LK/thunderbird-52.5.2.tar.bz2";
locale = "ta-LK";
arch = "linux-i686";
- sha512 = "978b1ba5f77271906ea67b37637b31a9c1da0f97453ea4e140adff8558ee2b01fe32f3018a48b141198cd0ad9f9d927ce213100be3f3310b020bfb3ff8b1d69c";
+ sha512 = "970405c59d2589e49c53f0ab37e959c6f3b94bac41929ac6d5776c7b78b91bc0f8a6c1acee1557338b76bb8fc2a9f62f179a0ad10a0a8c984254d39577402556";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/tr/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/tr/thunderbird-52.5.2.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha512 = "2531185c167e66b77c6b7f968927a64a9e8de56580fd82c7b2408bfac71523738610b740650644eeee4c485dbf532a8da92367bdc574733d0df0d749613bd6b4";
+ sha512 = "cec76a997708b5339d5e49baea40125226f4bd708fa57f43f7812e2c7be686515986b90ab6ee525dadcaccbd9b9ea2c961e1a645b2c9634062e3e0c9c00ce2dc";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/uk/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/uk/thunderbird-52.5.2.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha512 = "3f9eed73e2e85528deef2f2ffcbc166d2a836d363693f6ece98adeabe872a6aaa77facd16efd918fac9eefebed68ff35c59750d7116545a6540c9e1aede45c51";
+ sha512 = "be710c5a5d28b34136ad72456ab9893d7c31dc0f3eea8cfc38d70169c37df5c96fb3aa18b72555e081115d0791f3a634325da191ac004ffc6a38d1412e140e95";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/vi/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/vi/thunderbird-52.5.2.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha512 = "fa776aca6c434491925e6fcd1802f047fcdcc2ae817805ffae0c873e17f1ad233836954544d85ac378ab28fb607c9cbc5b1808a12bbfa1d9337c8e47de4eddd7";
+ sha512 = "7d1f59f1fd78609700b6d6246087b88c5190139c79e7e60f2eaba91908ff0afbac0bce0e2a60594cda0800cf68ab0b5568702e0cfcfd1718e4cf46a88f20bc01";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/zh-CN/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/zh-CN/thunderbird-52.5.2.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha512 = "ddc20a6b05b48d6bcbc59c585b4a2365cee6d526ddef29e3dd04d38c8632c5c7ddda9eab24f2850dd2614bb7acc6e982ae4673c2b51c679eb5afd48047bf6fca";
+ sha512 = "5763d93646a83b8a88e8c4b1c1c72101831f72323b600d576619330e2cf77ac7a9dc668aef5ef59188e0f467db900d1d8f3c2ef299f422f83de51f53519c70be";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.0/linux-i686/zh-TW/thunderbird-52.5.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/zh-TW/thunderbird-52.5.2.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha512 = "aa527aeaa6b10d785e3fa3a8052c5dfa70f9aae2601119aed7dfd60e8af30f03cc1b4d93f749c36be4e54bbce6071fe66fb1937fa392b8391ca695e55ffe68ab";
+ sha512 = "cd593b08ed5f31dd89b44e9b79b1db324c51facf63e9d9c0c2ad847b9cc13a0548e831a87078c9c0ae910512c4855e6f3ae22d1c40189e082ff6ff26224c35b4";
}
];
}
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 966e1886f34b87dcc648be9010ed5b9c21087a45..720b20e71290cd9b4b8ae36a4bebf633812dd6a6 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.5.0";
+ version = "52.5.2";
src = fetchurl {
url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
- sha512 = "b9b599e5853887bd518e5a57f6fd04751bb78f553f97b260cd9ba7268c4cff307be40b81b00f1320f5a5156e5c67115595b2d389f931c265d0c3448f56fb8319";
+ sha512 = "d626d3d37959539b15b5d2ae4a580fcc160380974bfc1a69a1fc8ff2435932e90a69fa386d5ecb6721d9154603c6b7d063e3368f6f995fea057eb593c06ef4ff";
};
# New sed no longer tolerates this mistake.
diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix
index 93e10fbe5664a125ef3ca51694019ad010d35044..743da79580674e48eadaebbdd5503cd3eccec1aa 100644
--- a/pkgs/applications/networking/newsreaders/liferea/default.nix
+++ b/pkgs/applications/networking/newsreaders/liferea/default.nix
@@ -6,13 +6,13 @@
let
pname = "liferea";
- version = "1.12-rc3";
+ version = "1.12.1";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2";
- sha256 = "0dd6hisqvc4ps6dx9ly34qx49ab1qa5h826b7dvf64mjqxa2v3kr";
+ sha256 = "14qx3x2xjcnydc4ma8vdac63phas7jzwbjl4b9r5hf6vxv3mpvdq";
};
nativeBuildInputs = [ wrapGAppsHook python3Packages.wrapPython intltool pkgconfig ];
diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix
index 5ebd01f38c413a864a14c0c39f10a02d22e1b072..d527279ab77571da1d54600bb1052cf4e530bdad 100644
--- a/pkgs/applications/networking/newsreaders/quiterss/default.nix
+++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "quiterss-${version}";
- version = "0.18.8";
+ version = "0.18.9";
src = fetchFromGitHub {
owner = "QuiteRSS";
repo = "quiterss";
rev = "${version}";
- sha256 = "09mdxpv04zycrip1p5w6947348xfraicijddvxsr7d498r59b7ff";
+ sha256 = "0n2rgzyxw6m29i8m8agri3cp5dbpjblhhyklvxsyzmkksnsxpw58";
};
nativeBuildInputs = [ pkgconfig qmake ];
diff --git a/pkgs/applications/networking/ostinato/default.nix b/pkgs/applications/networking/ostinato/default.nix
index 41e64d7b721fd8c58b42eb9522d814a2c17f585e..f2b7a4a4e999338575bb90604ce25930f0e53a0c 100644
--- a/pkgs/applications/networking/ostinato/default.nix
+++ b/pkgs/applications/networking/ostinato/default.nix
@@ -54,6 +54,10 @@ stdenv.mkDerivation rec {
EOF
'';
+ # `cd common; qmake ostproto.pro; make pdmlreader.o`:
+ # pdmlprotocol.h:23:25: fatal error: protocol.pb.h: No such file or directory
+ enableParallelBuilding = false;
+
meta = with stdenv.lib; {
description = "A packet traffic generator and analyzer";
homepage = http://ostinato.org;
diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix
index 7f8594b8bbb1c4707beb3ff32451c21da8b3dad8..c6e5d0f3cb31e54d9a0f7bf06873f23034969da7 100644
--- a/pkgs/applications/networking/p2p/deluge/default.nix
+++ b/pkgs/applications/networking/p2p/deluge/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, intltool, libtorrentRasterbar_1_0, pythonPackages }:
+{ stdenv, fetchurl, intltool, libtorrentRasterbar, pythonPackages }:
pythonPackages.buildPythonPackage rec {
name = "deluge-${version}";
version = "1.3.15";
@@ -9,7 +9,7 @@ pythonPackages.buildPythonPackage rec {
};
propagatedBuildInputs = with pythonPackages; [
- pyGtkGlade libtorrentRasterbar_1_0 twisted Mako chardet pyxdg pyopenssl service-identity
+ pyGtkGlade libtorrentRasterbar twisted Mako chardet pyxdg pyopenssl service-identity
];
nativeBuildInputs = [ intltool ];
diff --git a/pkgs/applications/networking/p2p/ncdc/default.nix b/pkgs/applications/networking/p2p/ncdc/default.nix
index 6d204de9ac438f80f7e72c8d99e5d25b0382d779..400600751a2e284d162208819a7b2e0b7b331136 100644
--- a/pkgs/applications/networking/p2p/ncdc/default.nix
+++ b/pkgs/applications/networking/p2p/ncdc/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Modern and lightweight direct connect client with a friendly ncurses interface";
- homepage = http://dev.yorhel.nl/ncdc;
+ homepage = https://dev.yorhel.nl/ncdc;
license = licenses.mit;
platforms = platforms.linux; # arbitrary
maintainers = with maintainers; [ ehmry ];
diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix
index 1cf6db21bedb0a5119a38f13c9ae50f04848a0b5..59c48c0a3d3aa701254e8db60d080de6cf4ca757 100644
--- a/pkgs/applications/networking/p2p/qbittorrent/default.nix
+++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix
@@ -10,11 +10,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "qbittorrent-${version}";
- version = "4.0.1";
+ version = "4.0.3";
src = fetchurl {
url = "mirror://sourceforge/qbittorrent/${name}.tar.xz";
- sha256 = "0khy875ahh9rlk8lyfpwsbxjsbp7i1cwqvd1j1s4cqc812szh3z3";
+ sha256 = "1lkbrvpzdfbqwilj09a9vraai7pz6dh999w4vl51mj1adm7bh0ws";
};
nativeBuildInputs = [ pkgconfig which ];
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Free Software alternative to µtorrent";
- homepage = http://www.qbittorrent.org/;
+ homepage = https://www.qbittorrent.org/;
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ viric ];
diff --git a/pkgs/applications/networking/p2p/transgui/default.nix b/pkgs/applications/networking/p2p/transgui/default.nix
index a33f85551f3d85b4281fed20677de6319da13410..f047b630ec409ee7a11a45898d960a570a5a94f0 100644
--- a/pkgs/applications/networking/p2p/transgui/default.nix
+++ b/pkgs/applications/networking/p2p/transgui/default.nix
@@ -3,12 +3,12 @@ libX11, glib, gtk2, gdk_pixbuf, pango, atk, cairo, openssl }:
stdenv.mkDerivation rec {
name = "transgui-5.0.1-svn-r${revision}";
- revision = "986";
+ revision = "988";
src = fetchsvn {
url = "https://svn.code.sf.net/p/transgui/code/trunk/";
rev = revision;
- sha256 = "0z83hvlhllm6p1z4gkcfi1x3akgn2xkssnfhwp74qynb0n5362pi";
+ sha256 = "1i6ysxs6d2wsmqi6ha10rl3n562brmhizlanhcfad04i53y8pyxf";
};
nativeBuildInputs = [ pkgconfig ];
@@ -27,6 +27,10 @@ stdenv.mkDerivation rec {
substituteInPlace restranslator.pas --replace /usr/ $out/
'';
+ patches = [
+ ./r988-compile-fix.patch
+ ];
+
makeFlags = [
"FPC=fpc"
"PP=fpc"
diff --git a/pkgs/applications/networking/p2p/transgui/r988-compile-fix.patch b/pkgs/applications/networking/p2p/transgui/r988-compile-fix.patch
new file mode 100644
index 0000000000000000000000000000000000000000..4b070d0cbe8a348404a20196b27dceac02888900
--- /dev/null
+++ b/pkgs/applications/networking/p2p/transgui/r988-compile-fix.patch
@@ -0,0 +1,22 @@
+diff --git a/utils.pas b/utils.pas
+index eb8b828..1ff2440 100644
+--- a/utils.pas
++++ b/utils.pas
+@@ -100,7 +100,7 @@ uses
+ {$ifdef CALLSTACK}
+ lineinfo2,
+ {$endif CALLSTACK}
+- LazFileUtils, LazUtf8, StdCtrls, Graphics;
++ LazFileUtils, LazUtf8, StdCtrls, Graphics, FileUtil;
+
+ {$ifdef windows}
+ function FileOpenUTF8(Const FileName : string; Mode : Integer) : THandle;
+@@ -235,7 +235,7 @@ end;
+
+ function ParamStrUTF8(Param: Integer): utf8string;
+ begin
+- Result:=FileUtil.ParamStrUTF8(Param);
++ Result:=LazUtf8.ParamStrUTF8(Param);
+ end;
+
+ function ParamCount: integer;
diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix
index 9b448f86736d2bc8e213182f4889abf79e894106..d2bbef7f581f016096cdf52eea41fb8baa81bc11 100644
--- a/pkgs/applications/networking/p2p/transmission/default.nix
+++ b/pkgs/applications/networking/p2p/transmission/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, file, makeWrapper
+{ stdenv, fetchurl, pkgconfig, intltool, file, wrapGAppsHook
, openssl, curl, libevent, inotify-tools, systemd, zlib
, enableGTK3 ? false, gtk3
, enableSystemd ? stdenv.isLinux
@@ -20,9 +20,10 @@ stdenv.mkDerivation rec {
sha256 = "0pykmhi7pdmzq47glbj8i2im6iarp4wnj4l1pyvsrnba61f0939s";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ]
+ ++ optionals enableGTK3 [ wrapGAppsHook ];
buildInputs = [ intltool file openssl curl libevent zlib ]
- ++ optionals enableGTK3 [ gtk3 makeWrapper ]
+ ++ optionals enableGTK3 [ gtk3 ]
++ optionals enableSystemd [ systemd ]
++ optionals stdenv.isLinux [ inotify-tools ];
@@ -41,10 +42,8 @@ stdenv.mkDerivation rec {
++ optional enableSystemd "--with-systemd-daemon"
++ optional enableGTK3 "--with-gtk";
- preFixup = optionalString enableGTK3 /* gsettings schemas for file dialogues */ ''
+ preFixup = optionalString enableGTK3 ''
rm "$out/share/icons/hicolor/icon-theme.cache"
- wrapProgram "$out/bin/transmission-gtk" \
- --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
'';
NIX_LDFLAGS = optionalString stdenv.isDarwin "-framework CoreFoundation";
diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix
index 9d26a74f8bb1b65e3c48f17a17c66d51557d3c90..d8e0c76dc490788d439e41967c86b4429f08acdf 100644
--- a/pkgs/applications/networking/p2p/tribler/default.nix
+++ b/pkgs/applications/networking/p2p/tribler/default.nix
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
maintainers = with maintainers; [ xvapx ];
- homepage = http://www.tribler.org/;
+ homepage = https://www.tribler.org/;
description = "A completely decentralised P2P filesharing client based on the Bittorrent protocol";
license = licenses.lgpl21;
platforms = platforms.linux;
diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix
index bceabc2a64a915bdbd5a960c21f42c1a39cbec74..b432872302782d5cac14e71874c12899ab9e5581 100644
--- a/pkgs/applications/networking/pjsip/default.nix
+++ b/pkgs/applications/networking/pjsip/default.nix
@@ -2,15 +2,19 @@
stdenv.mkDerivation rec {
name = "pjsip-${version}";
- version = "2.6";
+ version = "2.7.1";
src = fetchurl {
url = "http://www.pjsip.org/release/${version}/pjproject-${version}.tar.bz2";
- sha256 = "1d67c58jn22f7h6smkykk5vwl3sqpc7xi2vm3j3lbn3lq6hisnig";
+ sha256 = "09ii5hgl5s7grx4fiimcl3s77i385h7b3kwpfa2q0arbl1ibryjr";
};
buildInputs = [ openssl libsamplerate alsaLib ];
+ preConfigure = ''
+ export LD=$CC
+ '';
+
postInstall = ''
mkdir -p $out/bin
cp pjsip-apps/bin/pjsua-* $out/bin/pjsua
@@ -25,7 +29,7 @@ stdenv.mkDerivation rec {
description = "A multimedia communication library written in C, implementing standard based protocols such as SIP, SDP, RTP, STUN, TURN, and ICE";
homepage = http://pjsip.org/;
license = stdenv.lib.licenses.gpl2Plus;
- maintainers = with stdenv.lib.maintainers; [viric];
+ maintainers = with stdenv.lib.maintainers; [viric olynch];
platforms = with stdenv.lib.platforms; linux;
};
}
diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix
index f6be80e4a1d4d23ded6a4db206833b11c6ef0632..6f87e55e8ea3a1a62731dc3f3f229acdd0f45ff4 100644
--- a/pkgs/applications/networking/remote/citrix-receiver/default.nix
+++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix
@@ -67,9 +67,20 @@ let
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";
+ homepage = https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-137.html;
+ };
+
+ "13.8.0" = {
+ major = "13";
+ minor = "8";
+ patch = "0";
+ x64hash = "FDF5991CCD52B2B98289D7B2FB46D492D3E4032846D4AFA52CAA0F8AC0578931";
+ x86hash = "E0CFB43312BF79F753514B11F7B8DE4529823AE4C92D1B01E8A2C34F26AC57E7";
+ x64suffix = "10299729";
+ x86suffix = "10299729";
+ homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html;
};
};
diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix
index 31e1a860ac98dab308b44960e28c13009671250b..59ae225210ca6ce4897947c52e07e16ef48d8d93 100644
--- a/pkgs/applications/networking/remote/freerdp/default.nix
+++ b/pkgs/applications/networking/remote/freerdp/default.nix
@@ -13,14 +13,14 @@
}:
stdenv.mkDerivation rec {
- name = "freerdp-git-${version}";
- version = "20170724";
+ name = "freerdp-${version}";
+ version = "2.0.0-rc1";
src = fetchFromGitHub {
owner = "FreeRDP";
repo = "FreeRDP";
- rev = "2.0.0-rc0";
- sha256 = "0ngwdy0lfv2k59z1z8yq1wj5zbhqigpyfqbgh38m9p35yzh33lv1";
+ rev = version;
+ sha256 = "0m28n3mq3ax0j6j3ai4pnlx3shg2ap0md0bxlqkhfv6civ9r11nn";
};
# outputs = [ "bin" "out" "dev" ];
@@ -46,17 +46,19 @@ stdenv.mkDerivation rec {
cmake pkgconfig
];
+ enableParallelBuilding = true;
+
doCheck = false;
cmakeFlags = with lib; [
"-DCMAKE_INSTALL_LIBDIR=lib"
"-DWITH_CUNIT=OFF"
"-DWITH_OSS=OFF"
- ] ++ optional (libpulseaudio != null) "-DWITH_PULSE=ON"
- ++ optional (cups != null) "-DWITH_CUPS=ON"
- ++ optional (pcsclite != null) "-DWITH_PCSC=ON"
- ++ optional buildServer "-DWITH_SERVER=ON"
- ++ optional optimize "-DWITH_SSE2=ON";
+ ] ++ optional (libpulseaudio != null) "-DWITH_PULSE=ON"
+ ++ optional (cups != null) "-DWITH_CUPS=ON"
+ ++ optional (pcsclite != null) "-DWITH_PCSC=ON"
+ ++ optional buildServer "-DWITH_SERVER=ON"
+ ++ optional (optimize && stdenv.isx86_64) "-DWITH_SSE2=ON";
meta = with lib; {
description = "A Remote Desktop Protocol Client";
diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix
index 5cbee68551e5c8cd3d26750c52f48963da5af300..959608b04f5cd2f7b31ba9f326db494d937c8513 100644
--- a/pkgs/applications/networking/remote/remmina/default.nix
+++ b/pkgs/applications/networking/remote/remmina/default.nix
@@ -10,7 +10,7 @@
}:
let
- version = "1.2.0-rcgit.17";
+ version = "1.2.0-rcgit.24";
desktopItem = makeDesktopItem {
name = "remmina";
@@ -29,7 +29,7 @@ in stdenv.mkDerivation {
owner = "FreeRDP";
repo = "Remmina";
rev = "v${version}";
- sha256 = "1vfg8sfpj83ircp7ny6xsbn2ba5xbp3xrdl5wwyfcg1zrpdmi7f1";
+ sha256 = "1x7kygl9a5nh7rf2gfrk0wwv23mbw7rrjms402l3zp1w53hrhwmg";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix
index d002b51625c639d559697d47d52001ff505cd92f..4ff649dbf2a09f1be1e511ecb522915cfe739bc0 100644
--- a/pkgs/applications/networking/remote/teamviewer/default.nix
+++ b/pkgs/applications/networking/remote/teamviewer/default.nix
@@ -4,7 +4,7 @@ let
ld32 =
if stdenv.system == "i686-linux" then "${stdenv.cc}/nix-support/dynamic-linker"
else if stdenv.system == "x86_64-linux" then "${stdenv.cc}/nix-support/dynamic-linker-m32"
- else abort "Unsupported architecture";
+ else throw "Unsupported system ${stdenv.system}";
ld64 = "${stdenv.cc}/nix-support/dynamic-linker";
mkLdPath = ps: lib.makeLibraryPath (with ps; [ qt4 dbus alsaLib ]);
diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix
index 7622cb76ad2afad60f21e62fd8a7ca23a88d0585..5e94106a48f11e898d65141d24e0141440205d4e 100644
--- a/pkgs/applications/networking/resilio-sync/default.nix
+++ b/pkgs/applications/networking/resilio-sync/default.nix
@@ -4,7 +4,7 @@ let
arch = {
"x86_64-linux" = "x64";
"i686-linux" = "i386";
- }.${stdenv.system};
+ }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ];
in stdenv.mkDerivation rec {
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index 2ed87c71a90600c4f6d90621992a38d35311cc4e..f91c0de9c8d77de2d3550fdd4072535f2966f4e4 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.2";
+ version = "2.4.3";
variant = if withGtk then "gtk" else if withQt then "qt" else "cli";
in stdenv.mkDerivation {
@@ -20,10 +20,13 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
- sha256 = "0zglapd3sz08p2z9x8a5va3jnz17b3n5a1bskf7f2dgx6m3v5b6i";
+ sha256 = "0bpiby916k3k8bm7q8b1dflva6zs0a4ircskrck0d538dfcrb50q";
};
- cmakeFlags = optional withGtk "-DBUILD_wireshark_gtk=TRUE";
+ cmakeFlags = [
+ "-DBUILD_wireshark_gtk=${if withGtk then "ON" else "OFF"}"
+ "-DBUILD_wireshark=${if withQt then "ON" else "OFF"}"
+ ];
nativeBuildInputs = [
bison cmake extra-cmake-modules flex pkgconfig
diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix
index ad51703bd6fed507ba1960ff3d8f4ddc95af5067..71df7a0fb1e76b4f925361dd2aac1e36fae01418 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.38";
+ version = "1.39";
goPackagePath = "github.com/ncw/rclone";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "ncw";
repo = "rclone";
rev = "v${version}";
- sha256 = "0f56qm4lz55anzqf6dmjfywmvqy10zi5cl69zz8lda8lmvrpjm1d";
+ sha256 = "1x9qxhqkbyd7kd52ai9p996ppslh73xarn5w4ljaa97wwm5vwwsg";
};
outputs = [ "bin" "out" "man" ];
diff --git a/pkgs/applications/networking/sync/rsync/base.nix b/pkgs/applications/networking/sync/rsync/base.nix
index a95835610d52dc10bbc013bee31814162e94dedf..69613c489e1eaf9a089211802311944bf3e9171c 100644
--- a/pkgs/applications/networking/sync/rsync/base.nix
+++ b/pkgs/applications/networking/sync/rsync/base.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, fetchpatch }:
rec {
version = "3.1.2";
@@ -7,11 +7,33 @@ rec {
url = "mirror://samba/rsync/src/rsync-${version}.tar.gz";
sha256 = "1hm1q04hz15509f0p9bflw4d6jzfvpm1d36dxjwihk1wzakn5ypc";
};
- patches = fetchurl {
- # signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5
- url = "mirror://samba/rsync/rsync-patches-${version}.tar.gz";
- sha256 = "09i3dcl37p22dp75vlnsvx7bm05ggafnrf1zwhf2kbij4ngvxvpd";
- };
+ patches = [
+ (fetchurl {
+ # signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5
+ url = "mirror://samba/rsync/rsync-patches-${version}.tar.gz";
+ sha256 = "09i3dcl37p22dp75vlnsvx7bm05ggafnrf1zwhf2kbij4ngvxvpd";
+ })
+ (fetchpatch {
+ name = "CVE-2017-16548.patch";
+ url = "https://git.samba.org/rsync.git/?p=rsync.git;a=commitdiff_plain;h=47a63d90e71d3e19e0e96052bb8c6b9cb140ecc1;hp=bc112b0e7feece62ce98708092306639a8a53cce";
+ sha256 = "1dcdnfhbc5gd0ph7pds0xr2v8rpb2a4p7l9c1wml96nhnyww1pg1";
+ })
+ (fetchpatch {
+ name = "CVE-2017-17433.patch";
+ url = "https://git.samba.org/?p=rsync.git;a=patch;h=3e06d40029cfdce9d0f73d87cfd4edaf54be9c51";
+ sha256 = "1kvnh6znp37a447h9fm2pk7v4phx20bk60j4wbsd92xlpp7vck52";
+ })
+ (fetchpatch {
+ name = "CVE-2017-17434-patch1.patch";
+ url = "https://git.samba.org/?p=rsync.git;a=patch;h=5509597decdbd7b91994210f700329d8a35e70a1";
+ sha256 = "16gg670s6b4gn3fywkkagixkpkpf31a3fiqx2a544640pblbgvyx";
+ })
+ (fetchpatch {
+ name = "CVE-2017-17434-patch2.patch";
+ url = "https://git.samba.org/?p=rsync.git;a=patch;h=70aeb5fddd1b2f8e143276f8d5a085db16c593b9";
+ sha256 = "182pc5bk1i57ganyn51bcs6vi2fib7zcw4kz3iyqkzihnjds10a6";
+ })
+ ];
meta = with stdenv.lib; {
homepage = http://rsync.samba.org/;
diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix
index 1f5e9601ff22d04a5d95e30f5b78f5fe31d3238b..8c66e41f4cd2b7bc3b2e0378b7226c28f3be6f14 100644
--- a/pkgs/applications/networking/sync/rsync/default.nix
+++ b/pkgs/applications/networking/sync/rsync/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, libiconv, zlib, popt
+{ stdenv, fetchurl, fetchpatch, perl, libiconv, zlib, popt
, enableACLs ? true, acl ? null
, enableCopyDevicesPatch ? false
}:
@@ -6,7 +6,7 @@
assert enableACLs -> acl != null;
let
- base = import ./base.nix { inherit stdenv fetchurl; };
+ base = import ./base.nix { inherit stdenv fetchurl fetchpatch; };
in
stdenv.mkDerivation rec {
name = "rsync-${base.version}";
diff --git a/pkgs/applications/networking/sync/rsync/rrsync.nix b/pkgs/applications/networking/sync/rsync/rrsync.nix
index 7563b0ea1950ff8615a9d7eb1c209987de6f180d..bc2a6eb9c3cb658c49e0b314f06d558648357203 100644
--- a/pkgs/applications/networking/sync/rsync/rrsync.nix
+++ b/pkgs/applications/networking/sync/rsync/rrsync.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, perl, rsync }:
+{ stdenv, fetchurl, fetchpatch, perl, rsync }:
let
- base = import ./base.nix { inherit stdenv fetchurl; };
+ base = import ./base.nix { inherit stdenv fetchurl fetchpatch; };
in
stdenv.mkDerivation rec {
name = "rrsync-${base.version}";
diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..80ad1a43332a33312b8ff2c87c8146fd57774da1
--- /dev/null
+++ b/pkgs/applications/networking/syncplay/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, python2Packages }:
+
+python2Packages.buildPythonApplication rec {
+ name = "syncplay-${version}";
+ version = "1.5.0";
+
+ format = "other";
+
+ src = fetchurl {
+ url = https://github.com/Syncplay/syncplay/archive/v1.5.0.tar.gz;
+ sha256 = "762e6318588e14aa02b1340baa18510e7de87771c62ca5b44d985b6d1289964d";
+ };
+
+ propagatedBuildInputs = with python2Packages; [ pyside twisted ];
+
+ makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
+
+ postInstall = ''
+ mkdir -p $out/lib/python2.7/site-packages
+ mv $out/lib/syncplay/syncplay $out/lib/python2.7/site-packages/
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = http://syncplay.pl/;
+ description = "Free software that synchronises media players";
+ license = licenses.asl20;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ enzime ];
+ };
+}
diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index ecdecd07eeb9d2870bcbf0979493aa4f5b000fc3..953febf67a861e615ab8ea58f905ca1672cf5a30 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.40";
+ version = "0.14.42";
name = "syncthing-${version}";
src = fetchFromGitHub {
owner = "syncthing";
repo = "syncthing";
rev = "v${version}";
- sha256 = "0fd4k09sb91d1bjqj2v1fh7raq98fdw45aaa58kramwhidsf9sy5";
+ sha256 = "1n3favv94wj1fr7x9av523fgm12b0kjlrmifa25wg2p6z10vwbqf";
};
buildInputs = [ go removeReferencesTo ];
diff --git a/pkgs/applications/networking/syncthing012/default.nix b/pkgs/applications/networking/syncthing012/default.nix
index 4b5359555f4adf758d072b200297893a2bbf3646..cd6fcc28a50a1cc34ce7d4c02e3faaa5401010ab 100644
--- a/pkgs/applications/networking/syncthing012/default.nix
+++ b/pkgs/applications/networking/syncthing012/default.nix
@@ -24,4 +24,12 @@ buildGoPackage rec {
preBuild = ''
export buildFlagsArray+=("-tags" "noupgrade release")
'';
+
+ meta = {
+ knownVulnerabilities = [ "CVE-2017-1000420" ];
+ homepage = https://www.syncthing.net/;
+ description = "Open Source Continuous File Synchronization";
+ license = stdenv.lib.licenses.mpl20;
+ platforms = with stdenv.lib.platforms; linux ++ freebsd ++ openbsd ++ netbsd;
+ };
}
diff --git a/pkgs/applications/networking/syncthing013/default.nix b/pkgs/applications/networking/syncthing013/default.nix
index b6d318011aa18179e9e19d0fb38a6b1069fe05f2..e1a0dc38c11f78a9b6930e6eb5ed6dfc89a4e451 100644
--- a/pkgs/applications/networking/syncthing013/default.nix
+++ b/pkgs/applications/networking/syncthing013/default.nix
@@ -29,6 +29,7 @@ stdenv.mkDerivation rec {
'';
meta = {
+ knownVulnerabilities = [ "CVE-2017-1000420" ];
homepage = https://www.syncthing.net/;
description = "Open Source Continuous File Synchronization";
license = stdenv.lib.licenses.mpl20;
diff --git a/pkgs/applications/networking/testssl/default.nix b/pkgs/applications/networking/testssl/default.nix
index dc7c961856d635ecb13f68060e688007eb62c2bc..50ebee4a0ce530ea4e62c0dff6858c855385107e 100644
--- a/pkgs/applications/networking/testssl/default.nix
+++ b/pkgs/applications/networking/testssl/default.nix
@@ -1,7 +1,11 @@
{ stdenv, fetchFromGitHub, pkgs }:
-stdenv.mkDerivation rec {
+let
version = "2.9.5-1";
+ pwdBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ coreutils ])}/pwd";
+ opensslBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ openssl ])}/openssl";
+
+in stdenv.mkDerivation rec {
name = "testssl.sh-${version}";
src = fetchFromGitHub {
@@ -17,8 +21,6 @@ stdenv.mkDerivation rec {
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" \
diff --git a/pkgs/applications/office/calligra/2.nix b/pkgs/applications/office/calligra/2.nix
deleted file mode 100644
index 959a44a35c102ea15c5f62acb96bb47cce01bf6c..0000000000000000000000000000000000000000
--- a/pkgs/applications/office/calligra/2.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ 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 bec19d675cb0adfb2caaa018aec2b96e19d06257..1537dd9b03ff628190fefa6fbb3ac149a8ec78c1 100644
--- a/pkgs/applications/office/calligra/default.nix
+++ b/pkgs/applications/office/calligra/default.nix
@@ -1,5 +1,5 @@
{
- mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools, makeWrapper,
+ mkDerivation, lib, fetchurl, fetchpatch, 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,
@@ -23,6 +23,16 @@ mkDerivation rec {
sha256 = "1cjdd7sx1zhas6lhw0dzhrnki790jkf93f88wn6z9yrww32dsas5";
};
+ enableParallelBuilding = true;
+
+ patches = [
+ (fetchpatch {
+ name = "calligra-build-with-newer-kcalcore.patch";
+ url = "https://github.com/KDE/calligra/commit/9a02a545e8606aa91aff2038da137226a9432e1a.diff";
+ sha256 = "08xays41v6rfnc31vixf4vbz8zmi2x5lfnk7f82bm4sgmpgfxwa0";
+ })
+ ];
+
nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
buildInputs = [
diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix
index 3632138a0221b80e0c6a7c86809b994beda7c1e2..60c8b0280a14aff2ea17cc6f276d400245be93b1 100644
--- a/pkgs/applications/office/gnumeric/default.nix
+++ b/pkgs/applications/office/gnumeric/default.nix
@@ -9,11 +9,11 @@ let
isonum = fetchurl { url = http://www.oasis-open.org/docbook/xml/4.5/ent/isonum.ent; sha256 = "04b62dw2g3cj9i4vn9xyrsrlz8fpmmijq98dm0nrkky31bwbbrs3"; };
isogrk1 = fetchurl { url = http://www.oasis-open.org/docbook/xml/4.5/ent/isogrk1.ent; sha256 = "04b23anhs5wr62n4rgsjirzvw7rpjcsf8smz4ffzaqh3b0vw90vm"; };
in stdenv.mkDerivation rec {
- name = "gnumeric-1.12.36";
+ name = "gnumeric-1.12.38";
src = fetchurl {
url = "mirror://gnome/sources/gnumeric/1.12/${name}.tar.xz";
- sha256 = "3cbfe25f26bd31b832efed2827ac35c3c1600bed9ccd233a4037a9f4d7c54848";
+ sha256 = "3435d7d93a47a32764b1ec2d03f7fbb348a97af52530815e49370803a1a69c65";
};
configureFlags = "--disable-component";
diff --git a/pkgs/applications/office/kexi/default.nix b/pkgs/applications/office/kexi/default.nix
index 66aee6bd96280af5dd98422f96490813b52577c4..8463703c01791b518907e5683ea2f864c5901cd4 100644
--- a/pkgs/applications/office/kexi/default.nix
+++ b/pkgs/applications/office/kexi/default.nix
@@ -4,7 +4,7 @@
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
+ kdb, kproperty, kreport, lcms2, mysql, marble, postgresql
}:
mkDerivation rec {
@@ -24,7 +24,7 @@ mkDerivation rec {
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
+ kdb kproperty kreport lcms2 mysql.connector-c marble postgresql
];
propagatedUserEnvPkgs = [ kproperty ];
diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix
index 2d66fe4b309ec832454c4df64a57e0af6e1603cc..bb6e529f5d29970463bf95fc825093fe08ccda3f 100644
--- a/pkgs/applications/office/ledger/default.nix
+++ b/pkgs/applications/office/ledger/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- homepage = http://ledger-cli.org/;
+ homepage = https://ledger-cli.org/;
description = "A double-entry accounting system with a command-line reporting interface";
license = licenses.bsd3;
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 830ae68fd1b98042b732d59631ddece4ebd18b28..cd59f78b6c67b074f14125d11c86a12b751e2e5e 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -11,7 +11,7 @@
, fontsConf, pkgconfig, libzip, bluez5, libtool, maven
, libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf
, librevenge, libe-book, libmwaw, glm, glew, gst_all_1
-, gdb, commonsLogging, librdf_rasqal, makeWrapper, gsettings_desktop_schemas
+, gdb, commonsLogging, librdf_rasqal, wrapGAppsHook
, defaultIconTheme, glib, ncurses, xmlsec, epoxy, gpgme
, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" "hu" "it" ]
, withHelp ? true
@@ -166,10 +166,6 @@ in stdenv.mkDerivation rec {
for a in sbase scalc sdraw smath swriter simpress soffice; do
ln -s $out/lib/libreoffice/program/$a $out/bin/$a
- wrapProgram "$out/bin/$a" \
- --prefix XDG_DATA_DIRS : \
- "$out/share:$GSETTINGS_SCHEMAS_PATH" \
- ;
done
ln -s $out/bin/soffice $out/bin/libreoffice
@@ -252,16 +248,17 @@ in stdenv.mkDerivation rec {
libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
libXaw libXext libXi libXinerama libxml2 libxslt libXtst
libXdmcp libpthreadstubs mesa mythes gst_all_1.gstreamer
- gst_all_1.gst-plugins-base gsettings_desktop_schemas glib
+ gst_all_1.gst-plugins-base glib
neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler
python3 sablotron sane-backends unzip vigra which zip zlib
mdds bluez5 glibc libcmis libwps libabw libzmf libtool
libxshmfence libatomic_ops graphite2 harfbuzz gpgme
librevenge libe-book libmwaw glm glew ncurses xmlsec epoxy
- libodfgen CoinMP librdf_rasqal defaultIconTheme makeWrapper
+ libodfgen CoinMP librdf_rasqal defaultIconTheme
gdb
]
++ lib.optional kdeIntegration kdelibs4;
+ nativeBuildInputs = [ wrapGAppsHook ];
passthru = {
inherit srcs;
diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix
index a3991b8b35c1ff5b65800f8dcb445da2431b8fd6..679afaa2dce5199ee60b40235d24585dfbb39a1d 100644
--- a/pkgs/applications/office/libreoffice/still.nix
+++ b/pkgs/applications/office/libreoffice/still.nix
@@ -6,16 +6,15 @@
, openssl, gperf, cppunit, GConf, ORBit2, poppler
, librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw, libzmf
, autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
-, libwpg, dbus_glib, glibc, qt4, kdelibs4, clucene_core, libcdr, lcms, vigra
+, libwpg, dbus_glib, glibc, qt4, clucene_core, libcdr, lcms, vigra
, unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
, fontsConf, pkgconfig, libzip, bluez5, libtool, maven
, libatomic_ops, graphite2, harfbuzz, libodfgen
, librevenge, libe-book, libmwaw, glm, glew, gst_all_1
-, gdb, commonsLogging, librdf_rasqal, makeWrapper, gsettings_desktop_schemas
+, gdb, commonsLogging, librdf_rasqal, wrapGAppsHook
, defaultIconTheme, glib, ncurses
, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" "hu" "it" ]
, withHelp ? true
-, kdeIntegration ? false
}:
let
@@ -162,10 +161,6 @@ in stdenv.mkDerivation rec {
for a in sbase scalc sdraw smath swriter simpress soffice; do
ln -s $out/lib/libreoffice/program/$a $out/bin/$a
- wrapProgram "$out/bin/$a" \
- --prefix XDG_DATA_DIRS : \
- "$out/share:$GSETTINGS_SCHEMAS_PATH" \
- ;
done
ln -s $out/bin/soffice $out/bin/libreoffice
@@ -191,7 +186,6 @@ in stdenv.mkDerivation rec {
"--disable-report-builder"
"--enable-python=system"
"--enable-dbus"
- (lib.enableFeature kdeIntegration "kde4")
"--with-package-format=installed"
"--enable-epm"
"--with-jdk-home=${jdk.home}"
@@ -247,15 +241,15 @@ in stdenv.mkDerivation rec {
libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
libXaw libXext libXi libXinerama libxml2 libxslt libXtst
libXdmcp libpthreadstubs mesa mythes gst_all_1.gstreamer
- gst_all_1.gst-plugins-base gsettings_desktop_schemas glib
+ gst_all_1.gst-plugins-base glib
neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler
python3 sablotron sane-backends unzip vigra which zip zlib
mdds bluez5 glibc libcmis libwps libabw libzmf
libxshmfence libatomic_ops graphite2 harfbuzz
librevenge libe-book libmwaw glm glew ncurses
- libodfgen CoinMP librdf_rasqal defaultIconTheme makeWrapper
- ]
- ++ lib.optional kdeIntegration kdelibs4;
+ libodfgen CoinMP librdf_rasqal defaultIconTheme
+ ];
+ nativeBuildInputs = [ wrapGAppsHook ];
passthru = {
inherit srcs;
diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix
index b78eaa9fd3f321bec264f89c9f883054e70456d8..c2b6dc710ba2bdc7ebd401359167745359863529 100644
--- a/pkgs/applications/office/mendeley/default.nix
+++ b/pkgs/applications/office/mendeley/default.nix
@@ -15,7 +15,13 @@
, orc
, nss
, nspr
-, qt5
+, qtbase
+, qtsvg
+, qtdeclarative
+, qtwebchannel
+, qtquickcontrols
+, qtwebkit
+, qtwebengine
, sqlite
, xorg
, xlibs
@@ -47,13 +53,13 @@ let
else "11z65mj1a2rw6cwfarl8r1vzpcz4ww5mgvd5fyv31l60mbmnqkap";
deps = [
- qt5.qtbase
- qt5.qtsvg
- qt5.qtdeclarative
- qt5.qtwebchannel
- qt5.qtquickcontrols
- qt5.qtwebkit
- qt5.qtwebengine
+ qtbase
+ qtsvg
+ qtdeclarative
+ qtwebchannel
+ qtquickcontrols
+ qtwebkit
+ qtwebengine
alsaLib
dbus
freetype
@@ -96,6 +102,8 @@ stdenv.mkDerivation {
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ dpkg which ] ++ deps;
+ propagatedUserEnvPkgs = [ gconf ];
+
unpackPhase = "true";
installPhase = ''
diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/applications/office/mmex/default.nix
index 30b8809f2247e02749c405e105632c1a04cdd45c..3ddca8fe76208fa07ce7bfa4a757a79aa818a6dd 100644
--- a/pkgs/applications/office/mmex/default.nix
+++ b/pkgs/applications/office/mmex/default.nix
@@ -17,7 +17,7 @@ in
meta = {
description = "Easy-to-use personal finance software";
- homepage = http://www.moneymanagerex.org/;
+ homepage = https://www.moneymanagerex.org/;
license = stdenv.lib.licenses.gpl2Plus;
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/applications/office/mytetra/default.nix b/pkgs/applications/office/mytetra/default.nix
index 9f54f2df6bf2e2f532b461f881a6c1d45a48eb18..b752f552ba97d81c0369721268e2eebcdea13d85 100644
--- a/pkgs/applications/office/mytetra/default.nix
+++ b/pkgs/applications/office/mytetra/default.nix
@@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Smart manager for information collecting";
- homepage = http://webhamster.ru/site/page/index/articles/projectcode/138;
+ homepage = https://webhamster.ru/site/page/index/articles/projectcode/138;
license = licenses.gpl3;
maintainers = [ maintainers.gnidorah ];
platforms = platforms.linux;
diff --git a/pkgs/applications/office/osmo/default.nix b/pkgs/applications/office/osmo/default.nix
index 23ee4da8e015e214a94cae076b50c82605bf5400..b5475ae337a3a9afd86ab97f375989ed07d03d51 100644
--- a/pkgs/applications/office/osmo/default.nix
+++ b/pkgs/applications/office/osmo/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "osmo-${version}";
- version = "0.4.0-1";
+ version = "0.4.2";
src = fetchurl {
url = "mirror://sourceforge/osmo-pim/${name}.tar.gz";
- sha256 = "fb454718e071c44bd360ce3e56cb29926cbf44a0d06ec738fa9b40fe3cbf8a33";
+ sha256 = "1gjd4w9jckfpqr9n0bw0w25h3qhfyzw1xvilh3hqdadfinwyal2v";
};
nativeBuildInputs = [ pkgconfig gettext wrapGAppsHook ];
diff --git a/pkgs/applications/office/paperwork/backend.nix b/pkgs/applications/office/paperwork/backend.nix
index 2e052243a052afd3034bd5c213d120805c626b5b..9e17d807fb14cdd51e363a04ae2de4eb1b72642a 100644
--- a/pkgs/applications/office/paperwork/backend.nix
+++ b/pkgs/applications/office/paperwork/backend.nix
@@ -10,13 +10,13 @@
buildPythonPackage rec {
pname = "paperwork-backend";
- version = "1.2.1";
+ version = "1.2.2";
src = fetchFromGitHub {
owner = "openpaperwork";
repo = "paperwork-backend";
rev = version;
- sha256 = "1lrawibm6jnykj1bkrl8196kcxrhndzp7r0brdrb4hs54gql7j5x";
+ sha256 = "1rvf06vphm32601ja1bfkfkfpgjxiv0lh4yxjy31jll0bfnsf7pf";
};
# Python 2.x is not supported.
diff --git a/pkgs/applications/office/paperwork/default.nix b/pkgs/applications/office/paperwork/default.nix
index f0592aa0e68797ffe7ba85db639289eb945e9714..953499c21b91ef17b273f9b195239e25c2dd039f 100644
--- a/pkgs/applications/office/paperwork/default.nix
+++ b/pkgs/applications/office/paperwork/default.nix
@@ -7,13 +7,13 @@
python3Packages.buildPythonApplication rec {
name = "paperwork-${version}";
# Don't forget to also update paperwork-backend when updating this!
- version = "1.2.1";
+ version = "1.2.2";
src = fetchFromGitHub {
repo = "paperwork";
owner = "openpaperwork";
rev = version;
- sha256 = "0lqnq74hdjj778j2k0syibwy4i37l8w932gmibs8617s4yi34rxz";
+ sha256 = "1nb5sna2s952xb7c89qccg9qp693pyqj8g7xz16ll16ydfqnzsdk";
};
# Patch out a few paths that assume that we're using the FHS:
diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix
index f88cc1470981c058677b1803d9ff3c6a6067bcae..1aaf05a123e12f98c1e7b26fbdaa78245fbf4ebb 100644
--- a/pkgs/applications/office/skrooge/default.nix
+++ b/pkgs/applications/office/skrooge/default.nix
@@ -14,9 +14,12 @@ mkDerivation rec {
sha256 = "1dbvdrkdpgv39v8h7k3mri0nzlslfyd5kk410czj0jdn4qq400md";
};
- nativeBuildInputs = [ cmake extra-cmake-modules shared_mime_info ];
+ nativeBuildInputs = [
+ cmake extra-cmake-modules kdoctools shared_mime_info
+ ];
- buildInputs = [ qtwebkit qtscript grantlee kxmlgui kwallet kparts kdoctools
+ buildInputs = [
+ qtwebkit qtscript grantlee kxmlgui kwallet kparts
kjobwidgets kdesignerplugin kiconthemes knewstuff sqlcipher qca-qt5
kactivities karchive kguiaddons knotifyconfig krunner kwindowsystem libofx
];
diff --git a/pkgs/applications/office/tagainijisho/default.nix b/pkgs/applications/office/tagainijisho/default.nix
index bd7d537a2c6e8e8e08e6d6fd0b72a0a9799d4881..24542041cc8746220a232efabf2789002288715a 100644
--- a/pkgs/applications/office/tagainijisho/default.nix
+++ b/pkgs/applications/office/tagainijisho/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "A free, open-source Japanese dictionary and kanji lookup tool";
- homepage = http://www.tagaini.net/;
+ homepage = https://www.tagaini.net/;
license = with licenses; [
/* program */ gpl3Plus
/* data */ cc-by-sa-30
diff --git a/pkgs/applications/office/tudu/default.nix b/pkgs/applications/office/tudu/default.nix
index 76ad47950c491c0d772279a2e31a029017b167b7..a957cd6eee684c8aa3f3306edc19aff624fc3984 100644
--- a/pkgs/applications/office/tudu/default.nix
+++ b/pkgs/applications/office/tudu/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "0.10";
src = fetchurl {
- url = "http://code.meskio.net/tudu/${name}.tar.gz";
+ url = "https://code.meskio.net/tudu/${name}.tar.gz";
sha256 = "0571wh5hn0hgadyx34zq1zi35pzd7vpwkavm7kzb9hwgn07443x4";
};
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
meta = {
description = "ncurses-based hierarchical todo list manager with vim-like keybindings";
- homepage = http://code.meskio.net/tudu/;
+ homepage = https://code.meskio.net/tudu/;
license = stdenv.lib.licenses.gpl3;
platforms = stdenv.lib.platforms.linux;
};
diff --git a/pkgs/applications/office/watson/default.nix b/pkgs/applications/office/watson/default.nix
index a1fcfd5de700d9806ea062c02740a16460d59602..e0f0c58b45063ef707ff00c9489bbc595d015227 100644
--- a/pkgs/applications/office/watson/default.nix
+++ b/pkgs/applications/office/watson/default.nix
@@ -1,13 +1,14 @@
-{ stdenv, pythonPackages }:
+{ stdenv, pythonPackages, fetchpatch }:
-pythonPackages.buildPythonApplication rec {
+with pythonPackages;
+
+buildPythonApplication rec {
pname = "td-watson";
- name = "${pname}-${version}";
- version = "1.4.0";
+ version = "1.5.2";
- src = pythonPackages.fetchPypi {
+ src = fetchPypi {
inherit version pname;
- sha256 = "1py0g4990jmvq0dn7jasda7f10kzr41bix46hnbyc1rshjzc17hq";
+ sha256 = "6e03d44a9278807fe5245e9ed0943f13ffb88e11249a02655c84cb86260b27c8";
};
# uses tox, test invocation fails
@@ -15,8 +16,16 @@ pythonPackages.buildPythonApplication rec {
checkPhase = ''
py.test -vs tests
'';
- checkInputs = with pythonPackages; [ py pytest pytest-datafiles mock pytest-mock pytestrunner ];
- propagatedBuildInputs = with pythonPackages; [ requests click arrow ];
+
+ patches = [
+ (fetchpatch {
+ url = https://github.com/TailorDev/Watson/commit/f5760c71cbc22de4e12ede8f6f7257515a9064d3.patch;
+ sha256 = "0s9h26915ilpbd0qhmvk77r3gmrsdrl5l7dqxj0l5q66fp0z6b0g";
+ })
+ ];
+
+ checkInputs = [ py pytest pytest-datafiles mock pytest-mock pytestrunner ];
+ propagatedBuildInputs = [ requests click arrow ];
meta = with stdenv.lib; {
homepage = https://tailordev.github.io/Watson/;
@@ -24,4 +33,4 @@ pythonPackages.buildPythonApplication rec {
license = licenses.mit;
maintainers = with maintainers; [ mguentner ] ;
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/office/wordgrinder/default.nix b/pkgs/applications/office/wordgrinder/default.nix
index 67f7e2816a48a8bd71b76153330ab9bb22d5c6d4..da096acc27fcce3599df453fe642828b8900dbd1 100644
--- a/pkgs/applications/office/wordgrinder/default.nix
+++ b/pkgs/applications/office/wordgrinder/default.nix
@@ -1,24 +1,32 @@
{ stdenv, fetchFromGitHub, pkgconfig, makeWrapper
-, lua52Packages, libXft, ncurses, readline, zlib }:
+, lua52Packages, libXft, ncurses, ninja, readline, zlib }:
stdenv.mkDerivation rec {
name = "wordgrinder-${version}";
- version = "0.6-db14181";
+ version = "0.7.1";
src = fetchFromGitHub {
repo = "wordgrinder";
owner = "davidgiven";
- rev = "db141815e8bd1da6e684a1142a59492e516f3041";
- sha256 = "1l1jqzcqiwnc8r1igfi7ay4pzzhdhss81znnmfr4rc1ia8bpdjc2";
+ rev = "${version}";
+ sha256 = "19n4vn8zyvcvgwygm63d3jcmiwh6a2ikrrqqmkm8fvhdvwkqgr9k";
};
makeFlags = [
"PREFIX=$(out)"
"LUA_INCLUDE=${lua52Packages.lua}/include"
"LUA_LIB=${lua52Packages.lua}/lib/liblua.so"
+ "XFT_PACKAGE=--libs=\{-lX11 -lXft\}"
];
- nativeBuildInputs = [ pkgconfig makeWrapper ];
+ dontUseNinjaBuild = true;
+ dontUseNinjaInstall = true;
+
+ nativeBuildInputs = [
+ pkgconfig
+ makeWrapper
+ ninja
+ ];
buildInputs = [
libXft
diff --git a/pkgs/applications/office/zanshin/default.nix b/pkgs/applications/office/zanshin/default.nix
index 2130e64a2a3a7e1b1f9c144761a8b7d0b4ad5539..f8785616c5e662b2ac37e9af5b3ad267023427e9 100644
--- a/pkgs/applications/office/zanshin/default.nix
+++ b/pkgs/applications/office/zanshin/default.nix
@@ -1,6 +1,6 @@
{
mkDerivation, lib,
- fetchurl, fetchpatch,
+ fetchFromGitHub,
extra-cmake-modules,
qtbase, boost,
akonadi-calendar, akonadi-notes, akonadi-search, kidentitymanagement, kontactinterface, kldap,
@@ -9,22 +9,16 @@
mkDerivation rec {
pname = "zanshin";
- version = "0.4.1";
+ version = "2017-11-25";
name = "${pname}-${version}";
- src = fetchurl {
- url = "https://files.kde.org/${pname}/${name}.tar.bz2";
- sha256 = "1llqm4w4mhmdirgrmbgwrpqyn47phwggjdghf164k3qw0bi806as";
+ src = fetchFromGitHub {
+ owner = "KDE";
+ repo = "zanshin";
+ rev = "3df91dd81682d2ccfe542c4582dc1d5f98537c89";
+ sha256 = "18wx7bdqzp81xmwi266gphh2lfbcp5s0fzyp654gki40yhkqph6m";
};
- patches = [
- (fetchpatch {
- name = "zanshin-fix-qt59-build.patch";
- url = "https://phabricator.kde.org/R4:77ad64872f69ad9f7abe3aa8e103a12b95e100a4?diff=1";
- sha256 = "0p497gqd3jmhbmqzh46zp6zwf6j1q77a9jp0in49xhgc2kj5ar7x";
- })
- ];
-
nativeBuildInputs = [
extra-cmake-modules
];
diff --git a/pkgs/applications/science/astronomy/gpredict/default.nix b/pkgs/applications/science/astronomy/gpredict/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..148963d64c08dc4de0f1389c7cc542005ac33a73
--- /dev/null
+++ b/pkgs/applications/science/astronomy/gpredict/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, pkgconfig
+, gtk2-x11, glib, curl, goocanvas, intltool
+}:
+
+let
+ version = "1.3";
+in
+stdenv.mkDerivation {
+ name = "gpredict-${version}";
+
+ src = fetchurl {
+ url = "https://sourceforge.net/projects/gpredict/files/Gpredict/${version}/gpredict-${version}.tar.gz";
+ sha256 = "18ym71r2f5mwpnjcnrpwrk3py2f6jlqmj8hzp89wbcm1ipnvxxmh";
+ };
+
+ buildInputs = [ curl glib gtk2-x11 goocanvas ];
+ nativeBuildInputs = [ pkgconfig intltool ];
+
+ meta = with stdenv.lib; {
+ description = "Real time satellite tracking and orbit prediction";
+ longDescription = ''
+ Gpredict is a real time satellite tracking and orbit prediction program
+ written using the Gtk+ widgets. Gpredict is targetted mainly towards ham radio
+ operators but others interested in satellite tracking may find it useful as
+ well. Gpredict uses the SGP4/SDP4 algorithms, which are compatible with the
+ NORAD Keplerian elements.
+ '';
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ homepage = "https://sourceforge.net/projects/gpredict/";
+ maintainers = [ maintainers.markuskowa ];
+ };
+}
diff --git a/pkgs/applications/science/biology/snpeff/default.nix b/pkgs/applications/science/biology/snpeff/default.nix
index 844374fceb954f0ca8f2fa38aa54cb56816bdbde..e1add2e1483720f5c2935551e13bfa9adf9c6b1d 100644
--- a/pkgs/applications/science/biology/snpeff/default.nix
+++ b/pkgs/applications/science/biology/snpeff/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "snpeff-${version}";
- version = "4.3p";
+ version = "4.3t";
src = fetchurl {
- url = "mirror://sourceforge/project/snpeff/snpEff_v4_3p_core.zip";
- sha256 = "1xb3k0yxd634znw2q083ligm2ww4p6v64041r9sdy3930lhjvxb1";
+ url = "mirror://sourceforge/project/snpeff/snpEff_v4_3t_core.zip";
+ sha256 = "0i12mv93bfv8xjwc3rs2x73d6hkvi7kgbbbx3ry984l3ly4p6nnm";
};
buildInputs = [ unzip jre makeWrapper ];
diff --git a/pkgs/applications/science/electronics/bitscope/common.nix b/pkgs/applications/science/electronics/bitscope/common.nix
new file mode 100644
index 0000000000000000000000000000000000000000..b93b68458f9a6d6c3182de3789679d7163542ba4
--- /dev/null
+++ b/pkgs/applications/science/electronics/bitscope/common.nix
@@ -0,0 +1,67 @@
+{ atk
+, buildFHSUserEnv
+, cairo
+, dpkg
+, fetchurl
+, gdk_pixbuf
+, glib
+, gtk2-x11
+, makeWrapper
+, pango
+, stdenv
+, writeScriptBin
+, xorg
+}:
+
+{ src, toolName, version, ... } @ attrs:
+let
+ wrapBinary = libPaths: binaryName: ''
+ wrapProgram "$out/bin/${binaryName}" \
+ --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath libPaths}"
+ '';
+ pkg = stdenv.mkDerivation (rec {
+ inherit (attrs) version src;
+
+ name = "${toolName}-${version}";
+
+ meta = with stdenv.lib; {
+ homepage = http://bitscope.com/software/;
+ license = licenses.unfree;
+ platforms = [ "x86_64-linux" ];
+ maintainers = with maintainers; [
+ vidbina
+ ];
+ } // (attrs.meta or {});
+
+ buildInputs = [
+ dpkg
+ makeWrapper
+ ];
+
+ libs = attrs.libs or [
+ atk
+ cairo
+ gdk_pixbuf
+ glib
+ gtk2-x11
+ pango
+ xorg.libX11
+ ];
+
+ dontBuild = true;
+
+ unpackPhase = attrs.unpackPhase or ''
+ dpkg-deb -x ${attrs.src} ./
+ '';
+
+ installPhase = attrs.installPhase or ''
+ mkdir -p "$out/bin"
+ cp -a usr/* "$out/"
+ ${(wrapBinary libs) attrs.toolName}
+ '';
+ });
+in buildFHSUserEnv {
+ name = attrs.toolName;
+ meta = pkg.meta;
+ runScript = "${pkg.outPath}/bin/${attrs.toolName}";
+}
diff --git a/pkgs/applications/science/electronics/bitscope/packages.nix b/pkgs/applications/science/electronics/bitscope/packages.nix
new file mode 100644
index 0000000000000000000000000000000000000000..bb7710bf82eb6249e0515783c58601346e38723c
--- /dev/null
+++ b/pkgs/applications/science/electronics/bitscope/packages.nix
@@ -0,0 +1,153 @@
+{ buildFHSUserEnv
+, callPackage
+, fetchurl
+, makeWrapper
+, stdenv
+}:
+
+let
+ wrapBinary = libPaths: binaryName: ''
+ wrapProgram "$out/bin/${binaryName}" \
+ --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath libPaths}"
+ '';
+ mkBitscope = callPackage (import ./common.nix) { };
+in {
+ chart = let
+ toolName = "bitscope-chart";
+ version = "2.0.FK22M";
+ in mkBitscope {
+ inherit toolName version;
+
+ meta = {
+ description = "Multi-channel waveform data acquisition and chart recording application";
+ homepage = "http://bitscope.com/software/chart/";
+ };
+
+ src = fetchurl {
+ url = "http://bitscope.com/download/files/${toolName}_${version}_amd64.deb";
+ sha256 = "08mc82pjamyyyhh15sagsv0sc7yx5v5n54bg60fpj7v41wdwrzxw";
+ };
+ };
+
+ console = let
+ toolName = "bitscope-console";
+ version = "1.0.FK29A";
+ in mkBitscope {
+ # NOTE: this is meant as a demo by BitScope
+ inherit toolName version;
+
+ meta = {
+ description = "Demonstrative communications program designed to make it easy to talk to any model BitScope";
+ };
+
+ src = fetchurl {
+ url = "http://bitscope.com/download/files/${toolName}_${version}_amd64.deb";
+ sha256 = "00b4gxwz7w6pmfrcz14326b24kl44hp0gzzqcqxwi5vws3f0y49d";
+ };
+ };
+
+ display = let
+ toolName = "bitscope-display";
+ version = "1.0.EC17A";
+ in mkBitscope {
+ inherit toolName version;
+
+ meta = {
+ description = "Display diagnostic application for BitScope";
+ homepage = "http://bitscope.com/software/display/";
+ };
+
+ src = fetchurl {
+ url = "http://bitscope.com/download/files/${toolName}_${version}_amd64.deb";
+ sha256 = "05xr5mnka1v3ibcasg74kmj6nlv1nmn3lca1wv77whkq85cmz0s1";
+ };
+ };
+
+ dso = let
+ toolName = "bitscope-dso";
+ version = "2.8.FE22H";
+ in mkBitscope {
+ inherit toolName version;
+
+ meta = {
+ description = "Test and measurement software for BitScope";
+ homepage = "http://bitscope.com/software/dso/";
+ };
+
+ src = fetchurl {
+ url = "http://bitscope.com/download/files/${toolName}_${version}_amd64.deb";
+ sha256 = "0fc6crfkprj78dxxhvhbn1dx1db5chm0cpwlqpqv8sz6whp12mcj";
+ };
+ };
+
+ logic = let
+ toolName = "bitscope-logic";
+ version = "1.2.FC20C";
+ in mkBitscope {
+ inherit toolName version;
+
+ meta = {
+ description = "Mixed signal logic timing and serial protocol analysis software for BitScope";
+ home = "http://bitscope.com/software/logic/";
+ };
+
+ src = fetchurl {
+ url = "http://bitscope.com/download/files/${toolName}_${version}_amd64.deb";
+ sha256 = "0lkb7z9gfkiyxdwh4dq1zxfls8gzdw0na1vrrbgnxfg3klv4xns3";
+ };
+ };
+
+ meter = let
+ toolName = "bitscope-meter";
+ version = "2.0.FK22G";
+ in mkBitscope {
+ inherit toolName version;
+
+ meta = {
+ description = "Automated oscilloscope, voltmeter and frequency meter for BitScope";
+ homepage = "http://bitscope.com/software/logic/";
+ };
+
+ src = fetchurl {
+ url = "http://bitscope.com/download/files/${toolName}_${version}_amd64.deb";
+ sha256 = "0nirbci6ymhk4h4bck2s4wbsl5r9yndk2jvvv72zwkg21248mnbp";
+ };
+ };
+
+ proto = let
+ toolName = "bitscope-proto";
+ version = "0.9.FG13B";
+ in mkBitscope rec {
+ inherit toolName version;
+ # NOTE: this is meant as a demo by BitScope
+ # NOTE: clicking on logo produces error
+ # TApplication.HandleException Executable not found: "http://bitscope.com/blog/DK/?p=DK15A"
+
+ meta = {
+ description = "Demonstrative prototype oscilloscope built using the BitScope Library";
+ homepage = "http://bitscope.com/blog/DK/?p=DK15A";
+ };
+
+ src = fetchurl {
+ url = "http://bitscope.com/download/files/${toolName}_${version}_amd64.deb";
+ sha256 = "1ybjfbh3narn29ll4nci4b7rnxy0hj3wdfm4v8c6pjr8pfvv9spy";
+ };
+ };
+
+ server = let
+ toolName = "bitscope-server";
+ version = "1.0.FK26A";
+ in mkBitscope {
+ inherit toolName version;
+
+ meta = {
+ description = "Remote access server solution for any BitScope";
+ homepage = "http://bitscope.com/software/server/";
+ };
+
+ src = fetchurl {
+ url = "http://bitscope.com/download/files/${toolName}_${version}_amd64.deb";
+ sha256 = "1079n7msq6ks0n4aasx40rd4q99w8j9hcsaci71nd2im2jvjpw9a";
+ };
+ };
+}
diff --git a/pkgs/applications/science/electronics/kicad/unstable.nix b/pkgs/applications/science/electronics/kicad/unstable.nix
new file mode 100644
index 0000000000000000000000000000000000000000..f954bf5b70ca2bacb802e59d4b73fc55d0135896
--- /dev/null
+++ b/pkgs/applications/science/electronics/kicad/unstable.nix
@@ -0,0 +1,54 @@
+{ wxGTK, lib, stdenv, fetchFromGitHub, cmake, mesa, zlib
+, libX11, gettext, glew, glm, cairo, curl, openssl, boost, pkgconfig
+, doxygen, pcre, libpthreadstubs, libXdmcp
+
+, oceSupport ? true, opencascade_oce
+, ngspiceSupport ? true, ngspice
+, scriptingSupport ? true, swig, python, wxPython
+}:
+
+with lib;
+stdenv.mkDerivation rec {
+ name = "kicad-unstable-${version}";
+ version = "2017-12-11";
+
+ src = fetchFromGitHub {
+ owner = "KICad";
+ repo = "kicad-source-mirror";
+ rev = "1955f252265c38a313f6c595d6c4c637f38fd316";
+ sha256 = "15cc81h7nh5dk6gj6mc4ylcgdznfriilhb43n1g3xwyq3s8iaibz";
+ };
+
+ postPatch = ''
+ substituteInPlace CMakeModules/KiCadVersion.cmake \
+ --replace no-vcs-found ${version}
+ '';
+
+ cmakeFlags =
+ optionals (oceSupport) [ "-DKICAD_USE_OCE=ON" "-DOCE_DIR=${opencascade_oce}" ]
+ ++ optional (ngspiceSupport) "-DKICAD_SPICE=ON"
+ ++ optionals (scriptingSupport) [
+ "-DKICAD_SCRIPTING=ON"
+ "-DKICAD_SCRIPTING_MODULES=ON"
+ "-DKICAD_SCRIPTING_WXPYTHON=ON"
+ # nix installs wxPython headers in wxPython package, not in wxwidget
+ # as assumed. We explicitely set the header location.
+ "-DCMAKE_CXX_FLAGS=-I${wxPython}/include/wx-3.0"
+ ];
+
+ nativeBuildInputs = [ cmake doxygen pkgconfig ];
+ buildInputs = [
+ mesa zlib libX11 wxGTK pcre libXdmcp gettext glew glm libpthreadstubs
+ cairo curl openssl boost
+ ] ++ optional (oceSupport) opencascade_oce
+ ++ optional (ngspiceSupport) ngspice
+ ++ optionals (scriptingSupport) [ swig python wxPython ];
+
+ meta = {
+ description = "Free Software EDA Suite, Nightly Development Build";
+ homepage = http://www.kicad-pcb.org/;
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ berce ];
+ platforms = with platforms; linux;
+ };
+}
diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix
index 31c2d4f6475eef29728739da9696f0779e9b0706..e34383865576c02781705325cb74a79f05c4e8bb 100644
--- a/pkgs/applications/science/electronics/verilator/default.nix
+++ b/pkgs/applications/science/electronics/verilator/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Fast and robust (System)Verilog simulator/compiler";
- homepage = "http://www.veripool.org/wiki/verilator";
+ homepage = "https://www.veripool.org/wiki/verilator";
license = stdenv.lib.licenses.lgpl3;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ thoughtpolice ];
diff --git a/pkgs/applications/science/logic/acgtk/default.nix b/pkgs/applications/science/logic/acgtk/default.nix
index e7668999229681efaf2b9cb0240277f40749be67..9e6243c54980a68833b3d2b38cb659fb778d0e2f 100644
--- a/pkgs/applications/science/logic/acgtk/default.nix
+++ b/pkgs/applications/science/logic/acgtk/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
};
buildInputs = with ocamlPackages; [
- ocaml findlib camlp4 ansiterminal biniou bolt ocaml_cairo2 dypgen easy-format ocf yojson
+ ocaml findlib camlp4 ansiterminal biniou bolt cairo2 dypgen easy-format ocf yojson
];
patches = [ ./install-emacs-to-site-lisp.patch
diff --git a/pkgs/applications/science/logic/coq/8.4.nix b/pkgs/applications/science/logic/coq/8.4.nix
index 1f7ef571eaf90284c0c9cb617a82026e35f6cfc9..64b0f85aed2ad6a840e9c110d024ca30b8ce1995 100644
--- a/pkgs/applications/science/logic/coq/8.4.nix
+++ b/pkgs/applications/science/logic/coq/8.4.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation {
fi
}
- envHooks=(''${envHooks[@]} addCoqPath)
+ addEnvHooks "$targetOffset" addCoqPath
'';
passthru = {
diff --git a/pkgs/applications/science/logic/coq/HEAD.nix b/pkgs/applications/science/logic/coq/HEAD.nix
deleted file mode 100644
index 968ea74e2960ba9417ffd686922bafa9f8c75bc0..0000000000000000000000000000000000000000
--- a/pkgs/applications/science/logic/coq/HEAD.nix
+++ /dev/null
@@ -1,81 +0,0 @@
-# - coqide compilation can be disabled by setting buildIde to false;
-# - The csdp program used for the Micromega tactic is statically referenced.
-# However, coq can build without csdp by setting it to null.
-# In this case some Micromega tactics will search the user's path for the csdp program and will fail if it is not found.
-
-{stdenv, fetchgit, writeText, pkgconfig, ocamlPackages_4_02, ncurses, buildIde ? true, csdp ? null}:
-
-let
- version = "2017-02-03";
- coq-version = "8.6";
- ideFlags = if buildIde then "-lablgtkdir ${ocamlPackages_4_02.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
- csdpPatch = if csdp != null then ''
- substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp"
- substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true"
- '' else "";
- ocaml = ocamlPackages_4_02.ocaml;
- findlib = ocamlPackages_4_02.findlib;
- lablgtk = ocamlPackages_4_02.lablgtk;
- camlp5 = ocamlPackages_4_02.camlp5_transitional;
-in
-
-stdenv.mkDerivation {
- name = "coq-unstable-${version}";
-
- inherit coq-version;
- inherit ocaml camlp5 findlib;
-
- src = fetchgit {
- url = git://scm.gforge.inria.fr/coq/coq.git;
- rev = "078598d029792a3d9a54fae9b9ac189b75bc3b06";
- sha256 = "0sflrpp6x0ada0bjh67q1x65g88d179n3cawpwkp1pm4kw76g8x7";
- };
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ ocaml findlib camlp5 ncurses lablgtk ];
-
- postPatch = ''
- UNAME=$(type -tp uname)
- RM=$(type -tp rm)
- substituteInPlace configure --replace "/bin/uname" "$UNAME"
- substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM"
- substituteInPlace configure.ml --replace "\"Darwin\"; \"FreeBSD\"; \"OpenBSD\"" "\"Darwinx\"; \"FreeBSD\"; \"OpenBSD\""
- ${csdpPatch}
- '';
-
- setupHook = writeText "setupHook.sh" ''
- addCoqPath () {
- if test -d "''$1/lib/coq/${coq-version}/user-contrib"; then
- export COQPATH="''${COQPATH}''${COQPATH:+:}''$1/lib/coq/${coq-version}/user-contrib/"
- fi
- }
-
- envHooks=(''${envHooks[@]} addCoqPath)
- '';
-
- preConfigure = ''
- configureFlagsArray=(
- -opt
- ${ideFlags}
- )
- '';
-
- prefixKey = "-prefix ";
-
- buildFlags = "revision coq coqide";
-
- meta = with stdenv.lib; {
- description = "Coq proof assistant";
- longDescription = ''
- Coq is a formal proof management system. It provides a formal language
- to write mathematical definitions, executable algorithms and theorems
- together with an environment for semi-interactive development of
- machine-checked proofs.
- '';
- homepage = http://coq.inria.fr;
- license = licenses.lgpl21;
- branch = coq-version;
- maintainers = with maintainers; [ roconnor thoughtpolice vbgl ];
- platforms = platforms.unix;
- };
-}
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index cdfd035c7139696f568443ca88b246e63fe527d8..9ed535cfe639d1f2a359cff37083b13e9959e356 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -9,7 +9,7 @@
, ocamlPackages, ncurses
, buildIde ? true
, csdp ? null
-, version ? "8.6.1"
+, version
}:
let
@@ -19,8 +19,8 @@ let
"8.5pl3" = "15c3rdk59nifzihsp97z4vjxis5xmsnrvpb86qiazj143z2fmdgw";
"8.6" = "148mb48zpdax56c0blfi7v67lx014lnmrvxxasi28hsibyz2lvg4";
"8.6.1" = "0llrxcxwy5j87vbbjnisw42rfw1n1pm5602ssx64xaxx3k176g6l";
- "8.7+beta2" = "1r274m44z774xigvj43g211ms9z9bwgyp1g43rvq4fswb3gzxc4b";
"8.7.0" = "1h18b7xpnx3ix9vsi5fx4zdcbxy7bhra7gd5c5yzxmk53cgf1p9m";
+ "8.7.1" = "0gjn59jkbxwrihk8fx9d823wjyjh5m9gvj9l31nv6z6bcqhgdqi8";
}."${version}";
coq-version = builtins.substring 0 3 version;
camlp5 = ocamlPackages.camlp5_strict;
@@ -91,7 +91,8 @@ self = stdenv.mkDerivation {
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib camlp5 ncurses ocamlPackages.lablgtk ];
+ buildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib camlp5 ncurses ]
+ ++ stdenv.lib.optional buildIde ocamlPackages.lablgtk;
postPatch = ''
UNAME=$(type -tp uname)
@@ -109,7 +110,7 @@ self = stdenv.mkDerivation {
fi
}
- envHooks=(''${envHooks[@]} addCoqPath)
+ addEnvHooks "$targetOffset" addCoqPath
'';
preConfigure = ''
diff --git a/pkgs/applications/science/logic/drat-trim/default.nix b/pkgs/applications/science/logic/drat-trim/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..50454847baf1b7d92c6ffd47f7378b193826737c
--- /dev/null
+++ b/pkgs/applications/science/logic/drat-trim/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ name = "drat-trim-2017-08-31";
+
+ src = fetchFromGitHub {
+ owner = "marijnheule";
+ repo = "drat-trim";
+ rev = "37ac8f874826ffa3500a00698910e137498defac";
+ sha256 = "1m9q47dfnvdli1z3kb1jvvbm0dgaw725k1aw6h9w00bggqb91bqh";
+ };
+
+ postPatch = ''
+ substituteInPlace Makefile --replace gcc cc
+ '';
+
+ installPhase = ''
+ install -Dt $out/bin drat-trim
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A proof checker for unSAT proofs";
+ longDescription = ''
+ DRAT-trim is a satisfiability proof checking and trimming
+ utility designed to validate proofs for all known satisfiability
+ solving and preprocessing techniques. DRAT-trim can also emit
+ trimmed formulas, optimized proofs, and TraceCheck+ dependency
+ graphs.
+
+ DRAT-trim has been used as part of the judging process in the
+ annual SAT Competition in recent years, in order to check
+ competing SAT solvers' work when they claim that a SAT instance
+ is unsatisfiable.
+ '';
+ homepage = https://www.cs.utexas.edu/~marijn/drat-trim/;
+ license = licenses.mit;
+ maintainers = with maintainers; [ kini ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/applications/science/logic/ott/default.nix b/pkgs/applications/science/logic/ott/default.nix
index b10ec814ff55226cf1aa548d6dd08c9d104073fb..6fcc8f9c111ff39f7fc28e55849abca7b86bcede 100644
--- a/pkgs/applications/science/logic/ott/default.nix
+++ b/pkgs/applications/science/logic/ott/default.nix
@@ -1,18 +1,18 @@
-# - coqide compilation can be disabled by setting lablgtk to null;
-
-{stdenv, fetchurl, pkgconfig, ocaml, camlp5}:
+{ stdenv, fetchFromGitHub, pkgconfig, ocaml }:
stdenv.mkDerivation rec {
name = "ott-${version}";
- version = "0.25";
+ version = "0.27";
- src = fetchurl {
- url = "http://www.cl.cam.ac.uk/~pes20/ott/ott_distro_${version}.tar.gz";
- sha256 = "0i8ad1yrz9nrrgpi8db4z0aii5s0sy35mmzdfw5nq183mvbx8qqd";
+ src = fetchFromGitHub {
+ owner = "ott-lang";
+ repo = "ott";
+ rev = version;
+ sha256 = "12hzpyinswqaxwp6y793h7ywrv6289cw4911ah2yzq04ji095pfb";
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ ocaml camlp5 ];
+ buildInputs = [ ocaml ];
installPhase = ''
mkdir -p $out/bin
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
ln -s $out/bin/ott.opt $out/bin/ott
mkdir -p $out/share/emacs/site-lisp
- cp emacs/ottmode.el $out/share/emacs/site-lisp
+ cp emacs/ott-mode.el $out/share/emacs/site-lisp
'';
meta = {
diff --git a/pkgs/applications/science/logic/sapic/default.nix b/pkgs/applications/science/logic/sapic/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..27efe865a9d96adbe48fd75cdf1cfeb469d5b748
--- /dev/null
+++ b/pkgs/applications/science/logic/sapic/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, unzip, ocaml }:
+
+stdenv.mkDerivation rec {
+ name = "sapic-${version}";
+ version = "0.9";
+
+ src = fetchurl {
+ url = "http://sapic.gforge.inria.fr/${name}.zip";
+ sha256 = "1ckl090lpyfh90mkjhnpcys5grs3nrl9wlbn9nfkxxnaivn2yx9y";
+ };
+
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ ocaml ];
+ patches = [ ./native.patch ]; # create a native binary, not a bytecode one
+
+ buildPhase = "make depend && make";
+ installPhase = ''
+ mkdir -p $out/bin
+ cp ./sapic $out/bin
+ '';
+
+ meta = {
+ description = "Stateful applied Pi Calculus for protocol verification";
+ homepage = http://sapic.gforge.inria.fr/;
+ platforms = stdenv.lib.platforms.unix;
+ maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+ };
+}
diff --git a/pkgs/applications/science/logic/sapic/native.patch b/pkgs/applications/science/logic/sapic/native.patch
new file mode 100644
index 0000000000000000000000000000000000000000..6e0b98113df2ef63d6e5b18ac7866d517cd25027
--- /dev/null
+++ b/pkgs/applications/science/logic/sapic/native.patch
@@ -0,0 +1,38 @@
+diff --git a/Makefile b/Makefile
+index a1de94d..f9e2eb8 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,8 +1,8 @@
+ TARGET = sapic
+-OBJS=lexer.cmo apip.cmo firsttranslation.cmo main.cmo #secondtranslation.cmo thirdtranslation.cmo main.cmo
++OBJS=lexer.cmx apip.cmx firsttranslation.cmx main.cmx
+
+ sapic: $(OBJS)
+- ocamlc -o $@ $(OBJS)
++ ocamlopt.opt -o $@ $(OBJS)
+
+ depend:
+ ocamldep *.ml *.mli > .depend
+@@ -13,17 +13,17 @@ clean:
+ rm -rf *.cmi *.cmo $(TARGET)
+ rm -rf apip.ml apip.mli lexer.ml lexer.mli
+
+-.SUFFIXES: .ml .mli .mll .mly .cmo .cmi
++.SUFFIXES: .ml .mli .mll .mly .cmo .cmi .cmx
+
+-.ml.cmo:
+- ocamlc -c $<
++.ml.cmx:
++ ocamlopt.opt -c $<
+ .mli.cmi:
+- ocamlc -c $<
++ ocamlopt.opt -c $<
+ .mll.ml:
+ ocamllex $<
+ .mly.ml:
+ ocamlyacc $<
+ .ml.mli:
+- ocamlc -i $< > $@
++ ocamlopt.opt -i $< > $@
+
+ -include .depend
diff --git a/pkgs/applications/science/logic/stp/default.nix b/pkgs/applications/science/logic/stp/default.nix
index 8c0b82cc549c6d6d18ca93a8809be53b34de41f0..367449f44f38fff3a62916f63a61a469995ea930 100644
--- a/pkgs/applications/science/logic/stp/default.nix
+++ b/pkgs/applications/science/logic/stp/default.nix
@@ -23,6 +23,10 @@ stdenv.mkDerivation rec {
)
'';
+ # `make -f lib/Interface/CMakeFiles/cppinterface.dir/build.make lib/Interface/CMakeFiles/cppinterface.dir/cpp_interface.cpp.o`:
+ # include/stp/AST/UsefulDefs.h:41:29: fatal error: stp/AST/ASTKind.h: No such file or directory
+ enableParallelBuilding = false;
+
meta = with stdenv.lib; {
description = "Simple Theorem Prover";
maintainers = with maintainers; [ mornfall ];
diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix
index 53e1a90f5b6a5bc1bd1576bfb786b8715aa5ce12..3769b15f32a7f7ba1581e349f187230e1e55b62d 100644
--- a/pkgs/applications/science/logic/symbiyosys/default.nix
+++ b/pkgs/applications/science/logic/symbiyosys/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "symbiyosys-${version}";
- version = "2017.11.05";
+ version = "2017.12.06";
src = fetchFromGitHub {
owner = "cliffordwolf";
repo = "symbiyosys";
- rev = "db9c7e97b8f84ef7e9b18ae630009897c7982a08";
- sha256 = "0pyznkjm0vjmaf6mpwknmh052qrwy2fzi05h80ysx1bxc51ns0m0";
+ rev = "82f394260a74b07892d7f5bdec10ae0a8cad6caa";
+ sha256 = "0cniqxaf2m5xh7hqwcpdvwcxg7vqargzahbkzdfwafkdsqpb0ly3";
};
buildInputs = [ python3 yosys ];
diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..bed7eb65e328574770bc7bcbd8e876b16881847d
--- /dev/null
+++ b/pkgs/applications/science/logic/tamarin-prover/default.nix
@@ -0,0 +1,87 @@
+{ haskell, haskellPackages, mkDerivation, fetchFromGitHub, lib
+# the following are non-haskell dependencies
+, makeWrapper, which, maude, graphviz, sapic
+}:
+
+let
+ version = "1.3.0";
+ src = fetchFromGitHub {
+ owner = "tamarin-prover";
+ repo = "tamarin-prover";
+ rev = "8e823691ad3325bce8921617b013735523d74557";
+ sha256 = "0rr2syl9xhv17bwky5p39mhn0bypr24h8pld1xidxv87vy7vk7nr";
+ };
+
+ # tamarin has its own dependencies, but they're kept inside the repo,
+ # no submodules. this factors out the common metadata among all derivations
+ common = pname: src: {
+ inherit pname version src;
+
+ license = lib.licenses.gpl3;
+ homepage = https://tamarin-prover.github.io;
+ description = "Security protocol verification in the symbolic model";
+ maintainers = [ lib.maintainers.thoughtpolice ];
+ };
+
+ # tamarin use symlinks to the LICENSE and Setup.hs files, so for these sublibraries
+ # we set the patchPhase to fix that. otherwise, cabal cries a lot.
+ replaceSymlinks = ''
+ cp --remove-destination ${src}/LICENSE .;
+ cp --remove-destination ${src}/Setup.hs .;
+ '';
+
+ tamarin-prover-utils = mkDerivation (common "tamarin-prover-utils" (src + "/lib/utils") // {
+ patchPhase = replaceSymlinks;
+ libraryHaskellDepends = with haskellPackages; [
+ base base64-bytestring binary blaze-builder bytestring containers
+ deepseq dlist fclabels mtl pretty safe SHA syb time transformers
+ ];
+ });
+
+ tamarin-prover-term = mkDerivation (common "tamarin-prover-term" (src + "/lib/term") // {
+ patchPhase = replaceSymlinks;
+ libraryHaskellDepends = (with haskellPackages; [
+ attoparsec base binary bytestring containers deepseq dlist HUnit
+ mtl process safe
+ ]) ++ [ tamarin-prover-utils ];
+ });
+
+ tamarin-prover-theory = mkDerivation (common "tamarin-prover-theory" (src + "/lib/theory") // {
+ patchPhase = replaceSymlinks;
+ doHaddock = false; # broken
+ libraryHaskellDepends = (with haskellPackages; [
+ aeson aeson-pretty base binary bytestring containers deepseq dlist
+ fclabels mtl parallel parsec process safe text transformers uniplate
+ ]) ++ [ tamarin-prover-utils tamarin-prover-term ];
+ });
+
+in
+mkDerivation (common "tamarin-prover" src // {
+ isLibrary = false;
+ isExecutable = true;
+
+ # strip out unneeded deps manually
+ doHaddock = false;
+ enableSharedExecutables = false;
+ postFixup = "rm -rf $out/lib $out/nix-support $out/share/doc";
+
+ # wrap the prover to be sure it can find maude, sapic, etc
+ executableToolDepends = [ makeWrapper which maude graphviz sapic ];
+ postInstall = ''
+ wrapProgram $out/bin/tamarin-prover \
+ --prefix PATH : ${lib.makeBinPath [ which maude graphviz sapic ]}
+ '';
+
+ checkPhase = "./dist/build/tamarin-prover/tamarin-prover test";
+
+ executableHaskellDepends = (with haskellPackages; [
+ base binary binary-orphans blaze-builder blaze-html bytestring
+ cmdargs conduit containers deepseq directory fclabels file-embed
+ filepath gitrev http-types HUnit lifted-base mtl parsec process
+ resourcet safe shakespeare tamarin-prover-term
+ template-haskell text threads time wai warp yesod-core yesod-static
+ ]) ++ [ tamarin-prover-utils
+ tamarin-prover-term
+ tamarin-prover-theory
+ ];
+})
diff --git a/pkgs/applications/science/logic/z3/4.5.0.nix b/pkgs/applications/science/logic/z3/4.5.0.nix
new file mode 100644
index 0000000000000000000000000000000000000000..827cb2cbe3de86c5a153e29c431bfca685a98c97
--- /dev/null
+++ b/pkgs/applications/science/logic/z3/4.5.0.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, python2, fixDarwinDylibNames }:
+
+let
+ python = python2;
+in stdenv.mkDerivation rec {
+ name = "z3-${version}";
+ version = "4.5.0";
+
+ src = fetchFromGitHub {
+ owner = "Z3Prover";
+ repo = "z3";
+ rev = "z3-4.5.0";
+ sha256 = "0ssp190ksak93hiz61z90x6hy9hcw1ywp8b2dzmbhn6fbd4bnxzp";
+ };
+
+ buildInputs = [ python fixDarwinDylibNames ];
+ enableParallelBuilding = true;
+
+ configurePhase = ''
+ ${python.interpreter} scripts/mk_make.py --prefix=$out --python --pypkgdir=$out/${python.sitePackages}
+ cd build
+ '';
+
+ meta = {
+ description = "A high-performance theorem prover and SMT solver";
+ homepage = "https://github.com/Z3Prover/z3";
+ license = stdenv.lib.licenses.mit;
+ platforms = stdenv.lib.platforms.unix;
+ maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+ };
+}
diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix
index be25738a6076a1cad195cb67b064ba0c3e40e6a4..532df11209b80efb81d7a160452aa2431a51c836 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-2017-11-06";
+ version = "4.6.0";
src = fetchFromGitHub {
owner = "Z3Prover";
repo = "z3";
- rev = "3350f32e1f2c01c9df63b7d71899796a18ce2272";
- sha256 = "00jn0njn5h9v49pl67yxj6225m6334ndrx6mp37vcqac05pdbpw7";
+ rev = "b0aaa4c6d7a739eb5e8e56a73e0486df46483222";
+ sha256 = "1cgwlmjdbf4rsv2rriqi2sdpz9qxihxrcpm6a4s37ijy437xg78l";
};
buildInputs = [ python fixDarwinDylibNames ];
diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix
index 9d736694cbdc18cdd20f279be2925508955f4a37..ae272284bcdc0bc3c9de38cd56603214a66feb97 100644
--- a/pkgs/applications/science/machine-learning/shogun/default.nix
+++ b/pkgs/applications/science/machine-learning/shogun/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, ccache, cmake, ctags, swig
+{ stdenv, lib, fetchFromGitHub, fetchpatch, ccache, cmake, ctags, swig
# data, compression
, bzip2, curl, hdf5, json_c, lzma, lzo, protobuf, snappy
# maths
@@ -27,6 +27,12 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
+ patches = fetchpatch {
+ name = "Fix-meta-example-parser-bug-in-parallel-builds.patch";
+ url = "https://github.com/shogun-toolbox/shogun/commit/ecd6a8f11ac52748e89d27c7fab7f43c1de39f05.patch";
+ sha256 = "1hrwwrj78sxhwcvgaz7n4kvh5y9snfcc4jf5xpgji5hjymnl311n";
+ };
+
CCACHE_DIR=".ccache";
buildInputs = with lib; [
diff --git a/pkgs/applications/science/math/R/setup-hook.sh b/pkgs/applications/science/math/R/setup-hook.sh
index 09a775db9bf5b5d5c741cc98b285e8ace4c23081..6951e2a4b61bdab2f6df7aed0333d0d394c3cd2f 100644
--- a/pkgs/applications/science/math/R/setup-hook.sh
+++ b/pkgs/applications/science/math/R/setup-hook.sh
@@ -1,5 +1,7 @@
addRLibPath () {
- addToSearchPath R_LIBS_SITE $1/library
+ if [[ -d "$1/library" ]]; then
+ addToSearchPath R_LIBS_SITE "$1/library"
+ fi
}
-envHooks+=(addRLibPath)
+addEnvHooks "$targetOffset" addRLibPath
diff --git a/pkgs/applications/science/math/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix
index 89ed0582b37efde4efee8f160f1b20d4a5311ec5..bef695fc650a8f7f823b3a43e1abe87e8f14a6ba 100644
--- a/pkgs/applications/science/math/cntk/default.nix
+++ b/pkgs/applications/science/math/cntk/default.nix
@@ -95,5 +95,6 @@ in stdenv.mkDerivation rec {
description = "An open source deep-learning toolkit";
license = if onebitSGDSupport then licenses.unfreeRedistributable else licenses.mit;
maintainers = with maintainers; [ abbradar ];
+ broken = true; # Never succeeded to build.
};
}
diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix
index 3e4c8c70286951c4c8e35c9edc45b79afef639b0..67dcfd8dc1de45d742929d604f8555d1486cc565 100644
--- a/pkgs/applications/science/math/glsurf/default.nix
+++ b/pkgs/applications/science/math/glsurf/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7";
};
- buildInputs = [ freeglut mesa mysql.lib mpfr gmp
+ buildInputs = [ freeglut mesa mysql.connector-c mpfr gmp
libtiff libjpeg libpng giflib ]
++ (with ocamlPackages; [
ocaml findlib ocaml_mysql lablgl camlimages_4_0 mlgmpidl
diff --git a/pkgs/applications/science/math/weka/default.nix b/pkgs/applications/science/math/weka/default.nix
index 18cb268906343c6ab9945926b9ac81ed462233c2..7af0df5360d5dfb716ca854476718419390cb7c5 100644
--- a/pkgs/applications/science/math/weka/default.nix
+++ b/pkgs/applications/science/math/weka/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
homepage = http://www.cs.waikato.ac.nz/ml/weka/;
description = "Collection of machine learning algorithms for data mining tasks";
license = stdenv.lib.licenses.gpl2Plus;
- maintainer = [stdenv.lib.maintainers.mimadrid];
+ maintainers = [ stdenv.lib.maintainers.mimadrid ];
platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix
index 6c866a8d21640a4a5b29ec5cdc2a4211d8f706c8..c7f74071c24ffd23f2b9450e35bfbe9a3489fc06 100644
--- a/pkgs/applications/science/math/wxmaxima/default.nix
+++ b/pkgs/applications/science/math/wxmaxima/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub
-, wrapGAppsHook, autoreconfHook, gettext
+, wrapGAppsHook, cmake, gettext
, maxima, wxGTK, gnome3 }:
stdenv.mkDerivation rec {
@@ -15,14 +15,12 @@ stdenv.mkDerivation rec {
buildInputs = [ wxGTK maxima gnome3.defaultIconTheme ];
- nativeBuildInputs = [ wrapGAppsHook autoreconfHook gettext ];
+ nativeBuildInputs = [ wrapGAppsHook cmake gettext ];
preConfigure = ''
gappsWrapperArgs+=(--prefix PATH ":" ${maxima}/bin)
'';
- doCheck = true;
-
enableParallelBuilding = true;
meta = with stdenv.lib; {
diff --git a/pkgs/applications/science/programming/fdr/default.nix b/pkgs/applications/science/programming/fdr/default.nix
index 8ed8e0e73b000ff5b75225852b90e6564e0513d5..3bfb70f5ce8ecd0a895b63b00c578c9c331bcf95 100644
--- a/pkgs/applications/science/programming/fdr/default.nix
+++ b/pkgs/applications/science/programming/fdr/default.nix
@@ -1,9 +1,9 @@
{stdenv, fetchurl, qtbase, qtx11extras, ncurses, xorg, zlib, python27Packages}:
stdenv.mkDerivation {
- name = "fdr-4.2.0";
+ name = "fdr-4.2.3";
src = fetchurl {
- url = https://www.cs.ox.ac.uk/projects/fdr/downloads/fdr-3754-linux-x86_64.tar.gz;
- sha256 = "d24492485db9b8b95c62c53a6396094f836ee079cfc743688a397503c3ec9bf8";
+ url = https://www.cs.ox.ac.uk/projects/fdr/downloads/fdr-3789-linux-x86_64.tar.gz;
+ sha256 = "0n2yqichym5xdawlgk3r7yha88k7ycnx6585jfrcm7043sls1i88";
};
libPath = stdenv.lib.makeLibraryPath [
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
cp -r * "$out"
# Hack around lack of libtinfo in NixOS
ln -s ${ncurses.out}/lib/libncursesw.so.6 $out/lib/libtinfo.so.5
- ln -s ${qtbase.out}/$qtPluginPrefix $out/lib/qt_plugins
+ ln -s ${qtbase.bin}/${qtbase.qtPluginPrefix} $out/lib/qt_plugins
ln -s ${zlib.out}/lib/libz.so.1 $out/lib/libz.so.1
for b in fdr4 _fdr4 refines _refines cspmprofiler cspmexplorerprof
diff --git a/pkgs/applications/science/programming/plm/default.nix b/pkgs/applications/science/programming/plm/default.nix
index eb157e8b99f553d7bbf37c1e191e17b8067c8b96..f46f7afb659c789af43f78de2dfcdaf6e4350fb8 100644
--- a/pkgs/applications/science/programming/plm/default.nix
+++ b/pkgs/applications/science/programming/plm/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Free cross-platform programming exerciser";
- Homepage = http://webloria.loria.fr/~quinson/Teaching/PLM/;
+ homepage = http://webloria.loria.fr/~quinson/Teaching/PLM/;
license = licenses.gpl3;
maintainers = [ ];
platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/applications/search/doodle/default.nix b/pkgs/applications/search/doodle/default.nix
index 3a9df15057423af8680f80f9cbd682a9157a7228..ba9fbee5d96967ab8e7fc35819d15010fd45f51c 100644
--- a/pkgs/applications/search/doodle/default.nix
+++ b/pkgs/applications/search/doodle/default.nix
@@ -6,12 +6,12 @@ stdenv.mkDerivation rec {
buildInputs = [ libextractor gettext ];
src = fetchurl {
- url = "http://grothoff.org/christian/doodle/download/${name}.tar.gz";
+ url = "https://grothoff.org/christian/doodle/download/${name}.tar.gz";
sha256 = "0ayx5q7chzll9sv3miq35xl36r629cvgdzphf379kxzlzhjldy3j";
};
meta = {
- homepage = http://grothoff.org/christian/doodle/;
+ homepage = https://grothoff.org/christian/doodle/;
description = "Tool to quickly index and search documents on a computer";
license = stdenv.lib.licenses.gpl2Plus;
maintainers = with stdenv.lib.maintainers; [viric];
diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix
index 649b34e7569282eef65ffe8ff04d75a1a24c54cd..01669f3fd4094ad131ce91c031130d27bd221afc 100644
--- a/pkgs/applications/search/recoll/default.nix
+++ b/pkgs/applications/search/recoll/default.nix
@@ -7,12 +7,12 @@
assert stdenv.system != "powerpc-linux";
stdenv.mkDerivation rec {
- ver = "1.23.1";
+ ver = "1.23.5";
name = "recoll-${ver}";
src = fetchurl {
url = "http://www.lesbonscomptes.com/recoll/${name}.tar.gz";
- sha256 = "0si407qm47ndy0l6zv57lqb5za4aiv0lyghnzb211g03szjkfpg8";
+ sha256 = "0ps7ckrv63ydviqkqxs57hn04z53s2jnjnp94n1prs63xx0njswv";
};
configureFlags = [ "--with-inotify" ];
diff --git a/pkgs/applications/taxes/aangifte-2006/default.nix b/pkgs/applications/taxes/aangifte-2006/default.nix
index 72d6999fa1d7ba181cd95b4bf3ff49a0dcd8b01d..5883e51f712e37c0fe3a329638a77097de91b750 100644
--- a/pkgs/applications/taxes/aangifte-2006/default.nix
+++ b/pkgs/applications/taxes/aangifte-2006/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
meta = {
description = "Elektronische aangifte IB 2006";
- url = "http://www.belastingdienst.nl/download/1341.html";
+ homepage = "http://www.belastingdienst.nl/download/1341.html";
license = stdenv.lib.licenses.unfree;
platforms = stdenv.lib.platforms.linux;
hydraPlatforms = [];
diff --git a/pkgs/applications/taxes/aangifte-2007/default.nix b/pkgs/applications/taxes/aangifte-2007/default.nix
index 15c826feb6e7174607c92dc4729bfcc4a6f06cb1..43fb26d811a3863af13ff0200cc9ee708e06f532 100644
--- a/pkgs/applications/taxes/aangifte-2007/default.nix
+++ b/pkgs/applications/taxes/aangifte-2007/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
meta = {
description = "Elektronische aangifte IB 2007";
- url = "http://www.belastingdienst.nl/download/1341.html";
+ homepage = "http://www.belastingdienst.nl/download/1341.html";
license = stdenv.lib.licenses.unfree;
platforms = stdenv.lib.platforms.linux;
hydraPlatforms = [];
diff --git a/pkgs/applications/taxes/aangifte-2008/default.nix b/pkgs/applications/taxes/aangifte-2008/default.nix
index 905471cb76b80dd4f0befff2e792fc006d465df0..b9fad2fa10bd254a2701f381ba8b9453cb1636d3 100644
--- a/pkgs/applications/taxes/aangifte-2008/default.nix
+++ b/pkgs/applications/taxes/aangifte-2008/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
meta = {
description = "Elektronische aangifte IB 2008 (Dutch Tax Return Program)";
- url = http://www.belastingdienst.nl/particulier/aangifte2008/aangifte_2008/aangifte_2008.html;
+ homepage = http://www.belastingdienst.nl/particulier/aangifte2008/aangifte_2008/aangifte_2008.html;
license = stdenv.lib.licenses.unfree;
platforms = stdenv.lib.platforms.linux;
hydraPlatforms = [];
diff --git a/pkgs/applications/taxes/aangifte-2009/default.nix b/pkgs/applications/taxes/aangifte-2009/default.nix
index c944fc3d68b3490fb5994799f13263db68401c4d..d4230d426ece63897aa0f3e5a1402d734002f129 100644
--- a/pkgs/applications/taxes/aangifte-2009/default.nix
+++ b/pkgs/applications/taxes/aangifte-2009/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
meta = {
description = "Elektronische aangifte IB 2009 (Dutch Tax Return Program)";
- url = http://www.belastingdienst.nl/particulier/aangifte2009/download/;
+ homepage = http://www.belastingdienst.nl/particulier/aangifte2009/download/;
license = stdenv.lib.licenses.unfree;
platforms = stdenv.lib.platforms.linux;
hydraPlatforms = [];
diff --git a/pkgs/applications/taxes/aangifte-2010/default.nix b/pkgs/applications/taxes/aangifte-2010/default.nix
index b5a85415c376af4ba37767249790c94e153ca3ae..602368d2017bd906678a238492036a7ae9696b14 100644
--- a/pkgs/applications/taxes/aangifte-2010/default.nix
+++ b/pkgs/applications/taxes/aangifte-2010/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
meta = {
description = "Elektronische aangifte IB 2010 (Dutch Tax Return Program)";
- url = http://www.belastingdienst.nl/particulier/aangifte2009/download/;
+ homepage = http://www.belastingdienst.nl/particulier/aangifte2009/download/;
license = stdenv.lib.licenses.unfree;
platforms = stdenv.lib.platforms.linux;
hydraPlatforms = [];
diff --git a/pkgs/applications/taxes/aangifte-2011/default.nix b/pkgs/applications/taxes/aangifte-2011/default.nix
index a38bc4254bbe84ff2b1584baad0879defab5d5b5..80c772705142039cbbffa95fed551609df0f1087 100644
--- a/pkgs/applications/taxes/aangifte-2011/default.nix
+++ b/pkgs/applications/taxes/aangifte-2011/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
meta = {
description = "Elektronische aangifte IB 2011 (Dutch Tax Return Program)";
- url = http://www.belastingdienst.nl/particulier/aangifte2009/download/;
+ homepage = http://www.belastingdienst.nl/particulier/aangifte2009/download/;
license = stdenv.lib.licenses.unfree;
platforms = stdenv.lib.platforms.linux;
hydraPlatforms = [];
diff --git a/pkgs/applications/taxes/aangifte-2012/default.nix b/pkgs/applications/taxes/aangifte-2012/default.nix
index 2e51ef9ed4cf6080ba10198c719d1ddd759a415b..8066c86742c1d0b7e8122b274a3d1cfbedbe58bb 100644
--- a/pkgs/applications/taxes/aangifte-2012/default.nix
+++ b/pkgs/applications/taxes/aangifte-2012/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
meta = {
description = "Elektronische aangifte IB 2012 (Dutch Tax Return Program)";
- url = http://www.belastingdienst.nl/particulier/aangifte2012/download/;
+ homepage = http://www.belastingdienst.nl/particulier/aangifte2012/download/;
license = stdenv.lib.licenses.unfree;
platforms = stdenv.lib.platforms.linux;
hydraPlatforms = [];
diff --git a/pkgs/applications/taxes/aangifte-2013-wa/default.nix b/pkgs/applications/taxes/aangifte-2013-wa/default.nix
index 5ee0edb4b5e5abd249a53dfd39fc9ce5b72d25fa..6f8e6d6429d34c86aea45974e280aa7baa71aa0e 100644
--- a/pkgs/applications/taxes/aangifte-2013-wa/default.nix
+++ b/pkgs/applications/taxes/aangifte-2013-wa/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
meta = {
description = "Elektronische aangifte WA 2013 (Dutch Tax Return Program)";
- url = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2013_linux;
+ homepage = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2013_linux;
license = stdenv.lib.licenses.unfree;
platforms = stdenv.lib.platforms.linux;
hydraPlatforms = [];
diff --git a/pkgs/applications/taxes/aangifte-2013/default.nix b/pkgs/applications/taxes/aangifte-2013/default.nix
index 3cf85961a9bbc069feea3bd6a3d2b00ebc0ee544..d75b60c8367337dbe4f05e41fd8bb3fe8f930005 100644
--- a/pkgs/applications/taxes/aangifte-2013/default.nix
+++ b/pkgs/applications/taxes/aangifte-2013/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
meta = {
description = "Elektronische aangifte IB 2013 (Dutch Tax Return Program)";
- url = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2013_linux;
+ homepage = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2013_linux;
license = stdenv.lib.licenses.unfree;
platforms = stdenv.lib.platforms.linux;
hydraPlatforms = [];
diff --git a/pkgs/applications/taxes/aangifte-2014-wa/default.nix b/pkgs/applications/taxes/aangifte-2014-wa/default.nix
index 78bb8214257f7c3f99f6bb07798c839beb49405d..38124677f9a5a69707beaca5f981e7d18cdd40b3 100644
--- a/pkgs/applications/taxes/aangifte-2014-wa/default.nix
+++ b/pkgs/applications/taxes/aangifte-2014-wa/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
meta = {
description = "Elektronische aangifte WA 2014 (Dutch Tax Return Program)";
- url = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2014_linux;
+ homepage = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2014_linux;
license = stdenv.lib.licenses.unfree;
platforms = stdenv.lib.platforms.linux;
hydraPlatforms = [];
diff --git a/pkgs/applications/taxes/aangifte-2014/default.nix b/pkgs/applications/taxes/aangifte-2014/default.nix
index 0151cca52b2c721fd09ea4badc1ec5173b1e6fcc..33b6f8853aa2a61a868dc256811862124d6fe28b 100644
--- a/pkgs/applications/taxes/aangifte-2014/default.nix
+++ b/pkgs/applications/taxes/aangifte-2014/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
meta = {
description = "Elektronische aangifte IB 2014 (Dutch Tax Return Program)";
- url = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2014_linux;
+ homepage = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2014_linux;
license = stdenv.lib.licenses.unfree;
platforms = stdenv.lib.platforms.linux;
hydraPlatforms = [];
diff --git a/pkgs/applications/version-management/gerrit/default.nix b/pkgs/applications/version-management/gerrit/default.nix
index 54693f3c5f01a5df8ae5fdfd519cae2346eb9d25..0475a8ae76ca9d9c8f5560345c6428a479e1c340 100644
--- a/pkgs/applications/version-management/gerrit/default.nix
+++ b/pkgs/applications/version-management/gerrit/default.nix
@@ -2,16 +2,16 @@
stdenv.mkDerivation rec {
name = "gerrit-${version}";
- version = "2.14.3";
+ version = "2.14.6";
src = fetchurl {
url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war";
- sha256 = "1hxrlhp5l5q4lp5b5bq8va7856cnm4blfv01rgqq3yhvn432sq6v";
+ sha256 = "0fsqwfsnyb4nbxgb1i1mp0vshl0mk8bwqlddzqr9x2v99mbca28q";
};
outputHashAlgo = "sha256";
outputHashMode = "recursive";
- outputHash = "1j1afxv7yj2fxaw0wy8kmxi6sl9fwj8xsxs5kzg9qz5gzayb26kp";
+ outputHash = "1qrmvqqnlbabqz4yx06vi030ci12v0063iq2palxmbj3whrzv9la";
buildCommand = ''
mkdir -p "$out"/webapps/
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 75b53d2cfe0963131a69b1a2e043bb49a65e2695..7056249de3fc8b720e8ae09c78e66dc0f9c5e8b3 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -51,6 +51,10 @@ rec {
git-annex = pkgs.haskellPackages.git-annex;
gitAnnex = git-annex;
+ git-annex-metadata-gui = libsForQt5.callPackage ./git-annex-metadata-gui {
+ inherit (python3Packages) buildPythonApplication pyqt5 git-annex-adapter;
+ };
+
git-annex-remote-b2 = callPackage ./git-annex-remote-b2 { };
git-annex-remote-rclone = callPackage ./git-annex-remote-rclone { };
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..ba64a065d2812c576b5d8fd44e02f1d4971dca62
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, buildPythonApplication, fetchFromGitHub, pyqt5, git-annex-adapter }:
+
+buildPythonApplication rec {
+ name = "git-annex-metadata-gui-${version}";
+ version = "0.2.0";
+
+ src = fetchFromGitHub {
+ owner = "alpernebbi";
+ repo = "git-annex-metadata-gui";
+ rev = "v${version}";
+ sha256 = "03kch67k0q9lcs817906g864wwabkn208aiqvbiyqp1qbg99skam";
+ };
+
+ prePatch = ''
+ substituteInPlace setup.py --replace "'PyQt5', " ""
+ '';
+
+ propagatedBuildInputs = [ pyqt5 git-annex-adapter ];
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/alpernebbi/git-annex-metadata-gui;
+ description = "Graphical interface for git-annex metadata commands";
+ maintainers = with maintainers; [ dotlambda ];
+ license = licenses.gpl3Plus;
+ platforms = with platforms; linux;
+ };
+}
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix
index d38529e92e606f8c68ef509dcd08f8c094098516..c368dcd487e8e32ffb0b08d01ea88ea11f3822da 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
name = "git-annex-remote-rclone-${version}";
- version = "0.5";
+ version = "0.6";
rev = "v${version}";
src = fetchFromGitHub {
inherit rev;
owner = "DanielDent";
repo = "git-annex-remote-rclone";
- sha256 = "1353b6q3lnxhpdfy9yd2af65v7aypdhyvgn7ziksmsrbi12lb74i";
+ sha256 = "0j0hlxji8d974fq7zd4xc02n0jpi31ylhxc7z4zp8iiwad5mkpxp";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
index 8e3c6b8d9d023cf511bbdf4e2a0cb937cbb2e00c..31504d542d266dda4c19f6098f4f5d055793f468 100644
--- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
@@ -4,13 +4,13 @@ let
inherit (pythonPackages) buildPythonApplication pyqt4 sip pyinotify python mock;
in buildPythonApplication rec {
name = "git-cola-${version}";
- version = "2.11";
+ version = "3.0";
src = fetchFromGitHub {
owner = "git-cola";
repo = "git-cola";
rev = "v${version}";
- sha256 = "1prv8ib9jdkj5rgixj3hvkivwmbz5xvh8bmllrb1sb301yzi1s0g";
+ sha256 = "0jc360agrlhp1w9i725ffksvc6v95jnzzppjvza7ssip65gplrkx";
};
buildInputs = [ git gettext ];
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 4ec83af916070d087aad2b707eccc70ec7c84ce1..f308073f1f1e04ddeed13654a8466211aac39aeb 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
@@ -18,7 +18,6 @@ stdenv.mkDerivation rec {
];
postPatch = ''
- substituteInPlace Makefile --replace rst2man rst2man.py
patchShebangs .
'';
diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix
index ba2b71138067c8c63af76dea9dc3b3edda1e365b..1208afa196304b4224cf4e90e3a8f90b1f74d5fd 100644
--- a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix
@@ -14,12 +14,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "man" ];
- buildInputs = [ docutils makeWrapper ];
-
- # The install.sh script expects rst2man, but here it's named rst2man.py
- patchPhase = ''
- sed -i 's/rst2man/rst2man.py/g' install.sh
- '';
+ nativeBuildInputs = [ docutils makeWrapper ];
installPhase = ''
prefix="$out" ./install.sh
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 c0b6720690058e8416dbe4578ea1488c6abe49a8..3a2585433307cbe9ad98d9d418f9089dcf78aabb 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.15.0";
+ version = "2.15.1";
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 = "0siyxg1ppg6szjp8xp37zfq1fj97kbdxpigi3asmidqhkx41cw8h";
+ sha256 = "0p04linqdywdf7m1hqa904fzqvgzplsxlzdqrn96j1j5gpyr174r";
};
hardeningDisable = [ "format" ];
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 bed0ef3582715f3dd5f310223d9681c1b27cf437..07ea2be7ad34ec3809aa1e248ad5c5fd41483098 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.3.0";
+ version = "2.3.2";
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "jonas";
repo = pname;
rev = name;
- sha256 = "04qw3fyamm1lka9vh7adrkr2mcnwcch9ya5sph51jx6d4jz1lih5";
+ sha256 = "14cdlrdxbl8vzqw86fm3wyaixh607z47shc4dwd6rd9vj05w0m97";
};
nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkgconfig ];
diff --git a/pkgs/applications/version-management/gitaly/Gemfile b/pkgs/applications/version-management/gitaly/Gemfile
index 7e8f9f2b255773a1e2a8aea94273fdb1c1561908..2aaf872d109be6942b5e438619ee1f8e48dbc692 100644
--- a/pkgs/applications/version-management/gitaly/Gemfile
+++ b/pkgs/applications/version-management/gitaly/Gemfile
@@ -1,8 +1,10 @@
source 'https://rubygems.org'
gem 'github-linguist', '~> 4.7.0', require: 'linguist'
-gem 'gitaly-proto', '~> 0.37.0', require: 'gitaly'
+gem 'gitaly-proto', '~> 0.59.0', require: 'gitaly'
gem 'activesupport'
+gem 'gollum-lib', '~> 4.2', require: false
+gem 'gollum-rugged_adapter', '~> 0.4.4', require: false
group :development, :test do
gem 'gitlab-styles', '~> 2.0.0', require: false
diff --git a/pkgs/applications/version-management/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitaly/Gemfile.lock
index 5ea14855b97f075f9e161083b9ced76df11e7957..f4e4ab10883e7a78e28aca3a6342f00b6cd688f2 100644
--- a/pkgs/applications/version-management/gitaly/Gemfile.lock
+++ b/pkgs/applications/version-management/gitaly/Gemfile.lock
@@ -11,10 +11,13 @@ GEM
ast (2.3.0)
charlock_holmes (0.7.5)
concurrent-ruby (1.0.5)
+ diff-lcs (1.3)
escape_utils (1.1.1)
faraday (0.12.2)
multipart-post (>= 1.2, < 3)
- gitaly-proto (0.37.0)
+ gemojione (3.3.0)
+ json
+ gitaly-proto (0.59.0)
google-protobuf (~> 3.1)
grpc (~> 1.0)
github-linguist (4.7.6)
@@ -22,10 +25,29 @@ GEM
escape_utils (~> 1.1.0)
mime-types (>= 1.19)
rugged (>= 0.23.0b)
+ github-markup (1.6.1)
+ gitlab-grit (2.8.2)
+ charlock_holmes (~> 0.6)
+ diff-lcs (~> 1.1)
+ mime-types (>= 1.16)
+ posix-spawn (~> 0.3)
gitlab-styles (2.0.0)
rubocop (~> 0.49)
rubocop-gitlab-security (~> 0.1.0)
rubocop-rspec (~> 1.15)
+ gollum-grit_adapter (1.0.1)
+ gitlab-grit (~> 2.7, >= 2.7.1)
+ gollum-lib (4.2.7)
+ gemojione (~> 3.2)
+ github-markup (~> 1.6)
+ gollum-grit_adapter (~> 1.0)
+ nokogiri (>= 1.6.1, < 2.0)
+ rouge (~> 2.1)
+ sanitize (~> 2.1)
+ stringex (~> 2.6)
+ gollum-rugged_adapter (0.4.4)
+ mime-types (>= 1.15)
+ rugged (~> 0.25)
google-protobuf (3.4.0.2)
googleauth (0.5.3)
faraday (~> 0.12)
@@ -39,6 +61,7 @@ GEM
google-protobuf (~> 3.1)
googleauth (~> 0.5.1)
i18n (0.8.1)
+ json (2.1.0)
jwt (1.5.6)
little-plugger (1.1.4)
logging (2.2.2)
@@ -48,18 +71,23 @@ GEM
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
+ mini_portile2 (2.3.0)
minitest (5.9.1)
multi_json (1.12.1)
multipart-post (2.0.0)
+ nokogiri (1.8.1)
+ mini_portile2 (~> 2.3.0)
os (0.9.6)
parallel (1.12.0)
parser (2.4.0.0)
ast (~> 2.2)
+ posix-spawn (0.3.13)
powerpack (0.1.1)
public_suffix (2.0.5)
rainbow (2.2.2)
rake
rake (12.1.0)
+ rouge (2.2.1)
rubocop (0.50.0)
parallel (~> 1.10)
parser (>= 2.3.3.1, < 3.0)
@@ -73,11 +101,14 @@ GEM
rubocop (>= 0.50.0)
ruby-progressbar (1.8.3)
rugged (0.26.0)
+ sanitize (2.1.0)
+ nokogiri (>= 1.4.4)
signet (0.7.3)
addressable (~> 2.3)
faraday (~> 0.9)
jwt (~> 1.5)
multi_json (~> 1.10)
+ stringex (2.7.1)
thread_safe (0.3.6)
tzinfo (1.2.2)
thread_safe (~> 0.1)
@@ -88,9 +119,11 @@ PLATFORMS
DEPENDENCIES
activesupport
- gitaly-proto (~> 0.37.0)
+ gitaly-proto (~> 0.59.0)
github-linguist (~> 4.7.0)
gitlab-styles (~> 2.0.0)
+ gollum-lib (~> 4.2)
+ gollum-rugged_adapter (~> 0.4.4)
BUNDLED WITH
- 1.15.4
+ 1.16.0
diff --git a/pkgs/applications/version-management/gitaly/default.nix b/pkgs/applications/version-management/gitaly/default.nix
index 63e5758107f768fcdc2e85cd2bac7b289227d0bd..43ac470dcd469e88e7f79bd5de2295cc60326e43 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.43.1";
+ version = "0.59.2";
name = "gitaly-${version}";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
- sha256 = "19ggfc5nwv8q1wq739ab8qdfdngpi33431dgfa9593p6ad7v6hyq";
+ sha256 = "08f109rw3qxdr93l0kl8wxmrvn846a6vdkssvrp2zr40yn9wif7m";
};
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 57480f3f337efb36672e252cdb7efad1a7e0e698..81bb334085ac8fb9ada908fd167ce3ffd566b007 100644
--- a/pkgs/applications/version-management/gitaly/gemset.nix
+++ b/pkgs/applications/version-management/gitaly/gemset.nix
@@ -41,6 +41,14 @@
};
version = "1.0.5";
};
+ diff-lcs = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza";
+ type = "gem";
+ };
+ version = "1.3";
+ };
escape_utils = {
source = {
remotes = ["https://rubygems.org"];
@@ -58,14 +66,23 @@
};
version = "0.12.2";
};
+ gemojione = {
+ dependencies = ["json"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0ayk8r147k1s38nj18pwk76npx1p7jhi86silk800nj913pjvrhj";
+ type = "gem";
+ };
+ version = "3.3.0";
+ };
gitaly-proto = {
dependencies = ["google-protobuf" "grpc"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1nqp9ib00q55ig8zf1r6ldf3xkqw0874ra1mbcsm8sl46l84lx11";
+ sha256 = "0s86126iqhbmkix6zs357ixlc1syyxmwk2blaimsav7f0x9swy82";
type = "gem";
};
- version = "0.37.0";
+ version = "0.59.0";
};
github-linguist = {
dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"];
@@ -76,6 +93,23 @@
};
version = "4.7.6";
};
+ github-markup = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1nyb9ck2c9z5qi86n7r52w0m126qpnvc93yh35cn8bwsnkjqx0iq";
+ type = "gem";
+ };
+ version = "1.6.1";
+ };
+ gitlab-grit = {
+ dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0xgs3l81ghlc5nm75n0pz7b2cj3hpscfq5iy27c483nnjn2v5mc4";
+ type = "gem";
+ };
+ version = "2.8.2";
+ };
gitlab-styles = {
dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-rspec"];
source = {
@@ -85,6 +119,33 @@
};
version = "2.0.0";
};
+ gollum-grit_adapter = {
+ dependencies = ["gitlab-grit"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0fcibm63v1afc0fj5rki0mm51m7nndil4cjcjjvkh3yigfn4nr4b";
+ type = "gem";
+ };
+ version = "1.0.1";
+ };
+ gollum-lib = {
+ dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1filwvjfj5q2m6w4q274ai36d6f0mrsv2l2khhk4bv1q6pqby2fq";
+ type = "gem";
+ };
+ version = "4.2.7";
+ };
+ gollum-rugged_adapter = {
+ dependencies = ["mime-types" "rugged"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0khfmakp65frlaj7ajs6ihqg4xi7yc9z96kpsf1b7giqi3fqhhv4";
+ type = "gem";
+ };
+ version = "0.4.4";
+ };
google-protobuf = {
source = {
remotes = ["https://rubygems.org"];
@@ -119,6 +180,14 @@
};
version = "0.8.1";
};
+ json = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp";
+ type = "gem";
+ };
+ version = "2.1.0";
+ };
jwt = {
source = {
remotes = ["https://rubygems.org"];
@@ -169,6 +238,14 @@
};
version = "3.2016.0521";
};
+ mini_portile2 = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11";
+ type = "gem";
+ };
+ version = "2.3.0";
+ };
minitest = {
source = {
remotes = ["https://rubygems.org"];
@@ -193,6 +270,15 @@
};
version = "2.0.0";
};
+ nokogiri = {
+ dependencies = ["mini_portile2"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "105xh2zkr8nsyfaj2izaisarpnkrrl9000y3nyflg9cbzrfxv021";
+ type = "gem";
+ };
+ version = "1.8.1";
+ };
os = {
source = {
remotes = ["https://rubygems.org"];
@@ -218,6 +304,14 @@
};
version = "2.4.0.0";
};
+ posix-spawn = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1pmxmpins57qrbr31bs3bm7gidhaacmrp4md6i962gvpq4gyfcjw";
+ type = "gem";
+ };
+ version = "0.3.13";
+ };
powerpack = {
source = {
remotes = ["https://rubygems.org"];
@@ -251,6 +345,14 @@
};
version = "12.1.0";
};
+ rouge = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "02kpahk5nkc33yxnn75649kzxaz073wvazr2zyg491nndykgnvcs";
+ type = "gem";
+ };
+ version = "2.2.1";
+ };
rubocop = {
dependencies = ["parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"];
source = {
@@ -294,6 +396,15 @@
};
version = "0.26.0";
};
+ sanitize = {
+ dependencies = ["nokogiri"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0xsv6xqrlz91rd8wifjknadbl3z5h6qphmxy0hjb189qbdghggn3";
+ type = "gem";
+ };
+ version = "2.1.0";
+ };
signet = {
dependencies = ["addressable" "faraday" "jwt" "multi_json"];
source = {
@@ -303,6 +414,14 @@
};
version = "0.7.3";
};
+ stringex = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1zc93v00av643lc6njl09wwki7h5yqayhh1din8zqfylw814l1dv";
+ type = "gem";
+ };
+ version = "2.7.1";
+ };
thread_safe = {
source = {
remotes = ["https://rubygems.org"];
diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix
index d4afdd7b3cd4d1f15effbe79208e024516a36c48..f09d02ab022e87cdb3a8292564235abd236b75c2 100644
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@@ -7,13 +7,13 @@ with stdenv.lib;
buildGoPackage rec {
name = "gitea-${version}";
- version = "1.2.3";
+ version = "1.3.2";
src = fetchFromGitHub {
owner = "go-gitea";
repo = "gitea";
rev = "v${version}";
- sha256 = "0v24q14xzmqgwk10m7rqyn6pahd630v3bnc646ij4w8fbgr8hzja";
+ sha256 = "11gzb6x8zixmkm57x8hdncmdbbvppzld3yf7p7m0abigg8zyybsj";
};
patches = [ ./static-root-path.patch ];
diff --git a/pkgs/applications/version-management/gitea/static-root-path.patch b/pkgs/applications/version-management/gitea/static-root-path.patch
index 06ce521e9e8d50ae667caf9262d47105f04df643..7c36afdff84c4afd49e91109b0f4e8aeb70a12c2 100644
--- a/pkgs/applications/version-management/gitea/static-root-path.patch
+++ b/pkgs/applications/version-management/gitea/static-root-path.patch
@@ -2,12 +2,12 @@ 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() {
+@@ -730,7 +730,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(AppWorkPath)
+ StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString("@data@")
- AppDataPath = sec.Key("APP_DATA_PATH").MustString("data")
+ AppDataPath = sec.Key("APP_DATA_PATH").MustString(path.Join(AppWorkPath, "data"))
EnableGzip = sec.Key("ENABLE_GZIP").MustBool()
EnablePprof = sec.Key("ENABLE_PPROF").MustBool(false)
diff --git a/pkgs/applications/version-management/gitinspector/default.nix b/pkgs/applications/version-management/gitinspector/default.nix
index eea5242e6bcc9b8c1252e348fad6f3d5666b16c0..2428c6cebddd3be5abbb9043a74f425f03f15ef0 100644
--- a/pkgs/applications/version-management/gitinspector/default.nix
+++ b/pkgs/applications/version-management/gitinspector/default.nix
@@ -11,6 +11,10 @@ python2Packages.buildPythonApplication rec {
name = name + "-src";
};
+ checkInputs = with python2Packages; [
+ unittest2
+ ];
+
meta = with stdenv.lib; {
homepage = https://github.com/ejwa/gitinspector;
description = "Statistical analysis tool for git repositories";
diff --git a/pkgs/applications/version-management/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab-shell/default.nix
index ac05ca4c4847a446bcc4873d425f94ebece3decd..ab0ff74f03f59d8d59a674a4e9f439f35205d62c 100644
--- a/pkgs/applications/version-management/gitlab-shell/default.nix
+++ b/pkgs/applications/version-management/gitlab-shell/default.nix
@@ -1,19 +1,17 @@
{ stdenv, ruby, bundler, fetchFromGitLab, go }:
stdenv.mkDerivation rec {
- version = "5.9.3";
+ version = "5.10.2";
name = "gitlab-shell-${version}";
srcs = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-shell";
rev = "v${version}";
- sha256 = "12iil8ap9lbd7skj7xr2v6lsyjdd97svbmyj0n2j8m819fv0x27p";
+ sha256 = "16lwnzsppql7pkf8fka6cwkghdr57g225zvln9ii29w7nzz1hvaf";
};
- buildInputs = [
- ruby bundler go
- ];
+ buildInputs = [ ruby bundler go ];
patches = [ ./remove-hardcoded-locations.patch ./fixes.patch ];
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 dd1ecafb8bf836c1cc81eca058eac3e2b5ac67a0..f28e74b88c501db5e6a07a9fb166bf6d7c639209 100644
--- a/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch
+++ b/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch
@@ -25,3 +25,16 @@ index e7d0254..181ec8a 100644
end
def api
+diff --git a/go/internal/config/config.go b/go/internal/config/config.go
+index c57b4de..88cfc95 100644
+--- a/go/internal/config/config.go
++++ b/go/internal/config/config.go
+@@ -27,7 +27,7 @@ func New() (*Config, error) {
+ }
+ cfg.RootDir = dir
+
+- configBytes, err := ioutil.ReadFile(path.Join(cfg.RootDir, configFile))
++ configBytes, err := ioutil.ReadFile(os.Getenv("GITLAB_SHELL_CONFIG_PATH"))
+ if err != nil {
+ return nil, err
+ }
diff --git a/pkgs/applications/version-management/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab-workhorse/default.nix
index 1f3407eddcf50efe8ade84b7f46e7b60c9eac165..c43b5ab2a1b623ab01bfe618061488c0224d287b 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.2.0";
+ version = "3.3.1";
name = "gitlab-workhorse-${version}";
srcs = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-workhorse";
rev = "v${version}";
- sha256 = "1ivqlhvmxhdb8359yh469zl45j00n94b53naqi8jx06kijfsdz4r";
+ sha256 = "19x9ryp99xygj39kq2r756rahh9mxp6j83hxvv09y33vgz64y8xh";
};
buildInputs = [ git go ];
diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile
index b4a457bff6e524fa093eea8bfb531f949aad04c4..916314f42f93b91518299cfde35036cda1205987 100644
--- a/pkgs/applications/version-management/gitlab/Gemfile
+++ b/pkgs/applications/version-management/gitlab/Gemfile
@@ -1,6 +1,6 @@
source 'https://rubygems.org'
-gem 'rails', '4.2.8'
+gem 'rails', '4.2.10'
gem 'rails-deprecated_sanitizer', '~> 1.0.3'
# Responders respond_to and respond_with
@@ -90,7 +90,7 @@ gem 'kaminari', '~> 1.0'
gem 'hamlit', '~> 2.6.1'
# Files attachments
-gem 'carrierwave', '~> 1.1'
+gem 'carrierwave', '~> 1.2'
# Drag and Drop UI
gem 'dropzonejs-rails', '~> 0.7.1'
@@ -102,7 +102,7 @@ gem 'fog-google', '~> 0.5'
gem 'fog-local', '~> 0.3'
gem 'fog-openstack', '~> 0.1'
gem 'fog-rackspace', '~> 0.1.1'
-gem 'fog-aliyun', '~> 0.1.0'
+gem 'fog-aliyun', '~> 0.2.0'
# for Google storage
gem 'google-api-client', '~> 0.13.6'
@@ -111,7 +111,7 @@ gem 'google-api-client', '~> 0.13.6'
gem 'unf', '~> 0.1.4'
# Seed data
-gem 'seed-fu', '~> 2.3.5'
+gem 'seed-fu', '2.3.6' # Upgrade to > 2.3.7 once https://github.com/mbleigh/seed-fu/issues/123 is solved
# Markdown and HTML processing
gem 'html-pipeline', '~> 1.11.0'
@@ -171,7 +171,7 @@ gem 're2', '~> 1.1.1'
gem 'version_sorter', '~> 2.1.0'
# Cache
-gem 'redis-rails', '~> 5.0.1'
+gem 'redis-rails', '~> 5.0.2'
# Redis
gem 'redis', '~> 3.2'
@@ -245,7 +245,7 @@ gem 'font-awesome-rails', '~> 4.7'
gem 'gemojione', '~> 3.3'
gem 'gon', '~> 6.1.0'
gem 'jquery-atwho-rails', '~> 1.3.2'
-gem 'jquery-rails', '~> 4.1.0'
+gem 'jquery-rails', '~> 4.3.1'
gem 'request_store', '~> 1.3'
gem 'select2-rails', '~> 3.5.9'
gem 'virtus', '~> 1.0.1'
@@ -263,6 +263,8 @@ gem 'gettext_i18n_rails', '~> 1.8.0'
gem 'gettext_i18n_rails_js', '~> 1.2.0'
gem 'gettext', '~> 3.2.2', require: false, group: :development
+gem 'batch-loader'
+
# Perf bar
gem 'peek', '~> 1.0.1'
gem 'peek-gc', '~> 0.0.2'
@@ -281,7 +283,7 @@ group :metrics do
gem 'influxdb', '~> 0.2', require: false
# Prometheus
- gem 'prometheus-client-mmap', '~>0.7.0.beta18'
+ gem 'prometheus-client-mmap', '~> 0.7.0.beta43'
gem 'raindrops', '~> 0.18'
end
@@ -324,9 +326,9 @@ group :development, :test do
# Generate Fake data
gem 'ffaker', '~> 2.4'
- gem 'capybara', '~> 2.15.0'
+ gem 'capybara', '~> 2.15'
gem 'capybara-screenshot', '~> 1.0.0'
- gem 'poltergeist', '~> 1.9.0'
+ gem 'selenium-webdriver', '~> 3.5'
gem 'spring', '~> 2.0.0'
gem 'spring-commands-rspec', '~> 1.0.4'
@@ -343,7 +345,7 @@ group :development, :test do
gem 'benchmark-ips', '~> 2.3.0', require: false
- gem 'license_finder', '~> 2.1.0', require: false
+ gem 'license_finder', '~> 3.1', require: false
gem 'knapsack', '~> 1.11.0'
gem 'activerecord_sane_schema_dumper', '0.2'
@@ -398,7 +400,7 @@ group :ed25519 do
end
# Gitaly GRPC client
-gem 'gitaly-proto', '~> 0.39.0', require: 'gitaly'
+gem 'gitaly-proto', '~> 0.59.0', require: 'gitaly'
gem 'toml-rb', '~> 0.3.15', require: false
diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock
index fd3aab2d54ad13cddf0c05ef480862d52dba4242..c8915e9172c5c7097827ed074fc54dea6b2fa39f 100644
--- a/pkgs/applications/version-management/gitlab/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/Gemfile.lock
@@ -4,40 +4,40 @@ GEM
RedCloth (4.3.2)
abstract_type (0.0.7)
ace-rails-ap (4.1.2)
- actionmailer (4.2.8)
- actionpack (= 4.2.8)
- actionview (= 4.2.8)
- activejob (= 4.2.8)
+ actionmailer (4.2.10)
+ actionpack (= 4.2.10)
+ actionview (= 4.2.10)
+ activejob (= 4.2.10)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
- actionpack (4.2.8)
- actionview (= 4.2.8)
- activesupport (= 4.2.8)
+ actionpack (4.2.10)
+ actionview (= 4.2.10)
+ activesupport (= 4.2.10)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
- actionview (4.2.8)
- activesupport (= 4.2.8)
+ actionview (4.2.10)
+ activesupport (= 4.2.10)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
- activejob (4.2.8)
- activesupport (= 4.2.8)
+ activejob (4.2.10)
+ activesupport (= 4.2.10)
globalid (>= 0.3.0)
- activemodel (4.2.8)
- activesupport (= 4.2.8)
+ activemodel (4.2.10)
+ activesupport (= 4.2.10)
builder (~> 3.1)
- activerecord (4.2.8)
- activemodel (= 4.2.8)
- activesupport (= 4.2.8)
+ activerecord (4.2.10)
+ activemodel (= 4.2.10)
+ activesupport (= 4.2.10)
arel (~> 6.0)
activerecord-nulldb-adapter (0.3.7)
activerecord (>= 2.0.0)
activerecord_sane_schema_dumper (0.2)
rails (>= 4, < 5)
- activesupport (4.2.8)
+ activesupport (4.2.10)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
@@ -75,6 +75,7 @@ GEM
thread_safe (~> 0.3, >= 0.3.1)
babosa (1.0.2)
base32 (0.3.2)
+ batch-loader (1.1.1)
bcrypt (3.1.11)
bcrypt_pbkdf (1.0.0)
benchmark-ips (2.3.0)
@@ -85,6 +86,7 @@ GEM
bindata (2.4.1)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
+ blankslate (2.1.2.4)
bootstrap-sass (3.3.6)
autoprefixer-rails (>= 5.2.1)
sass (>= 3.3.4)
@@ -109,18 +111,19 @@ GEM
capybara-screenshot (1.0.14)
capybara (>= 1.0, < 3)
launchy
- carrierwave (1.1.0)
+ carrierwave (1.2.1)
activemodel (>= 4.0.0)
activesupport (>= 4.0.0)
mime-types (>= 1.16)
cause (0.1)
charlock_holmes (0.7.5)
+ childprocess (0.7.0)
+ ffi (~> 1.0, >= 1.0.11)
chronic (0.10.2)
chronic_duration (0.10.6)
numerizer (~> 0.1.1)
chunky_png (1.3.5)
citrus (3.0.2)
- cliver (0.3.2)
coderay (1.1.1)
coercible (1.0.0)
descendants_tracker (~> 0.0.1)
@@ -216,7 +219,7 @@ GEM
flowdock (0.7.1)
httparty (~> 0.7)
multi_json
- fog-aliyun (0.1.0)
+ fog-aliyun (0.2.0)
fog-core (~> 1.27)
fog-json (~> 1.0)
ipaddress (~> 0.8)
@@ -275,7 +278,7 @@ GEM
po_to_json (>= 1.0.0)
rails (>= 3.2.0)
gherkin-ruby (0.3.2)
- gitaly-proto (0.39.0)
+ gitaly-proto (0.59.0)
google-protobuf (~> 3.1)
grpc (~> 1.0)
github-linguist (4.7.6)
@@ -293,14 +296,14 @@ GEM
diff-lcs (~> 1.1)
mime-types (>= 1.16)
posix-spawn (~> 0.3)
- gitlab-markup (1.6.2)
+ gitlab-markup (1.6.3)
gitlab_omniauth-ldap (2.0.4)
net-ldap (~> 0.16)
omniauth (~> 1.3)
pyu-ruby-sasl (>= 0.0.3.3, < 0.1)
rubyntlm (~> 0.5)
- globalid (0.3.7)
- activesupport (>= 4.1.0)
+ globalid (0.4.1)
+ activesupport (>= 4.2.0)
gollum-grit_adapter (1.0.1)
gitlab-grit (~> 2.7, >= 2.7.1)
gollum-lib (4.2.7)
@@ -326,7 +329,7 @@ GEM
mime-types (~> 3.0)
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
- google-protobuf (3.4.0.2)
+ google-protobuf (3.4.1.1)
googleauth (0.5.3)
faraday (~> 0.12)
jwt (~> 1.4)
@@ -353,7 +356,7 @@ GEM
rake
grape_logging (1.7.0)
grape
- grpc (1.6.0)
+ grpc (1.4.5)
google-protobuf (~> 3.1)
googleauth (~> 0.5.1)
haml (4.0.7)
@@ -396,7 +399,8 @@ GEM
json (~> 1.8)
multi_xml (>= 0.5.2)
httpclient (2.8.2)
- i18n (0.8.6)
+ i18n (0.9.1)
+ concurrent-ruby (~> 1.0)
ice_nine (0.11.2)
influxdb (0.2.3)
cause
@@ -407,7 +411,7 @@ GEM
multipart-post
oauth (~> 0.5, >= 0.5.0)
jquery-atwho-rails (1.3.2)
- jquery-rails (4.1.1)
+ jquery-rails (4.3.1)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
@@ -449,11 +453,13 @@ GEM
actionmailer (>= 3.2)
letter_opener (~> 1.0)
railties (>= 3.2)
- license_finder (2.1.0)
+ license_finder (3.1.1)
bundler
httparty
rubyzip
thor
+ toml (= 0.1.2)
+ with_env (> 1.0)
xml-simple
licensee (8.7.0)
rugged (~> 0.24)
@@ -468,8 +474,8 @@ GEM
railties (>= 4, < 5.2)
loofah (2.0.3)
nokogiri (>= 1.5.9)
- mail (2.6.6)
- mime-types (>= 1.16, < 4)
+ mail (2.7.0)
+ mini_mime (>= 0.1.1)
mail_room (0.9.1)
memoist (0.16.0)
memoizable (0.4.2)
@@ -482,7 +488,6 @@ GEM
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.2)
multi_xml (0.6.0)
@@ -567,8 +572,10 @@ GEM
parallel (1.12.0)
paranoia (2.3.1)
activerecord (>= 4.0, < 5.2)
- parser (2.4.0.0)
- ast (~> 2.2)
+ parser (2.4.0.2)
+ ast (~> 2.3)
+ parslet (1.5.0)
+ blankslate (~> 2.0)
path_expander (1.0.1)
peek (1.0.1)
concurrent-ruby (>= 0.9.0)
@@ -603,11 +610,6 @@ GEM
pg (0.18.4)
po_to_json (1.0.1)
json (>= 1.6.0)
- poltergeist (1.9.0)
- capybara (~> 2.1)
- cliver (~> 0.3.1)
- multi_json (~> 1.0)
- websocket-driver (>= 0.2.0)
posix-spawn (0.3.13)
powerpack (0.1.1)
premailer (1.10.4)
@@ -622,8 +624,7 @@ GEM
parser
unparser
procto (0.0.3)
- prometheus-client-mmap (0.7.0.beta18)
- mmap2 (~> 2.2, >= 2.2.7)
+ prometheus-client-mmap (0.7.0.beta43)
pry (0.10.4)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
@@ -653,16 +654,16 @@ GEM
rack
rack-test (0.6.3)
rack (>= 1.0)
- rails (4.2.8)
- actionmailer (= 4.2.8)
- actionpack (= 4.2.8)
- actionview (= 4.2.8)
- activejob (= 4.2.8)
- activemodel (= 4.2.8)
- activerecord (= 4.2.8)
- activesupport (= 4.2.8)
+ rails (4.2.10)
+ actionmailer (= 4.2.10)
+ actionpack (= 4.2.10)
+ actionview (= 4.2.10)
+ activejob (= 4.2.10)
+ activemodel (= 4.2.10)
+ activerecord (= 4.2.10)
+ activesupport (= 4.2.10)
bundler (>= 1.3.0, < 2.0)
- railties (= 4.2.8)
+ railties (= 4.2.10)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
@@ -675,15 +676,15 @@ GEM
rails-i18n (4.0.9)
i18n (~> 0.7)
railties (~> 4.0)
- railties (4.2.8)
- actionpack (= 4.2.8)
- activesupport (= 4.2.8)
+ railties (4.2.10)
+ actionpack (= 4.2.10)
+ activesupport (= 4.2.10)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (2.2.2)
rake
raindrops (0.18.0)
- rake (12.1.0)
+ rake (12.3.0)
rblineprof (0.3.6)
debugger-ruby_core_source (~> 1.3)
rbnacl (4.0.2)
@@ -698,24 +699,24 @@ GEM
recursive-open-struct (1.0.0)
redcarpet (3.4.0)
redis (3.3.3)
- redis-actionpack (5.0.1)
+ redis-actionpack (5.0.2)
actionpack (>= 4.0, < 6)
redis-rack (>= 1, < 3)
- redis-store (>= 1.1.0, < 1.4.0)
- redis-activesupport (5.0.1)
+ redis-store (>= 1.1.0, < 2)
+ redis-activesupport (5.0.4)
activesupport (>= 3, < 6)
- redis-store (~> 1.2.0)
+ redis-store (>= 1.3, < 2)
redis-namespace (1.5.2)
redis (~> 3.0, >= 3.0.4)
- redis-rack (1.6.0)
- rack (~> 1.5)
- redis-store (~> 1.2.0)
- redis-rails (5.0.1)
- redis-actionpack (~> 5.0.0)
- redis-activesupport (~> 5.0.0)
- redis-store (~> 1.2.0)
- redis-store (1.2.0)
- redis (>= 2.2)
+ redis-rack (2.0.4)
+ rack (>= 1.5, < 3)
+ redis-store (>= 1.2, < 2)
+ redis-rails (5.0.2)
+ redis-actionpack (>= 5.0, < 6)
+ redis-activesupport (>= 5.0, < 6)
+ redis-store (>= 1.2, < 2)
+ redis-store (1.4.1)
+ redis (>= 2.2, < 5)
representable (3.0.4)
declarative (< 0.1.0)
declarative-option (< 0.2.0)
@@ -817,6 +818,9 @@ GEM
activesupport (>= 3.1)
select2-rails (3.5.9.3)
thor (~> 0.14)
+ selenium-webdriver (3.5.0)
+ childprocess (~> 0.5)
+ rubyzip (~> 1.0)
sentry-raven (2.5.3)
faraday (>= 0.7.6, < 1.0)
settingslogic (2.0.9)
@@ -867,7 +871,7 @@ GEM
sprockets (3.7.1)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
- sprockets-rails (3.2.0)
+ sprockets-rails (3.2.1)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
@@ -898,12 +902,14 @@ GEM
tilt (2.0.6)
timecop (0.8.1)
timfel-krb5-auth (0.8.3)
+ toml (0.1.2)
+ parslet (~> 1.5.0)
toml-rb (0.3.15)
citrus (~> 3.0, > 3.0)
truncato (0.7.10)
htmlentities (~> 4.3.1)
nokogiri (~> 1.8.0, >= 1.7.0)
- tzinfo (1.2.3)
+ tzinfo (1.2.4)
thread_safe (~> 0.1)
u2f (0.2.1)
uber (0.1.0)
@@ -948,13 +954,11 @@ GEM
hashdiff
webpack-rails (0.9.10)
railties (>= 3.2.0)
- websocket-driver (0.6.3)
- websocket-extensions (>= 0.1.0)
- websocket-extensions (0.1.2)
wikicloth (0.8.1)
builder
expression_parser
rinku
+ with_env (1.1.0)
xml-simple (1.1.5)
xpath (2.1.0)
nokogiri (~> 1.3)
@@ -978,6 +982,7 @@ DEPENDENCIES
awesome_print (~> 1.2.0)
babosa (~> 1.0.2)
base32 (~> 0.3.0)
+ batch-loader
bcrypt_pbkdf (~> 1.0)
benchmark-ips (~> 2.3.0)
better_errors (~> 2.1.0)
@@ -988,9 +993,9 @@ DEPENDENCIES
browser (~> 2.2)
bullet (~> 5.5.0)
bundler-audit (~> 0.5.0)
- capybara (~> 2.15.0)
+ capybara (~> 2.15)
capybara-screenshot (~> 1.0.0)
- carrierwave (~> 1.1)
+ carrierwave (~> 1.2)
charlock_holmes (~> 0.7.5)
chronic (~> 0.10.2)
chronic_duration (~> 0.10.6)
@@ -1015,7 +1020,7 @@ DEPENDENCIES
flay (~> 2.8.0)
flipper (~> 0.10.2)
flipper-active_record (~> 0.10.2)
- fog-aliyun (~> 0.1.0)
+ fog-aliyun (~> 0.2.0)
fog-aws (~> 1.4)
fog-core (~> 1.44)
fog-google (~> 0.5)
@@ -1030,7 +1035,7 @@ DEPENDENCIES
gettext (~> 3.2.2)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.2.0)
- gitaly-proto (~> 0.39.0)
+ gitaly-proto (~> 0.59.0)
github-linguist (~> 4.7.0)
gitlab-flowdock-git-hook (~> 1.0.1)
gitlab-markup (~> 1.6.2)
@@ -1055,14 +1060,14 @@ DEPENDENCIES
influxdb (~> 0.2)
jira-ruby (~> 1.4)
jquery-atwho-rails (~> 1.3.2)
- jquery-rails (~> 4.1.0)
+ jquery-rails (~> 4.3.1)
json-schema (~> 2.8.0)
jwt (~> 1.5.6)
kaminari (~> 1.0)
knapsack (~> 1.11.0)
kubeclient (~> 2.2.0)
letter_opener_web (~> 1.3.0)
- license_finder (~> 2.1.0)
+ license_finder (~> 3.1)
licensee (~> 8.7.0)
lograge (~> 0.5)
loofah (~> 2.0.3)
@@ -1104,16 +1109,15 @@ DEPENDENCIES
peek-redis (~> 1.2.0)
peek-sidekiq (~> 1.0.3)
pg (~> 0.18.2)
- poltergeist (~> 1.9.0)
premailer-rails (~> 1.9.7)
- prometheus-client-mmap (~> 0.7.0.beta18)
+ prometheus-client-mmap (~> 0.7.0.beta43)
pry-byebug (~> 3.4.1)
pry-rails (~> 0.3.4)
rack-attack (~> 4.4.1)
rack-cors (~> 0.4.0)
rack-oauth2 (~> 1.2.1)
rack-proxy (~> 0.6.0)
- rails (= 4.2.8)
+ rails (= 4.2.10)
rails-deprecated_sanitizer (~> 1.0.3)
rails-i18n (~> 4.0.9)
rainbow (~> 2.2)
@@ -1127,7 +1131,7 @@ DEPENDENCIES
redcarpet (~> 3.4)
redis (~> 3.2)
redis-namespace (~> 1.5.2)
- redis-rails (~> 5.0.1)
+ redis-rails (~> 5.0.2)
request_store (~> 1.3)
responders (~> 2.0)
rouge (~> 2.0)
@@ -1148,8 +1152,9 @@ DEPENDENCIES
sanitize (~> 2.0)
sass-rails (~> 5.0.6)
scss_lint (~> 0.54.0)
- seed-fu (~> 2.3.5)
+ seed-fu (= 2.3.6)
select2-rails (~> 3.5.9)
+ selenium-webdriver (~> 3.5)
sentry-raven (~> 2.5.3)
settingslogic (~> 2.0.9)
sham_rack (~> 1.3.6)
@@ -1189,4 +1194,4 @@ DEPENDENCIES
wikicloth (= 0.8.1)
BUNDLED WITH
- 1.15.4
+ 1.16.0
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index bc3ca9192bcb8ba8e557f9c4896271a00126e8d2..ea4c9c8731d23daa9d2d0e31b3ea041b3e1c2cf0 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -18,11 +18,11 @@ let
};
};
- version = "10.1.1";
+ version = "10.3.3";
gitlabDeb = fetchurl {
url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/jessie/gitlab-ce_${version}-ce.0_amd64.deb/download";
- sha256 = "0xvzxcygy6ffqm24rk6v9gs6g9r744vpwwvk9d00wjla7hwmq3w2";
+ sha256 = "0bnafl7mpm3vjhfkqwgf5ff1y1iixfdfvv25zmpl0yjd70fwx2aq";
};
in
@@ -30,17 +30,17 @@ in
stdenv.mkDerivation rec {
name = "gitlab-${version}";
- buildInputs = [
- rubyEnv ruby bundler tzdata git procps dpkg nettools
- ];
-
src = fetchFromGitHub {
owner = "gitlabhq";
repo = "gitlabhq";
rev = "v${version}";
- sha256 = "0p118msad6l12pd4q3vkvjggiiasbkh6pnl94riqyb5zkb7yrb1a";
+ sha256 = "1fhjijs8rvxrgx43fc7vp6f3vwshwq74gjwk41fi2yam8bri8p6k";
};
+ buildInputs = [
+ rubyEnv ruby bundler tzdata git procps dpkg nettools
+ ];
+
patches = [
./remove-hardcoded-locations.patch
./nulladapter.patch
@@ -74,7 +74,11 @@ stdenv.mkDerivation rec {
buildPhase = ''
mv config/gitlab.yml.example config/gitlab.yml
- dpkg -x ${gitlabDeb} .
+ # work around unpacking deb containing binary with suid bit
+ ar p ${gitlabDeb} data.tar.gz | gunzip > gitlab-deb-data.tar
+ tar -f gitlab-deb-data.tar --delete ./opt/gitlab/embedded/bin/ksu
+ tar -xf gitlab-deb-data.tar
+
mv -v opt/gitlab/embedded/service/gitlab-rails/public/assets public
rm -rf opt
diff --git a/pkgs/applications/version-management/gitlab/gemset.nix b/pkgs/applications/version-management/gitlab/gemset.nix
index 4fb4c48b0dee9197bdc4e8b2b43cd84f1c272ca8..fe861e14304666691d1efc397fa28987a7379463 100644
--- a/pkgs/applications/version-management/gitlab/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/gemset.nix
@@ -19,55 +19,55 @@
dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0pr3cmr0bpgg5d0f6wy1z6r45n14r9yin8jnr4hi3ssf402xpc0q";
+ sha256 = "1ivyjsapqgn1xfb2p8yqjrg2jldqm5r7hxrjxq6kdr05gk4fsg59";
type = "gem";
};
- version = "4.2.8";
+ version = "4.2.10";
};
actionpack = {
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "09fbazl0ja80na2wadfp3fzmdmdy1lsb4wd2yg7anbj0zk0ap7a9";
+ sha256 = "0l6agrxdaishxjx2zc2x8md95plfp39bfskzgs6v9gsdp2y2arpx";
type = "gem";
};
- version = "4.2.8";
+ version = "4.2.10";
};
actionview = {
dependencies = ["activesupport" "builder" "erubis" "rails-dom-testing" "rails-html-sanitizer"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1mg4a8143q2wjhjq4mngl69jkv249z5jvg0jkdribdv4zkg586rp";
+ sha256 = "1jrx2pmkywk70z7n17gw3jrcdw3n03wdzvg45bnq8wxshl1lmbhv";
type = "gem";
};
- version = "4.2.8";
+ version = "4.2.10";
};
activejob = {
dependencies = ["activesupport" "globalid"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0kazbpfgzz6cdmwjnlb9m671ps4qgggwv2hy8y9xi4h96djyyfqz";
+ sha256 = "10jsa5pqklcsd2npicqxr5abjlwi53di2brpzgz35k557fkpc1z8";
type = "gem";
};
- version = "4.2.8";
+ version = "4.2.10";
};
activemodel = {
dependencies = ["activesupport" "builder"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "11vhh7zmp92880s5sx8r32v2p0b7xg039mfr92pjynpkz4q901ld";
+ sha256 = "0c4vj9xajxa906bqbcjpni74nya6rh2nbb15gl8xm0vl9zf3ll9v";
type = "gem";
};
- version = "4.2.8";
+ version = "4.2.10";
};
activerecord = {
dependencies = ["activemodel" "activesupport" "arel"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1kk4dhn8jfhqfsf1dmb3a183gix6k46xr6cjkxj0rp51w2za1ns0";
+ sha256 = "1lws9y4p9c2vnmv3ddfpv8jh6azlddppl3fi31vahaz14ifxjk5s";
type = "gem";
};
- version = "4.2.8";
+ version = "4.2.10";
};
activerecord-nulldb-adapter = {
dependencies = ["activerecord"];
@@ -91,10 +91,10 @@
dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0wibdzd2f5l5rlsw1a1y3j3fhw2imrrbkxggdraa6q9qbdnc66hi";
+ sha256 = "0s12j8vl8vrxfngkdlz9g8bpz9akq1z42d57mx5r537b2pji8nr7";
type = "gem";
};
- version = "4.2.8";
+ version = "4.2.10";
};
acts-as-taggable-on = {
dependencies = ["activerecord"];
@@ -248,6 +248,14 @@
};
version = "0.3.2";
};
+ batch-loader = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1w4ysjfh74612wsgdnnaq3xqw25hzsr6ajb5syiv1ix7fi15y8bv";
+ type = "gem";
+ };
+ version = "1.1.1";
+ };
bcrypt = {
source = {
remotes = ["https://rubygems.org"];
@@ -298,6 +306,14 @@
};
version = "0.7.2";
};
+ blankslate = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0jnnq5q5dwy2rbfcl769vd9bk1yn0242f6yjlb9mnqdm9627cdcx";
+ type = "gem";
+ };
+ version = "2.1.2.4";
+ };
bootstrap-sass = {
dependencies = ["autoprefixer-rails" "sass"];
source = {
@@ -387,10 +403,10 @@
dependencies = ["activemodel" "activesupport" "mime-types"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0nms4w6vkm7djghdxwi9qzykhc2ynjwblgqwk87w61fhispqlq2c";
+ sha256 = "012b5jks7hxis1agiy7rbra5h4zhmwhy95gck3kr22nwdxfk71ii";
type = "gem";
};
- version = "1.1.0";
+ version = "1.2.1";
};
cause = {
source = {
@@ -408,6 +424,15 @@
};
version = "0.7.5";
};
+ childprocess = {
+ dependencies = ["ffi"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0rqf595gv0bb48awck2cvipk78jy5pj08p1r4xbrfpd0i60jb9hd";
+ type = "gem";
+ };
+ version = "0.7.0";
+ };
chronic = {
source = {
remotes = ["https://rubygems.org"];
@@ -441,14 +466,6 @@
};
version = "3.0.2";
};
- cliver = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "096f4rj7virwvqxhkavy0v55rax10r4jqf8cymbvn4n631948xc7";
- type = "gem";
- };
- version = "0.3.2";
- };
coderay = {
source = {
remotes = ["https://rubygems.org"];
@@ -894,10 +911,10 @@
dependencies = ["fog-core" "fog-json" "ipaddress" "xml-simple"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1i76g8sdskyfc0gcnd6n9i757s7dmwg3wf6spcr2xh8wzyxkm1pj";
+ sha256 = "0x66xyrw4ahyr6f9masiqmz5q6h8scv46y59crnfp8dj7r52hw8m";
type = "gem";
};
- version = "0.1.0";
+ version = "0.2.0";
};
fog-aws = {
dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"];
@@ -1071,10 +1088,10 @@
dependencies = ["google-protobuf" "grpc"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0irc3yfyr5li2ki6w03znsklnk0qx3srk4wrb7jav042c4kw325k";
+ sha256 = "0s86126iqhbmkix6zs357ixlc1syyxmwk2blaimsav7f0x9swy82";
type = "gem";
};
- version = "0.39.0";
+ version = "0.59.0";
};
github-linguist = {
dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"];
@@ -1114,10 +1131,10 @@
gitlab-markup = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "114jfbyyfwad609k1l1fcmbzszb3frdchh83gdwndkglllvprhjz";
+ sha256 = "1pvx257azpr00yvb74lgjpgnj72nwyd29l9a18280rgmp4cjniki";
type = "gem";
};
- version = "1.6.2";
+ version = "1.6.3";
};
gitlab_omniauth-ldap = {
dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"];
@@ -1132,10 +1149,10 @@
dependencies = ["activesupport"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "11plkgyl3w9k4y2scc1igvpgwyz4fnmsr63h2q4j8wkb48nlnhak";
+ sha256 = "02smrgdi11kziqi9zhnsy9i6yr2fnxrqlv3lllsvdjki3cd4is38";
type = "gem";
};
- version = "0.3.7";
+ version = "0.4.1";
};
gollum-grit_adapter = {
dependencies = ["gitlab-grit"];
@@ -1185,10 +1202,10 @@
google-protobuf = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1jh8axm5m75rvdf2i3s24pmi7p613armh9vk3p1d0ryfx159mqkl";
+ sha256 = "1l9b2f4msp1gkay2mqjbjs7kfhchf916zh1y365singiysrwn2i6";
type = "gem";
};
- version = "3.4.0.2";
+ version = "3.4.1.1";
};
googleauth = {
dependencies = ["faraday" "jwt" "logging" "memoist" "multi_json" "os" "signet"];
@@ -1248,10 +1265,10 @@
dependencies = ["google-protobuf" "googleauth"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "056ipqai887x5jpbgcc215kdi0lfqjzcjbx3hx11cjrfww01zc52";
+ sha256 = "1zhci260088zlghpaz6ania1blz1dd7lgklsjnqk1vcymhpr6b38";
type = "gem";
};
- version = "1.6.0";
+ version = "1.4.5";
};
haml = {
dependencies = ["tilt"];
@@ -1401,12 +1418,13 @@
version = "2.8.2";
};
i18n = {
+ dependencies = ["concurrent-ruby"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1i3aqvzfsj786kwjj70jsjpxm6ffw5pwhalzr2abjfv2bdc7k9kw";
+ sha256 = "032wbfixfpwa67c893x5sn02ab0928vfqfshcs02bwkkxpqy9x8s";
type = "gem";
};
- version = "0.8.6";
+ version = "0.9.1";
};
ice_nine = {
source = {
@@ -1454,10 +1472,10 @@
dependencies = ["rails-dom-testing" "railties" "thor"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1asbrr9hqf43q9qbjf87f5lm7fp12pndh76z89ks6jwxf1350fj1";
+ sha256 = "02ii77vwxc49f2lrkbdzww2168bp5nihwzakc9mqyrsbw394w7ki";
type = "gem";
};
- version = "4.1.1";
+ version = "4.3.1";
};
json = {
source = {
@@ -1582,13 +1600,13 @@
version = "1.3.0";
};
license_finder = {
- dependencies = ["httparty" "rubyzip" "thor" "xml-simple"];
+ dependencies = ["httparty" "rubyzip" "thor" "toml" "with_env" "xml-simple"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "092rwf1yjq1l63zbqanmbnbky8g5pj7c3g30mcqbyppbqrsflx80";
+ sha256 = "12p18a34q8dgzjwi2plgv889kxnxqnnmrqhvjs3ng2z26hv2zfag";
type = "gem";
};
- version = "2.1.0";
+ version = "3.1.1";
};
licensee = {
dependencies = ["rugged"];
@@ -1643,13 +1661,13 @@
version = "2.0.3";
};
mail = {
- dependencies = ["mime-types"];
+ dependencies = ["mini_mime"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0d7lhj2dw52ycls6xigkfz6zvfhc6qggply9iycjmcyj9760yvz9";
+ sha256 = "10dyifazss9mgdzdv08p47p344wmphp5pkh5i73s7c04ra8y6ahz";
type = "gem";
};
- version = "2.6.6";
+ version = "2.7.0";
};
mail_room = {
source = {
@@ -1733,14 +1751,6 @@
};
version = "5.7.0";
};
- mmap2 = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1rgf4zhqa6632nbqj585hc0x69iz21s5c91mpijcr9i5wpj9p1s6";
- type = "gem";
- };
- version = "2.2.7";
- };
mousetrap-rails = {
source = {
remotes = ["https://rubygems.org"];
@@ -2081,10 +2091,19 @@
dependencies = ["ast"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "130rfk8a2ws2fyq52hmi1n0xakylw39wv4x1qhai4z17x2b0k9cq";
+ sha256 = "0bqc29xx4zwlshvi6krrd0sl82d7xjfhcrxvgf38wvdqcl3b7ck3";
+ type = "gem";
+ };
+ version = "2.4.0.2";
+ };
+ parslet = {
+ dependencies = ["blankslate"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0qp1m8n3m6k6g22nn1ivcfkvccq5jmbkw53vvcjw5xssq179l9z3";
type = "gem";
};
- version = "2.4.0.0";
+ version = "1.5.0";
};
path_expander = {
source = {
@@ -2192,15 +2211,6 @@
};
version = "1.0.1";
};
- poltergeist = {
- dependencies = ["capybara" "cliver" "multi_json" "websocket-driver"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1fnkly1ks31nf5cdks9jd5c5vynbanrr8pwp801qq2i8bg78rwc0";
- type = "gem";
- };
- version = "1.9.0";
- };
posix-spawn = {
source = {
remotes = ["https://rubygems.org"];
@@ -2253,13 +2263,12 @@
version = "0.0.3";
};
prometheus-client-mmap = {
- dependencies = ["mmap2"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1fgkilpiha338mvfkj5rwhny3vld0nb3v1vgbrlxbhnvch26wakh";
+ sha256 = "1wpk9zfbr7c1asvnq1v6jmc3ydbl8y17v24cj4vyhy3nkpds0cij";
type = "gem";
};
- version = "0.7.0.beta18";
+ version = "0.7.0.beta43";
};
pry = {
dependencies = ["coderay" "method_source" "slop"];
@@ -2378,10 +2387,10 @@
dependencies = ["actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activesupport" "railties" "sprockets-rails"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0dpbf3ybzbhqqkwg5vi60121860cr8fybvchrxk5wy3f2jcj0mch";
+ sha256 = "15vbdlkmlh470g7msqhmcmhxhi4finv3cjg595x9viafvphnf40l";
type = "gem";
};
- version = "4.2.8";
+ version = "4.2.10";
};
rails-deprecated_sanitizer = {
dependencies = ["activesupport"];
@@ -2423,10 +2432,10 @@
dependencies = ["actionpack" "activesupport" "rake" "thor"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0bavl4hj7bnl3ryqi9rvykm410kflplgingkcxasfv1gdilddh4g";
+ sha256 = "0snymfqj2cql0gp51i6a44avcirdridc15yggnxjj9raa9f3229p";
type = "gem";
};
- version = "4.2.8";
+ version = "4.2.10";
};
rainbow = {
dependencies = ["rake"];
@@ -2448,10 +2457,10 @@
rake = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0mfqgpp3m69s5v1rd51lfh5qpjwyia5p4rg337pw8c8wzm6pgfsw";
+ sha256 = "190p7cs8zdn07mjj6xwwsdna3g0r98zs4crz7jh2j2q5b0nbxgjf";
type = "gem";
};
- version = "12.1.0";
+ version = "12.3.0";
};
rblineprof = {
dependencies = ["debugger-ruby_core_source"];
@@ -2542,19 +2551,19 @@
dependencies = ["actionpack" "redis-rack" "redis-store"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0gnkqi7cji2q5yfwm8b752k71pqrb3dqksv983yrf23virqnjfjr";
+ sha256 = "15k41gz7nygd4yydk2yd25gghya1j7q6zifk4mdrra6bwnwjbm63";
type = "gem";
};
- version = "5.0.1";
+ version = "5.0.2";
};
redis-activesupport = {
dependencies = ["activesupport" "redis-store"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0i0r23rv32k25jqwbr4cb73alyaxwvz9crdaw3gv26h1zjrdjisd";
+ sha256 = "0rq5dhrzc1l8c7f5gx9r7mvnsk5206dfwih3yv5si5rf42nx2ay5";
type = "gem";
};
- version = "5.0.1";
+ version = "5.0.4";
};
redis-namespace = {
dependencies = ["redis"];
@@ -2569,28 +2578,28 @@
dependencies = ["rack" "redis-store"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0fbxl5gv8krjf6n88gvn44xbzhfnsysnzawz7zili298ak98lsb3";
+ sha256 = "0px0wv8zripc6lrn3k0k61j6nlxda145q8sz50yvnig17wlk36gb";
type = "gem";
};
- version = "1.6.0";
+ version = "2.0.4";
};
redis-rails = {
dependencies = ["redis-actionpack" "redis-activesupport" "redis-store"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "04l2y26k4v30p3dx0pqf9gz257q73qzgrfqf3qv6bxwyv8z9f5hm";
+ sha256 = "0hjvkyaw5hgz7v6fgwdk8pb966z44h1gv8jarmb0gwhkqmjnsh40";
type = "gem";
};
- version = "5.0.1";
+ version = "5.0.2";
};
redis-store = {
dependencies = ["redis"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1da15wr3wc1d4hqy7h7smdc2k2jpfac3waa9d65si6f4dmqymkkq";
+ sha256 = "00yh8rhv91vxjlqs4ylic99m9npjxmgib2vjj8hgzk1174y6vcmq";
type = "gem";
};
- version = "1.2.0";
+ version = "1.4.1";
};
representable = {
dependencies = ["declarative" "declarative-option" "uber"];
@@ -2954,6 +2963,15 @@
};
version = "3.5.9.3";
};
+ selenium-webdriver = {
+ dependencies = ["childprocess" "rubyzip"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0w6r0k1w7hpk853qfw18lipyzxs0r0d6xr70zqsjfdn2dwr0rb30";
+ type = "gem";
+ };
+ version = "3.5.0";
+ };
sentry-raven = {
dependencies = ["faraday"];
source = {
@@ -3141,10 +3159,10 @@
dependencies = ["actionpack" "activesupport" "sprockets"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1zr9vk2vn44wcn4265hhnnnsciwlmqzqc6bnx78if1xcssxj6x44";
+ sha256 = "0ab42pm8p5zxpv3sfraq45b9lj39cz9mrpdirm30vywzrwwkm5p1";
type = "gem";
};
- version = "3.2.0";
+ version = "3.2.1";
};
sqlite3 = {
source = {
@@ -3295,6 +3313,15 @@
};
version = "0.8.3";
};
+ toml = {
+ dependencies = ["parslet"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1wnvi1g8id1sg6776fvzf98lhfbscchgiy1fp5pvd58a8ds2fq9v";
+ type = "gem";
+ };
+ version = "0.1.2";
+ };
toml-rb = {
dependencies = ["citrus"];
source = {
@@ -3317,10 +3344,10 @@
dependencies = ["thread_safe"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "05r81lk7q7275rdq7xipfm0yxgqyd2ggh73xpc98ypngcclqcscl";
+ sha256 = "09dpbrih054mn42flbbcdpzk2727mzfvjrgqb12zdafhx7p9rrzp";
type = "gem";
};
- version = "1.2.3";
+ version = "1.2.4";
};
u2f = {
source = {
@@ -3476,31 +3503,22 @@
};
version = "0.9.10";
};
- websocket-driver = {
- dependencies = ["websocket-extensions"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1v39w1ig6ps8g55xhz6x1w53apl17ii6kpy0jg9249akgpdvb0k9";
- type = "gem";
- };
- version = "0.6.3";
- };
- websocket-extensions = {
+ wikicloth = {
+ dependencies = ["builder" "expression_parser" "rinku"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "07qnsafl6203a2zclxl20hy4jq11c471cgvd0bj5r9fx1qqw06br";
+ sha256 = "1jp6c2yzyqbap8jdiw8yz6l08sradky1llhyhmrg934l1b5akj3s";
type = "gem";
};
- version = "0.1.2";
+ version = "0.8.1";
};
- wikicloth = {
- dependencies = ["builder" "expression_parser" "rinku"];
+ with_env = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1jp6c2yzyqbap8jdiw8yz6l08sradky1llhyhmrg934l1b5akj3s";
+ sha256 = "1r5ns064mbb99hf1dyxsk9183hznc5i7mn3bi86zka6dlvqf9csh";
type = "gem";
};
- version = "0.8.1";
+ version = "1.1.0";
};
xml-simple = {
source = {
@@ -3519,4 +3537,4 @@
};
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 3b30ff03346b8b4ed35b754aa80d2673381a082c..a495ce63cc59b940cea8ccdc69ae5660b49a5ef4 100644
--- a/pkgs/applications/version-management/gitlab/nulladapter.patch
+++ b/pkgs/applications/version-management/gitlab/nulladapter.patch
@@ -7,7 +7,7 @@ index 4861171ef5..f6e701c548 100644
+gem 'activerecord-nulldb-adapter'
+
- gem 'rails', '4.2.8'
+ gem 'rails', '4.2.10'
gem 'rails-deprecated_sanitizer', '~> 1.0.3'
diff --git a/Gemfile.lock b/Gemfile.lock
diff --git a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
index 39c7c28847c477f413547bf83ca9d87b1865d888..acc615c63ca5839244518f02b513dbf8561d7204 100644
--- a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
+++ b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
@@ -62,24 +62,15 @@ 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,7 +13,7 @@
+@@ -26,7 +26,7 @@
end
- def self.read_latest
-- path = Rails.root.join("log", file_name)
-+ path = File.join(ENV["GITLAB_LOG_PATH"], file_name)
-
- return [] unless File.readable?(path)
-
-@@ -22,7 +22,7 @@
+ def self.full_log_path
+- Rails.root.join("log", file_name)
++ File.join(ENV["GITLAB_LOG_PATH"], file_name)
end
- def self.build
-- new(Rails.root.join("log", file_name))
-+ new(File.join(ENV["GITLAB_LOG_PATH"], file_name))
- end
- end
- end
+ def self.cache_key
diff --git a/lib/gitlab/uploads_transfer.rb b/lib/gitlab/uploads_transfer.rb
index b5f4124052..f72c556983 100644
--- a/lib/gitlab/uploads_transfer.rb
diff --git a/pkgs/applications/version-management/gitless/default.nix b/pkgs/applications/version-management/gitless/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..2b93a95e45aef6463737a44946795d022a8c7e77
--- /dev/null
+++ b/pkgs/applications/version-management/gitless/default.nix
@@ -0,0 +1,26 @@
+{ fetchFromGitHub, pythonPackages, stdenv }:
+
+pythonPackages.buildPythonApplication rec {
+ ver = "0.8.5";
+ name = "gitless-${ver}";
+
+ src = fetchFromGitHub {
+ owner = "sdg-mit";
+ repo = "gitless";
+ rev = "v${ver}";
+ sha256 = "1v22i5lardswpqb6vxjgwra3ac8652qyajbijfj18vlkhajz78hq";
+ };
+
+ propagatedBuildInputs = with pythonPackages; [ sh pygit2 clint ];
+
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ homepage = http://gitless.com/;
+ description = "A version control system built on top of Git";
+ license = licenses.gpl2;
+ platforms = platforms.all;
+ maintainers = [ maintainers.cransom ];
+ };
+}
+
diff --git a/pkgs/applications/version-management/guitone/default.nix b/pkgs/applications/version-management/guitone/default.nix
index bfaa62ebb66d7ba8c4f90aa4fda114406a8bd6d6..ded0d5e398634d8f8b69588a36adaa5dc3826c78 100644
--- a/pkgs/applications/version-management/guitone/default.nix
+++ b/pkgs/applications/version-management/guitone/default.nix
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
branch = "net.venge.monotone.guitone";
};
+ patches = [ ./parallel-building.patch ];
+
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ qt4 qmake4Hook graphviz ];
@@ -24,6 +26,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Qt4 based GUI for monotone";
homepage = http://guitone.thomaskeller.biz;
+ downloadPage = https://code.monotone.ca/p/guitone/;
inherit (qt4.meta) platforms;
};
}
diff --git a/pkgs/applications/version-management/guitone/parallel-building.patch b/pkgs/applications/version-management/guitone/parallel-building.patch
new file mode 100644
index 0000000000000000000000000000000000000000..f0e924cbfb812226ae82b925d23d4edab600d3c0
--- /dev/null
+++ b/pkgs/applications/version-management/guitone/parallel-building.patch
@@ -0,0 +1,7 @@
+Without this `make tmp/AttributesView.o` fails with
+src/view/dialogs/AddEditAttribute.h:22:35: fatal error: ui_add_edit_attribute.h: No such file or directory
+--- a/guitone.pro
++++ b/guitone.pro
+@@ -215 +215,2 @@ help.commands = @echo Available targets: $${QMAKE_EXTRA_TARGETS}
+ QMAKE_EXTRA_TARGETS += help
++CONFIG += depend_includepath
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 774aa1082bc8ee11660517adebfebfc40313f6e7..541bc8799a8308e1b44c0e3fd23d9a1ff085ea27 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -18,12 +18,12 @@ in python2Packages.buildPythonApplication {
inherit python; # pass it so that the same version can be used in hg2git
- buildInputs = [ makeWrapper docutils unzip ];
+ buildInputs = [ makeWrapper docutils unzip ]
+ ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices ];
- propagatedBuildInputs = [ hg-git dulwich ]
- ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices cf-private ];
+ propagatedBuildInputs = [ hg-git dulwich ];
- makeFlags = "PREFIX=$(out)";
+ makeFlags = [ "PREFIX=$(out)" ];
postInstall = (stdenv.lib.optionalString guiSupport
''
@@ -34,9 +34,9 @@ in python2Packages.buildPythonApplication {
hgk=$out/lib/${python.libPrefix}/site-packages/hgext/hgk.py
EOF
# setting HG so that hgk can be run itself as well (not only hg view)
- WRAP_TK=" --set TK_LIBRARY \"${tk}/lib/${tk.libPrefix}\"
- --set HG \"$out/bin/hg\"
- --prefix PATH : \"${tk}/bin\" "
+ WRAP_TK=" --set TK_LIBRARY ${tk}/lib/${tk.libPrefix}
+ --set HG $out/bin/hg
+ --prefix PATH : ${tk}/bin "
'') +
''
for i in $(cd $out/bin && ls); do
diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix
index f0185e187bbec24569c96b309b9deb45ab800023..8b2d6fcc8c3859166f2d0e80ba55eb44c7be9d2e 100644
--- a/pkgs/applications/version-management/yadm/default.nix
+++ b/pkgs/applications/version-management/yadm/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchFromGitHub }:
-let version = "1.07"; in
+let version = "1.12.0"; in
stdenv.mkDerivation {
name = "yadm-${version}";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
owner = "TheLocehiliosan";
repo = "yadm";
rev = "${version}";
- sha256 = "0kkxrvw17pmrx1dq0dq53jb9pm545firakrxc48znfw54n2036fw";
+ sha256 = "0873jgks7dpfkj5km1jchxdrhf7lia70p0f8zsrh9p4crj5f4pc6";
};
buildCommand = ''
diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix
index 21b3f557776551847949623d70a15ebc7e292fba..4adbdbdadb2a87dde1a4a59d9101acb06fa9e662 100644
--- a/pkgs/applications/video/cinelerra/default.nix
+++ b/pkgs/applications/video/cinelerra/default.nix
@@ -50,11 +50,9 @@ stdenv.mkDerivation {
fontconfig intltool
];
- # Note: the build may fail with e.g.:
- # CXX edl.o
+ # $ make -C cinelerra edl.o
# edl.C:50:25: fatal error: versioninfo.h: No such file or directory
- # #include "versioninfo.h"
- enableParallelBuilding = true;
+ enableParallelBuilding = false;
meta = {
description = "Video Editor";
diff --git a/pkgs/applications/video/gnome-mplayer/default.nix b/pkgs/applications/video/gnome-mplayer/default.nix
index ba72e085bf7c47ba04471c76b5c65c2df717f04a..9f98d46d53bdd834b01a1b4d1eff3abfb8d630a9 100644
--- a/pkgs/applications/video/gnome-mplayer/default.nix
+++ b/pkgs/applications/video/gnome-mplayer/default.nix
@@ -1,20 +1,33 @@
-{stdenv, fetchurl, pkgconfig, glib, gtk2, dbus, dbus_glib, GConf}:
+{stdenv, substituteAll, fetchFromGitHub, pkgconfig, gettext, glib, gtk3, gmtk, dbus, dbus_glib
+, libnotify, libpulseaudio, mplayer, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "gnome-mplayer-1.0.4";
+ name = "gnome-mplayer-${version}";
+ version = "1.0.9";
- src = fetchurl {
- url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/gnome-mplayer/${name}.tar.gz";
- sha256 = "1k5yplsvddcm7xza5h4nfb6vibzjcqsk8gzis890alizk07f5xp2";
+ src = fetchFromGitHub {
+ owner = "kdekorte";
+ repo = "gnome-mplayer";
+ rev = "v${version}";
+ sha256 = "0qvy9fllvg1mad6y1j79iaqa6khs0q2cb0z62yfg4srbr07fi8xr";
};
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ glib gtk2 dbus dbus_glib GConf];
+ nativeBuildInputs = [ pkgconfig gettext wrapGAppsHook ];
+ buildInputs = [ glib gtk3 gmtk dbus dbus_glib libnotify libpulseaudio ];
- hardeningDisable = [ "format" ];
+ patches = [
+ (substituteAll {
+ src = ./fix-paths.patch;
+ mencoder = "${mplayer}/bin/mencoder";
+ mplayer = "${mplayer}/bin/mplayer";
+ })
+ ];
- meta = {
- homepage = http://kdekorte.googlepages.com/gnomemplayer;
+ meta = with stdenv.lib; {
description = "Gnome MPlayer, a simple GUI for MPlayer";
+ homepage = https://sites.google.com/site/kdekorte2/gnomemplayer;
+ license = licenses.gpl2;
+ maintainers = with maintainers; [];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/video/gnome-mplayer/fix-paths.patch b/pkgs/applications/video/gnome-mplayer/fix-paths.patch
new file mode 100644
index 0000000000000000000000000000000000000000..ede4991c4662cb7a1909837b4f77d534ec4775ca
--- /dev/null
+++ b/pkgs/applications/video/gnome-mplayer/fix-paths.patch
@@ -0,0 +1,87 @@
+--- a/src/gui.c
++++ b/src/gui.c
+@@ -7470,7 +7470,7 @@
+ filename = g_strdup_printf("%s/00000001.jpg", dirname);
+ g_free(basepath);
+ // run mplayer and try to get the first frame and convert it to a jpeg
+- av[ac++] = g_strdup_printf("mplayer");
++ av[ac++] = g_strdup_printf("@mplayer@");
+ av[ac++] = g_strdup_printf("-vo");
+ av[ac++] = g_strdup_printf("jpeg:outdir=%s", dirname);
+ av[ac++] = g_strdup_printf("-ao");
+--- a/src/property_page_common.c
++++ b/src/property_page_common.c
+@@ -80,7 +80,7 @@
+ MetaData *ret;
+ ret = g_new0(MetaData, 1);
+
+- av[ac++] = g_strdup_printf("mplayer");
++ av[ac++] = g_strdup_printf("@mplayer@");
+ av[ac++] = g_strdup_printf("-vo");
+ av[ac++] = g_strdup_printf("null");
+ av[ac++] = g_strdup_printf("-ao");
+--- a/src/support.c
++++ b/src/support.c
+@@ -566,7 +566,7 @@
+ } else {
+ playlist = FALSE;
+ if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) {
+- av[ac++] = g_strdup_printf("mplayer");
++ av[ac++] = g_strdup_printf("@mplayer@");
+ } else {
+ av[ac++] = g_strdup_printf("%s", mplayer_bin);
+ }
+@@ -728,7 +728,7 @@
+ playlist = FALSE;
+ // run mplayer and try to get the first frame and convert it to a jpeg
+ if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) {
+- av[ac++] = g_strdup_printf("mplayer");
++ av[ac++] = g_strdup_printf("@mplayer@");
+ } else {
+ av[ac++] = g_strdup_printf("%s", mplayer_bin);
+ }
+@@ -825,7 +825,7 @@
+ playlist = FALSE;
+
+ if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) {
+- av[ac++] = g_strdup_printf("mplayer");
++ av[ac++] = g_strdup_printf("@mplayer@");
+ } else {
+ av[ac++] = g_strdup_printf("%s", mplayer_bin);
+ }
+@@ -1251,7 +1251,7 @@
+ gm_log(verbose, G_LOG_LEVEL_INFO, "getting file metadata for %s", name);
+
+ if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) {
+- av[ac++] = g_strdup_printf("mplayer");
++ av[ac++] = g_strdup_printf("@mplayer@");
+ } else {
+ av[ac++] = g_strdup_printf("%s", mplayer_bin);
+ }
+@@ -1532,7 +1532,7 @@
+ return 0;
+
+ if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) {
+- av[ac++] = g_strdup_printf("mplayer");
++ av[ac++] = g_strdup_printf("@mplayer@");
+ } else {
+ av[ac++] = g_strdup_printf("%s", mplayer_bin);
+ }
+@@ -1597,7 +1597,7 @@
+
+ if (control_id == 0) {
+ ac = 0;
+- av[ac++] = g_strdup_printf("mencoder");
++ av[ac++] = g_strdup_printf("@mencoder@");
+ av[ac++] = g_strdup_printf("-ovc");
+ av[ac++] = g_strdup_printf("copy");
+ av[ac++] = g_strdup_printf("-oac");
+@@ -2830,7 +2830,7 @@
+ gboolean ret = TRUE;
+
+ if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) {
+- av[ac++] = g_strdup_printf("mplayer");
++ av[ac++] = g_strdup_printf("@mplayer@");
+ } else {
+ av[ac++] = g_strdup_printf("%s", mplayer_bin);
+ }
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index da90f681f7a833235c6de5d882c36b967ef3593c..28577a429bd20a6ca3e57ca373271d1b1e162145 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -8,8 +8,7 @@
, libXt, libXmu, libXext, xextproto
, libXinerama, libXrandr, randrproto
, libXtst, libXfixes, fixesproto, systemd
-, SDL, SDL2, SDL_image, SDL_mixer, alsaLib
-, mesa, glew, fontconfig, freetype, ftgl
+, alsaLib, mesa, glew, fontconfig, freetype, ftgl
, libjpeg, jasper, libpng, libtiff
, libmpeg2, libsamplerate, libmad
, libogg, libvorbis, flac, libxslt
@@ -44,6 +43,7 @@ assert vdpauSupport -> libvdpau != null;
# - cmake is no longer in project/cmake
# - maybe we can remove auto{conf,make} and libtool from inputs
# - check if dbus support PR has been merged and add dbus as a buildInput
+# - try to use system ffmpeg (kodi 17 works best with bundled 3.1 with patches)
let
kodiReleaseDate = "20171115";
@@ -78,7 +78,8 @@ let
preConfigure = ''
cp ${kodi_src}/tools/depends/target/ffmpeg/{CMakeLists.txt,*.cmake} .
'';
- buildInputs = [ gnutls libidn libtasn1 p11_kit zlib ];
+ buildInputs = [ gnutls libidn libtasn1 p11_kit zlib libva ]
+ ++ lib.optional vdpauSupport libvdpau;
nativeBuildInputs = [ cmake nasm pkgconfig ];
};
@@ -124,13 +125,12 @@ in stdenv.mkDerivation rec {
openssl gperf tinyxml2 taglib libssh swig jre
libX11 xproto inputproto libXt libXmu libXext xextproto
libXinerama libXrandr randrproto libXtst libXfixes fixesproto
- SDL SDL_image SDL_mixer alsaLib
- mesa glew fontconfig freetype ftgl
- libjpeg jasper libpng libtiff libva wayland
+ alsaLib mesa glew fontconfig freetype ftgl
+ libjpeg jasper libpng libtiff wayland
libmpeg2 libsamplerate libmad
libogg libvorbis flac libxslt systemd
lzo libcdio libmodplug libass libbluray
- sqlite mysql.lib avahi lame
+ sqlite mysql.connector-c avahi lame
curl bzip2 zip unzip glxinfo xdpyinfo
libcec libcec_platform dcadec libuuid
libgcrypt libgpgerror libunistring
@@ -140,7 +140,7 @@ in stdenv.mkDerivation rec {
# libdvdcss libdvdnav libdvdread
]
++ lib.optional dbusSupport dbus_libs
- ++ lib.optionals joystickSupport [ cwiid SDL2 ]
+ ++ lib.optionals joystickSupport [ cwiid ]
++ lib.optional nfsSupport libnfs
++ lib.optional pulseSupport libpulseaudio
++ lib.optional rtmpSupport rtmpdump
@@ -189,7 +189,7 @@ in stdenv.mkDerivation rec {
wrapProgram $out/bin/$p \
--prefix PATH ":" "${lib.makeBinPath [ python2 glxinfo xdpyinfo ]}" \
--prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath
- [ curl systemd libmad libvdpau libcec libcec_platform rtmpdump libass SDL2 ]}"
+ [ curl systemd libmad libvdpau libcec libcec_platform rtmpdump libass ]}"
done
substituteInPlace $out/share/xsessions/kodi.desktop \
diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index 52c39e837a12d87fe0981300bfca25eaf9198157..6bcba1e927f9e1b9331e431dbfa607db840bfb57 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -264,7 +264,7 @@ rec {
meta = with stdenv.lib; {
homepage = https://forum.kodi.tv/showthread.php?tid=187421;
- descritpion = "A comic book reader";
+ description = "A comic book reader";
maintainers = with maintainers; [ edwtjo ];
};
};
diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix
index ae7625d1972ab7ece1bf533fc4cdbe69678136bf..1e890c24db1aaa6a74c4ae5c25d5358ddd0432f0 100644
--- a/pkgs/applications/video/makemkv/default.nix
+++ b/pkgs/applications/video/makemkv/default.nix
@@ -4,17 +4,17 @@
stdenv.mkDerivation rec {
name = "makemkv-${ver}";
- ver = "1.10.7";
+ ver = "1.10.8";
builder = ./builder.sh;
src_bin = fetchurl {
url = "http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz";
- sha256 = "2b9a9e6fb779bc876371b2f88b23fddad3e92d6449fe5d1541dcd9ad04e01eac";
+ sha256 = "b7861aa7b03203f50d2ce3130f805c4b0406d13aec597648050349fa8b084b29";
};
src_oss = fetchurl {
url = "http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz";
- sha256 = "be61fcee31dc52944ec7ef440ff8fffbc140d24877e6afb19149c541564eb654";
+ sha256 = "d17cfd916a9bdda35b1065bce86a48a987caf9ffb4d6861609458f9f312603c7";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix
index f70c142ab41d0cf1db39486db2afd6bde9abe6d9..bef3a78d782ebf6ba0e44347cb5478fec7ed9ba2 100644
--- a/pkgs/applications/video/minitube/default.nix
+++ b/pkgs/applications/video/minitube/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
you an endless video stream. Minitube is not about cloning the YouTube
website, it aims to create a new TV-like experience.
'';
- homepage = http://flavio.tordini.org/minitube;
+ homepage = https://flavio.tordini.org/minitube;
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ nckx ];
diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index 183722beed818fccc23550cbfbfbb3d35fca7461..867dacc213e2679e3ab5bc6d440aaad980a8a34d 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, autoconf, automake, libiconv
+{ stdenv, fetchFromGitLab, pkgconfig, autoconf, automake, libiconv
, drake, ruby, docbook_xsl, file, xdg_utils, gettext, expat, qt5, boost
, libebml, zlib, libmatroska, libogg, libvorbis, flac, libxslt
, withGUI ? true
@@ -10,13 +10,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "mkvtoolnix-${version}";
- version = "17.0.0";
+ version = "19.0.0";
- src = fetchFromGitHub {
+ src = fetchFromGitLab {
owner = "mbunkus";
repo = "mkvtoolnix";
rev = "release-${version}";
- sha256 = "1v74rxf9wm0sn2illy0hp36hpwz7q04y0k32wq6wn7qrnzkzcc88";
+ sha256 = "068g0mmi284zl9d9p9zhp55h6rj58j5c27czd3mg42kq74cwcsx9";
};
nativeBuildInputs = [ pkgconfig autoconf automake gettext drake ruby docbook_xsl libxslt ];
diff --git a/pkgs/applications/video/motion/default.nix b/pkgs/applications/video/motion/default.nix
index d52154887071609807ca89a4bb584d981ee59a2f..67c91168fa2de66cbff852a0e646a93ec5bfd033 100644
--- a/pkgs/applications/video/motion/default.nix
+++ b/pkgs/applications/video/motion/default.nix
@@ -2,15 +2,18 @@
stdenv.mkDerivation rec {
name = "motion-${version}";
- version = "4.0.1";
+ version = "4.1.1";
+
src = fetchFromGitHub {
owner = "Motion-Project";
repo = "motion";
rev = "release-${version}";
- sha256 = "172bn2ny5r9fcb4kn9bjq3znpgl8ai84w4b99vhk5jggp2haa3bb";
+ sha256 = "1prbgl9wb9q7igsb6n11c25m0p0z246fxr1q8n1vcjr4rcb65y38";
};
+
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ libjpeg ffmpeg ];
+
meta = with stdenv.lib; {
homepage = http://www.lavrsen.dk/foswiki/bin/view/Motion/WebHome;
description = "Monitors the video signal from cameras";
diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix
index 24c5b4335c46cd168ffeeb67e5e0ce7bf1fb0ad0..fe6090c3230e950d14bba013b79e0ef4c602d6fb 100644
--- a/pkgs/applications/video/mplayer/default.nix
+++ b/pkgs/applications/video/mplayer/default.nix
@@ -102,7 +102,8 @@ stdenv.mkDerivation rec {
rm -rf ffmpeg
'';
- nativeBuildInputs = [ buildPackages.stdenv.cc pkgconfig yasm ];
+ depsBuildBuild = [ buildPackages.stdenv.cc ];
+ nativeBuildInputs = [ pkgconfig yasm ];
buildInputs = with stdenv.lib;
[ freetype ffmpeg ]
++ optional aalibSupport aalib
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 680cad1ec252e161f479329817359296f409c744..7aaa1b65fc45d81780a690dfd92cdf12195accbf 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, makeWrapper
+{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, makeWrapper
, docutils, perl, pkgconfig, python3, which, ffmpeg
, freefont_ttf, freetype, libass, libpthreadstubs
, lua, lua5_sockets, libuchardet, libiconv ? null, darwin
@@ -90,7 +90,14 @@ in stdenv.mkDerivation rec {
sha256 = "0746kmsg69675y5c70vn8imcr9d1zpjz97f27xr1vx00yjpd518v";
};
- patchPhase = ''
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/mpv-player/mpv/commit/2ecf240b1cd20875991a5b18efafbe799864ff7f.patch";
+ sha256 = "1sr0770rvhsgz8d7ysr9qqp4g9gwdhgj8g3rgnz90wl49lgrykhb";
+ })
+ ];
+
+ postPatch = ''
patchShebangs ./TOOLS/
'';
diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix
index 71bb0405111c7c5aed8d042762364a7caa73b048..167c5bdba40a986c310ef18e04cb2a3727f9f89a 100644
--- a/pkgs/applications/video/mythtv/default.nix
+++ b/pkgs/applications/video/mythtv/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
homepage = https://www.mythtv.org/;
description = "Open Source DVR";
license = licenses.gpl2;
- meta.platforms = platforms.linux;
+ platforms = platforms.linux;
maintainers = [ maintainers.titanous ];
};
}
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 057e4327ebe17311e600334ce9e0dd6e3174f81c..64bdbd21686f669c312e0e70c18c742ff642975a 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -70,7 +70,7 @@ in stdenv.mkDerivation rec {
postInstall = ''
wrapProgram $out/bin/obs \
- --prefix "LD_LIBRARY_PATH" : "${xorg.libX11.out}/lib"
+ --prefix "LD_LIBRARY_PATH" : "${xorg.libX11.out}/lib:${vlc}/lib"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/video/ogmtools/default.nix b/pkgs/applications/video/ogmtools/default.nix
index 83e69495b03a304a137f5c2106432746f6586b4b..221f4fc0e5c3c9d6b92895e7bad260647b344f93 100644
--- a/pkgs/applications/video/ogmtools/default.nix
+++ b/pkgs/applications/video/ogmtools/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "ogmtools-1.5";
src = fetchurl {
- url = "http://www.bunkus.org/videotools/ogmtools/${name}.tar.bz2";
+ url = "https://www.bunkus.org/videotools/ogmtools/${name}.tar.bz2";
sha256 = "1spx81p5wf59ksl3r3gvf78d77sh7gj8a6lw773iv67bphfivmn8";
};
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
(ogmdemux) or creation of (ogmmerge) OGG media streams. Includes dvdxchap
tool for extracting chapter information from DVD.
'';
- homepage = http://www.bunkus.org/videotools/ogmtools/;
+ homepage = https://www.bunkus.org/videotools/ogmtools/;
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
};
diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix
index 447518d008b4180212bd860a6e4280eb3b52c7b1..75bd398b20805313fd7cb22eb112327ba6259ec9 100644
--- a/pkgs/applications/video/simplescreenrecorder/default.nix
+++ b/pkgs/applications/video/simplescreenrecorder/default.nix
@@ -1,22 +1,19 @@
{ stdenv, fetchurl, alsaLib, ffmpeg, libjack2, libX11, libXext
-, libXfixes, mesa, pkgconfig, libpulseaudio, qt4
+, libXfixes, mesa, pkgconfig, libpulseaudio, qt4, cmake, ninja
}:
stdenv.mkDerivation rec {
name = "simplescreenrecorder-${version}";
- version = "0.3.8";
+ version = "0.3.9";
src = fetchurl {
url = "https://github.com/MaartenBaert/ssr/archive/${version}.tar.gz";
- sha256 = "0v8w35n8w772s08w7k0icynqdsdakbrcanbgx6j847bfqfsg21gg";
+ sha256 = "1gnf9wbiq2fcbqcn1a5nfmp8r0nxrrlgh2wly2mfkkwymynhx0pk";
};
patches = [ ./fix-paths.patch ];
postPatch = ''
- # #455
- sed '1i#include ' -i src/Benchmark.cpp
-
for i in scripts/ssr-glinject src/AV/Input/GLInjectInput.cpp; do
substituteInPlace $i \
--subst-var out \
@@ -24,14 +21,12 @@ stdenv.mkDerivation rec {
done
'';
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [
+ nativeBuildInputs = [ pkgconfig cmake ninja ];
+ buildInputs = [
alsaLib ffmpeg libjack2 libX11 libXext libXfixes mesa
libpulseaudio qt4
];
- enableParallelBuilding = true;
-
meta = with stdenv.lib; {
description = "A screen recorder for Linux";
homepage = http://www.maartenbaert.be/simplescreenrecorder;
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index b465379c50edeccfa60e63eab3e4faa78b17b763..fffbd5c0ffb4f770c24d8c6c2a5b880d6d35e5cb 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -21,21 +21,13 @@ assert (!withQt5 -> qt4 != null);
stdenv.mkDerivation rec {
name = "vlc-${version}";
- version = "2.2.6";
+ version = "2.2.8";
src = fetchurl {
url = "http://get.videolan.org/vlc/${version}/${name}.tar.xz";
- sha256 = "1a22b913p2227ljz89c4fgjlyln5gcz8z58w32r0wh4srnnd60y4";
+ sha256 = "1v32snw46rkgbdqdy3dssl2y13i8p2cr1cw1i18r6vdmiy24dw4v";
};
- 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/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index ba74bc38a357c785053297ed0b8fce7fa805a6b4..c4c0adbb9bf9ee1cf40588ef7e43c1b41d51b2eb 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -105,6 +105,7 @@ rec {
cd ./components/engine
export AUTO_GOPATH=1
export DOCKER_GITCOMMIT="${rev}"
+ export VERSION="${version}"
./hack/make.sh dynbinary
cd -
'') + ''
@@ -136,11 +137,7 @@ rec {
extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps utillinux ]);
installPhase = optionalString (stdenv.isLinux) ''
- 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
+ install -Dm755 ./components/engine/bundles/dynbinary-daemon/dockerd $out/libexec/docker/dockerd
makeWrapper $out/libexec/docker/dockerd $out/bin/dockerd \
--prefix PATH : "$out/libexec/docker:$extraPath"
@@ -207,26 +204,14 @@ rec {
# Get revisions from
# https://github.com/docker/docker-ce/blob/v${version}/components/engine/hack/dockerfile/binaries-commits
- 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_11 = dockerGen rec {
- version = "17.11.0-ce";
- rev = "1caf76ce6baa889133ece59fab3c36aaf143d4ef"; # git commit
- sha256 = "09s7lxcs4wdjj69l7z3nybbms7iqspk1wy7qnr4r52s8vr3fd5s4";
- runcRev = "0351df1c5a66838d0c392b4ac4cf9450de844e2d";
- runcSha256 = "1cmkdv6rli7v0y0fddqxvrvzd486fg9ssp3kgkya3szkljzz4xj0";
- containerdRev = "992280e8e265f491f7a624ab82f3e238be086e49";
- containerdSha256 = "1ci6jlgrrgz4ph451035sl98lj2jd467pd4qnv85ma9gzblrxs7n";
+ docker_17_12 = dockerGen rec {
+ version = "17.12.0-ce";
+ rev = "486a48d2701493bb65385788a291e36febb44ec1"; # git commit
+ sha256 = "14kp7wrzf3s9crk8px1dc575lchyrcl2dqiwr3sgxb9mzjfiyqps";
+ runcRev = "b2567b37d7b75eb4cf325b77297b140ea686ce8f";
+ runcSha256 = "0zarsrbfcm1yp6mdl6rcrigdf7nb70xmv2cbggndz0qqyrw0mk0l";
+ containerdRev = "89623f28b87a6004d4b785663257362d1658a729";
+ containerdSha256 = "0irx7ps6rhq7z69cr3gspxdr7ywrv6dz62gkr1z2723cki9hsxma";
tiniRev = "949e6facb77383876aeff8a6944dde66b3089574";
tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
};
diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix
index c7f8ea696b579432c4a139f465c9b2fe4ca0c6f5..e42c1d5dd1e49f3771c80da2409b5e1108557e44 100644
--- a/pkgs/applications/virtualization/open-vm-tools/default.nix
+++ b/pkgs/applications/virtualization/open-vm-tools/default.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
better management of, and seamless user interactions with, guests.
'';
license = licenses.gpl2;
- platforms = platforms.linux;
+ platforms = [ "x86_64-linux" "i686-linux" ];
maintainers = with maintainers; [ joamaki ];
};
}
diff --git a/pkgs/applications/virtualization/openstack/glance.nix b/pkgs/applications/virtualization/openstack/glance.nix
deleted file mode 100644
index 21cb4906d0347debec04d97ef40d1fa4b78b55b7..0000000000000000000000000000000000000000
--- a/pkgs/applications/virtualization/openstack/glance.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{ stdenv, fetchurl, python2Packages, sqlite, which, strace }:
-
-python2Packages.buildPythonApplication rec {
- name = "glance-${version}";
- version = "11.0.0";
- namePrefix = "";
-
- PBR_VERSION = "${version}";
-
- src = fetchurl {
- url = "https://github.com/openstack/glance/archive/${version}.tar.gz";
- sha256 = "05rz1lmzdmpnw8sf87vvi0l6q9g6s840z934zyinw17yfcvmqrdg";
- };
-
- # https://github.com/openstack/glance/blob/stable/liberty/requirements.txt
- propagatedBuildInputs = with python2Packages; [
- pbr sqlalchemy anyjson eventlet PasteDeploy routes webob sqlalchemy_migrate
- httplib2 pycrypto iso8601 stevedore futurist keystonemiddleware paste
- jsonschema keystoneclient pyopenssl six retrying semantic-version qpid-python
- WSME osprofiler glance_store castellan taskflow cryptography xattr pysendfile
-
- # oslo componenets
- oslo-config oslo-context oslo-concurrency oslo-service oslo-utils oslo-db
- oslo-i18n oslo-log oslo-messaging oslo-middleware oslo-policy oslo-serialization
- MySQL_python
- ];
-
- buildInputs = with python2Packages; [
- Babel coverage fixtures mox3 mock oslosphinx requests testrepository pep8
- testresources testscenarios testtools psutil_1 oslotest psycopg2
- sqlite which strace
- ];
-
- patchPhase = ''
- # it's not a test, but a class mixin
- sed -i 's/ImageCacheTestCase/ImageCacheMixin/' glance/tests/unit/test_image_cache.py
-
- # these require network access, see https://bugs.launchpad.net/glance/+bug/1508868
- sed -i 's/test_get_image_data_http/noop/' glance/tests/unit/common/scripts/test_scripts_utils.py
- sed -i 's/test_set_image_data_http/noop/' glance/tests/unit/common/scripts/image_import/test_main.py
- sed -i 's/test_create_image_with_nonexistent_location_url/noop/' glance/tests/unit/v1/test_api.py
- sed -i 's/test_upload_image_http_nonexistent_location_url/noop/' glance/tests/unit/v1/test_api.py
-
- # TODO: couldn't figure out why this test is failing
- sed -i 's/test_all_task_api/noop/' glance/tests/integration/v2/test_tasks_api.py
- '';
-
- postInstall = ''
- # check all binaries don't crash
- for i in $out/bin/*; do
- case "$i" in
- *glance-artifacts) # https://bugs.launchpad.net/glance/+bug/1508879
- :
- ;;
- *)
- $i --help
- esac
- done
-
- cp etc/*-paste.ini $out/etc/
- '';
-
- meta = with stdenv.lib; {
- homepage = http://glance.openstack.org/;
- description = "Services for discovering, registering, and retrieving virtual machine images";
- license = stdenv.lib.licenses.asl20;
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/applications/virtualization/openstack/keystone.nix b/pkgs/applications/virtualization/openstack/keystone.nix
deleted file mode 100644
index 39c54f0d204b07a89aaaecf8ba11f77675c6bdf0..0000000000000000000000000000000000000000
--- a/pkgs/applications/virtualization/openstack/keystone.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{ stdenv, fetchurl, python2Packages, xmlsec, which, openssl }:
-
-python2Packages.buildPythonApplication rec {
- name = "keystone-${version}";
- version = "8.0.0";
- namePrefix = "";
-
- PBR_VERSION = "${version}";
-
- src = fetchurl {
- url = "https://github.com/openstack/keystone/archive/${version}.tar.gz";
- sha256 = "1xbrs7xgwjzrs07zyxxcl2lq18dh582gd6lx1zzzji8c0qmffy0z";
- };
-
- # remove on next version bump
- patches = [ ./remove-oslo-policy-tests.patch ];
-
- # https://github.com/openstack/keystone/blob/stable/liberty/requirements.txt
- propagatedBuildInputs = with python2Packages; [
- pbr webob eventlet greenlet PasteDeploy paste routes cryptography six
- sqlalchemy sqlalchemy_migrate stevedore passlib keystoneclient memcached
- keystonemiddleware oauthlib pysaml2 dogpile_cache jsonschema pycadf msgpack
- xmlsec MySQL_python
-
- # oslo
- oslo-cache oslo-concurrency oslo-config oslo-context oslo-messaging oslo-db
- oslo-i18n oslo-log oslo-middleware oslo-policy oslo-serialization oslo-service
- oslo-utils
- ];
-
- buildInputs = with python2Packages; [
- coverage fixtures mock subunit tempest-lib testtools testrepository
- ldap ldappool webtest requests oslotest pep8 pymongo which
- ];
-
- makeWrapperArgs = ["--prefix PATH : '${openssl.bin}/bin:$PATH'"];
-
- postInstall = ''
- # install .ini files
- mkdir -p $out/etc
- cp etc/* $out/etc
-
- # check all binaries don't crash
- for i in $out/bin/*; do
- $i --help
- done
- '';
-
- meta = with stdenv.lib; {
- homepage = http://keystone.openstack.org/;
- description = "Authentication, authorization and service discovery mechanisms via HTTP";
- license = stdenv.lib.licenses.asl20;
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/applications/virtualization/openstack/neutron-iproute-4.patch b/pkgs/applications/virtualization/openstack/neutron-iproute-4.patch
deleted file mode 100644
index d7a2caa2bdea15033d363aabfa41c543a3c10d99..0000000000000000000000000000000000000000
--- a/pkgs/applications/virtualization/openstack/neutron-iproute-4.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 3aefdf4de76fdcdc02093bc631e339f9ecd4c707 Mon Sep 17 00:00:00 2001
-From: James Page
-Date: Fri, 18 Sep 2015 16:38:47 +0100
-Subject: Add compatibility with iproute2 >= 4.0
-
-The ip netns list command adds additional id data in more recent
-versions of iproute2 of the format:
-
- qdhcp-35fc068a-750d-4add-b1d2-af392dbd8790 (id: 1)
-
-Update parsing to deal with old and new formats.
-
-Change-Id: I0d3fc4262284172f5ad31e4f2f78ae1fb33b4228
-Closes-Bug: 1497309
----
- neutron/agent/linux/ip_lib.py | 6 +++---
- neutron/tests/functional/agent/test_l3_agent.py | 2 +-
- neutron/tests/unit/agent/linux/test_ip_lib.py | 15 +++++++++++++++
- 3 files changed, 19 insertions(+), 4 deletions(-)
-
-diff --git a/neutron/agent/linux/ip_lib.py b/neutron/agent/linux/ip_lib.py
-index 551341a..a717bf6 100644
---- a/neutron/agent/linux/ip_lib.py
-+++ b/neutron/agent/linux/ip_lib.py
-@@ -208,7 +208,7 @@ class IPWrapper(SubProcessBase):
- @classmethod
- def get_namespaces(cls):
- output = cls._execute([], 'netns', ('list',))
-- return [l.strip() for l in output.split('\n')]
-+ return [l.split()[0] for l in output.splitlines()]
-
-
- class IPDevice(SubProcessBase):
-@@ -819,8 +819,8 @@ class IpNetnsCommand(IpCommandBase):
- output = self._parent._execute(
- ['o'], 'netns', ['list'],
- run_as_root=cfg.CONF.AGENT.use_helper_for_ns_read)
-- for line in output.split('\n'):
-- if name == line.strip():
-+ for line in [l.split()[0] for l in output.splitlines()]:
-+ if name == line:
- return True
- return False
-
-diff --git a/neutron/tests/functional/agent/test_l3_agent.py b/neutron/tests/functional/agent/test_l3_agent.py
-index ffa20e6..84b16df 100644
---- a/neutron/tests/functional/agent/test_l3_agent.py
-+++ b/neutron/tests/functional/agent/test_l3_agent.py
-@@ -790,7 +790,7 @@ class L3HATestFramework(L3AgentTestFramework):
- get_ns_name = mock.patch.object(
- namespaces.RouterNamespace, '_get_ns_name').start()
- get_ns_name.return_value = "%s%s%s" % (
-- namespaces.RouterNamespace._get_ns_name(router_info['id']),
-+ 'qrouter-' + router_info['id'],
- self.NESTED_NAMESPACE_SEPARATOR, self.agent.host)
- router1 = self.manage_router(self.agent, router_info)
-
-diff --git a/neutron/tests/unit/agent/linux/test_ip_lib.py b/neutron/tests/unit/agent/linux/test_ip_lib.py
-index 2de408d..bdfc9d7 100644
---- a/neutron/tests/unit/agent/linux/test_ip_lib.py
-+++ b/neutron/tests/unit/agent/linux/test_ip_lib.py
-@@ -27,6 +27,11 @@ NETNS_SAMPLE = [
- 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb',
- 'cccccccc-cccc-cccc-cccc-cccccccccccc']
-
-+NETNS_SAMPLE_IPROUTE2_4 = [
-+ '12345678-1234-5678-abcd-1234567890ab (id: 1)',
-+ 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb (id: 0)',
-+ 'cccccccc-cccc-cccc-cccc-cccccccccccc (id: 2)']
-+
- LINK_SAMPLE = [
- '1: lo: mtu 16436 qdisc noqueue state UNKNOWN \\'
- 'link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00 promiscuity 0',
-@@ -279,6 +284,16 @@ class TestIpWrapper(base.BaseTestCase):
-
- self.execute.assert_called_once_with([], 'netns', ('list',))
-
-+ def test_get_namespaces_iproute2_4(self):
-+ self.execute.return_value = '\n'.join(NETNS_SAMPLE_IPROUTE2_4)
-+ retval = ip_lib.IPWrapper.get_namespaces()
-+ self.assertEqual(retval,
-+ ['12345678-1234-5678-abcd-1234567890ab',
-+ 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb',
-+ 'cccccccc-cccc-cccc-cccc-cccccccccccc'])
-+
-+ self.execute.assert_called_once_with([], 'netns', ('list',))
-+
- def test_add_tuntap(self):
- ip_lib.IPWrapper().add_tuntap('tap0')
- self.execute.assert_called_once_with([], 'tuntap',
---
-cgit v0.11.2
-
diff --git a/pkgs/applications/virtualization/openstack/neutron.nix b/pkgs/applications/virtualization/openstack/neutron.nix
deleted file mode 100644
index 9ee586cf040915d300fdd8589c03d97e099d3714..0000000000000000000000000000000000000000
--- a/pkgs/applications/virtualization/openstack/neutron.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{ stdenv, fetchurl, python2Packages, xmlsec, which, dnsmasq }:
-
-python2Packages.buildPythonApplication rec {
- name = "neutron-${version}";
- version = "7.0.0";
- namePrefix = "";
-
- PBR_VERSION = "${version}";
-
- src = fetchurl {
- url = "https://github.com/openstack/neutron/archive/${version}.tar.gz";
- sha256 = "02ll081xly7zfjmgkal81fy3aplbnn5zgx8xfy3yy1nv3kfnyi40";
- };
-
- # https://github.com/openstack/neutron/blob/stable/liberty/requirements.txt
- propagatedBuildInputs = with python2Packages; [
- pbr paste PasteDeploy routes debtcollector eventlet greenlet httplib2 requests
- jinja2 keystonemiddleware netaddr retrying sqlalchemy webob alembic six
- stevedore pecan ryu networking-hyperv MySQL_python
-
- # clients
- keystoneclient neutronclient novaclient
-
- # oslo components
- oslo-concurrency oslo-config oslo-context oslo-db oslo-i18n oslo-log oslo-messaging
- oslo-middleware oslo-policy oslo-rootwrap oslo-serialization oslo-service oslo-utils
- oslo-versionedobjects
- ];
-
- # make sure we include migrations
- prePatch = ''
- echo "graft neutron" >> MANIFEST.in
- substituteInPlace etc/neutron/rootwrap.d/dhcp.filters --replace "/sbin/dnsmasq" "${dnsmasq}/bin/dnsmasq"
- '';
- patches = [ ./neutron-iproute-4.patch ];
-
- buildInputs = with python2Packages; [
- cliff coverage fixtures mock subunit requests-mock oslosphinx testrepository
- testtools testresources testscenarios webtest oslotest os-testr tempest-lib
- ddt pep8
- ];
-
- postInstall = ''
- # requires extra optional dependencies
- # TODO: package networking_mlnx, networking_vsphere, bsnstacklib, XenAPI
- rm $out/bin/{neutron-mlnx-agent,neutron-ovsvapp-agent,neutron-restproxy-agent,neutron-rootwrap-xen-dom0}
-
- # check all binaries don't crash
- for i in $out/bin/*; do
- case "$i" in
- *neutron-pd-notify|*neutron-rootwrap-daemon|*neutron-rootwrap)
- :
- ;;
- *)
- $i --help
- esac
- done
- '';
-
- meta = with stdenv.lib; {
- homepage = http://neutron.openstack.org/;
- description = "Virtual network service for Openstack";
- license = stdenv.lib.licenses.asl20;
- platforms = stdenv.lib.platforms.linux;
- # Marked as broken due to needing an update for security issues.
- # See: https://github.com/NixOS/nixpkgs/issues/18856
- broken = true;
- };
-}
diff --git a/pkgs/applications/virtualization/openstack/nova.nix b/pkgs/applications/virtualization/openstack/nova.nix
deleted file mode 100644
index ef3eb2fb084297e922d69bed21aa7a4f9b628b0a..0000000000000000000000000000000000000000
--- a/pkgs/applications/virtualization/openstack/nova.nix
+++ /dev/null
@@ -1,71 +0,0 @@
-{ stdenv, fetchurl, python2Packages, openssl, openssh }:
-
-python2Packages.buildPythonApplication rec {
- name = "nova-${version}";
- version = "12.0.0";
- namePrefix = "";
-
- PBR_VERSION = "${version}";
-
- src = fetchurl {
- url = "https://github.com/openstack/nova/archive/${version}.tar.gz";
- sha256 = "175n1znvmy8f5vqvabc2fa4qy8y17685z4gzpq8984mdsdnpv21w";
- };
-
- # otherwise migrate.cfg is not installed
- patchPhase = ''
- echo "graft nova" >> MANIFEST.in
-
- # remove transient error test, see http://hydra.nixos.org/build/40203534
- rm nova/tests/unit/compute/test_{shelve,compute_utils}.py
- '';
-
- # https://github.com/openstack/nova/blob/stable/liberty/requirements.txt
- propagatedBuildInputs = with python2Packages; [
- pbr sqlalchemy boto decorator eventlet jinja2 lxml routes cryptography
- webob greenlet PasteDeploy paste prettytable sqlalchemy_migrate netaddr
- netifaces paramiko Babel iso8601 jsonschema keystoneclient requests six
- stevedore websockify rfc3986 os-brick psutil_1 alembic psycopg2 pymysql
- keystonemiddleware MySQL_python
-
- # oslo components
- oslo-rootwrap oslo-reports oslo-utils oslo-i18n oslo-config oslo-context
- oslo-log oslo-serialization oslo-middleware oslo-db oslo-service oslo-messaging
- oslo-concurrency oslo-versionedobjects
-
- # clients
- cinderclient neutronclient glanceclient
- ];
-
- buildInputs = with python2Packages; [
- coverage fixtures mock mox3 subunit requests-mock pillow oslosphinx
- oslotest testrepository testresources testtools tempest-lib bandit
- oslo-vmware pep8 barbicanclient ironicclient openssl openssh
- ];
-
- postInstall = ''
- cp -prvd etc $out/etc
-
- # check all binaries don't crash
- for i in $out/bin/*; do
- case "$i" in
- *nova-dhcpbridge*)
- :
- ;;
- *nova-rootwrap*)
- :
- ;;
- *)
- $i --help
- ;;
- esac
- done
- '';
-
- meta = with stdenv.lib; {
- homepage = http://nova.openstack.org/;
- description = "OpenStack Compute (a.k.a. Nova), a cloud computing fabric controller";
- license = stdenv.lib.licenses.asl20;
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/applications/virtualization/openstack/remove-oslo-policy-tests.patch b/pkgs/applications/virtualization/openstack/remove-oslo-policy-tests.patch
deleted file mode 100644
index 3cdc27a2d2af2e46998407f82fe48bcc213847fc..0000000000000000000000000000000000000000
--- a/pkgs/applications/virtualization/openstack/remove-oslo-policy-tests.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 6016d017004acaae288312b196ef07ea98e9962d Mon Sep 17 00:00:00 2001
-From: Brant Knudson
-Date: Mon, 12 Oct 2015 15:12:45 -0500
-Subject: [PATCH] Remove oslo.policy implementation tests from keystone
-
-oslo.policy 0.12.0 contains a change to use requests to do the http
-check rather than urllib. This change caused keystone tests to fail
-because the keystone tests were mocking urllib, making assumptions
-about how oslo.policy is implemented. Keystone doesn't need to test
-internal features of oslo.policy, so these tests are removed.
-
-Change-Id: I9d6e4950b9fe75cbb94100c8effdcec002642027
-Closes-Bug: 1505374
----
- keystone/tests/unit/test_policy.py | 24 ------------------------
- 1 file changed, 24 deletions(-)
-
-diff --git a/keystone/tests/unit/test_policy.py b/keystone/tests/unit/test_policy.py
-index b2f0e52..686e2b7 100644
---- a/keystone/tests/unit/test_policy.py
-+++ b/keystone/tests/unit/test_policy.py
-@@ -16,10 +16,8 @@
- import json
- import os
-
--import mock
- from oslo_policy import policy as common_policy
- import six
--from six.moves.urllib import request as urlrequest
- from testtools import matchers
-
- from keystone import exception
-@@ -118,28 +116,6 @@ def test_enforce_good_action(self):
- action = "example:allowed"
- rules.enforce(self.credentials, action, self.target)
-
-- def test_enforce_http_true(self):
--
-- def fakeurlopen(url, post_data):
-- return six.StringIO("True")
--
-- action = "example:get_http"
-- target = {}
-- with mock.patch.object(urlrequest, 'urlopen', fakeurlopen):
-- result = rules.enforce(self.credentials, action, target)
-- self.assertTrue(result)
--
-- def test_enforce_http_false(self):
--
-- def fakeurlopen(url, post_data):
-- return six.StringIO("False")
--
-- action = "example:get_http"
-- target = {}
-- with mock.patch.object(urlrequest, 'urlopen', fakeurlopen):
-- self.assertRaises(exception.ForbiddenAction, rules.enforce,
-- self.credentials, action, target)
--
- def test_templatized_enforcement(self):
- target_mine = {'project_id': 'fake'}
- target_not_mine = {'project_id': 'another'}
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 2488bb1ae10e185abd98d0d6d7e90874287eb985..91b02f7ad1f0d278dc3fa16eb07cdec42e990d70 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -18,16 +18,17 @@
with stdenv.lib;
let
- version = "2.10.1";
- sha256 = "1a3bjr0ygx4r2qd4nx5jf77jhh4xis3zga27lfryn0b4ap3hn14f";
+ version = "2.11.0";
+ sha256 = "1jvzw6rdhimn583dz6an8xiw07n3ycvxmj3jpv1s312scv3k9w64";
audio = optionalString (hasSuffix "linux" stdenv.system) "alsa,"
+ optionalString pulseSupport "pa,"
+ optionalString sdlSupport "sdl,";
- hostCpuTargets = if stdenv.isi686 || stdenv.isx86_64 then "i386-softmmu,x86_64-softmmu"
- else if stdenv.isArm then "arm-softmmu"
- else if stdenv.isAarch64 then "aarch64-softmmu"
- else throw "Don't know how to build a 'hostCpuOnly = true' QEMU";
+ hostCpuTargets = if stdenv.isx86_64 then "i386-softmmu,x86_64-softmmu"
+ else if stdenv.isi686 then "i386-softmmu"
+ else if stdenv.isArm then "arm-softmmu"
+ else if stdenv.isAarch64 then "aarch64-softmmu"
+ else throw "Don't know how to build a 'hostCpuOnly = true' QEMU";
in
stdenv.mkDerivation rec {
@@ -62,12 +63,7 @@ stdenv.mkDerivation rec {
patches = [ ./no-etc-install.patch ]
++ optional nixosTestRunner ./force-uid0-on-9p.patch
- ++ optional pulseSupport ./fix-hda-recording.patch
- ++ [ (fetchpatch {
- name = "qemu-CVE-2017-15118.patch";
- url = "http://git.qemu.org/?p=qemu.git;a=patch;h=51ae4f8455c9e32c54770c4ebc25bf86a8128183";
- sha256 = "0f9i096dz3h1i8g92y99vak23rjs1shf7prlcxqizsz0fah7wx7h"; })
- ];
+ ++ optional pulseSupport ./fix-hda-recording.patch;
hardeningDisable = [ "stackprotector" ];
@@ -97,14 +93,13 @@ stdenv.mkDerivation rec {
done
'';
+ # Add a ‘qemu-kvm’ wrapper for compatibility/convenience.
postInstall =
- ''
- # Add a ‘qemu-kvm’ wrapper for compatibility/convenience.
- p="$out/bin/qemu-system-${if stdenv.system == "x86_64-linux" then "x86_64" else "i386"}"
- if [ -e "$p" ]; then
- makeWrapper "$p" $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"
- fi
- '';
+ if stdenv.isx86_64 then ''makeWrapper $out/bin/qemu-system-x86_64 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"''
+ else if stdenv.isi686 then ''makeWrapper $out/bin/qemu-system-i386 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"''
+ else if stdenv.isArm then ''makeWrapper $out/bin/qemu-system-arm $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"''
+ else if stdenv.isAarch64 then ''makeWrapper $out/bin/qemu-system-aarch64 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"''
+ else "";
meta = with stdenv.lib; {
homepage = http://www.qemu.org/;
diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix
index ddd8cf72b93db9d98a83733d939609d24ca6d7bb..236cb8f31e66de1e53b54f00fcf81d876c9f83d8 100644
--- a/pkgs/applications/virtualization/singularity/default.nix
+++ b/pkgs/applications/virtualization/singularity/default.nix
@@ -1,20 +1,52 @@
{ stdenv
, fetchFromGitHub
-, autoreconfHook }:
+, autoreconfHook
+, gnutar
+, which
+, gnugrep
+, coreutils
+, python
+, e2fsprogs
+, makeWrapper
+, squashfsTools
+, gzip
+, gnused
+, curl
+, utillinux
+ }:
stdenv.mkDerivation rec {
name = "singularity-${version}";
- version = "2.2";
+ version = "2.4";
+
+ enableParallelBuilding = true;
+
+ patches = [ ./env.patch ];
+
+ preConfigure = ''
+ sed -i 's/-static//g' src/Makefile.am
+ patchShebangs .
+ '';
+
+ fixupPhase = ''
+ patchShebangs $out
+ for f in $out/libexec/singularity/helpers/help.sh $out/libexec/singularity/cli/*.exec $out/libexec/singularity/bootstrap-scripts/*.sh ; do
+ chmod a+x $f
+ sed -i 's| /sbin/| |g' $f
+ sed -i 's| /bin/bash| ${stdenv.shell}|g' $f
+ wrapProgram $f --prefix PATH : ${stdenv.lib.makeBinPath buildInputs}
+ done
+ '';
src = fetchFromGitHub {
owner = "singularityware";
repo = "singularity";
rev = version;
- sha256 = "19g43gfdy5s8y4252474cp39d6ypn5dd37wp0s21fgd13vqy26px";
+ sha256 = "1hi1ag1lb2x4djbz4x34wix83ymx0g9mzn2md6yrpiflc1d85rjz";
};
- nativeBuildInputs = [ autoreconfHook ];
- buildInputs = [ ];
+ nativeBuildInputs = [ autoreconfHook makeWrapper ];
+ buildInputs = [ coreutils gnugrep python e2fsprogs which gnutar squashfsTools gzip gnused curl utillinux ];
meta = with stdenv.lib; {
homepage = http://singularity.lbl.gov/;
diff --git a/pkgs/applications/virtualization/singularity/env.patch b/pkgs/applications/virtualization/singularity/env.patch
new file mode 100644
index 0000000000000000000000000000000000000000..bc3be363bb818885b8b452762247b320fe217924
--- /dev/null
+++ b/pkgs/applications/virtualization/singularity/env.patch
@@ -0,0 +1,21 @@
+diff --git a/libexec/functions b/libexec/functions
+index bc68107..6c2211c 100644
+--- a/libexec/functions
++++ b/libexec/functions
+@@ -29,16 +29,6 @@ if [ -z "${SINGULARITY_MESSAGELEVEL:-}" ]; then
+ SINGULARITY_MESSAGELEVEL=5
+ fi
+
+-if [ -z "${USER:-}" ]; then
+- USER=`id -un`
+- export USER
+-fi
+-if [ -z "${HOME:-}" ]; then
+- HOME=`getent passwd "$USER" | cut -d : -f 6`
+- export HOME
+-fi
+-
+-
+ message() {
+ LEVEL="${1:-}"
+ MESSAGE="${2:-}"
diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix
index 13dbf544c9279f54b5727da100f5e06f52adb5dc..b99475bcda84a783774e3d6b566badd9e499c2bd 100644
--- a/pkgs/applications/virtualization/virt-manager/default.nix
+++ b/pkgs/applications/virtualization/virt-manager/default.nix
@@ -9,12 +9,12 @@ with stdenv.lib;
python2Packages.buildPythonApplication rec {
name = "virt-manager-${version}";
- version = "1.4.2";
+ version = "1.4.3";
namePrefix = "";
src = fetchurl {
url = "http://virt-manager.org/download/sources/virt-manager/${name}.tar.gz";
- sha256 = "0x6mnqw8bng3r69pvmnq9q6yyhicxg22yz62b6dzbb4z16xl1r23";
+ sha256 = "093azs8p4p7y4nf5j25xpsvdxww7gky1g0hs8mkcvmpxl2wjd0jj";
};
nativeBuildInputs = [ wrapGAppsHook intltool file ];
diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix
index f386b457fc50886fc0270007f8646aa2422ae8ed..4c5000f0208c0b076cc4f427d1ad061340f0f145 100644
--- a/pkgs/applications/virtualization/virt-manager/qt.nix
+++ b/pkgs/applications/virtualization/virt-manager/qt.nix
@@ -1,27 +1,27 @@
{ mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig
, qtbase, qtmultimedia, qtsvg
-, lxqt, libvncserver, libvirt, pcre, pixman, spice_gtk, spice_protocol
+, libvncserver, libvirt, pcre, pixman, qtermwidget, spice_gtk, spice_protocol
}:
mkDerivation rec {
name = "virt-manager-qt-${version}";
- version = "0.45.75";
+ version = "0.48.79";
src = fetchFromGitHub {
owner = "F1ash";
repo = "qt-virt-manager";
rev = "${version}";
- sha256 = "1s59g7kkz8481y8yyf89f549xwbg1978zj9ds61iy94mwz80b38n";
+ sha256 = "1mzncca9blc742vb77gyfza0sd1rby3qy5yl4x19nkllid92jn6k";
};
cmakeFlags = [
"-DBUILD_QT_VERSION=5"
+ "-DQTERMWIDGET_INCLUDE_DIRS=${qtermwidget}/include/qtermwidget5"
];
buildInputs = [
- # 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
+ qtbase qtmultimedia qtsvg
+ libvirt libvncserver pcre pixman qtermwidget spice_gtk spice_protocol
];
nativeBuildInputs = [ cmake pkgconfig ];
@@ -38,5 +38,6 @@ mkDerivation rec {
'';
license = licenses.gpl2;
maintainers = with maintainers; [ peterhoeg ];
+ inherit (qtbase.meta) platforms;
};
}
diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix
index 3b8d0a7cf63e58dc4f09b19701516277dfbad4d3..68ee06953a38610d4a42fcaf019d8890fe5d434c 100644
--- a/pkgs/applications/virtualization/virt-viewer/default.nix
+++ b/pkgs/applications/virtualization/virt-viewer/default.nix
@@ -25,8 +25,12 @@ stdenv.mkDerivation rec {
buildInputs = [
glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl shared_mime_info
libvirt yajl gsettings_desktop_schemas makeWrapper libvirt-glib
- libcap_ng numactl libapparmor xen
- ] ++ optionals spiceSupport [ spice_gtk spice_protocol libcap gdbm ];
+ libcap_ng numactl libapparmor
+ ] ++ optionals stdenv.isx86_64 [
+ xen
+ ] ++ optionals spiceSupport [
+ spice_gtk spice_protocol libcap gdbm
+ ];
postInstall = ''
for f in "$out"/bin/*; do
diff --git a/pkgs/applications/virtualization/virtualbox/HostServices-SharedClipboard-x11-stub.cpp-use-RT_NOR.patch b/pkgs/applications/virtualization/virtualbox/HostServices-SharedClipboard-x11-stub.cpp-use-RT_NOR.patch
new file mode 100644
index 0000000000000000000000000000000000000000..7abe62a59cb8903942924c8b1d2956f389da14ac
--- /dev/null
+++ b/pkgs/applications/virtualization/virtualbox/HostServices-SharedClipboard-x11-stub.cpp-use-RT_NOR.patch
@@ -0,0 +1,153 @@
+From 9ac54c606b581847a170ac2fe525419aff2e5341 Mon Sep 17 00:00:00 2001
+From: Florian Klink
+Date: Wed, 6 Dec 2017 23:58:20 +0100
+Subject: [PATCH] HostServices/SharedClipboard/x11-stub.cpp: use RT_NOREF
+ rather than NOREF
+
+Currently, build process fails when configuring with --build-headless like this:
+
+```
+kBuild: Compiling VBoxSharedClipboard - /tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/service.cpp
+kBuild: Compiling VBoxSharedClipboard - /tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp
+/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:58:29: error: macro "NOREF" passed 2 arguments, but takes just 1
+ NOREF(pClient, fHeadless);
+ ^
+/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:94:30: error: macro "NOREF" passed 2 arguments, but takes just 1
+ NOREF(pClient, u32Formats);
+ ^
+/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:110:37: error: macro "NOREF" passed 4 arguments, but takes just 1
+ NOREF(pClient, u32Format, pv, cb);
+ ^
+/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:128:37: error: macro "NOREF" passed 4 arguments, but takes just 1
+ NOREF(pClient, pv, cb, u32Format);
+ ^
+/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp: In function 'int vboxClipboardConnect(VBOXCLIPBOARDCLIENTDATA*, bool)':
+/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:58:5: error: 'NOREF' was not declared in this scope
+ NOREF(pClient, fHeadless);
+ ^~~~~
+/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:55:52: warning: unused parameter 'pClient' [-Wunused-parameter]
+ int vboxClipboardConnect (VBOXCLIPBOARDCLIENTDATA *pClient,
+ ^~~~~~~
+/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:56:32: warning: unused parameter 'fHeadless' [-Wunused-parameter]
+ bool fHeadless)
+ ^~~~~~~~~
+/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp: In function 'void vboxClipboardFormatAnnounce(VBOXCLIPBOARDCLIENTDATA*, uint32_t)':
+/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:94:5: error: 'NOREF' was not declared in this scope
+ NOREF(pClient, u32Formats);
+ ^~~~~
+/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:91:60: warning: unused parameter 'pClient' [-Wunused-parameter]
+ void vboxClipboardFormatAnnounce (VBOXCLIPBOARDCLIENTDATA *pClient,
+ ^~~~~~~
+/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:92:44: warning: unused parameter 'u32Formats' [-Wunused-parameter]
+ uint32_t u32Formats)
+ ^~~~~~~~~~
+/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp: In function 'int vboxClipboardReadData(VBOXCLIPBOARDCLIENTDATA*, uint32_t, void*, uint32_t, uint32_t*)':
+/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:110:5: error: 'NOREF' was not declared in this scope
+ NOREF(pClient, u32Format, pv, cb);
+ ^~~~~
+/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:107:53: warning: unused parameter 'pClient' [-Wunused-parameter]
+ int vboxClipboardReadData (VBOXCLIPBOARDCLIENTDATA *pClient, uint32_t u32Format,
+ ^~~~~~~
+/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:107:71: warning: unused parameter 'u32Format' [-Wunused-parameter]
+ int vboxClipboardReadData (VBOXCLIPBOARDCLIENTDATA *pClient, uint32_t u32Format,
+ ^~~~~~~~~
+/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:108:34: warning: unused parameter 'pv' [-Wunused-parameter]
+ void *pv, uint32_t cb, uint32_t *pcbActual)
+ ^~
+/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:108:47: warning: unused parameter 'cb' [-Wunused-parameter]
+ void *pv, uint32_t cb, uint32_t *pcbActual)
+ ^~
+/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp: In function 'void vboxClipboardWriteData(VBOXCLIPBOARDCLIENTDATA*, void*, uint32_t, uint32_t)':
+/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:128:5: error: 'NOREF' was not declared in this scope
+ NOREF(pClient, pv, cb, u32Format);
+ ^~~~~
+/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:125:55: warning: unused parameter 'pClient' [-Wunused-parameter]
+ void vboxClipboardWriteData (VBOXCLIPBOARDCLIENTDATA *pClient, void *pv,
+ ^~~~~~~
+/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:125:70: warning: unused parameter 'pv' [-Wunused-parameter]
+ void vboxClipboardWriteData (VBOXCLIPBOARDCLIENTDATA *pClient, void *pv,
+ ^~
+/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:126:39: warning: unused parameter 'cb' [-Wunused-parameter]
+ uint32_t cb, uint32_t u32Format)
+ ^~
+/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:126:52: warning: unused parameter 'u32Format' [-Wunused-parameter]
+ uint32_t cb, uint32_t u32Format)
+ ^~~~~~~~~
+kmk: *** [/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/out/linux.amd64/release/obj/VBoxSharedClipboard/x11-stub.o] Error 1
+The failing command:
+@g++ -c -O2 -g -pipe -pedantic -Wshadow -Wall -Wextra -Wno-missing-field-initializers -Wno-unused -Wno-trigraphs -fdiagnostics-show-option -Wno-unused-parameter -Wlogical-op -Wno-variadic-macros
+-Wno-long-long -Wunused-variable -Wunused-function -Wunused-label -Wunused-parameter -Wno-overloaded-virtual -Wno-variadic-macros -O2 -mtune=generic -fno-omit-frame-pointer -fno-strict-aliasing
+-fvisibility=hidden -DVBOX_HAVE_VISIBILITY_HIDDEN -DRT_USE_VISIBILITY_DEFAULT -fvisibility-inlines-hidden -fPIC -m64
+-I/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/out/linux.amd64/release/obj/VBoxSharedClipboard/dtrace -I/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/include
+-I/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/out/linux.amd64/release -DVBOX -DVBOX_OSE -DVBOX_WITH_64_BITS_GUESTS -DVBOX_WITH_REM -DVBOX_WITH_RAW_MODE -DRT_OS_LINUX -D_FILE_OFFSET_BITS=64
+-DRT_ARCH_AMD64 -D__AMD64__ -DVBOX_WITH_DEBUGGER -DVBOX_WITH_HARDENING -DRTPATH_APP_PRIVATE=\"/nix/store/fqjnpbzq25ffpkpk6hsl3x19ydin2pp1-virtualbox-5.2.2/share/virtualbox\"
+-DRTPATH_APP_PRIVATE_ARCH=\"/nix/store/fqjnpbzq25ffpkpk6hsl3x19ydin2pp1-virtualbox-5.2.2/libexec/virtualbox\"
+-DRTPATH_APP_PRIVATE_ARCH_TOP=\"/nix/store/fqjnpbzq25ffpkpk6hsl3x19ydin2pp1-virtualbox-5.2.2/share/virtualbox\"
+-DRTPATH_SHARED_LIBS=\"/nix/store/fqjnpbzq25ffpkpk6hsl3x19ydin2pp1-virtualbox-5.2.2/libexec/virtualbox\" -DRTPATH_APP_DOCS=\"/nix/store/fqjnpbzq25ffpkpk6hsl3x19ydin2pp1-virtualbox-5.2.2/doc\"
+-DIN_RING3 -DHC_ARCH_BITS=64 -DGC_ARCH_BITS=64 -DVBOX_WITH_DTRACE -DVBOX_WITH_DTRACE_R3 -DPIC -DVBOX_WITH_HGCM
+-Wp,-MD,/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/out/linux.amd64/release/obj/VBoxSharedClipboard/x11-stub.o.dep
+-Wp,-MT,/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/out/linux.amd64/release/obj/VBoxSharedClipboard/x11-stub.o -Wp,-MP -o
+/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/out/linux.amd64/release/obj/VBoxSharedClipboard/x11-stub.o
+/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp
+```
+
+This seems to be caused by the usage of NOREF in
+src/VBox/HostServices/SharedClipboard/x11-stub.cpp, so use RT_NOREFN
+instead.
+
+Signed-off-by: Florian Klink
+---
+ src/VBox/HostServices/SharedClipboard/x11-stub.cpp | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/VBox/HostServices/SharedClipboard/x11-stub.cpp b/src/VBox/HostServices/SharedClipboard/x11-stub.cpp
+index d890215..57ba883 100644
+--- a/src/VBox/HostServices/SharedClipboard/x11-stub.cpp
++++ b/src/VBox/HostServices/SharedClipboard/x11-stub.cpp
+@@ -55,7 +55,7 @@ void vboxClipboardDestroy (void)
+ int vboxClipboardConnect (VBOXCLIPBOARDCLIENTDATA *pClient,
+ bool fHeadless)
+ {
+- NOREF(pClient, fHeadless);
++ RT_NOREF2(pClient, fHeadless);
+ LogFlowFunc(("called, returning VINF_SUCCESS.\n"));
+ return VINF_SUCCESS;
+ }
+@@ -77,7 +77,7 @@ int vboxClipboardSync (VBOXCLIPBOARDCLIENTDATA * /* pClient */)
+ */
+ void vboxClipboardDisconnect (VBOXCLIPBOARDCLIENTDATA *pClient)
+ {
+- NOREF(pClient);
++ RT_NOREF1(pClient);
+ LogFlowFunc(("called, returning.\n"));
+ }
+
+@@ -91,7 +91,7 @@ void vboxClipboardDisconnect (VBOXCLIPBOARDCLIENTDATA *pClient)
+ void vboxClipboardFormatAnnounce (VBOXCLIPBOARDCLIENTDATA *pClient,
+ uint32_t u32Formats)
+ {
+- NOREF(pClient, u32Formats);
++ RT_NOREF2(pClient, u32Formats);
+ LogFlowFunc(("called, returning.\n"));
+ }
+
+@@ -107,7 +107,7 @@ void vboxClipboardFormatAnnounce (VBOXCLIPBOARDCLIENTDATA *pClient,
+ int vboxClipboardReadData (VBOXCLIPBOARDCLIENTDATA *pClient, uint32_t u32Format,
+ void *pv, uint32_t cb, uint32_t *pcbActual)
+ {
+- NOREF(pClient, u32Format, pv, cb);
++ RT_NOREF4(pClient, u32Format, pv, cb);
+ LogFlowFunc(("called, returning VINF_SUCCESS.\n"));
+ /* No data available. */
+ *pcbActual = 0;
+@@ -125,6 +125,6 @@ int vboxClipboardReadData (VBOXCLIPBOARDCLIENTDATA *pClient, uint32_t u32Format,
+ void vboxClipboardWriteData (VBOXCLIPBOARDCLIENTDATA *pClient, void *pv,
+ uint32_t cb, uint32_t u32Format)
+ {
+- NOREF(pClient, pv, cb, u32Format);
++ RT_NOREF4(pClient, pv, cb, u32Format);
+ LogFlowFunc(("called, returning.\n"));
+ }
+--
+2.15.0
+
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 3e502cde08b20b27952fdf5203884a187ddf66ee..3e9322ddeafb312598e4dc47ba1465d2465ab9a1 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -1,8 +1,9 @@
{ stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext
, libXcursor, libXmu, qt5, libIDL, SDL, libcap, zlib, libpng, glib, lvm2
, libXrandr, libXinerama
-, which, alsaLib, curl, libvpx, gawk, nettools, dbus
-, xorriso, makeself, perl, pkgconfig
+, pkgconfig, which, docbook_xsl, docbook_xml_dtd_43
+, alsaLib, curl, libvpx, gawk, nettools, dbus
+, xorriso, makeself, perl
, javaBindings ? false, jdk ? null
, pythonBindings ? false, python2 ? null
, enableExtensionPack ? false, requireFile ? null, patchelf ? null, fakeroot ? null
@@ -19,10 +20,11 @@ let
python = python2;
buildType = "release";
# Manually sha256sum the extensionPack file, must be hex!
- extpack = "9328548ca8cbc526232c0631cb5a17618c771b07665b362c1e3d89a2425bf799";
- extpackRev = "119230";
- main = "05y03fcp013gc500q34bj6hvx1banib41v8l3hcxknzfgwq0rarm";
- version = "5.2.2";
+ # Do not forget to update the hash in ./guest-additions/default.nix!
+ extpack = "98e9df4f23212c3de827af9d770b391cf2dba8d21f4de597145512c1479302cd";
+ extpackRev = "119785";
+ main = "053xpf0kxrig4jq5djfz9drhkxy1x5a4p9qvgxc0b3hnk6yn1869";
+ version = "5.2.4";
# See https://github.com/NixOS/nixpkgs/issues/672 for details
extensionPack = requireFile rec {
@@ -51,10 +53,12 @@ in stdenv.mkDerivation {
outputs = [ "out" "modsrc" ];
+ nativeBuildInputs = [ pkgconfig which docbook_xsl docbook_xml_dtd_43 ];
+
buildInputs =
[ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor libIDL
libcap glib lvm2 alsaLib curl libvpx pam xorriso makeself perl
- pkgconfig which libXmu libpng patchelfUnstable python ]
+ libXmu libpng patchelfUnstable python ]
++ optional javaBindings jdk
++ optional pythonBindings python # Python is needed even when not building bindings
++ optional pulseSupport libpulseaudio
@@ -88,8 +92,13 @@ in stdenv.mkDerivation {
set +x
'';
- patches = optional enableHardening ./hardened.patch
- ++ [ ./qtx11extras.patch ];
+ patches =
+ optional enableHardening ./hardened.patch
+ # https://www.virtualbox.org/pipermail/vbox-dev/2017-December/014888.html
+ ++ optional headless [ ./HostServices-SharedClipboard-x11-stub.cpp-use-RT_NOR.patch ]
+ ++ [ ./qtx11extras.patch ];
+
+
postPatch = ''
sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \
@@ -197,8 +206,9 @@ in stdenv.mkDerivation {
meta = {
description = "PC emulator";
- homepage = http://www.virtualbox.org/;
- maintainers = [ lib.maintainers.sander ];
- platforms = lib.platforms.linux;
+ license = licenses.gpl2;
+ homepage = https://www.virtualbox.org/;
+ maintainers = with maintainers; [ flokli sander ];
+ platforms = [ "x86_64-linux" "i686-linux" ];
};
}
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 0aa0423fc13aa084533387b4d6dfa1ba115b1d91..8f789cdf170789ef73cb9456ac4ec3b416b69f3c 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
- sha256 = "1f0vm20qdjxqsbciwgybxqqpn609gj5dy68an8lpi1wlk93s05w3";
+ sha256 = "0qhsr6vc48ld2p9q3a6n6rfg57rsn163axr3r1m2yqr2snr4pnk0";
};
KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration";
- buildInputs = [ patchelf cdrkit makeWrapper dbus ];
+ buildInputs = [ patchelf cdrkit makeWrapper dbus ] ++ kernel.moduleBuildDependencies;
installPhase = ''
mkdir -p $out
diff --git a/pkgs/applications/virtualization/xen/4.5.nix b/pkgs/applications/virtualization/xen/4.5.nix
index 308913adf89c2156bc436abf840e3c31c4c0ed39..ec3fe9ccf221a81ffb406e1e45da8d2eedd66fe3 100644
--- a/pkgs/applications/virtualization/xen/4.5.nix
+++ b/pkgs/applications/virtualization/xen/4.5.nix
@@ -230,6 +230,12 @@ callPackage (import ./generic.nix (rec {
XSA_243_45
XSA_244_45
XSA_245
+ XSA_246_45
+ XSA_247_45
+ XSA_248_45
+ XSA_249
+ XSA_250_45
+ XSA_251_45
];
# Fix build on Glibc 2.24.
diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix
index 259dd72a960cf9c644c07c474073ce20207b1a05..6eedca18960b35ccbdf506713228df5b042350ae 100644
--- a/pkgs/applications/virtualization/xen/4.8.nix
+++ b/pkgs/applications/virtualization/xen/4.8.nix
@@ -158,6 +158,12 @@ callPackage (import ./generic.nix (rec {
XSA_243_48
XSA_244
XSA_245
+ XSA_246
+ XSA_247_48
+ XSA_248_48
+ XSA_249
+ XSA_250
+ XSA_251_48
];
# Fix build on Glibc 2.24.
diff --git a/pkgs/applications/virtualization/xen/xsa-patches.nix b/pkgs/applications/virtualization/xen/xsa-patches.nix
index fd85c85f22bbd6401fb6eed3d9a82ecae36a2747..8f8cc459a2438a8107bcda2d0cd741bfacafc7e9 100644
--- a/pkgs/applications/virtualization/xen/xsa-patches.nix
+++ b/pkgs/applications/virtualization/xen/xsa-patches.nix
@@ -771,4 +771,97 @@ in rec {
sha256 = "1k6z5r7wnrswsczn2j3a1mc4nvxqm4ydj6n6rvgqizk2pszdkqg8";
})
];
+
+ # 4.5 - 4.7
+ XSA_246_45 = [
+ (xsaPatch {
+ name = "246-4.7";
+ sha256 = "13rad4k8z3bq15d67dhgy96kdbrjiq9sy8px0jskbpx9ygjdahkn";
+ })
+ ];
+
+ # 4.8 - 4.9
+ XSA_246 = [
+ (xsaPatch {
+ name = "246-4.9";
+ sha256 = "0z68vm0z5zvv9gm06pxs9kxq2q9fdbl0l0cm71ggzdplg1vw0snz";
+ })
+ ];
+
+ # 4.8
+ XSA_247_48 = [
+ (xsaPatch {
+ name = "247-4.8/0001-p2m-Always-check-to-see-if-removing-a-p2m-entry-actu";
+ sha256 = "0kvjrk90n69s721c2qj2df5raml3pjk6bg80aig353p620w6s3xh";
+ })
+ (xsaPatch {
+ name = "247-4.8/0002-p2m-Check-return-value-of-p2m_set_entry-when-decreas";
+ sha256 = "1s9kv6h6dd8psi5qf5l5gpk9qhq8blckwhl76cjbldcgi6imb3nr";
+ })
+ ];
+
+ # 4.5
+ XSA_247_45 = [
+ (xsaPatch {
+ name = "247-4.5/0001-p2m-Always-check-to-see-if-removing-a-p2m-entry-actu";
+ sha256 = "0h1mp5s9si8aw2gipds317f27h9pi7bgnhj0bcmw11p0ch98sg1m";
+ })
+ (xsaPatch {
+ name = "247-4.5/0002-p2m-Check-return-value-of-p2m_set_entry-when-decreas";
+ sha256 = "0vjjybxbcm4xl26wbqvcqfiyvvlayswm4f98i1fr5a9abmljn5sb";
+ })
+ ];
+
+ # 4.5
+ XSA_248_45 = [
+ (xsaPatch {
+ name = "248-4.5";
+ sha256 = "0csxg6h492ddsa210b45av28iqf7cn2dfdqk4zx10zwf1pv2shyn";
+ })
+ ];
+
+ # 4.8
+ XSA_248_48 = [
+ (xsaPatch {
+ name = "248-4.8";
+ sha256 = "1ycw29q22ymxg18kxpr5p7vhpmp8klssbp5gq77hspxzz2mb96q1";
+ })
+ ];
+
+ # 4.5 .. 4.9
+ XSA_249 = [
+ (xsaPatch {
+ name = "249";
+ sha256 = "0v6ngzqhkz7yv4n83xlpxfbkr2qyg5b1cds7ikkinm86hiqy6agl";
+ })
+ ];
+ # 4.5
+ XSA_250_45 = [
+ (xsaPatch {
+ name = "250-4.5";
+ sha256 = "0pqldl6qnl834gvfp90z247q9xcjh3835s2iffnajz7jhjb2145d";
+ })
+ ];
+ # 4.8 ...
+ XSA_250 = [
+ (xsaPatch {
+ name = "250";
+ sha256 = "1wpigg8kmha57sspqqln3ih9nbczsw6rx3v72mc62lh62qvwd7x8";
+ })
+ ];
+ # 4.5
+ XSA_251_45 = [
+ (xsaPatch {
+ name = "251-4.5";
+ sha256 = "0lc94cx271z09r0mhxaypyd9d4740051p28idf5calx5228dqjgm";
+ })
+ ];
+ # 4.8
+ XSA_251_48 = [
+ (xsaPatch {
+ name = "251-4.8";
+ sha256 = "079wi0j6iydid2zj7k584w2c393kgh588w7sjz2nn4039qn8k9mq";
+ })
+ ];
+
}
diff --git a/pkgs/applications/window-managers/awesome/3.5.nix b/pkgs/applications/window-managers/awesome/3.5.nix
index 3a2a030b8a4d8eccb161ba0ffe765f3dda93b679..f3d43d15efba7c2ed0f3d3e928deb8b62fbb442f 100644
--- a/pkgs/applications/window-managers/awesome/3.5.nix
+++ b/pkgs/applications/window-managers/awesome/3.5.nix
@@ -70,8 +70,8 @@ stdenv.mkDerivation rec {
postInstall = ''
wrapProgram $out/bin/awesome \
- --prefix LUA_CPATH ";" '"${lgi}/lib/lua/${lua.luaversion}/?.so"' \
- --prefix LUA_PATH ";" '"${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua"' \
+ --prefix LUA_CPATH ";" "${lgi}/lib/lua/${lua.luaversion}/?.so" \
+ --prefix LUA_PATH ";" "${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \
--prefix PATH : "${stdenv.lib.makeBinPath [ compton unclutter procps iproute coreutils curl alsaUtils findutils xterm ]}"
diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix
index 4043c05e3d6d24d10009656b3b085258bf66ce96..ca596cdfddc1f479ad563c845c610d0a4c6bd0c2 100644
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@@ -49,8 +49,8 @@ with luaPackages; stdenv.mkDerivation rec {
postInstall = ''
wrapProgram $out/bin/awesome \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
- --prefix LUA_CPATH ";" '${lgi}/lib/lua/${lua.luaversion}/?.so' \
- --prefix LUA_PATH ";" '${lgi}/share/lua/${lua.luaversion}/?.lua' \
+ --add-flags '--search ${lgi}/lib/lua/${lua.luaversion}' \
+ --add-flags '--search ${lgi}/share/lua/${lua.luaversion}' \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \
--prefix PATH : "${stdenv.lib.makeBinPath [ compton unclutter procps iproute coreutils curl alsaUtils findutils xterm ]}"
diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/applications/window-managers/dwm/default.nix
index 9f6c89375182aed33914a72ea5b4e2a5fe4598b7..76352753db1d0cc86f630f0c248497c439ce8675 100644
--- a/pkgs/applications/window-managers/dwm/default.nix
+++ b/pkgs/applications/window-managers/dwm/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
buildPhase = " make ";
meta = {
- homepage = http://suckless.org/;
+ homepage = https://suckless.org/;
description = "Dynamic window manager for X";
license = stdenv.lib.licenses.mit;
maintainers = with stdenv.lib.maintainers; [viric];
diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix
index fbea1d4e9a41a5f77ff91742129c43b7102f2c6a..05f89728f6a7d518493311e19f7929a8ebd41395 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 = "1651";
+ version = "1653";
src = fetchFromGitHub {
owner = "joewing";
repo = "jwm";
rev = "s${version}";
- sha256 = "097wqipg1h7h19a5bqdx7iq60fkjrx2niwsgg1f8cfz106yhbp6q";
+ sha256 = "09ci3g97xmif66pp9n4sdvdmlxpw67pwp8lbjynxhdvha5pwwpv5";
};
nativeBuildInputs = [ pkgconfig automake autoconf libtool gettext which ];
diff --git a/pkgs/applications/window-managers/orbment/bemenu.nix b/pkgs/applications/window-managers/orbment/bemenu.nix
new file mode 100644
index 0000000000000000000000000000000000000000..065b81948c2d02872b148058355d5f83ac3cf194
--- /dev/null
+++ b/pkgs/applications/window-managers/orbment/bemenu.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig
+, pango, wayland, libxkbcommon }:
+
+stdenv.mkDerivation rec {
+ name = "bemenu-2017-02-14";
+
+ src = fetchFromGitHub {
+ owner = "Cloudef";
+ repo = "bemenu";
+ rev = "d6261274cf0b3aa51ce8ea7418a79495b20ad558";
+ sha256 = "08bc623y5yjbz7q83lhl6rb0xs6ji17z79c260bx0fgin8sfj5x8";
+ };
+
+ nativeBuildInputs = [ cmake pkgconfig ];
+
+ buildInputs = [ pango wayland libxkbcommon ];
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ description = "A dynamic menu library and client program inspired by dmenu";
+ homepage = src.meta.homepage;
+ license = with licenses; [ gpl3 lgpl3 ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/window-managers/orbment/default.nix b/pkgs/applications/window-managers/orbment/default.nix
index 8071bc4bb4264725c1855dbabd2eb455aedbf8d0..46130680af42d94e6afd598395fcada39b579cfa 100644
--- a/pkgs/applications/window-managers/orbment/default.nix
+++ b/pkgs/applications/window-managers/orbment/default.nix
@@ -1,9 +1,12 @@
-{ lib, stdenv, fetchgit, cmake, pkgconfig
+{ lib, stdenv, fetchgit, cmake, pkgconfig, makeWrapper, callPackage
, wlc, dbus_libs, wayland, libxkbcommon, pixman, libinput, udev, zlib, libpng
, libdrm, libX11
+, westonLite
}:
-stdenv.mkDerivation rec {
+let
+ bemenu = callPackage ./bemenu.nix {};
+in stdenv.mkDerivation rec {
name = "orbment-${version}";
version = "git-2016-08-13";
@@ -14,13 +17,20 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
- nativeBuildInputs = [ cmake pkgconfig ];
+ nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
buildInputs = [
wlc dbus_libs wayland libxkbcommon pixman libinput udev zlib libpng libX11
libdrm
];
+ postFixup = ''
+ wrapProgram $out/bin/orbment \
+ --prefix PATH : "${stdenv.lib.makeBinPath [ bemenu westonLite ]}"
+ '';
+
+ enableParallelBuilding = true;
+
meta = {
description = "Modular Wayland compositor";
homepage = src.url;
diff --git a/pkgs/applications/window-managers/oroborus/default.nix b/pkgs/applications/window-managers/oroborus/default.nix
index d2bf1e5a96de207745b99bd878fd586b33ea3683..13eef1c045a499d46673def5cf7ff5213ade59a1 100644
--- a/pkgs/applications/window-managers/oroborus/default.nix
+++ b/pkgs/applications/window-managers/oroborus/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
meta = {
description = "A really minimalistic X window manager";
- homepage = http://www.oroborus.org/;
+ homepage = https://www.oroborus.org/;
license = licenses.gpl2Plus;
maintainers = [ maintainers.AndersonTorres ];
platforms = platforms.linux;
diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix
index 22521cc6da8db22d25c7d1a6685344785b87a9cf..a7b9a77b3dbf403039bea78895ea6d2560bcdff7 100644
--- a/pkgs/applications/window-managers/qtile/default.nix
+++ b/pkgs/applications/window-managers/qtile/default.nix
@@ -41,6 +41,8 @@ python27Packages.buildPythonApplication rec {
--run 'export QTILE_SAVED_PATH=$PATH'
'';
+ doCheck = false; # Requires X server.
+
meta = with stdenv.lib; {
homepage = http://www.qtile.org/;
license = licenses.mit;
@@ -49,4 +51,3 @@ python27Packages.buildPythonApplication rec {
maintainers = with maintainers; [ kamilchm ];
};
}
-
diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix
index 1e1072e49604e6f71b7e5372202ca90470ca6d3d..d643e2dd2186c9c8375b1616cd984a0a40c9f16b 100644
--- a/pkgs/applications/window-managers/sway/default.nix
+++ b/pkgs/applications/window-managers/sway/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
name = "sway-${version}";
- version = "0.15.0";
+ version = "0.15.1";
src = fetchFromGitHub {
owner = "swaywm";
repo = "sway";
rev = version;
- sha256 = "0rz5rgap2ah7hkk4glvlmjq0c8i2f47qzkwjx7gm4wmb8gymikmh";
+ sha256 = "00prns3dnafd19ap774p8v994i3p185ji0dnp2xxbkgh2z7sbwpi";
};
nativeBuildInputs = [
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- cmakeFlags = "-DVERSION=${version}";
+ cmakeFlags = "-DVERSION=${version} -DLD_LIBRARY_PATH=/run/opengl-driver/lib:/run/opengl-driver-32/lib";
meta = with stdenv.lib; {
description = "i3-compatible window manager for Wayland";
diff --git a/pkgs/applications/window-managers/velox/default.nix b/pkgs/applications/window-managers/velox/default.nix
index 789f074aecdfd7065d7a79259690110b688e2a90..0b430693eeed9237c14676af0c7f9095e5bcfa8b 100644
--- a/pkgs/applications/window-managers/velox/default.nix
+++ b/pkgs/applications/window-managers/velox/default.nix
@@ -1,25 +1,53 @@
-{ lib, stdenv, fetchurl, fetchFromGitHub, pkgconfig
-, swc, libxkbcommon
-, wld, wayland, pixman, fontconfig
+{ lib, stdenv, fetchFromGitHub, pkgconfig, makeWrapper, newScope
+, libxkbcommon
+, wayland, pixman, fontconfig
+, stConf ? null, stPatches ? []
}:
-stdenv.mkDerivation rec {
+let
+ callPackage = newScope self;
+ self = {
+ swc = callPackage ./swc.nix {};
+ wld = callPackage ./wld.nix {};
+ dmenu-velox = callPackage ./dmenu.nix {};
+ st-velox = callPackage ./st.nix {
+ conf = stConf;
+ patches = stPatches;
+ };
+ };
+in with self; stdenv.mkDerivation rec {
name = "velox-${version}";
- version = "git-2015-11-03";
- repo = "https://github.com/michaelforney/velox";
- rev = "53b41348df7e37886cab012609923255e4397419";
+ version = "git-2017-07-04";
- src = fetchurl {
- url = "${repo}/archive/${rev}.tar.gz";
- sha256 = "e49583efbbe62ea30f0084491ff757dff683f35eef6e9b68aa413e0b50c4bf20";
+ src = fetchFromGitHub {
+ owner = "michaelforney";
+ repo = "velox";
+ rev = "0b1d3d62861653d92d0a1056855a84fcef661bc0";
+ sha256 = "0p5ra5p5w21wl696rmv0vdnl7jnri5iwnxfs6nl6miwydhq2dmci";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig makeWrapper ];
buildInputs = [ swc libxkbcommon wld wayland pixman fontconfig ];
+ propagatedUserEnvPkgs = [ swc ];
+
makeFlags = "PREFIX=$(out)";
- installPhase = "PREFIX=$out make install";
+ preBuild = ''
+ substituteInPlace config.c \
+ --replace /etc/velox.conf $out/etc/velox.conf
+ '';
+ installPhase = ''
+ PREFIX=$out make install
+ mkdir -p $out/etc
+ cp velox.conf.sample $out/etc/velox.conf
+ '';
+ postFixup = ''
+ wrapProgram $out/bin/velox \
+ --prefix PATH : "${stdenv.lib.makeBinPath [ dmenu-velox st-velox ]}"
+ '';
+
+ enableParallelBuilding = true;
meta = {
description = "velox window manager";
diff --git a/pkgs/applications/window-managers/velox/dmenu.nix b/pkgs/applications/window-managers/velox/dmenu.nix
new file mode 100644
index 0000000000000000000000000000000000000000..182a290e0eeeff557343b8b5eaef2c5de3afcdab
--- /dev/null
+++ b/pkgs/applications/window-managers/velox/dmenu.nix
@@ -0,0 +1,37 @@
+{stdenv, fetchFromGitHub #, libX11, libXinerama, enableXft, libXft, zlib
+, swc, wld, wayland, libxkbcommon, pixman, fontconfig
+}:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+ name = "dmenu-velox-${version}";
+ version = "git-2017-04-07";
+
+ src = fetchFromGitHub {
+ owner = "michaelforney";
+ repo = "dmenu";
+ rev = "f385d9d18813071b4b4257bf8d4d572daeda0e70";
+ sha256 = "14j8jv0nlybinhzkgd6dplvng9zy8p292prlx39w0k4fm6x5nv6y";
+ };
+
+ buildInputs = [ swc wld wayland libxkbcommon pixman fontconfig ];
+
+ postPatch = ''
+ sed -ri -e 's!\<(dmenu|dmenu_path)\>!'"$out/bin"'/&!g' dmenu_run
+ '';
+
+ preConfigure = [
+ ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g; s@/usr/share/swc@${swc}/share/swc@g" config.mk''
+ ];
+
+ enableParallelBuilding = true;
+
+ meta = {
+ description = "A generic, highly customizable, and efficient menu for the X Window System";
+ homepage = http://tools.suckless.org/dmenu;
+ license = stdenv.lib.licenses.mit;
+ maintainers = with stdenv.lib.maintainers; [ ];
+ platforms = with stdenv.lib.platforms; all;
+ };
+}
diff --git a/pkgs/applications/misc/st/wayland.nix b/pkgs/applications/window-managers/velox/st.nix
similarity index 50%
rename from pkgs/applications/misc/st/wayland.nix
rename to pkgs/applications/window-managers/velox/st.nix
index 69794b1cffbdff52b8fe319c98b31b7a752a36b5..49ce57469bd658cc958ceec56aa3c5e22a844689 100644
--- a/pkgs/applications/misc/st/wayland.nix
+++ b/pkgs/applications/window-managers/velox/st.nix
@@ -1,17 +1,18 @@
-{ stdenv, fetchurl, pkgconfig, writeText
-, ncurses, wayland, wld, libxkbcommon, fontconfig, pixman
-, conf ? null, patches ? [] }:
+{ stdenv, fetchFromGitHub, pkgconfig, writeText
+, ncurses, wayland, wayland-protocols, wld, libxkbcommon, fontconfig, pixman
+, conf, patches }:
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "st-wayland-${version}";
- version = "git-2015-08-29";
- rev = "61b47b76a09599c8093214e28c48938f5b424daa";
-
- src = fetchurl {
- url = "https://github.com/michaelforney/st/archive/${rev}.tar.gz";
- sha256 = "7164da135f02405dba5ae3131dfd896e072df29ac6c0928f3b887beffb8a7d97";
+ name = "st-velox-${version}";
+ version = "git-2016-12-22";
+
+ src = fetchFromGitHub {
+ owner = "michaelforney";
+ repo = "st";
+ rev = "b27f17da65f74b0a923952601873524e03b4d047";
+ sha256 = "17aa4bz5g14jvqghk2c8mw77hb8786s07pv814rmlk7nnsavmp3i";
};
inherit patches;
@@ -20,7 +21,7 @@ stdenv.mkDerivation rec {
preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ ncurses wayland wld libxkbcommon fontconfig pixman ];
+ buildInputs = [ ncurses wayland wayland-protocols wld libxkbcommon fontconfig pixman ];
NIX_LDFLAGS = "-lfontconfig";
@@ -28,6 +29,8 @@ stdenv.mkDerivation rec {
TERMINFO=$out/share/terminfo make install PREFIX=$out
'';
+ enableParallelBuilding = true;
+
meta = {
homepage = http://st.suckless.org/;
license = licenses.mit;
diff --git a/pkgs/applications/window-managers/velox/swc.nix b/pkgs/applications/window-managers/velox/swc.nix
new file mode 100644
index 0000000000000000000000000000000000000000..a2f98b8b65e719afb7a67f58982d5c4e6138bba9
--- /dev/null
+++ b/pkgs/applications/window-managers/velox/swc.nix
@@ -0,0 +1,36 @@
+{ lib, stdenv, fetchFromGitHub, pkgconfig
+, wld, wayland, wayland-protocols, fontconfig, pixman, libdrm, libinput, libevdev, libxkbcommon, libxcb, xcbutilwm
+}:
+
+stdenv.mkDerivation rec {
+ name = "swc-${version}";
+ version = "git-2017-06-28";
+
+ src = fetchFromGitHub {
+ owner = "michaelforney";
+ repo = "swc";
+ rev = "5b20050872f8ad29cfc97729f8af47b6b3df5393";
+ sha256 = "1lxpm17v5d8png6ixc0zn0w00xgrhz2n5b8by9vx6800b18246z8";
+ };
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ buildInputs = [ wld wayland wayland-protocols fontconfig pixman libdrm libinput libevdev libxkbcommon libxcb xcbutilwm ];
+
+ prePatch = ''
+ substituteInPlace launch/local.mk --replace 4755 755
+ '';
+
+ makeFlags = "PREFIX=$(out)";
+ installPhase = "PREFIX=$out make install";
+
+ enableParallelBuilding = true;
+
+ meta = {
+ description = "A library for making a simple Wayland compositor";
+ homepage = src.meta.homepage;
+ license = lib.licenses.mit;
+ platforms = lib.platforms.linux;
+ maintainers = with lib.maintainers; [ ];
+ };
+}
diff --git a/pkgs/development/libraries/wld/default.nix b/pkgs/applications/window-managers/velox/wld.nix
similarity index 59%
rename from pkgs/development/libraries/wld/default.nix
rename to pkgs/applications/window-managers/velox/wld.nix
index 1dd5858ec72016653fbf130efce05783e99d1e39..d85f8212ec478ee313b06f710497ebd53b737b78 100644
--- a/pkgs/development/libraries/wld/default.nix
+++ b/pkgs/applications/window-managers/velox/wld.nix
@@ -1,16 +1,16 @@
-{ lib, stdenv, fetchurl, pkgconfig
+{ lib, stdenv, fetchFromGitHub, pkgconfig
, wayland, fontconfig, pixman, freetype, libdrm
}:
stdenv.mkDerivation rec {
name = "wld-${version}";
- version = "git-2015-09-01";
- repo = "https://github.com/michaelforney/wld";
- rev = "efe0a1ed1856a2e4a1893ed0f2d7dde43b5627f0";
+ version = "git-2017-10-31";
- src = fetchurl {
- url = "${repo}/archive/${rev}.tar.gz";
- sha256 = "09388f7828e18c75e7b8d41454903886a725d7a868f60e66c128bd7d2e953ee1";
+ src = fetchFromGitHub {
+ owner = "michaelforney";
+ repo = "wld";
+ rev = "b4e902bbecb678c45485b52c3aa183cbc932c595";
+ sha256 = "0j2n776flnzyw3vhxl0r8h1c48wrihi4g6bs2z8j4hbw5pnwq1k6";
};
nativeBuildInputs = [ pkgconfig ];
@@ -20,9 +20,11 @@ stdenv.mkDerivation rec {
makeFlags = "PREFIX=$(out)";
installPhase = "PREFIX=$out make install";
+ enableParallelBuilding = true;
+
meta = {
description = "A primitive drawing library targeted at Wayland";
- homepage = repo;
+ homepage = src.meta.homepage;
license = lib.licenses.mit;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ ];
diff --git a/pkgs/applications/window-managers/way-cooler/bar.diff b/pkgs/applications/window-managers/way-cooler/bar.diff
new file mode 100644
index 0000000000000000000000000000000000000000..e60ebabe98337afdaee0d53b27b64d0bed4eecda
--- /dev/null
+++ b/pkgs/applications/window-managers/way-cooler/bar.diff
@@ -0,0 +1,37 @@
+--- bar.py.txt.orig 2017-12-05 18:10:20.108569182 +0300
++++ ./bar.py.txt 2017-12-10 21:42:10.622781945 +0300
+@@ -5,6 +5,7 @@ import datetime
+ import json
+ from time import sleep
+ from pydbus import SessionBus
++from glob import glob
+
+ BUS = SessionBus()
+ LAYOUT = BUS.get(bus_name='org.way-cooler', object_path='/org/way_cooler/Layout')
+@@ -32,7 +33,7 @@ def main():
+ output += func()
+ print(output)
+ sys.stdout.flush()
+- sleep(.1)
++ sleep(1)
+
+ def get_workspaces(layout_json):
+ """Gets the workspace names from the layout json"""
+@@ -49,9 +50,14 @@ def get_time():
+ return datetime.datetime.now().strftime(' %a %b %d %H:%M ')
+
+ def get_battery():
+- with open("/sys/class/power_supply/BAT0/capacity", "r") as f:
+- bat = f.readlines()
+- return bat[0].strip() + "% Battery"
++ try:
++ [path] = glob("/sys/class/power_supply/BAT?/capacity")
++ with open(path, "r") as f:
++ bat = f.readlines()
++ result = bat[0].strip() + "% Battery"
++ except Exception:
++ result = ""
++ return result
+
+ def format_workspaces(layout, workspaces, active_workspace):
+ workspaces = " " + workspaces.replace(" ", " ") + " "
diff --git a/pkgs/applications/window-managers/way-cooler/default.nix b/pkgs/applications/window-managers/way-cooler/default.nix
old mode 100755
new mode 100644
index 75c9e6ecf8c890742d206bfdc7ff4761b8eb3be6..1830ee2c42a5d96aec2c4e2eb213e2f88c38aa95
--- a/pkgs/applications/window-managers/way-cooler/default.nix
+++ b/pkgs/applications/window-managers/way-cooler/default.nix
@@ -1,27 +1,112 @@
-{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig
-, wayland, xwayland, wlc, dbus_libs, dbus_glib, cairo, libxkbcommon }:
+{ stdenv, fetchFromGitHub, fetchurl, pkgconfig, makeWrapper, symlinkJoin, writeShellScriptBin, callPackage, defaultCrateOverrides
+, wayland, wlc, dbus_libs, dbus_glib, cairo, libxkbcommon, pam, python3Packages, lemonbar
+}:
-with rustPlatform;
+let
+ # refer to
+ # https://github.com/way-cooler/way-cooler.github.io/blob/master/way-cooler-release-i3-default.sh
+ # for version numbers
+ fakegit = writeShellScriptBin "git" ''
+ echo ""
+ '';
+ way-cooler = ((callPackage ./way-cooler.nix {}).way_cooler_0_6_2.override {
+ crateOverrides = defaultCrateOverrides // {
-buildRustPackage rec {
- name = "way-cooler-${version}";
- version = "0.5.2";
+ way-cooler = attrs: { buildInputs = [ wlc cairo libxkbcommon fakegit ]; };
+ dbus = attrs: { buildInputs = [ pkgconfig dbus_libs ]; };
+ gobject-sys = attrs: { buildInputs = [ dbus_glib ]; };
+ cairo-rs = attrs: { buildInputs = [ cairo ]; };
+ };}).overrideAttrs (oldAttrs: rec {
+ nativeBuildInputs = [ makeWrapper ];
- src = fetchFromGitHub {
- owner = "way-cooler";
- repo = "way-cooler";
- rev = "v${version}";
- sha256 = "10s01x54kwjm2c85v57i6g3pvj5w3wpkjblj036mmd865fla1brb";
- };
+ postBuild = ''
+ mkdir -p $out/etc
+ cp -r config $out/etc/way-cooler
+ '';
+ # prior v0.7 https://github.com/way-cooler/way-cooler/issues/395
+ postFixup = ''
+ makeWrapper $out/bin/way_cooler $out/bin/way-cooler \
+ --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ wayland ]}"
+ '';
+ });
+ wc-bg = ((callPackage ./wc-bg.nix {}).way_cooler_bg_0_2_1.override {
+ crateOverrides = defaultCrateOverrides // {
+
+ dbus = attrs: { buildInputs = [ pkgconfig dbus_libs ]; };
+ };}).overrideAttrs (oldAttrs: rec {
+ postFixup = ''
+ cd $out/bin
+ mv way_cooler_bg way-cooler-bg
+ '';
+ });
+ wc-grab = ((callPackage ./wc-grab.nix {}).wc_grab_0_2_0.override {
+ crateOverrides = defaultCrateOverrides // {
+
+ wc-grab = attrs: {
+ src = fetchFromGitHub {
+ owner = "way-cooler";
+ repo = "way-cooler-grab";
+ rev = "v0.2.0";
+ sha256 = "1pc8rhvzdi6bi8g5w03i0ygbcpks9051c3d3yc290rgmmmmkmnwq";
+ };
+ };
- cargoSha256 = "06qivlybmmc49ksv4232sm1r4hp923xsq4c2ksa4i2azdzc1csdc";
+ dbus = attrs: { buildInputs = [ pkgconfig dbus_libs ]; };
+ };}).overrideAttrs (oldAttrs: rec {
+ postFixup = ''
+ cd $out/bin
+ mv wc_grab wc-grab
+ '';
+ });
+ wc-lock = ((callPackage ./wc-lock.nix {}).wc_lock_0_1_0.override {
+ crateOverrides = defaultCrateOverrides // { wc-lock = attrs: {
- buildInputs = [ wlc dbus_libs dbus_glib cairo libxkbcommon ];
+ buildInputs = [ pam ];
+ };};}).overrideAttrs (oldAttrs: rec {
+ nativeBuildInputs = [ makeWrapper ];
- nativeBuildInputs = [ pkgconfig ];
+ postFixup = ''
+ makeWrapper $out/bin/wc_lock $out/bin/wc-lock \
+ --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libxkbcommon ]}"
+ '';
+ });
+ # https://github.com/way-cooler/way-cooler/issues/446
+ wc-bar-bare = stdenv.mkDerivation {
+ name = "wc-bar-bare-2017-12-05";
+
+ src = fetchurl {
+ url = "https://github.com/way-cooler/way-cooler/files/1529701/bar.py.txt";
+ sha256 = "1n1rf1k02i6vimr9n0iksf65phhyy96i5wh5d0rrx7yqki3dh6ka";
+ };
+
+ unpackPhase = "cat $src > bar.py.txt";
+
+ # https://github.com/way-cooler/way-cooler/issues/446#issuecomment-350567833
+ patches = [ ./bar.diff ];
+
+ pythonPath = with python3Packages; [ pydbus ];
+ nativeBuildInputs = with python3Packages; [ python wrapPython ];
+
+ installPhase = ''
+ install -Dm755 bar.py.txt $out/bin/bar.py
+ patchShebangs $out/bin/bar.py
+ wrapPythonPrograms
+ '';
+ };
+ wc-bar = writeShellScriptBin "lemonbar" ''
+ SELECTED="#000000"
+ SELECTED_OTHER_WORKSPACE="#555555"
+ BACKGROUND="#4E2878"
+ # https://github.com/way-cooler/way-cooler/issues/446#issuecomment-349471439
+ sleep 5
+ ${wc-bar-bare}/bin/bar.py $SELECTED $BACKGROUND $SELECTED_OTHER_WORKSPACE 2> /tmp/bar_debug.txt | ${lemonbar}/bin/lemonbar -B $BACKGROUND -F "#FFF" -n "lemonbar" -p -d
+ '';
+in symlinkJoin rec {
+ version = "0.6.2";
+ name = "way-cooler-with-extensions-${version}";
+ paths = [ way-cooler wc-bg wc-grab wc-lock wc-bar ];
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/way-cooler/way-cooler.nix b/pkgs/applications/window-managers/way-cooler/way-cooler.nix
new file mode 100644
index 0000000000000000000000000000000000000000..816a1c887089b1b0b82adafbce19889b8b4bece1
--- /dev/null
+++ b/pkgs/applications/window-managers/way-cooler/way-cooler.nix
@@ -0,0 +1,938 @@
+# Generated by carnix 0.5.0: carnix -o way-cooler.nix Cargo.lock
+{ lib, buildPlatform, buildRustCrate, fetchgit }:
+let kernel = buildPlatform.parsed.kernel.name;
+ abi = buildPlatform.parsed.abi.name;
+ hasFeature = feature:
+ lib.lists.any
+ (originName: feature.${originName})
+ (builtins.attrNames feature);
+
+ hasDefault = feature:
+ let defaultFeatures = builtins.attrNames (feature."default" or {}); in
+ (defaultFeatures == [])
+ || (lib.lists.any (originName: feature."default".${originName}) defaultFeatures);
+
+ mkFeatures = feat: lib.lists.foldl (features: featureName:
+ if featureName != "" && hasFeature feat.${featureName} then
+ [ featureName ] ++ features
+ else
+ features
+ ) (if hasDefault feat then [ "default" ] else []) (builtins.attrNames feat);
+ aho_corasick_0_5_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "aho-corasick";
+ version = "0.5.3";
+ authors = [ "Andrew Gallant " ];
+ sha256 = "1igab46mvgknga3sxkqc917yfff0wsjxjzabdigmh240p5qxqlnn";
+ libName = "aho_corasick";
+ crateBin = [ { name = "aho-corasick-dot"; } ];
+ inherit dependencies buildDependencies features;
+ };
+ bitflags_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "bitflags";
+ version = "0.4.0";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "0an03kibhfcc0mcxf6a0mvbab0s7cggnvflw8jn0b15i351h828c";
+ inherit dependencies buildDependencies features;
+ };
+ bitflags_0_5_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "bitflags";
+ version = "0.5.0";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "0bgw1kiy121kikjrwj6zsd7l8n1gg1jirivzkc7zpjsvqa3p0hla";
+ inherit dependencies buildDependencies features;
+ };
+ bitflags_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "bitflags";
+ version = "0.6.0";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "1znq4b770mdp3kdj9yz199ylc2pmf8l5j2f281jjrcfhg1mm22h6";
+ inherit dependencies buildDependencies features;
+ };
+ bitflags_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "bitflags";
+ version = "0.7.0";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "1hr72xg5slm0z4pxs2hiy4wcyx3jva70h58b7mid8l0a4c8f7gn5";
+ inherit dependencies buildDependencies features;
+ };
+ bitflags_0_8_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "bitflags";
+ version = "0.8.2";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "0whaj3969ysqxzk620sk1isvq6vh85516f2fplvqjrw3syz44sb2";
+ inherit dependencies buildDependencies features;
+ };
+ c_vec_1_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "c_vec";
+ version = "1.2.1";
+ authors = [ "Guillaume Gomez " ];
+ sha256 = "15gm72wx9kd0n51454i58rmpkmig8swghrj2440frxxi9kqg97xd";
+ inherit dependencies buildDependencies features;
+ };
+ cairo_rs_0_1_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "cairo-rs";
+ version = "0.1.3";
+ authors = [ "The Gtk-rs Project Developers" ];
+ sha256 = "17wp5wh1jvn2ny8s6fckvbwn0x8ixha6xrqas1bqxd9ygm5g58w1";
+ libName = "cairo";
+ build = "build.rs";
+ inherit dependencies buildDependencies features;
+ };
+ cairo_sys_rs_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "cairo-sys-rs";
+ version = "0.3.4";
+ authors = [ "The Gtk-rs Project Developers" ];
+ sha256 = "1fzxshv7vysnnc2nywla6gj3hh00nr6cz1ak0mrxkg65rzrgxkww";
+ libName = "cairo_sys";
+ build = "build.rs";
+ inherit dependencies buildDependencies features;
+ };
+ cfg_if_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "cfg-if";
+ version = "0.1.0";
+ authors = [ "Alex Crichton " ];
+ sha256 = "1grr9v6ijms84cvl1jqv5hp9clw9gn3l3g6kj9a31sdzvidd6v29";
+ inherit dependencies buildDependencies features;
+ };
+ dbus_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "dbus";
+ version = "0.4.1";
+ authors = [ "David Henningsson " ];
+ sha256 = "0qw32qj2rys318h780klxlznkwg93dfimbn8mc34m4940l8v00g9";
+ build = "build.rs";
+ inherit dependencies buildDependencies features;
+ };
+ dbus_macros_0_0_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "dbus-macros";
+ version = "0.0.6";
+ authors = [ "Antoni Boucher " ];
+ sha256 = "1nymk2hzzgyafyr5nfa4r4frx4hml3wlwgzfr9b69vmcvn3d2jyd";
+ inherit dependencies buildDependencies features;
+ };
+ dlib_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "dlib";
+ version = "0.3.1";
+ authors = [ "Victor Berger " ];
+ sha256 = "11mhh6g9vszp2ay3r46x4capnnmvvhx5hcp74bapxjhiixqjfvkr";
+ inherit dependencies buildDependencies features;
+ };
+ dtoa_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "dtoa";
+ version = "0.4.1";
+ authors = [ "David Tolnay " ];
+ sha256 = "0mgg4r90yby68qg7y8csbclhsm53ac26vsyq615viq535plllhzw";
+ inherit dependencies buildDependencies features;
+ };
+ dummy_rustwlc_0_6_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "dummy-rustwlc";
+ version = "0.6.3";
+ authors = [ "Snirk Immington " "Preston Carpenter " ];
+ sha256 = "09pcl2r3ifajgq794j4jqaq0n4kyb2z4aaavs1fr78w4fhrzqqmj";
+ inherit dependencies buildDependencies features;
+ };
+ env_logger_0_3_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "env_logger";
+ version = "0.3.5";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "1mvxiaaqsyjliv1mm1qaagjqiccw11mdyi3n9h9rf8y6wj15zycw";
+ inherit dependencies buildDependencies features;
+ };
+ fixedbitset_0_1_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "fixedbitset";
+ version = "0.1.6";
+ authors = [ "bluss" ];
+ sha256 = "1jcq0i41l888153v4jyb6q2kc9sjs004md5byfz5mprlmhdawha3";
+ inherit dependencies buildDependencies features;
+ };
+ gcc_0_3_46_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "gcc";
+ version = "0.3.46";
+ authors = [ "Alex Crichton " ];
+ sha256 = "17rbdxa2yapjymbdq7b930sc1ipiwhx4xz7hh48q4bz3d28zg6qb";
+ inherit dependencies buildDependencies features;
+ };
+ getopts_0_2_14_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "getopts";
+ version = "0.2.14";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "1wdz34vls97g9868h8kiw4wmwkbyxg4xm3xzvr1542hc3w4c7z0a";
+ inherit dependencies buildDependencies features;
+ };
+ glib_0_1_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "glib";
+ version = "0.1.3";
+ authors = [ "The Gtk-rs Project Developers" ];
+ sha256 = "1j2zwsnxlfdrj8wdi8yp3zl5l9nydsifgxspnwl6ijq3ywnjhcpa";
+ inherit dependencies buildDependencies features;
+ };
+ glib_sys_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "glib-sys";
+ version = "0.3.4";
+ authors = [ "The Gtk-rs Project Developers" ];
+ sha256 = "06ymp4ljrjnb7cly0bixy3svxgnwpbx79499889dqakpfs7566rc";
+ libName = "glib_sys";
+ build = "build.rs";
+ inherit dependencies buildDependencies features;
+ };
+ gobject_sys_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "gobject-sys";
+ version = "0.3.4";
+ authors = [ "The Gtk-rs Project Developers" ];
+ sha256 = "0rrk3c94myhspyl3iq7k4kcm72zxl8bk3r7kvqv2f9lf6y820giw";
+ libName = "gobject_sys";
+ build = "build.rs";
+ inherit dependencies buildDependencies features;
+ };
+ hlua_0_1_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "hlua";
+ version = "0.1.9";
+ authors = [ "pierre.krieger1708@gmail.com" ];
+ sha256 = "1vn7w1rcaj9g04yx5jak09a3wpw7g3yx2fgn8ibx36z07vpf57fs";
+ inherit dependencies buildDependencies features;
+ };
+ itoa_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "itoa";
+ version = "0.3.1";
+ authors = [ "David Tolnay " ];
+ sha256 = "0jp1wvfw0qqbyz0whbycp7xr5nx1ds5plh4wsfyj503xmjf9ab4k";
+ inherit dependencies buildDependencies features;
+ };
+ json_macro_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "json_macro";
+ version = "0.1.1";
+ authors = [ "Denis Kolodin " ];
+ sha256 = "0hl2934shpwqbszrq035valbdz9y8p7dza183brygy5dbvivcyqy";
+ inherit dependencies buildDependencies features;
+ };
+ kernel32_sys_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "kernel32-sys";
+ version = "0.2.2";
+ authors = [ "Peter Atashian " ];
+ sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj";
+ libName = "kernel32";
+ build = "build.rs";
+ inherit dependencies buildDependencies features;
+ };
+ lazy_static_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "lazy_static";
+ version = "0.2.8";
+ authors = [ "Marvin Löbel " ];
+ sha256 = "1xbpxx7cd5kl60g87g43q80jxyrsildhxfjc42jb1x4jncknpwbl";
+ inherit dependencies buildDependencies features;
+ };
+ libc_0_2_23_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "libc";
+ version = "0.2.23";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "1i29f6k26fmv81c5bjc6hw2j95sd01h9ad66qxdc755b24xfa9jm";
+ inherit dependencies buildDependencies features;
+ };
+ libloading_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "libloading";
+ version = "0.3.4";
+ authors = [ "Simonas Kazlauskas " ];
+ sha256 = "1f2vy32cr434n638nv8sdf05iwa53q9q5ahlcpw1l9ywh1bcbhf1";
+ build = "build.rs";
+ inherit dependencies buildDependencies features;
+ };
+ log_0_3_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "log";
+ version = "0.3.7";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "1qxrwkhpfzhgcmfnw4bl9yy7wwr92wwbin3dp6izcfy58lr369v4";
+ inherit dependencies buildDependencies features;
+ };
+ lua52_sys_0_0_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "lua52-sys";
+ version = "0.0.4";
+ authors = [ "Pierre Krieger " ];
+ sha256 = "115i7k2dnnf4c1b2mxwf5mvqv2wsqmmxm3krphf5wjky20gi2ciz";
+ build = "build.rs";
+ inherit dependencies buildDependencies features;
+ };
+ memchr_0_1_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "memchr";
+ version = "0.1.11";
+ authors = [ "Andrew Gallant " "bluss" ];
+ sha256 = "0x73jghamvxxq5fsw9wb0shk5m6qp3q6fsf0nibn0i6bbqkw91s8";
+ inherit dependencies buildDependencies features;
+ };
+ nix_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "nix";
+ version = "0.6.0";
+ authors = [ "Carl Lerche " ];
+ sha256 = "1bgh75y897isnxbw3vd79vns9h6q4d59p1cgv9c4laysyw6fkqwf";
+ build = "build.rs";
+ inherit dependencies buildDependencies features;
+ };
+ nix_0_8_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "nix";
+ version = "0.8.1";
+ authors = [ "The nix-rust Project Developers" ];
+ sha256 = "0iqmn55ajwcq91pl8xviwdvc2zrkaccajsp0nc9lbq9ydli0vhf9";
+ inherit dependencies buildDependencies features;
+ };
+ num_traits_0_1_37_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "num-traits";
+ version = "0.1.37";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "0rwzfmdjq6iz6plva2gi7agvy1w9sjs7aqjh0p115w57xiix2224";
+ inherit dependencies buildDependencies features;
+ };
+ ordermap_0_2_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "ordermap";
+ version = "0.2.10";
+ authors = [ "bluss" ];
+ sha256 = "1pj6d56nwi0wa7cnwl80dwz13vws9nf5s1b7k7i2dav35gkpwy1z";
+ inherit dependencies buildDependencies features;
+ };
+ petgraph_0_4_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "petgraph";
+ version = "0.4.5";
+ authors = [ "bluss" "mitchmindtree" ];
+ sha256 = "0482id2flwnxkhj1443g384cvk7f9lva9n6wj2wsag9145zhpjzg";
+ inherit dependencies buildDependencies features;
+ };
+ phf_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "phf";
+ version = "0.7.21";
+ authors = [ "Steven Fackler " ];
+ sha256 = "11m2rzm2s8s35m0s97gjxxb181xz352kjlhr387xj5c8q3qp5afg";
+ libPath = "src/lib.rs";
+ inherit dependencies buildDependencies features;
+ };
+ phf_codegen_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "phf_codegen";
+ version = "0.7.21";
+ authors = [ "Steven Fackler " ];
+ sha256 = "0kgy8s2q4zr0iqcm21mgq4ppc45wy6z7b5wn98xyfsrcad6lwmmj";
+ inherit dependencies buildDependencies features;
+ };
+ phf_generator_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "phf_generator";
+ version = "0.7.21";
+ authors = [ "Steven Fackler " ];
+ sha256 = "1jxjfzc6d6d4l9nv0r2bb66if5brk9lnncmg4dpjjifn6zhhqd9g";
+ inherit dependencies buildDependencies features;
+ };
+ phf_shared_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "phf_shared";
+ version = "0.7.21";
+ authors = [ "Steven Fackler " ];
+ sha256 = "0lxpg3wgxfhzfalmf9ha9my1lsvfjy74ah9f6mfw88xlp545jlln";
+ libPath = "src/lib.rs";
+ inherit dependencies buildDependencies features;
+ };
+ pkg_config_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "pkg-config";
+ version = "0.3.9";
+ authors = [ "Alex Crichton " ];
+ sha256 = "06k8fxgrsrxj8mjpjcq1n7mn2p1shpxif4zg9y5h09c7vy20s146";
+ inherit dependencies buildDependencies features;
+ };
+ rand_0_3_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "rand";
+ version = "0.3.15";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "1fs30rc1xic40s1n7l3y7pxzfifpy03mgrvhy5ggp5p7zjfv3rr8";
+ inherit dependencies buildDependencies features;
+ };
+ regex_0_1_80_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "regex";
+ version = "0.1.80";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "0y4s8ghhx6sgzb35irwivm3w0l2hhqhmdcd2px9hirqnkagal9l6";
+ inherit dependencies buildDependencies features;
+ };
+ regex_syntax_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "regex-syntax";
+ version = "0.3.9";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "1mzhphkbwppwd1zam2jkgjk550cqgf6506i87bw2yzrvcsraiw7m";
+ inherit dependencies buildDependencies features;
+ };
+ rustc_serialize_0_3_24_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "rustc-serialize";
+ version = "0.3.24";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "0rfk6p66mqkd3g36l0ddlv2rvnp1mp3lrq5frq9zz5cbnz5pmmxn";
+ inherit dependencies buildDependencies features;
+ };
+ rustc_version_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "rustc_version";
+ version = "0.1.7";
+ authors = [ "Marvin Löbel " ];
+ sha256 = "0plm9pbyvcwfibd0kbhzil9xmr1bvqi8fgwlfw0x4vali8s6s99p";
+ inherit dependencies buildDependencies features;
+ };
+ rustwlc_0_6_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "rustwlc";
+ version = "0.6.2";
+ authors = [ "Snirk Immington " "Timidger " ];
+ sha256 = "16k8wzyvn1syxcjimy2vh7hc6jlbw31v03ysrzrqgfwncmwx5b2d";
+ build = "build.rs";
+ inherit dependencies buildDependencies features;
+ };
+ semver_0_1_20_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "semver";
+ version = "0.1.20";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "05cdig0071hls2k8lxbqmyqpl0zjmc53i2d43mwzps033b8njh4n";
+ inherit dependencies buildDependencies features;
+ };
+ serde_0_9_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "serde";
+ version = "0.9.15";
+ authors = [ "Erick Tryzelaar " ];
+ sha256 = "0rlflkc57kvy69hnhj4arfsj7ic4hpihxsb00zg5lkdxfj5qjx9b";
+ inherit dependencies buildDependencies features;
+ };
+ serde_json_0_9_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "serde_json";
+ version = "0.9.10";
+ authors = [ "Erick Tryzelaar " ];
+ sha256 = "0g6bxlfnvf2miicnsizyrxm686rfval6gbss1i2qcna8msfwc005";
+ inherit dependencies buildDependencies features;
+ };
+ siphasher_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "siphasher";
+ version = "0.2.2";
+ authors = [ "Frank Denis " ];
+ sha256 = "0iyx7nlzfny9ly1634a6zcq0yvrinhxhypwas4p8ry3zqnn76qqr";
+ inherit dependencies buildDependencies features;
+ };
+ target_build_utils_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "target_build_utils";
+ version = "0.3.1";
+ authors = [ "Simonas Kazlauskas " ];
+ sha256 = "1b450nyxlbgicp2p45mhxiv6yv0z7s4iw01lsaqh3v7b4bm53flj";
+ build = "build.rs";
+ inherit dependencies buildDependencies features;
+ };
+ thread_id_2_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "thread-id";
+ version = "2.0.0";
+ authors = [ "Ruud van Asseldonk " ];
+ sha256 = "06i3c8ckn97i5rp16civ2vpqbknlkx66dkrl070iw60nawi0kjc3";
+ inherit dependencies buildDependencies features;
+ };
+ thread_local_0_2_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "thread_local";
+ version = "0.2.7";
+ authors = [ "Amanieu d'Antras " ];
+ sha256 = "19p0zrs24rdwjvpi10jig5ms3sxj00pv8shkr9cpddri8cdghqp7";
+ inherit dependencies buildDependencies features;
+ };
+ utf8_ranges_0_1_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "utf8-ranges";
+ version = "0.1.3";
+ authors = [ "Andrew Gallant " ];
+ sha256 = "1cj548a91a93j8375p78qikaiam548xh84cb0ck8y119adbmsvbp";
+ inherit dependencies buildDependencies features;
+ };
+ uuid_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "uuid";
+ version = "0.3.1";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "16ak1c84dfkd8h33cvkxrkvc30k7b0bhrnza8ni2c0jsx85fpbip";
+ inherit dependencies buildDependencies features;
+ };
+ void_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "void";
+ version = "1.0.2";
+ authors = [ "Jonathan Reem " ];
+ sha256 = "0h1dm0dx8dhf56a83k68mijyxigqhizpskwxfdrs1drwv2cdclv3";
+ inherit dependencies buildDependencies features;
+ };
+ way_cooler_0_6_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "way-cooler";
+ version = "0.6.2";
+ authors = [ "Snirk Immington " "Timidger " ];
+ sha256 = "0ygzgjjhf54fcpk6sbi0acbyki4ff1v7wyckfk4lhv4ycpg9v3cj";
+ build = "build.rs";
+ inherit dependencies buildDependencies features;
+ };
+ wayland_scanner_0_9_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "wayland-scanner";
+ version = "0.9.4";
+ authors = [ "Victor Berger " ];
+ sha256 = "1kdhpm1gkn99sj8vxhyr1x6nxnhm0cjvypajycvn2fa9sdpgw8yc";
+ inherit dependencies buildDependencies features;
+ };
+ wayland_server_0_9_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "wayland-server";
+ version = "0.9.4";
+ authors = [ "Victor Berger " ];
+ sha256 = "1aqidrac0z7ny65yhfv9inl3xmdmph21yhmyd3k0nafyghgg9pxw";
+ build = "build.rs";
+ inherit dependencies buildDependencies features;
+ };
+ wayland_sys_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "wayland-sys";
+ version = "0.6.0";
+ authors = [ "Victor Berger " ];
+ sha256 = "0m6db0kld2d4xv4ai9kxlqrh362hwi0030b4zbss0sfha1hx5mfl";
+ inherit dependencies buildDependencies features;
+ };
+ wayland_sys_0_9_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "wayland-sys";
+ version = "0.9.4";
+ authors = [ "Victor Berger " ];
+ sha256 = "0vqrc46ib5hgbq6djghapairbjskdncas09k680f7pwylbi7yzcj";
+ inherit dependencies buildDependencies features;
+ };
+ winapi_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "winapi";
+ version = "0.2.8";
+ authors = [ "Peter Atashian " ];
+ sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as";
+ inherit dependencies buildDependencies features;
+ };
+ winapi_build_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "winapi-build";
+ version = "0.1.1";
+ authors = [ "Peter Atashian " ];
+ sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga";
+ libName = "build";
+ inherit dependencies buildDependencies features;
+ };
+ xml_rs_0_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "xml-rs";
+ version = "0.3.6";
+ authors = [ "Vladimir Matveev " ];
+ sha256 = "1g1cclib7fj900m4669vxlz45lxcq0m36g7cd8chl494c2xsgj15";
+ libPath = "src/lib.rs";
+ libName = "xml";
+ crateBin = [ { name = "xml-analyze"; path = "src/analyze.rs"; } ];
+ inherit dependencies buildDependencies features;
+ };
+
+in
+rec {
+ aho_corasick_0_5_3 = aho_corasick_0_5_3_ rec {
+ dependencies = [ memchr_0_1_11 ];
+ };
+ memchr_0_1_11_features."default".from_aho_corasick_0_5_3__default = true;
+ bitflags_0_4_0 = bitflags_0_4_0_ rec {
+ features = mkFeatures bitflags_0_4_0_features;
+ };
+ bitflags_0_4_0_features."".self = true;
+ bitflags_0_5_0 = bitflags_0_5_0_ rec {
+ features = mkFeatures bitflags_0_5_0_features;
+ };
+ bitflags_0_5_0_features."".self = true;
+ bitflags_0_6_0 = bitflags_0_6_0_ rec {};
+ bitflags_0_7_0 = bitflags_0_7_0_ rec {};
+ bitflags_0_8_2 = bitflags_0_8_2_ rec {
+ features = mkFeatures bitflags_0_8_2_features;
+ };
+ bitflags_0_8_2_features."i128".self_unstable = hasFeature (bitflags_0_8_2_features."unstable" or {});
+ c_vec_1_2_1 = c_vec_1_2_1_ rec {};
+ cairo_rs_0_1_3 = cairo_rs_0_1_3_ rec {
+ dependencies = [ c_vec_1_2_1 cairo_sys_rs_0_3_4 glib_0_1_3 libc_0_2_23 ]
+ ++ (if lib.lists.any (x: x == "glib") features then [glib_0_1_3] else [])
+ ++ (if kernel == "windows" then [ winapi_0_2_8 ] else []);
+ buildDependencies = [];
+ features = mkFeatures cairo_rs_0_1_3_features;
+ };
+ cairo_rs_0_1_3_features."".self = true;
+ cairo_rs_0_1_3_features."glib".self_default = hasDefault cairo_rs_0_1_3_features;
+ cairo_rs_0_1_3_features."gtk-rs-lgpl-docs".self_embed-lgpl-docs = hasFeature (cairo_rs_0_1_3_features."embed-lgpl-docs" or {});
+ cairo_rs_0_1_3_features."gtk-rs-lgpl-docs".self_purge-lgpl-docs = hasFeature (cairo_rs_0_1_3_features."purge-lgpl-docs" or {});
+ c_vec_1_2_1_features."default".from_cairo_rs_0_1_3__default = true;
+ cairo_sys_rs_0_3_4_features."png".from_cairo_rs_0_1_3__png = hasFeature (cairo_rs_0_1_3_features."png" or {});
+ cairo_sys_rs_0_3_4_features."v1_12".from_cairo_rs_0_1_3__v1_12 = hasFeature (cairo_rs_0_1_3_features."v1_12" or {});
+ cairo_sys_rs_0_3_4_features."xcb".from_cairo_rs_0_1_3__xcb = hasFeature (cairo_rs_0_1_3_features."xcb" or {});
+ cairo_sys_rs_0_3_4_features."default".from_cairo_rs_0_1_3__default = true;
+ glib_0_1_3_features."default".from_cairo_rs_0_1_3__default = true;
+ libc_0_2_23_features."default".from_cairo_rs_0_1_3__default = true;
+ winapi_0_2_8_features."default".from_cairo_rs_0_1_3__default = true;
+ cairo_sys_rs_0_3_4 = cairo_sys_rs_0_3_4_ rec {
+ dependencies = [ libc_0_2_23 ]
+ ++ (if kernel == "windows" then [ winapi_0_2_8 ] else []);
+ buildDependencies = [ pkg_config_0_3_9 ];
+ features = mkFeatures cairo_sys_rs_0_3_4_features;
+ };
+ cairo_sys_rs_0_3_4_features."v1_12".self_v1_14 = hasFeature (cairo_sys_rs_0_3_4_features."v1_14" or {});
+ cairo_sys_rs_0_3_4_features."x11".self_xlib = hasFeature (cairo_sys_rs_0_3_4_features."xlib" or {});
+ libc_0_2_23_features."default".from_cairo_sys_rs_0_3_4__default = true;
+ x11_0_0_0_features."xlib".from_cairo_sys_rs_0_3_4 = true;
+ x11_0_0_0_features."default".from_cairo_sys_rs_0_3_4__default = true;
+ winapi_0_2_8_features."default".from_cairo_sys_rs_0_3_4__default = true;
+ cfg_if_0_1_0 = cfg_if_0_1_0_ rec {};
+ dbus_0_4_1 = dbus_0_4_1_ rec {
+ dependencies = [ libc_0_2_23 ];
+ buildDependencies = [ pkg_config_0_3_9 ];
+ };
+ libc_0_2_23_features."default".from_dbus_0_4_1__default = true;
+ dbus_macros_0_0_6 = dbus_macros_0_0_6_ rec {
+ dependencies = [ dbus_0_4_1 ];
+ };
+ dbus_0_4_1_features."default".from_dbus_macros_0_0_6__default = true;
+ dlib_0_3_1 = dlib_0_3_1_ rec {
+ dependencies = [ libloading_0_3_4 ];
+ features = mkFeatures dlib_0_3_1_features;
+ };
+ dlib_0_3_1_features."".self = true;
+ libloading_0_3_4_features."default".from_dlib_0_3_1__default = true;
+ dtoa_0_4_1 = dtoa_0_4_1_ rec {};
+ dummy_rustwlc_0_6_3 = dummy_rustwlc_0_6_3_ rec {
+ dependencies = [ bitflags_0_6_0 libc_0_2_23 wayland_sys_0_9_4 ];
+ };
+ bitflags_0_6_0_features."default".from_dummy_rustwlc_0_6_3__default = true;
+ libc_0_2_23_features."default".from_dummy_rustwlc_0_6_3__default = true;
+ wayland_sys_0_9_4_features."server".from_dummy_rustwlc_0_6_3 = true;
+ wayland_sys_0_9_4_features."dlopen".from_dummy_rustwlc_0_6_3 = true;
+ wayland_sys_0_9_4_features."default".from_dummy_rustwlc_0_6_3__default = true;
+ env_logger_0_3_5 = env_logger_0_3_5_ rec {
+ dependencies = [ log_0_3_7 regex_0_1_80 ]
+ ++ (if lib.lists.any (x: x == "regex") features then [regex_0_1_80] else []);
+ features = mkFeatures env_logger_0_3_5_features;
+ };
+ env_logger_0_3_5_features."".self = true;
+ env_logger_0_3_5_features."regex".self_default = hasDefault env_logger_0_3_5_features;
+ log_0_3_7_features."default".from_env_logger_0_3_5__default = true;
+ regex_0_1_80_features."default".from_env_logger_0_3_5__default = true;
+ fixedbitset_0_1_6 = fixedbitset_0_1_6_ rec {};
+ gcc_0_3_46 = gcc_0_3_46_ rec {
+ dependencies = [];
+ features = mkFeatures gcc_0_3_46_features;
+ };
+ gcc_0_3_46_features."rayon".self_parallel = hasFeature (gcc_0_3_46_features."parallel" or {});
+ rayon_0_0_0_features."default".from_gcc_0_3_46__default = true;
+ getopts_0_2_14 = getopts_0_2_14_ rec {};
+ glib_0_1_3 = glib_0_1_3_ rec {
+ dependencies = [ bitflags_0_5_0 glib_sys_0_3_4 gobject_sys_0_3_4 lazy_static_0_2_8 libc_0_2_23 ];
+ features = mkFeatures glib_0_1_3_features;
+ };
+ glib_0_1_3_features."v2_38".self_v2_40 = hasFeature (glib_0_1_3_features."v2_40" or {});
+ glib_0_1_3_features."v2_40".self_v2_44 = hasFeature (glib_0_1_3_features."v2_44" or {});
+ glib_0_1_3_features."v2_44".self_v2_46 = hasFeature (glib_0_1_3_features."v2_46" or {});
+ glib_0_1_3_features."v2_46".self_v2_48 = hasFeature (glib_0_1_3_features."v2_48" or {});
+ glib_0_1_3_features."v2_48".self_v2_50 = hasFeature (glib_0_1_3_features."v2_50" or {});
+ bitflags_0_5_0_features."default".from_glib_0_1_3__default = true;
+ glib_sys_0_3_4_features."v2_38".from_glib_0_1_3__v2_38 = hasFeature (glib_0_1_3_features."v2_38" or {});
+ glib_sys_0_3_4_features."v2_40".from_glib_0_1_3__v2_40 = hasFeature (glib_0_1_3_features."v2_40" or {});
+ glib_sys_0_3_4_features."v2_44".from_glib_0_1_3__v2_44 = hasFeature (glib_0_1_3_features."v2_44" or {});
+ glib_sys_0_3_4_features."v2_46".from_glib_0_1_3__v2_46 = hasFeature (glib_0_1_3_features."v2_46" or {});
+ glib_sys_0_3_4_features."v2_48".from_glib_0_1_3__v2_48 = hasFeature (glib_0_1_3_features."v2_48" or {});
+ glib_sys_0_3_4_features."v2_50".from_glib_0_1_3__v2_50 = hasFeature (glib_0_1_3_features."v2_50" or {});
+ glib_sys_0_3_4_features."default".from_glib_0_1_3__default = true;
+ gobject_sys_0_3_4_features."v2_38".from_glib_0_1_3__v2_38 = hasFeature (glib_0_1_3_features."v2_38" or {});
+ gobject_sys_0_3_4_features."v2_44".from_glib_0_1_3__v2_44 = hasFeature (glib_0_1_3_features."v2_44" or {});
+ gobject_sys_0_3_4_features."v2_46".from_glib_0_1_3__v2_46 = hasFeature (glib_0_1_3_features."v2_46" or {});
+ gobject_sys_0_3_4_features."default".from_glib_0_1_3__default = true;
+ lazy_static_0_2_8_features."default".from_glib_0_1_3__default = true;
+ libc_0_2_23_features."default".from_glib_0_1_3__default = true;
+ glib_sys_0_3_4 = glib_sys_0_3_4_ rec {
+ dependencies = [ bitflags_0_8_2 libc_0_2_23 ];
+ buildDependencies = [ pkg_config_0_3_9 ];
+ features = mkFeatures glib_sys_0_3_4_features;
+ };
+ glib_sys_0_3_4_features."v2_34".self_v2_36 = hasFeature (glib_sys_0_3_4_features."v2_36" or {});
+ glib_sys_0_3_4_features."v2_36".self_v2_38 = hasFeature (glib_sys_0_3_4_features."v2_38" or {});
+ glib_sys_0_3_4_features."v2_38".self_v2_40 = hasFeature (glib_sys_0_3_4_features."v2_40" or {});
+ glib_sys_0_3_4_features."v2_40".self_v2_44 = hasFeature (glib_sys_0_3_4_features."v2_44" or {});
+ glib_sys_0_3_4_features."v2_44".self_v2_46 = hasFeature (glib_sys_0_3_4_features."v2_46" or {});
+ glib_sys_0_3_4_features."v2_46".self_v2_48 = hasFeature (glib_sys_0_3_4_features."v2_48" or {});
+ glib_sys_0_3_4_features."v2_48".self_v2_50 = hasFeature (glib_sys_0_3_4_features."v2_50" or {});
+ bitflags_0_8_2_features."default".from_glib_sys_0_3_4__default = true;
+ libc_0_2_23_features."default".from_glib_sys_0_3_4__default = true;
+ gobject_sys_0_3_4 = gobject_sys_0_3_4_ rec {
+ dependencies = [ bitflags_0_8_2 glib_sys_0_3_4 libc_0_2_23 ];
+ buildDependencies = [ pkg_config_0_3_9 ];
+ features = mkFeatures gobject_sys_0_3_4_features;
+ };
+ gobject_sys_0_3_4_features."v2_34".self_v2_36 = hasFeature (gobject_sys_0_3_4_features."v2_36" or {});
+ gobject_sys_0_3_4_features."v2_36".self_v2_38 = hasFeature (gobject_sys_0_3_4_features."v2_38" or {});
+ gobject_sys_0_3_4_features."v2_38".self_v2_42 = hasFeature (gobject_sys_0_3_4_features."v2_42" or {});
+ gobject_sys_0_3_4_features."v2_42".self_v2_44 = hasFeature (gobject_sys_0_3_4_features."v2_44" or {});
+ gobject_sys_0_3_4_features."v2_44".self_v2_46 = hasFeature (gobject_sys_0_3_4_features."v2_46" or {});
+ bitflags_0_8_2_features."default".from_gobject_sys_0_3_4__default = true;
+ glib_sys_0_3_4_features."default".from_gobject_sys_0_3_4__default = true;
+ libc_0_2_23_features."default".from_gobject_sys_0_3_4__default = true;
+ hlua_0_1_9 = hlua_0_1_9_ rec {
+ dependencies = [ libc_0_2_23 lua52_sys_0_0_4 ];
+ };
+ libc_0_2_23_features."default".from_hlua_0_1_9__default = true;
+ lua52_sys_0_0_4_features."default".from_hlua_0_1_9__default = true;
+ itoa_0_3_1 = itoa_0_3_1_ rec {};
+ json_macro_0_1_1 = json_macro_0_1_1_ rec {
+ dependencies = [ rustc_serialize_0_3_24 ];
+ };
+ rustc_serialize_0_3_24_features."default".from_json_macro_0_1_1__default = true;
+ kernel32_sys_0_2_2 = kernel32_sys_0_2_2_ rec {
+ dependencies = [ winapi_0_2_8 ];
+ buildDependencies = [ winapi_build_0_1_1 ];
+ };
+ winapi_0_2_8_features."default".from_kernel32_sys_0_2_2__default = true;
+ lazy_static_0_2_8 = lazy_static_0_2_8_ rec {
+ dependencies = [];
+ features = mkFeatures lazy_static_0_2_8_features;
+ };
+ lazy_static_0_2_8_features."nightly".self_spin_no_std = hasFeature (lazy_static_0_2_8_features."spin_no_std" or {});
+ lazy_static_0_2_8_features."spin".self_spin_no_std = hasFeature (lazy_static_0_2_8_features."spin_no_std" or {});
+ spin_0_0_0_features."default".from_lazy_static_0_2_8__default = true;
+ libc_0_2_23 = libc_0_2_23_ rec {
+ features = mkFeatures libc_0_2_23_features;
+ };
+ libc_0_2_23_features."use_std".self_default = hasDefault libc_0_2_23_features;
+ libloading_0_3_4 = libloading_0_3_4_ rec {
+ dependencies = [ lazy_static_0_2_8 ]
+ ++ (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ] else []);
+ buildDependencies = [ target_build_utils_0_3_1 ];
+ };
+ lazy_static_0_2_8_features."default".from_libloading_0_3_4__default = true;
+ kernel32_sys_0_2_2_features."default".from_libloading_0_3_4__default = true;
+ winapi_0_2_8_features."default".from_libloading_0_3_4__default = true;
+ log_0_3_7 = log_0_3_7_ rec {
+ features = mkFeatures log_0_3_7_features;
+ };
+ log_0_3_7_features."use_std".self_default = hasDefault log_0_3_7_features;
+ lua52_sys_0_0_4 = lua52_sys_0_0_4_ rec {
+ dependencies = [ libc_0_2_23 ];
+ buildDependencies = [ gcc_0_3_46 pkg_config_0_3_9 ];
+ };
+ libc_0_2_23_features."default".from_lua52_sys_0_0_4__default = true;
+ memchr_0_1_11 = memchr_0_1_11_ rec {
+ dependencies = [ libc_0_2_23 ];
+ };
+ libc_0_2_23_features."default".from_memchr_0_1_11__default = true;
+ nix_0_6_0 = nix_0_6_0_ rec {
+ dependencies = [ bitflags_0_4_0 cfg_if_0_1_0 libc_0_2_23 void_1_0_2 ];
+ buildDependencies = [ rustc_version_0_1_7 semver_0_1_20 ];
+ features = mkFeatures nix_0_6_0_features;
+ };
+ nix_0_6_0_features."".self = true;
+ bitflags_0_4_0_features."default".from_nix_0_6_0__default = true;
+ cfg_if_0_1_0_features."default".from_nix_0_6_0__default = true;
+ libc_0_2_23_features."default".from_nix_0_6_0__default = true;
+ void_1_0_2_features."default".from_nix_0_6_0__default = true;
+ nix_0_8_1 = nix_0_8_1_ rec {
+ dependencies = [ bitflags_0_7_0 cfg_if_0_1_0 libc_0_2_23 void_1_0_2 ];
+ features = mkFeatures nix_0_8_1_features;
+ };
+ nix_0_8_1_features."".self = true;
+ bitflags_0_7_0_features."default".from_nix_0_8_1__default = true;
+ cfg_if_0_1_0_features."default".from_nix_0_8_1__default = true;
+ libc_0_2_23_features."default".from_nix_0_8_1__default = true;
+ void_1_0_2_features."default".from_nix_0_8_1__default = true;
+ num_traits_0_1_37 = num_traits_0_1_37_ rec {};
+ ordermap_0_2_10 = ordermap_0_2_10_ rec {
+ features = mkFeatures ordermap_0_2_10_features;
+ };
+ ordermap_0_2_10_features."".self = true;
+ petgraph_0_4_5 = petgraph_0_4_5_ rec {
+ dependencies = [ fixedbitset_0_1_6 ordermap_0_2_10 ]
+ ++ (if lib.lists.any (x: x == "ordermap") features then [ordermap_0_2_10] else []);
+ features = mkFeatures petgraph_0_4_5_features;
+ };
+ petgraph_0_4_5_features."".self = true;
+ petgraph_0_4_5_features."unstable".self_all = hasFeature (petgraph_0_4_5_features."all" or {});
+ petgraph_0_4_5_features."quickcheck".self_all = hasFeature (petgraph_0_4_5_features."all" or {});
+ petgraph_0_4_5_features."stable_graph".self_all = hasFeature (petgraph_0_4_5_features."all" or {});
+ petgraph_0_4_5_features."graphmap".self_all = hasFeature (petgraph_0_4_5_features."all" or {});
+ petgraph_0_4_5_features."graphmap".self_default = hasDefault petgraph_0_4_5_features;
+ petgraph_0_4_5_features."stable_graph".self_default = hasDefault petgraph_0_4_5_features;
+ petgraph_0_4_5_features."ordermap".self_graphmap = hasFeature (petgraph_0_4_5_features."graphmap" or {});
+ petgraph_0_4_5_features."generate".self_unstable = hasFeature (petgraph_0_4_5_features."unstable" or {});
+ fixedbitset_0_1_6_features."default".from_petgraph_0_4_5__default = true;
+ ordermap_0_2_10_features."default".from_petgraph_0_4_5__default = true;
+ quickcheck_0_0_0_features."default".from_petgraph_0_4_5__default = false;
+ phf_0_7_21 = phf_0_7_21_ rec {
+ dependencies = [ phf_shared_0_7_21 ];
+ features = mkFeatures phf_0_7_21_features;
+ };
+ phf_0_7_21_features."".self = true;
+ phf_shared_0_7_21_features."core".from_phf_0_7_21__core = hasFeature (phf_0_7_21_features."core" or {});
+ phf_shared_0_7_21_features."unicase".from_phf_0_7_21__unicase = hasFeature (phf_0_7_21_features."unicase" or {});
+ phf_shared_0_7_21_features."default".from_phf_0_7_21__default = true;
+ phf_codegen_0_7_21 = phf_codegen_0_7_21_ rec {
+ dependencies = [ phf_generator_0_7_21 phf_shared_0_7_21 ];
+ };
+ phf_generator_0_7_21_features."default".from_phf_codegen_0_7_21__default = true;
+ phf_shared_0_7_21_features."default".from_phf_codegen_0_7_21__default = true;
+ phf_generator_0_7_21 = phf_generator_0_7_21_ rec {
+ dependencies = [ phf_shared_0_7_21 rand_0_3_15 ];
+ };
+ phf_shared_0_7_21_features."default".from_phf_generator_0_7_21__default = true;
+ rand_0_3_15_features."default".from_phf_generator_0_7_21__default = true;
+ phf_shared_0_7_21 = phf_shared_0_7_21_ rec {
+ dependencies = [ siphasher_0_2_2 ];
+ features = mkFeatures phf_shared_0_7_21_features;
+ };
+ phf_shared_0_7_21_features."".self = true;
+ siphasher_0_2_2_features."default".from_phf_shared_0_7_21__default = true;
+ unicase_0_0_0_features."default".from_phf_shared_0_7_21__default = true;
+ pkg_config_0_3_9 = pkg_config_0_3_9_ rec {};
+ rand_0_3_15 = rand_0_3_15_ rec {
+ dependencies = [ libc_0_2_23 ];
+ };
+ libc_0_2_23_features."default".from_rand_0_3_15__default = true;
+ regex_0_1_80 = regex_0_1_80_ rec {
+ dependencies = [ aho_corasick_0_5_3 memchr_0_1_11 regex_syntax_0_3_9 thread_local_0_2_7 utf8_ranges_0_1_3 ];
+ features = mkFeatures regex_0_1_80_features;
+ };
+ regex_0_1_80_features."simd".self_simd-accel = hasFeature (regex_0_1_80_features."simd-accel" or {});
+ aho_corasick_0_5_3_features."default".from_regex_0_1_80__default = true;
+ memchr_0_1_11_features."default".from_regex_0_1_80__default = true;
+ regex_syntax_0_3_9_features."default".from_regex_0_1_80__default = true;
+ simd_0_0_0_features."default".from_regex_0_1_80__default = true;
+ thread_local_0_2_7_features."default".from_regex_0_1_80__default = true;
+ utf8_ranges_0_1_3_features."default".from_regex_0_1_80__default = true;
+ regex_syntax_0_3_9 = regex_syntax_0_3_9_ rec {};
+ rustc_serialize_0_3_24 = rustc_serialize_0_3_24_ rec {};
+ rustc_version_0_1_7 = rustc_version_0_1_7_ rec {
+ dependencies = [ semver_0_1_20 ];
+ };
+ semver_0_1_20_features."default".from_rustc_version_0_1_7__default = true;
+ rustwlc_0_6_2 = rustwlc_0_6_2_ rec {
+ dependencies = [ bitflags_0_7_0 libc_0_2_23 wayland_sys_0_6_0 ]
+ ++ (if lib.lists.any (x: x == "wayland-sys") features then [wayland_sys_0_6_0] else []);
+ features = mkFeatures rustwlc_0_6_2_features;
+ };
+ rustwlc_0_6_2_features."".self = true;
+ rustwlc_0_6_2_features."wayland-sys".self_wlc-wayland = hasFeature (rustwlc_0_6_2_features."wlc-wayland" or {});
+ bitflags_0_7_0_features."default".from_rustwlc_0_6_2__default = true;
+ libc_0_2_23_features."default".from_rustwlc_0_6_2__default = true;
+ wayland_sys_0_6_0_features."server".from_rustwlc_0_6_2 = true;
+ wayland_sys_0_6_0_features."default".from_rustwlc_0_6_2__default = true;
+ semver_0_1_20 = semver_0_1_20_ rec {};
+ serde_0_9_15 = serde_0_9_15_ rec {
+ dependencies = [];
+ features = mkFeatures serde_0_9_15_features;
+ };
+ serde_0_9_15_features."unstable".self_alloc = hasFeature (serde_0_9_15_features."alloc" or {});
+ serde_0_9_15_features."alloc".self_collections = hasFeature (serde_0_9_15_features."collections" or {});
+ serde_0_9_15_features."std".self_default = hasDefault serde_0_9_15_features;
+ serde_0_9_15_features."serde_derive".self_derive = hasFeature (serde_0_9_15_features."derive" or {});
+ serde_0_9_15_features."serde_derive".self_playground = hasFeature (serde_0_9_15_features."playground" or {});
+ serde_0_9_15_features."unstable".self_unstable-testing = hasFeature (serde_0_9_15_features."unstable-testing" or {});
+ serde_0_9_15_features."std".self_unstable-testing = hasFeature (serde_0_9_15_features."unstable-testing" or {});
+ serde_derive_0_0_0_features."default".from_serde_0_9_15__default = true;
+ serde_json_0_9_10 = serde_json_0_9_10_ rec {
+ dependencies = [ dtoa_0_4_1 itoa_0_3_1 num_traits_0_1_37 serde_0_9_15 ];
+ features = mkFeatures serde_json_0_9_10_features;
+ };
+ serde_json_0_9_10_features."linked-hash-map".self_preserve_order = hasFeature (serde_json_0_9_10_features."preserve_order" or {});
+ dtoa_0_4_1_features."default".from_serde_json_0_9_10__default = true;
+ itoa_0_3_1_features."default".from_serde_json_0_9_10__default = true;
+ linked_hash_map_0_0_0_features."default".from_serde_json_0_9_10__default = true;
+ num_traits_0_1_37_features."default".from_serde_json_0_9_10__default = true;
+ serde_0_9_15_features."default".from_serde_json_0_9_10__default = true;
+ siphasher_0_2_2 = siphasher_0_2_2_ rec {
+ dependencies = [];
+ };
+ clippy_0_0_0_features."default".from_siphasher_0_2_2__default = true;
+ target_build_utils_0_3_1 = target_build_utils_0_3_1_ rec {
+ dependencies = [ phf_0_7_21 serde_json_0_9_10 ]
+ ++ (if lib.lists.any (x: x == "serde_json") features then [serde_json_0_9_10] else []);
+ buildDependencies = [ phf_codegen_0_7_21 ];
+ features = mkFeatures target_build_utils_0_3_1_features;
+ };
+ target_build_utils_0_3_1_features."".self = true;
+ target_build_utils_0_3_1_features."serde_json".self_default = hasDefault target_build_utils_0_3_1_features;
+ phf_0_7_21_features."default".from_target_build_utils_0_3_1__default = true;
+ serde_json_0_9_10_features."default".from_target_build_utils_0_3_1__default = true;
+ thread_id_2_0_0 = thread_id_2_0_0_ rec {
+ dependencies = [ kernel32_sys_0_2_2 libc_0_2_23 ];
+ };
+ kernel32_sys_0_2_2_features."default".from_thread_id_2_0_0__default = true;
+ libc_0_2_23_features."default".from_thread_id_2_0_0__default = true;
+ thread_local_0_2_7 = thread_local_0_2_7_ rec {
+ dependencies = [ thread_id_2_0_0 ];
+ };
+ thread_id_2_0_0_features."default".from_thread_local_0_2_7__default = true;
+ utf8_ranges_0_1_3 = utf8_ranges_0_1_3_ rec {};
+ uuid_0_3_1 = uuid_0_3_1_ rec {
+ dependencies = [ rand_0_3_15 rustc_serialize_0_3_24 ]
+ ++ (if lib.lists.any (x: x == "rand") features then [rand_0_3_15] else []) ++ (if lib.lists.any (x: x == "rustc-serialize") features then [rustc_serialize_0_3_24] else []);
+ features = mkFeatures uuid_0_3_1_features;
+ };
+ uuid_0_3_1_features."".self = true;
+ uuid_0_3_1_features."rand".self_v4 = hasFeature (uuid_0_3_1_features."v4" or {});
+ uuid_0_3_1_features."sha1".self_v5 = hasFeature (uuid_0_3_1_features."v5" or {});
+ rand_0_3_15_features."default".from_uuid_0_3_1__default = true;
+ rustc_serialize_0_3_24_features."default".from_uuid_0_3_1__default = true;
+ serde_0_0_0_features."default".from_uuid_0_3_1__default = true;
+ sha1_0_0_0_features."default".from_uuid_0_3_1__default = true;
+ void_1_0_2 = void_1_0_2_ rec {
+ features = mkFeatures void_1_0_2_features;
+ };
+ void_1_0_2_features."std".self_default = hasDefault void_1_0_2_features;
+ way_cooler_0_6_2 = way_cooler_0_6_2_ rec {
+ dependencies = [ bitflags_0_7_0 cairo_rs_0_1_3 dbus_0_4_1 dbus_macros_0_0_6 env_logger_0_3_5 getopts_0_2_14 hlua_0_1_9 json_macro_0_1_1 lazy_static_0_2_8 log_0_3_7 nix_0_6_0 petgraph_0_4_5 rustc_serialize_0_3_24 rustwlc_0_6_2 uuid_0_3_1 wayland_server_0_9_4 wayland_sys_0_9_4 ];
+ buildDependencies = [ wayland_scanner_0_9_4 ];
+ features = mkFeatures way_cooler_0_6_2_features;
+ };
+ way_cooler_0_6_2_features."".self = true;
+ bitflags_0_7_0_features."default".from_way_cooler_0_6_2__default = true;
+ cairo_rs_0_1_3_features."default".from_way_cooler_0_6_2__default = true;
+ dbus_0_4_1_features."default".from_way_cooler_0_6_2__default = true;
+ dbus_macros_0_0_6_features."default".from_way_cooler_0_6_2__default = true;
+ env_logger_0_3_5_features."default".from_way_cooler_0_6_2__default = true;
+ getopts_0_2_14_features."default".from_way_cooler_0_6_2__default = true;
+ hlua_0_1_9_features."default".from_way_cooler_0_6_2__default = true;
+ json_macro_0_1_1_features."default".from_way_cooler_0_6_2__default = true;
+ lazy_static_0_2_8_features."default".from_way_cooler_0_6_2__default = true;
+ log_0_3_7_features."default".from_way_cooler_0_6_2__default = true;
+ nix_0_6_0_features."default".from_way_cooler_0_6_2__default = true;
+ petgraph_0_4_5_features."default".from_way_cooler_0_6_2__default = true;
+ rustc_serialize_0_3_24_features."default".from_way_cooler_0_6_2__default = true;
+ rustwlc_0_6_2_features."wlc-wayland".from_way_cooler_0_6_2 = true;
+ rustwlc_0_6_2_features."static-wlc".from_way_cooler_0_6_2__static-wlc = hasFeature (way_cooler_0_6_2_features."static-wlc" or {});
+ rustwlc_0_6_2_features."default".from_way_cooler_0_6_2__default = true;
+ uuid_0_3_1_features."v4".from_way_cooler_0_6_2 = true;
+ uuid_0_3_1_features."rustc-serialize".from_way_cooler_0_6_2 = true;
+ uuid_0_3_1_features."default".from_way_cooler_0_6_2__default = true;
+ wayland_server_0_9_4_features."default".from_way_cooler_0_6_2__default = true;
+ wayland_sys_0_9_4_features."client".from_way_cooler_0_6_2 = true;
+ wayland_sys_0_9_4_features."dlopen".from_way_cooler_0_6_2 = true;
+ wayland_sys_0_9_4_features."default".from_way_cooler_0_6_2__default = true;
+ wayland_scanner_0_9_4 = wayland_scanner_0_9_4_ rec {
+ dependencies = [ xml_rs_0_3_6 ];
+ };
+ xml_rs_0_3_6_features."default".from_wayland_scanner_0_9_4__default = true;
+ wayland_server_0_9_4 = wayland_server_0_9_4_ rec {
+ dependencies = [ bitflags_0_7_0 libc_0_2_23 nix_0_8_1 wayland_sys_0_9_4 ];
+ buildDependencies = [ wayland_scanner_0_9_4 ];
+ features = mkFeatures wayland_server_0_9_4_features;
+ };
+ wayland_server_0_9_4_features."".self = true;
+ bitflags_0_7_0_features."default".from_wayland_server_0_9_4__default = true;
+ libc_0_2_23_features."default".from_wayland_server_0_9_4__default = true;
+ nix_0_8_1_features."default".from_wayland_server_0_9_4__default = true;
+ wayland_sys_0_9_4_features."server".from_wayland_server_0_9_4 = true;
+ wayland_sys_0_9_4_features."dlopen".from_wayland_server_0_9_4__dlopen = hasFeature (wayland_server_0_9_4_features."dlopen" or {});
+ wayland_sys_0_9_4_features."default".from_wayland_server_0_9_4__default = true;
+ wayland_sys_0_6_0 = wayland_sys_0_6_0_ rec {
+ dependencies = [ dlib_0_3_1 libc_0_2_23 ]
+ ++ (if lib.lists.any (x: x == "libc") features then [libc_0_2_23] else []);
+ features = mkFeatures wayland_sys_0_6_0_features;
+ };
+ wayland_sys_0_6_0_features."".self = true;
+ wayland_sys_0_6_0_features."lazy_static".self_dlopen = hasFeature (wayland_sys_0_6_0_features."dlopen" or {});
+ wayland_sys_0_6_0_features."libc".self_server = hasFeature (wayland_sys_0_6_0_features."server" or {});
+ dlib_0_3_1_features."dlopen".from_wayland_sys_0_6_0__dlopen = hasFeature (wayland_sys_0_6_0_features."dlopen" or {});
+ dlib_0_3_1_features."default".from_wayland_sys_0_6_0__default = true;
+ lazy_static_0_0_0_features."default".from_wayland_sys_0_6_0__default = true;
+ libc_0_2_23_features."default".from_wayland_sys_0_6_0__default = true;
+ wayland_sys_0_9_4 = wayland_sys_0_9_4_ rec {
+ dependencies = [ dlib_0_3_1 lazy_static_0_2_8 libc_0_2_23 ]
+ ++ (if lib.lists.any (x: x == "lazy_static") features then [lazy_static_0_2_8] else []) ++ (if lib.lists.any (x: x == "libc") features then [libc_0_2_23] else []);
+ features = mkFeatures wayland_sys_0_9_4_features;
+ };
+ wayland_sys_0_9_4_features."".self = true;
+ wayland_sys_0_9_4_features."lazy_static".self_dlopen = hasFeature (wayland_sys_0_9_4_features."dlopen" or {});
+ wayland_sys_0_9_4_features."libc".self_server = hasFeature (wayland_sys_0_9_4_features."server" or {});
+ dlib_0_3_1_features."dlopen".from_wayland_sys_0_9_4__dlopen = hasFeature (wayland_sys_0_9_4_features."dlopen" or {});
+ dlib_0_3_1_features."default".from_wayland_sys_0_9_4__default = true;
+ lazy_static_0_2_8_features."default".from_wayland_sys_0_9_4__default = true;
+ libc_0_2_23_features."default".from_wayland_sys_0_9_4__default = true;
+ winapi_0_2_8 = winapi_0_2_8_ rec {};
+ winapi_build_0_1_1 = winapi_build_0_1_1_ rec {};
+ xml_rs_0_3_6 = xml_rs_0_3_6_ rec {
+ dependencies = [ bitflags_0_7_0 ];
+ };
+ bitflags_0_7_0_features."default".from_xml_rs_0_3_6__default = true;
+}
diff --git a/pkgs/applications/window-managers/way-cooler/wc-bg.nix b/pkgs/applications/window-managers/way-cooler/wc-bg.nix
new file mode 100644
index 0000000000000000000000000000000000000000..50e2bf83734825fa083042182e78d0570c88442c
--- /dev/null
+++ b/pkgs/applications/window-managers/way-cooler/wc-bg.nix
@@ -0,0 +1,962 @@
+# Generated by carnix 0.5.0: carnix -o wc-bg.nix Cargo.lock
+{ lib, buildPlatform, buildRustCrate, fetchgit }:
+let kernel = buildPlatform.parsed.kernel.name;
+ abi = buildPlatform.parsed.abi.name;
+ hasFeature = feature:
+ lib.lists.any
+ (originName: feature.${originName})
+ (builtins.attrNames feature);
+
+ hasDefault = feature:
+ let defaultFeatures = builtins.attrNames (feature."default" or {}); in
+ (defaultFeatures == [])
+ || (lib.lists.any (originName: feature."default".${originName}) defaultFeatures);
+
+ mkFeatures = feat: lib.lists.foldl (features: featureName:
+ if featureName != "" && hasFeature feat.${featureName} then
+ [ featureName ] ++ features
+ else
+ features
+ ) (if hasDefault feat then [ "default" ] else []) (builtins.attrNames feat);
+ ansi_term_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "ansi_term";
+ version = "0.9.0";
+ authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) " ];
+ sha256 = "1vcd8m2hglrdi4zmqnkkz5zy3c73ifgii245k7vj6qr5dzpn9hij";
+ inherit dependencies buildDependencies features;
+ };
+ atty_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "atty";
+ version = "0.2.2";
+ authors = [ "softprops " ];
+ sha256 = "05c6jvrxljp4s1aycgq2z3y56f7f5yvc56v25cqlmpc1qx65z7ba";
+ inherit dependencies buildDependencies features;
+ };
+ bitflags_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "bitflags";
+ version = "0.6.0";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "1znq4b770mdp3kdj9yz199ylc2pmf8l5j2f281jjrcfhg1mm22h6";
+ inherit dependencies buildDependencies features;
+ };
+ bitflags_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "bitflags";
+ version = "0.7.0";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "1hr72xg5slm0z4pxs2hiy4wcyx3jva70h58b7mid8l0a4c8f7gn5";
+ inherit dependencies buildDependencies features;
+ };
+ bitflags_0_8_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "bitflags";
+ version = "0.8.2";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "0whaj3969ysqxzk620sk1isvq6vh85516f2fplvqjrw3syz44sb2";
+ inherit dependencies buildDependencies features;
+ };
+ byteorder_0_5_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "byteorder";
+ version = "0.5.3";
+ authors = [ "Andrew Gallant " ];
+ sha256 = "0zsr6b0m0yl5c0yy92nq7srfpczd1dx1xqcx3rlm5fbl8si9clqx";
+ inherit dependencies buildDependencies features;
+ };
+ byteorder_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "byteorder";
+ version = "1.0.0";
+ authors = [ "Andrew Gallant " ];
+ sha256 = "14pdnds4517vcpablc51vv76hvc3glnpkpbb7qdil591q7lyb0m1";
+ inherit dependencies buildDependencies features;
+ };
+ clap_2_23_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "clap";
+ version = "2.23.2";
+ authors = [ "Kevin K. " ];
+ sha256 = "1sfc2h9sn4k3vkgqxwk2mhl75f0i9gl3ncl7d2y7plhp18k5nlrs";
+ inherit dependencies buildDependencies features;
+ };
+ color_quant_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "color_quant";
+ version = "1.0.0";
+ authors = [ "nwin " ];
+ sha256 = "0jwr40lr115zm2bydk1wja12gcxrmgsx0n1z1pipq00sab71maaj";
+ inherit dependencies buildDependencies features;
+ };
+ dbus_0_5_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "dbus";
+ version = "0.5.2";
+ authors = [ "David Henningsson " ];
+ sha256 = "1ga3p2myqxbz34n2bbw4gk1ipf76mjr8r2rvrvnalwggymzfkhj7";
+ build = "build.rs";
+ inherit dependencies buildDependencies features;
+ };
+ deque_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "deque";
+ version = "0.3.1";
+ authors = [ "Alex Crichton " "Samuel Fredrickson " "Linus Färnstrand " "Amanieu d'Antras " ];
+ sha256 = "04x8i5aagxmslk350i8qszyw7kmvrqc3d99g4qi1xnfmr61y7m68";
+ inherit dependencies buildDependencies features;
+ };
+ dlib_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "dlib";
+ version = "0.3.1";
+ authors = [ "Victor Berger " ];
+ sha256 = "11mhh6g9vszp2ay3r46x4capnnmvvhx5hcp74bapxjhiixqjfvkr";
+ inherit dependencies buildDependencies features;
+ };
+ dtoa_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "dtoa";
+ version = "0.4.1";
+ authors = [ "David Tolnay " ];
+ sha256 = "0mgg4r90yby68qg7y8csbclhsm53ac26vsyq615viq535plllhzw";
+ inherit dependencies buildDependencies features;
+ };
+ enum_primitive_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "enum_primitive";
+ version = "0.1.1";
+ authors = [ "Anders Kaseorg " ];
+ sha256 = "1a225rlsz7sz3nn14dar71kp2f9v08s3rwl6j55xp51mv01f695y";
+ inherit dependencies buildDependencies features;
+ };
+ error_chain_0_7_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "error-chain";
+ version = "0.7.2";
+ authors = [ "Brian Anderson " "Paul Colomiets " "Colin Kiegel " "Yamakaky " ];
+ sha256 = "0b1r4ggdgy1djfvz2s4l5kirmfsmxd286y6wx0p9ahv2phb7inyi";
+ inherit dependencies buildDependencies features;
+ };
+ flate2_0_2_19_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "flate2";
+ version = "0.2.19";
+ authors = [ "Alex Crichton " ];
+ sha256 = "1dpnvw4hcxplalr3bk527d9rfiy7c08580hji9dnfcv5fmdg1znq";
+ inherit dependencies buildDependencies features;
+ };
+ gcc_0_3_45_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "gcc";
+ version = "0.3.45";
+ authors = [ "Alex Crichton " ];
+ sha256 = "0d3pzpbh7wr7645i2rkg5f7c4bhp01a9syrw600fjcvqhkiykp5n";
+ inherit dependencies buildDependencies features;
+ };
+ gif_0_9_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "gif";
+ version = "0.9.1";
+ authors = [ "nwin " ];
+ sha256 = "16s7b0rqc6gg1fcbppakm3jy2q462w3qvykcmcmifmg7q7lwsg6r";
+ inherit dependencies buildDependencies features;
+ };
+ glob_0_2_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "glob";
+ version = "0.2.11";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "104389jjxs8r2f5cc9p0axhjmndgln60ih5x4f00ccgg9d3zarlf";
+ inherit dependencies buildDependencies features;
+ };
+ image_0_10_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "image";
+ version = "0.10.4";
+ authors = [ "ccgn" "bvssvni " "nwin" "TyOverby " ];
+ sha256 = "1pwrs7k5760b38i1lg872x9q2zc6xvhs7mjhlzvjnr5p85zx2fbw";
+ libPath = "./src/lib.rs";
+ inherit dependencies buildDependencies features;
+ };
+ inflate_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "inflate";
+ version = "0.1.1";
+ authors = [ "nwin " ];
+ sha256 = "112kh9hjcjjxdybl032mdhpwnr3qxw8j0ch6hwanwpcf3gz42g1h";
+ inherit dependencies buildDependencies features;
+ };
+ itoa_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "itoa";
+ version = "0.3.1";
+ authors = [ "David Tolnay " ];
+ sha256 = "0jp1wvfw0qqbyz0whbycp7xr5nx1ds5plh4wsfyj503xmjf9ab4k";
+ inherit dependencies buildDependencies features;
+ };
+ jpeg_decoder_0_1_12_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "jpeg-decoder";
+ version = "0.1.12";
+ authors = [ "Ulf Nilsson " ];
+ sha256 = "1f8y6v3alf93gwfmcd53izh77w2a1gv85zlhdbnyla2kna7r9pwz";
+ inherit dependencies buildDependencies features;
+ };
+ kernel32_sys_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "kernel32-sys";
+ version = "0.2.2";
+ authors = [ "Peter Atashian " ];
+ sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj";
+ libName = "kernel32";
+ build = "build.rs";
+ inherit dependencies buildDependencies features;
+ };
+ lazy_static_0_1_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "lazy_static";
+ version = "0.1.16";
+ authors = [ "Marvin Löbel " ];
+ sha256 = "0lc5ixs5bmnc43lfri2ynh9393l7vs0z3sw2v5rkaady2ivnznpc";
+ inherit dependencies buildDependencies features;
+ };
+ lazy_static_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "lazy_static";
+ version = "0.2.8";
+ authors = [ "Marvin Löbel " ];
+ sha256 = "1xbpxx7cd5kl60g87g43q80jxyrsildhxfjc42jb1x4jncknpwbl";
+ inherit dependencies buildDependencies features;
+ };
+ libc_0_2_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "libc";
+ version = "0.2.21";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "0glj3lxwc8358cfw9pb5dd4zr9iynzj6w2ly59nshrggsw021j75";
+ inherit dependencies buildDependencies features;
+ };
+ libloading_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "libloading";
+ version = "0.3.4";
+ authors = [ "Simonas Kazlauskas " ];
+ sha256 = "1f2vy32cr434n638nv8sdf05iwa53q9q5ahlcpw1l9ywh1bcbhf1";
+ build = "build.rs";
+ inherit dependencies buildDependencies features;
+ };
+ lzw_0_10_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "lzw";
+ version = "0.10.0";
+ authors = [ "nwin " ];
+ sha256 = "1cfsy2w26kbz9bjaqp9dh1wyyh47rpmhwvj4jpc1rmffbf438fvb";
+ inherit dependencies buildDependencies features;
+ };
+ metadeps_1_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "metadeps";
+ version = "1.1.1";
+ authors = [ "Josh Triplett " ];
+ sha256 = "1px8v94jn4ps63gqmvgsfcqxrwjhpa9z4xr0y1lh95wn2063fsar";
+ inherit dependencies buildDependencies features;
+ };
+ miniz_sys_0_1_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "miniz-sys";
+ version = "0.1.9";
+ authors = [ "Alex Crichton " ];
+ sha256 = "09m2953zr0msq8cgk86991y4aqfvw3cxf52fx0d49jqy92nqmfmv";
+ libPath = "lib.rs";
+ libName = "miniz_sys";
+ build = "build.rs";
+ inherit dependencies buildDependencies features;
+ };
+ num_bigint_0_1_37_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "num-bigint";
+ version = "0.1.37";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "0scyqfi5azf48yyc8fhns8i1g8zq1rax155hhj9mhr0c1j6w99gs";
+ inherit dependencies buildDependencies features;
+ };
+ num_integer_0_1_34_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "num-integer";
+ version = "0.1.34";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "1i160ddy78sgih3xq9r6raqmg4s83abwbphv4cvyb1lnwsh0b318";
+ inherit dependencies buildDependencies features;
+ };
+ num_iter_0_1_33_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "num-iter";
+ version = "0.1.33";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "1xjzf2p2vaqwknkr4s8ka5hn6cpr5rsshnydbpkn2pvapfzdrqd3";
+ inherit dependencies buildDependencies features;
+ };
+ num_rational_0_1_36_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "num-rational";
+ version = "0.1.36";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "0jibhs8xiap2wlv1xjwdvhyj4yrxwfisqbnfm53vjm5ldlijp87p";
+ inherit dependencies buildDependencies features;
+ };
+ num_traits_0_1_37_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "num-traits";
+ version = "0.1.37";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "0rwzfmdjq6iz6plva2gi7agvy1w9sjs7aqjh0p115w57xiix2224";
+ inherit dependencies buildDependencies features;
+ };
+ num_cpus_1_3_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "num_cpus";
+ version = "1.3.0";
+ authors = [ "Sean McArthur " ];
+ sha256 = "0i0zm6qh932k9b67qf7f1vsczkdim5kg9qv73m7y5hhw1i781rrb";
+ inherit dependencies buildDependencies features;
+ };
+ phf_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "phf";
+ version = "0.7.21";
+ authors = [ "Steven Fackler " ];
+ sha256 = "11m2rzm2s8s35m0s97gjxxb181xz352kjlhr387xj5c8q3qp5afg";
+ libPath = "src/lib.rs";
+ inherit dependencies buildDependencies features;
+ };
+ phf_codegen_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "phf_codegen";
+ version = "0.7.21";
+ authors = [ "Steven Fackler " ];
+ sha256 = "0kgy8s2q4zr0iqcm21mgq4ppc45wy6z7b5wn98xyfsrcad6lwmmj";
+ inherit dependencies buildDependencies features;
+ };
+ phf_generator_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "phf_generator";
+ version = "0.7.21";
+ authors = [ "Steven Fackler " ];
+ sha256 = "1jxjfzc6d6d4l9nv0r2bb66if5brk9lnncmg4dpjjifn6zhhqd9g";
+ inherit dependencies buildDependencies features;
+ };
+ phf_shared_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "phf_shared";
+ version = "0.7.21";
+ authors = [ "Steven Fackler " ];
+ sha256 = "0lxpg3wgxfhzfalmf9ha9my1lsvfjy74ah9f6mfw88xlp545jlln";
+ libPath = "src/lib.rs";
+ inherit dependencies buildDependencies features;
+ };
+ pkg_config_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "pkg-config";
+ version = "0.3.9";
+ authors = [ "Alex Crichton " ];
+ sha256 = "06k8fxgrsrxj8mjpjcq1n7mn2p1shpxif4zg9y5h09c7vy20s146";
+ inherit dependencies buildDependencies features;
+ };
+ png_0_5_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "png";
+ version = "0.5.2";
+ authors = [ "nwin " ];
+ sha256 = "1pgann3f1ysgf8y1acw86v4s3ji1xk85ri353biyvh4i1cpn1g3q";
+ inherit dependencies buildDependencies features;
+ };
+ rand_0_3_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "rand";
+ version = "0.3.15";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "1fs30rc1xic40s1n7l3y7pxzfifpy03mgrvhy5ggp5p7zjfv3rr8";
+ inherit dependencies buildDependencies features;
+ };
+ rayon_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "rayon";
+ version = "0.7.0";
+ authors = [ "Niko Matsakis " ];
+ sha256 = "102qkpni68wc9fz1hmba1z8d6pgnl86g5gdl9i3h3ilc6zjymxx7";
+ inherit dependencies buildDependencies features;
+ };
+ rayon_core_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "rayon-core";
+ version = "1.0.0";
+ authors = [ "Niko Matsakis " ];
+ sha256 = "0gv3ysmx69r20n0ywjnqbgm802jjzgg0rly1iv1ssphgn5gg4hsh";
+ build = "build.rs";
+ inherit dependencies buildDependencies features;
+ };
+ rustc_serialize_0_3_23_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "rustc-serialize";
+ version = "0.3.23";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "0s8i928syzkj1xrsfqf04xlyi4zl37bfpzilf160gi2vhcikj0lw";
+ inherit dependencies buildDependencies features;
+ };
+ rustc_version_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "rustc_version";
+ version = "0.1.7";
+ authors = [ "Marvin Löbel " ];
+ sha256 = "0plm9pbyvcwfibd0kbhzil9xmr1bvqi8fgwlfw0x4vali8s6s99p";
+ inherit dependencies buildDependencies features;
+ };
+ scoped_threadpool_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "scoped_threadpool";
+ version = "0.1.7";
+ authors = [ "Marvin Löbel " ];
+ sha256 = "0dg58f18i6v071640062n0vymr4h42cnj0xy8a7b80sc0mddykyk";
+ inherit dependencies buildDependencies features;
+ };
+ semver_0_1_20_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "semver";
+ version = "0.1.20";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "05cdig0071hls2k8lxbqmyqpl0zjmc53i2d43mwzps033b8njh4n";
+ inherit dependencies buildDependencies features;
+ };
+ serde_0_9_13_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "serde";
+ version = "0.9.13";
+ authors = [ "Erick Tryzelaar " ];
+ sha256 = "1lgh3mhmdagzb6wrm6nd4f9mfqwmw464hc8q99ia2qv4xwkx72xp";
+ inherit dependencies buildDependencies features;
+ };
+ serde_json_0_9_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "serde_json";
+ version = "0.9.10";
+ authors = [ "Erick Tryzelaar " ];
+ sha256 = "0g6bxlfnvf2miicnsizyrxm686rfval6gbss1i2qcna8msfwc005";
+ inherit dependencies buildDependencies features;
+ };
+ siphasher_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "siphasher";
+ version = "0.2.2";
+ authors = [ "Frank Denis " ];
+ sha256 = "0iyx7nlzfny9ly1634a6zcq0yvrinhxhypwas4p8ry3zqnn76qqr";
+ inherit dependencies buildDependencies features;
+ };
+ strsim_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "strsim";
+ version = "0.6.0";
+ authors = [ "Danny Guo " ];
+ sha256 = "1lz85l6y68hr62lv4baww29yy7g8pg20dlr0lbaswxmmcb0wl7gd";
+ inherit dependencies buildDependencies features;
+ };
+ target_build_utils_0_3_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "target_build_utils";
+ version = "0.3.0";
+ authors = [ "Simonas Kazlauskas " ];
+ sha256 = "03vxpzmcsvzi1zzjj1h9c956m9s815v3ikrxa1mz1h5hzs3q7bkg";
+ build = "build.rs";
+ inherit dependencies buildDependencies features;
+ };
+ tempfile_2_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "tempfile";
+ version = "2.1.5";
+ authors = [ "Steven Allen " ];
+ sha256 = "1yz8aaj78z9gsn4b71y0m6fa5bnxhqafcczhxvmwra56k943aqkw";
+ build = "build.rs";
+ inherit dependencies buildDependencies features;
+ };
+ term_size_0_3_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "term_size";
+ version = "0.3.0";
+ authors = [ "Kevin K. " "Benjamin Sago " ];
+ sha256 = "054d5avad49sy5nfaaaphai4kv4rmdh6q0npchnvdhpxp02lcfhs";
+ inherit dependencies buildDependencies features;
+ };
+ toml_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "toml";
+ version = "0.2.1";
+ authors = [ "Alex Crichton " ];
+ sha256 = "0p4rkaqhmk4fp6iqpxfgp3p98hxhbs2wmla3fq531n875h922yqs";
+ inherit dependencies buildDependencies features;
+ };
+ unicode_segmentation_1_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "unicode-segmentation";
+ version = "1.1.0";
+ authors = [ "kwantam " ];
+ sha256 = "10hk7wy0217jwdbp27p36skwkig5lbhk482yfzij9m87h247rry0";
+ inherit dependencies buildDependencies features;
+ };
+ unicode_width_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "unicode-width";
+ version = "0.1.4";
+ authors = [ "kwantam " ];
+ sha256 = "1rp7a04icn9y5c0lm74nrd4py0rdl0af8bhdwq7g478n1xifpifl";
+ inherit dependencies buildDependencies features;
+ };
+ vec_map_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "vec_map";
+ version = "0.7.0";
+ authors = [ "Alex Crichton " "Jorge Aparicio " "Alexis Beingessner " "Brian Anderson <>" "tbu- <>" "Manish Goregaokar <>" "Aaron Turon " "Adolfo Ochagavía <>" "Niko Matsakis <>" "Steven Fackler <>" "Chase Southwood " "Eduard Burtescu <>" "Florian Wilkens <>" "Félix Raimundo <>" "Tibor Benke <>" "Markus Siemens " "Josh Branchaud " "Huon Wilson " "Corey Farwell " "Aaron Liblong <>" "Nick Cameron " "Patrick Walton " "Felix S Klock II <>" "Andrew Paseltiner " "Sean McArthur " "Vadim Petrochenkov <>" ];
+ sha256 = "0jawvi83b1nm101nam0w71kdyh7cy3fr0l9qj1hfcjvzvihfk2l1";
+ inherit dependencies buildDependencies features;
+ };
+ way_cooler_bg_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "way-cooler-bg";
+ version = "0.2.1";
+ authors = [ "Timidger " ];
+ sha256 = "04sa2g4kisc6g15fam7ciqya96l5ajfd8x2fq5i46m22qrvagvq2";
+ inherit dependencies buildDependencies features;
+ };
+ wayland_client_0_6_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "wayland-client";
+ version = "0.6.2";
+ authors = [ "Victor Berger " ];
+ sha256 = "04p9wjjvd4ahylhb27i7aggcrchcqk9ykpny6hjsc1lqfbqbhj3d";
+ build = "build.rs";
+ inherit dependencies buildDependencies features;
+ };
+ wayland_scanner_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "wayland-scanner";
+ version = "0.6.0";
+ authors = [ "Victor Berger " ];
+ sha256 = "01x9i8ngl9m3hngv7p0xb2qfwfxpcljhbrils506cf1l1q8838kb";
+ inherit dependencies buildDependencies features;
+ };
+ wayland_sys_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "wayland-sys";
+ version = "0.6.0";
+ authors = [ "Victor Berger " ];
+ sha256 = "0m6db0kld2d4xv4ai9kxlqrh362hwi0030b4zbss0sfha1hx5mfl";
+ inherit dependencies buildDependencies features;
+ };
+ winapi_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "winapi";
+ version = "0.2.8";
+ authors = [ "Peter Atashian " ];
+ sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as";
+ inherit dependencies buildDependencies features;
+ };
+ winapi_build_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "winapi-build";
+ version = "0.1.1";
+ authors = [ "Peter Atashian " ];
+ sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga";
+ libName = "build";
+ inherit dependencies buildDependencies features;
+ };
+ xml_rs_0_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "xml-rs";
+ version = "0.3.6";
+ authors = [ "Vladimir Matveev " ];
+ sha256 = "1g1cclib7fj900m4669vxlz45lxcq0m36g7cd8chl494c2xsgj15";
+ libPath = "src/lib.rs";
+ libName = "xml";
+ crateBin = [ { name = "xml-analyze"; path = "src/analyze.rs"; } ];
+ inherit dependencies buildDependencies features;
+ };
+
+in
+rec {
+ ansi_term_0_9_0 = ansi_term_0_9_0_ rec {};
+ atty_0_2_2 = atty_0_2_2_ rec {
+ dependencies = (if !(kernel == "windows") then [ libc_0_2_21 ] else [])
+ ++ (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ] else []);
+ };
+ libc_0_2_21_features."default".from_atty_0_2_2__default = true;
+ kernel32_sys_0_2_2_features."default".from_atty_0_2_2__default = true;
+ winapi_0_2_8_features."default".from_atty_0_2_2__default = true;
+ bitflags_0_6_0 = bitflags_0_6_0_ rec {};
+ bitflags_0_7_0 = bitflags_0_7_0_ rec {};
+ bitflags_0_8_2 = bitflags_0_8_2_ rec {
+ features = mkFeatures bitflags_0_8_2_features;
+ };
+ bitflags_0_8_2_features."i128".self_unstable = hasFeature (bitflags_0_8_2_features."unstable" or {});
+ byteorder_0_5_3 = byteorder_0_5_3_ rec {
+ features = mkFeatures byteorder_0_5_3_features;
+ };
+ byteorder_0_5_3_features."std".self_default = hasDefault byteorder_0_5_3_features;
+ byteorder_1_0_0 = byteorder_1_0_0_ rec {
+ features = mkFeatures byteorder_1_0_0_features;
+ };
+ byteorder_1_0_0_features."std".self_default = hasDefault byteorder_1_0_0_features;
+ clap_2_23_2 = clap_2_23_2_ rec {
+ dependencies = [ ansi_term_0_9_0 atty_0_2_2 bitflags_0_8_2 strsim_0_6_0 term_size_0_3_0 unicode_segmentation_1_1_0 unicode_width_0_1_4 vec_map_0_7_0 ]
+ ++ (if lib.lists.any (x: x == "ansi_term") features then [ansi_term_0_9_0] else []) ++ (if lib.lists.any (x: x == "atty") features then [atty_0_2_2] else []) ++ (if lib.lists.any (x: x == "strsim") features then [strsim_0_6_0] else []) ++ (if lib.lists.any (x: x == "term_size") features then [term_size_0_3_0] else []);
+ features = mkFeatures clap_2_23_2_features;
+ };
+ clap_2_23_2_features."".self = true;
+ clap_2_23_2_features."ansi_term".self_color = hasFeature (clap_2_23_2_features."color" or {});
+ clap_2_23_2_features."atty".self_color = hasFeature (clap_2_23_2_features."color" or {});
+ clap_2_23_2_features."suggestions".self_default = hasDefault clap_2_23_2_features;
+ clap_2_23_2_features."color".self_default = hasDefault clap_2_23_2_features;
+ clap_2_23_2_features."wrap_help".self_default = hasDefault clap_2_23_2_features;
+ clap_2_23_2_features."clippy".self_lints = hasFeature (clap_2_23_2_features."lints" or {});
+ clap_2_23_2_features."strsim".self_suggestions = hasFeature (clap_2_23_2_features."suggestions" or {});
+ clap_2_23_2_features."term_size".self_wrap_help = hasFeature (clap_2_23_2_features."wrap_help" or {});
+ clap_2_23_2_features."yaml-rust".self_yaml = hasFeature (clap_2_23_2_features."yaml" or {});
+ ansi_term_0_9_0_features."default".from_clap_2_23_2__default = true;
+ atty_0_2_2_features."default".from_clap_2_23_2__default = true;
+ bitflags_0_8_2_features."default".from_clap_2_23_2__default = true;
+ clippy_0_0_0_features."default".from_clap_2_23_2__default = true;
+ strsim_0_6_0_features."default".from_clap_2_23_2__default = true;
+ term_size_0_3_0_features."default".from_clap_2_23_2__default = true;
+ unicode_segmentation_1_1_0_features."default".from_clap_2_23_2__default = true;
+ unicode_width_0_1_4_features."default".from_clap_2_23_2__default = true;
+ vec_map_0_7_0_features."default".from_clap_2_23_2__default = true;
+ yaml_rust_0_0_0_features."default".from_clap_2_23_2__default = true;
+ color_quant_1_0_0 = color_quant_1_0_0_ rec {};
+ dbus_0_5_2 = dbus_0_5_2_ rec {
+ dependencies = [ libc_0_2_21 ];
+ buildDependencies = [ metadeps_1_1_1 ];
+ features = mkFeatures dbus_0_5_2_features;
+ };
+ dbus_0_5_2_features."".self = true;
+ libc_0_2_21_features."default".from_dbus_0_5_2__default = true;
+ deque_0_3_1 = deque_0_3_1_ rec {
+ dependencies = [ rand_0_3_15 ];
+ };
+ rand_0_3_15_features."default".from_deque_0_3_1__default = true;
+ dlib_0_3_1 = dlib_0_3_1_ rec {
+ dependencies = [ libloading_0_3_4 ];
+ features = mkFeatures dlib_0_3_1_features;
+ };
+ dlib_0_3_1_features."".self = true;
+ libloading_0_3_4_features."default".from_dlib_0_3_1__default = true;
+ dtoa_0_4_1 = dtoa_0_4_1_ rec {};
+ enum_primitive_0_1_1 = enum_primitive_0_1_1_ rec {
+ dependencies = [ num_traits_0_1_37 ];
+ };
+ num_traits_0_1_37_features."default".from_enum_primitive_0_1_1__default = false;
+ error_chain_0_7_2 = error_chain_0_7_2_ rec {
+ dependencies = [];
+ features = mkFeatures error_chain_0_7_2_features;
+ };
+ error_chain_0_7_2_features."backtrace".self_default = hasDefault error_chain_0_7_2_features;
+ error_chain_0_7_2_features."example_generated".self_default = hasDefault error_chain_0_7_2_features;
+ backtrace_0_0_0_features."default".from_error_chain_0_7_2__default = true;
+ flate2_0_2_19 = flate2_0_2_19_ rec {
+ dependencies = [ libc_0_2_21 miniz_sys_0_1_9 ]
+ ++ (if lib.lists.any (x: x == "miniz-sys") features then [miniz_sys_0_1_9] else []);
+ features = mkFeatures flate2_0_2_19_features;
+ };
+ flate2_0_2_19_features."".self = true;
+ flate2_0_2_19_features."miniz-sys".self_default = hasDefault flate2_0_2_19_features;
+ flate2_0_2_19_features."tokio-io".self_tokio = hasFeature (flate2_0_2_19_features."tokio" or {});
+ flate2_0_2_19_features."futures".self_tokio = hasFeature (flate2_0_2_19_features."tokio" or {});
+ flate2_0_2_19_features."libz-sys".self_zlib = hasFeature (flate2_0_2_19_features."zlib" or {});
+ futures_0_0_0_features."default".from_flate2_0_2_19__default = true;
+ libc_0_2_21_features."default".from_flate2_0_2_19__default = true;
+ libz_sys_0_0_0_features."default".from_flate2_0_2_19__default = true;
+ miniz_sys_0_1_9_features."default".from_flate2_0_2_19__default = true;
+ tokio_io_0_0_0_features."default".from_flate2_0_2_19__default = true;
+ gcc_0_3_45 = gcc_0_3_45_ rec {
+ dependencies = [];
+ features = mkFeatures gcc_0_3_45_features;
+ };
+ gcc_0_3_45_features."rayon".self_parallel = hasFeature (gcc_0_3_45_features."parallel" or {});
+ rayon_0_0_0_features."default".from_gcc_0_3_45__default = true;
+ gif_0_9_1 = gif_0_9_1_ rec {
+ dependencies = [ color_quant_1_0_0 lzw_0_10_0 ];
+ features = mkFeatures gif_0_9_1_features;
+ };
+ gif_0_9_1_features."libc".self_c_api = hasFeature (gif_0_9_1_features."c_api" or {});
+ gif_0_9_1_features."raii_no_panic".self_default = hasDefault gif_0_9_1_features;
+ color_quant_1_0_0_features."default".from_gif_0_9_1__default = true;
+ libc_0_0_0_features."default".from_gif_0_9_1__default = true;
+ lzw_0_10_0_features."default".from_gif_0_9_1__default = true;
+ glob_0_2_11 = glob_0_2_11_ rec {};
+ image_0_10_4 = image_0_10_4_ rec {
+ dependencies = [ byteorder_0_5_3 enum_primitive_0_1_1 gif_0_9_1 glob_0_2_11 jpeg_decoder_0_1_12 num_iter_0_1_33 num_rational_0_1_36 num_traits_0_1_37 png_0_5_2 scoped_threadpool_0_1_7 ]
+ ++ (if lib.lists.any (x: x == "gif") features then [gif_0_9_1] else []) ++ (if lib.lists.any (x: x == "jpeg-decoder") features then [jpeg_decoder_0_1_12] else []) ++ (if lib.lists.any (x: x == "png") features then [png_0_5_2] else []) ++ (if lib.lists.any (x: x == "scoped_threadpool") features then [scoped_threadpool_0_1_7] else []);
+ features = mkFeatures image_0_10_4_features;
+ };
+ image_0_10_4_features."".self = true;
+ image_0_10_4_features."gif_codec".self_default = hasDefault image_0_10_4_features;
+ image_0_10_4_features."jpeg".self_default = hasDefault image_0_10_4_features;
+ image_0_10_4_features."ico".self_default = hasDefault image_0_10_4_features;
+ image_0_10_4_features."png_codec".self_default = hasDefault image_0_10_4_features;
+ image_0_10_4_features."ppm".self_default = hasDefault image_0_10_4_features;
+ image_0_10_4_features."tga".self_default = hasDefault image_0_10_4_features;
+ image_0_10_4_features."tiff".self_default = hasDefault image_0_10_4_features;
+ image_0_10_4_features."webp".self_default = hasDefault image_0_10_4_features;
+ image_0_10_4_features."bmp".self_default = hasDefault image_0_10_4_features;
+ image_0_10_4_features."hdr".self_default = hasDefault image_0_10_4_features;
+ image_0_10_4_features."gif".self_gif_codec = hasFeature (image_0_10_4_features."gif_codec" or {});
+ image_0_10_4_features."scoped_threadpool".self_hdr = hasFeature (image_0_10_4_features."hdr" or {});
+ image_0_10_4_features."bmp".self_ico = hasFeature (image_0_10_4_features."ico" or {});
+ image_0_10_4_features."png_codec".self_ico = hasFeature (image_0_10_4_features."ico" or {});
+ image_0_10_4_features."jpeg-decoder".self_jpeg = hasFeature (image_0_10_4_features."jpeg" or {});
+ image_0_10_4_features."png".self_png_codec = hasFeature (image_0_10_4_features."png_codec" or {});
+ byteorder_0_5_3_features."default".from_image_0_10_4__default = true;
+ enum_primitive_0_1_1_features."default".from_image_0_10_4__default = true;
+ gif_0_9_1_features."default".from_image_0_10_4__default = true;
+ glob_0_2_11_features."default".from_image_0_10_4__default = true;
+ jpeg_decoder_0_1_12_features."default".from_image_0_10_4__default = true;
+ num_iter_0_1_33_features."default".from_image_0_10_4__default = true;
+ num_rational_0_1_36_features."default".from_image_0_10_4__default = true;
+ num_traits_0_1_37_features."default".from_image_0_10_4__default = true;
+ png_0_5_2_features."default".from_image_0_10_4__default = true;
+ scoped_threadpool_0_1_7_features."default".from_image_0_10_4__default = true;
+ inflate_0_1_1 = inflate_0_1_1_ rec {
+ features = mkFeatures inflate_0_1_1_features;
+ };
+ inflate_0_1_1_features."".self = true;
+ itoa_0_3_1 = itoa_0_3_1_ rec {};
+ jpeg_decoder_0_1_12 = jpeg_decoder_0_1_12_ rec {
+ dependencies = [ byteorder_1_0_0 rayon_0_7_0 ]
+ ++ (if lib.lists.any (x: x == "rayon") features then [rayon_0_7_0] else []);
+ features = mkFeatures jpeg_decoder_0_1_12_features;
+ };
+ jpeg_decoder_0_1_12_features."".self = true;
+ jpeg_decoder_0_1_12_features."rayon".self_default = hasDefault jpeg_decoder_0_1_12_features;
+ byteorder_1_0_0_features."default".from_jpeg_decoder_0_1_12__default = true;
+ rayon_0_7_0_features."default".from_jpeg_decoder_0_1_12__default = true;
+ kernel32_sys_0_2_2 = kernel32_sys_0_2_2_ rec {
+ dependencies = [ winapi_0_2_8 ];
+ buildDependencies = [ winapi_build_0_1_1 ];
+ };
+ winapi_0_2_8_features."default".from_kernel32_sys_0_2_2__default = true;
+ lazy_static_0_1_16 = lazy_static_0_1_16_ rec {
+ features = mkFeatures lazy_static_0_1_16_features;
+ };
+ lazy_static_0_1_16_features."".self = true;
+ lazy_static_0_2_8 = lazy_static_0_2_8_ rec {
+ dependencies = [];
+ features = mkFeatures lazy_static_0_2_8_features;
+ };
+ lazy_static_0_2_8_features."nightly".self_spin_no_std = hasFeature (lazy_static_0_2_8_features."spin_no_std" or {});
+ lazy_static_0_2_8_features."spin".self_spin_no_std = hasFeature (lazy_static_0_2_8_features."spin_no_std" or {});
+ spin_0_0_0_features."default".from_lazy_static_0_2_8__default = true;
+ libc_0_2_21 = libc_0_2_21_ rec {
+ features = mkFeatures libc_0_2_21_features;
+ };
+ libc_0_2_21_features."use_std".self_default = hasDefault libc_0_2_21_features;
+ libloading_0_3_4 = libloading_0_3_4_ rec {
+ dependencies = [ lazy_static_0_2_8 ]
+ ++ (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ] else []);
+ buildDependencies = [ target_build_utils_0_3_0 ];
+ };
+ lazy_static_0_2_8_features."default".from_libloading_0_3_4__default = true;
+ kernel32_sys_0_2_2_features."default".from_libloading_0_3_4__default = true;
+ winapi_0_2_8_features."default".from_libloading_0_3_4__default = true;
+ lzw_0_10_0 = lzw_0_10_0_ rec {
+ features = mkFeatures lzw_0_10_0_features;
+ };
+ lzw_0_10_0_features."raii_no_panic".self_default = hasDefault lzw_0_10_0_features;
+ metadeps_1_1_1 = metadeps_1_1_1_ rec {
+ dependencies = [ error_chain_0_7_2 pkg_config_0_3_9 toml_0_2_1 ];
+ };
+ error_chain_0_7_2_features."default".from_metadeps_1_1_1__default = false;
+ pkg_config_0_3_9_features."default".from_metadeps_1_1_1__default = true;
+ toml_0_2_1_features."default".from_metadeps_1_1_1__default = false;
+ miniz_sys_0_1_9 = miniz_sys_0_1_9_ rec {
+ dependencies = [ libc_0_2_21 ];
+ buildDependencies = [ gcc_0_3_45 ];
+ };
+ libc_0_2_21_features."default".from_miniz_sys_0_1_9__default = true;
+ num_bigint_0_1_37 = num_bigint_0_1_37_ rec {
+ dependencies = [ num_integer_0_1_34 num_traits_0_1_37 rand_0_3_15 rustc_serialize_0_3_23 ]
+ ++ (if lib.lists.any (x: x == "rand") features then [rand_0_3_15] else []) ++ (if lib.lists.any (x: x == "rustc-serialize") features then [rustc_serialize_0_3_23] else []);
+ features = mkFeatures num_bigint_0_1_37_features;
+ };
+ num_bigint_0_1_37_features."".self = true;
+ num_bigint_0_1_37_features."rand".self_default = hasDefault num_bigint_0_1_37_features;
+ num_bigint_0_1_37_features."rustc-serialize".self_default = hasDefault num_bigint_0_1_37_features;
+ num_integer_0_1_34_features."default".from_num_bigint_0_1_37__default = true;
+ num_traits_0_1_37_features."default".from_num_bigint_0_1_37__default = true;
+ rand_0_3_15_features."default".from_num_bigint_0_1_37__default = true;
+ rustc_serialize_0_3_23_features."default".from_num_bigint_0_1_37__default = true;
+ serde_0_0_0_features."default".from_num_bigint_0_1_37__default = true;
+ num_integer_0_1_34 = num_integer_0_1_34_ rec {
+ dependencies = [ num_traits_0_1_37 ];
+ };
+ num_traits_0_1_37_features."default".from_num_integer_0_1_34__default = true;
+ num_iter_0_1_33 = num_iter_0_1_33_ rec {
+ dependencies = [ num_integer_0_1_34 num_traits_0_1_37 ];
+ };
+ num_integer_0_1_34_features."default".from_num_iter_0_1_33__default = true;
+ num_traits_0_1_37_features."default".from_num_iter_0_1_33__default = true;
+ num_rational_0_1_36 = num_rational_0_1_36_ rec {
+ dependencies = [ num_bigint_0_1_37 num_integer_0_1_34 num_traits_0_1_37 rustc_serialize_0_3_23 ]
+ ++ (if lib.lists.any (x: x == "num-bigint") features then [num_bigint_0_1_37] else []) ++ (if lib.lists.any (x: x == "rustc-serialize") features then [rustc_serialize_0_3_23] else []);
+ features = mkFeatures num_rational_0_1_36_features;
+ };
+ num_rational_0_1_36_features."".self = true;
+ num_rational_0_1_36_features."num-bigint".self_bigint = hasFeature (num_rational_0_1_36_features."bigint" or {});
+ num_rational_0_1_36_features."bigint".self_default = hasDefault num_rational_0_1_36_features;
+ num_rational_0_1_36_features."rustc-serialize".self_default = hasDefault num_rational_0_1_36_features;
+ num_bigint_0_1_37_features."default".from_num_rational_0_1_36__default = true;
+ num_integer_0_1_34_features."default".from_num_rational_0_1_36__default = true;
+ num_traits_0_1_37_features."default".from_num_rational_0_1_36__default = true;
+ rustc_serialize_0_3_23_features."default".from_num_rational_0_1_36__default = true;
+ serde_0_0_0_features."default".from_num_rational_0_1_36__default = true;
+ num_traits_0_1_37 = num_traits_0_1_37_ rec {};
+ num_cpus_1_3_0 = num_cpus_1_3_0_ rec {
+ dependencies = [ libc_0_2_21 ];
+ };
+ libc_0_2_21_features."default".from_num_cpus_1_3_0__default = true;
+ phf_0_7_21 = phf_0_7_21_ rec {
+ dependencies = [ phf_shared_0_7_21 ];
+ features = mkFeatures phf_0_7_21_features;
+ };
+ phf_0_7_21_features."".self = true;
+ phf_shared_0_7_21_features."core".from_phf_0_7_21__core = hasFeature (phf_0_7_21_features."core" or {});
+ phf_shared_0_7_21_features."unicase".from_phf_0_7_21__unicase = hasFeature (phf_0_7_21_features."unicase" or {});
+ phf_shared_0_7_21_features."default".from_phf_0_7_21__default = true;
+ phf_codegen_0_7_21 = phf_codegen_0_7_21_ rec {
+ dependencies = [ phf_generator_0_7_21 phf_shared_0_7_21 ];
+ };
+ phf_generator_0_7_21_features."default".from_phf_codegen_0_7_21__default = true;
+ phf_shared_0_7_21_features."default".from_phf_codegen_0_7_21__default = true;
+ phf_generator_0_7_21 = phf_generator_0_7_21_ rec {
+ dependencies = [ phf_shared_0_7_21 rand_0_3_15 ];
+ };
+ phf_shared_0_7_21_features."default".from_phf_generator_0_7_21__default = true;
+ rand_0_3_15_features."default".from_phf_generator_0_7_21__default = true;
+ phf_shared_0_7_21 = phf_shared_0_7_21_ rec {
+ dependencies = [ siphasher_0_2_2 ];
+ features = mkFeatures phf_shared_0_7_21_features;
+ };
+ phf_shared_0_7_21_features."".self = true;
+ siphasher_0_2_2_features."default".from_phf_shared_0_7_21__default = true;
+ unicase_0_0_0_features."default".from_phf_shared_0_7_21__default = true;
+ pkg_config_0_3_9 = pkg_config_0_3_9_ rec {};
+ png_0_5_2 = png_0_5_2_ rec {
+ dependencies = [ bitflags_0_7_0 flate2_0_2_19 inflate_0_1_1 num_iter_0_1_33 ]
+ ++ (if lib.lists.any (x: x == "flate2") features then [flate2_0_2_19] else []);
+ features = mkFeatures png_0_5_2_features;
+ };
+ png_0_5_2_features."".self = true;
+ png_0_5_2_features."png-encoding".self_default = hasDefault png_0_5_2_features;
+ png_0_5_2_features."flate2".self_png-encoding = hasFeature (png_0_5_2_features."png-encoding" or {});
+ bitflags_0_7_0_features."default".from_png_0_5_2__default = true;
+ flate2_0_2_19_features."default".from_png_0_5_2__default = true;
+ inflate_0_1_1_features."default".from_png_0_5_2__default = true;
+ num_iter_0_1_33_features."default".from_png_0_5_2__default = true;
+ rand_0_3_15 = rand_0_3_15_ rec {
+ dependencies = [ libc_0_2_21 ];
+ };
+ libc_0_2_21_features."default".from_rand_0_3_15__default = true;
+ rayon_0_7_0 = rayon_0_7_0_ rec {
+ dependencies = [ rayon_core_1_0_0 ];
+ features = mkFeatures rayon_0_7_0_features;
+ };
+ rayon_0_7_0_features."".self = true;
+ rayon_core_1_0_0_features."unstable".from_rayon_0_7_0__unstable = hasFeature (rayon_0_7_0_features."unstable" or {});
+ rayon_core_1_0_0_features."default".from_rayon_0_7_0__default = true;
+ rayon_core_1_0_0 = rayon_core_1_0_0_ rec {
+ dependencies = [ deque_0_3_1 lazy_static_0_2_8 libc_0_2_21 num_cpus_1_3_0 rand_0_3_15 ];
+ features = mkFeatures rayon_core_1_0_0_features;
+ };
+ rayon_core_1_0_0_features."futures".self_unstable = hasFeature (rayon_core_1_0_0_features."unstable" or {});
+ deque_0_3_1_features."default".from_rayon_core_1_0_0__default = true;
+ futures_0_0_0_features."default".from_rayon_core_1_0_0__default = true;
+ lazy_static_0_2_8_features."default".from_rayon_core_1_0_0__default = true;
+ libc_0_2_21_features."default".from_rayon_core_1_0_0__default = true;
+ num_cpus_1_3_0_features."default".from_rayon_core_1_0_0__default = true;
+ rand_0_3_15_features."default".from_rayon_core_1_0_0__default = true;
+ rustc_serialize_0_3_23 = rustc_serialize_0_3_23_ rec {};
+ rustc_version_0_1_7 = rustc_version_0_1_7_ rec {
+ dependencies = [ semver_0_1_20 ];
+ };
+ semver_0_1_20_features."default".from_rustc_version_0_1_7__default = true;
+ scoped_threadpool_0_1_7 = scoped_threadpool_0_1_7_ rec {
+ features = mkFeatures scoped_threadpool_0_1_7_features;
+ };
+ scoped_threadpool_0_1_7_features."".self = true;
+ semver_0_1_20 = semver_0_1_20_ rec {};
+ serde_0_9_13 = serde_0_9_13_ rec {
+ dependencies = [];
+ features = mkFeatures serde_0_9_13_features;
+ };
+ serde_0_9_13_features."unstable".self_alloc = hasFeature (serde_0_9_13_features."alloc" or {});
+ serde_0_9_13_features."alloc".self_collections = hasFeature (serde_0_9_13_features."collections" or {});
+ serde_0_9_13_features."std".self_default = hasDefault serde_0_9_13_features;
+ serde_0_9_13_features."serde_derive".self_derive = hasFeature (serde_0_9_13_features."derive" or {});
+ serde_0_9_13_features."serde_derive".self_playground = hasFeature (serde_0_9_13_features."playground" or {});
+ serde_0_9_13_features."unstable".self_unstable-testing = hasFeature (serde_0_9_13_features."unstable-testing" or {});
+ serde_0_9_13_features."std".self_unstable-testing = hasFeature (serde_0_9_13_features."unstable-testing" or {});
+ serde_derive_0_0_0_features."default".from_serde_0_9_13__default = true;
+ serde_json_0_9_10 = serde_json_0_9_10_ rec {
+ dependencies = [ dtoa_0_4_1 itoa_0_3_1 num_traits_0_1_37 serde_0_9_13 ];
+ features = mkFeatures serde_json_0_9_10_features;
+ };
+ serde_json_0_9_10_features."linked-hash-map".self_preserve_order = hasFeature (serde_json_0_9_10_features."preserve_order" or {});
+ dtoa_0_4_1_features."default".from_serde_json_0_9_10__default = true;
+ itoa_0_3_1_features."default".from_serde_json_0_9_10__default = true;
+ linked_hash_map_0_0_0_features."default".from_serde_json_0_9_10__default = true;
+ num_traits_0_1_37_features."default".from_serde_json_0_9_10__default = true;
+ serde_0_9_13_features."default".from_serde_json_0_9_10__default = true;
+ siphasher_0_2_2 = siphasher_0_2_2_ rec {
+ dependencies = [];
+ };
+ clippy_0_0_0_features."default".from_siphasher_0_2_2__default = true;
+ strsim_0_6_0 = strsim_0_6_0_ rec {};
+ target_build_utils_0_3_0 = target_build_utils_0_3_0_ rec {
+ dependencies = [ phf_0_7_21 serde_json_0_9_10 ]
+ ++ (if lib.lists.any (x: x == "serde_json") features then [serde_json_0_9_10] else []);
+ buildDependencies = [ phf_codegen_0_7_21 ];
+ features = mkFeatures target_build_utils_0_3_0_features;
+ };
+ target_build_utils_0_3_0_features."".self = true;
+ target_build_utils_0_3_0_features."serde_json".self_default = hasDefault target_build_utils_0_3_0_features;
+ phf_0_7_21_features."default".from_target_build_utils_0_3_0__default = true;
+ serde_json_0_9_10_features."default".from_target_build_utils_0_3_0__default = true;
+ tempfile_2_1_5 = tempfile_2_1_5_ rec {
+ dependencies = [ rand_0_3_15 ]
+ ++ (if (kernel == "linux" || kernel == "darwin") then [ libc_0_2_21 ] else [])
+ ++ (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ] else []);
+ buildDependencies = [ rustc_version_0_1_7 ];
+ };
+ rand_0_3_15_features."default".from_tempfile_2_1_5__default = true;
+ libc_0_2_21_features."default".from_tempfile_2_1_5__default = true;
+ kernel32_sys_0_2_2_features."default".from_tempfile_2_1_5__default = true;
+ winapi_0_2_8_features."default".from_tempfile_2_1_5__default = true;
+ term_size_0_3_0 = term_size_0_3_0_ rec {
+ dependencies = []
+ ++ (if !(kernel == "windows") then [ libc_0_2_21 ] else [])
+ ++ (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ] else []);
+ features = mkFeatures term_size_0_3_0_features;
+ };
+ term_size_0_3_0_features."clippy".self_lints = hasFeature (term_size_0_3_0_features."lints" or {});
+ term_size_0_3_0_features."nightly".self_lints = hasFeature (term_size_0_3_0_features."lints" or {});
+ term_size_0_3_0_features."lints".self_travis = hasFeature (term_size_0_3_0_features."travis" or {});
+ term_size_0_3_0_features."nightly".self_travis = hasFeature (term_size_0_3_0_features."travis" or {});
+ clippy_0_0_0_features."default".from_term_size_0_3_0__default = true;
+ libc_0_2_21_features."default".from_term_size_0_3_0__default = true;
+ kernel32_sys_0_2_2_features."default".from_term_size_0_3_0__default = true;
+ winapi_0_2_8_features."default".from_term_size_0_3_0__default = true;
+ toml_0_2_1 = toml_0_2_1_ rec {
+ dependencies = [];
+ };
+ toml_0_2_1_features."rustc-serialize".self_default = hasDefault toml_0_2_1_features;
+ rustc_serialize_0_0_0_features."default".from_toml_0_2_1__default = true;
+ serde_0_0_0_features."default".from_toml_0_2_1__default = true;
+ unicode_segmentation_1_1_0 = unicode_segmentation_1_1_0_ rec {
+ features = mkFeatures unicode_segmentation_1_1_0_features;
+ };
+ unicode_segmentation_1_1_0_features."".self = true;
+ unicode_width_0_1_4 = unicode_width_0_1_4_ rec {
+ features = mkFeatures unicode_width_0_1_4_features;
+ };
+ unicode_width_0_1_4_features."".self = true;
+ vec_map_0_7_0 = vec_map_0_7_0_ rec {
+ dependencies = [];
+ features = mkFeatures vec_map_0_7_0_features;
+ };
+ vec_map_0_7_0_features."serde".self_eders = hasFeature (vec_map_0_7_0_features."eders" or {});
+ vec_map_0_7_0_features."serde_derive".self_eders = hasFeature (vec_map_0_7_0_features."eders" or {});
+ serde_0_0_0_features."default".from_vec_map_0_7_0__default = true;
+ serde_derive_0_0_0_features."default".from_vec_map_0_7_0__default = true;
+ way_cooler_bg_0_2_1 = way_cooler_bg_0_2_1_ rec {
+ dependencies = [ byteorder_0_5_3 clap_2_23_2 dbus_0_5_2 image_0_10_4 tempfile_2_1_5 wayland_client_0_6_2 wayland_sys_0_6_0 ];
+ };
+ byteorder_0_5_3_features."default".from_way_cooler_bg_0_2_1__default = true;
+ clap_2_23_2_features."default".from_way_cooler_bg_0_2_1__default = true;
+ dbus_0_5_2_features."default".from_way_cooler_bg_0_2_1__default = true;
+ image_0_10_4_features."default".from_way_cooler_bg_0_2_1__default = true;
+ tempfile_2_1_5_features."default".from_way_cooler_bg_0_2_1__default = true;
+ wayland_client_0_6_2_features."cursor".from_way_cooler_bg_0_2_1 = true;
+ wayland_client_0_6_2_features."dlopen".from_way_cooler_bg_0_2_1 = true;
+ wayland_client_0_6_2_features."default".from_way_cooler_bg_0_2_1__default = true;
+ wayland_sys_0_6_0_features."client".from_way_cooler_bg_0_2_1 = true;
+ wayland_sys_0_6_0_features."dlopen".from_way_cooler_bg_0_2_1 = true;
+ wayland_sys_0_6_0_features."default".from_way_cooler_bg_0_2_1__default = true;
+ wayland_client_0_6_2 = wayland_client_0_6_2_ rec {
+ dependencies = [ bitflags_0_6_0 libc_0_2_21 wayland_sys_0_6_0 ];
+ buildDependencies = [ wayland_scanner_0_6_0 ];
+ features = mkFeatures wayland_client_0_6_2_features;
+ };
+ wayland_client_0_6_2_features."wp-presentation_time".self_all_stable_protocols = hasFeature (wayland_client_0_6_2_features."all_stable_protocols" or {});
+ wayland_client_0_6_2_features."wp-viewporter".self_all_stable_protocols = hasFeature (wayland_client_0_6_2_features."all_stable_protocols" or {});
+ wayland_client_0_6_2_features."unstable-protocols".self_all_unstable_protocols = hasFeature (wayland_client_0_6_2_features."all_unstable_protocols" or {});
+ wayland_client_0_6_2_features."wpu-xdg_shell".self_all_unstable_protocols = hasFeature (wayland_client_0_6_2_features."all_unstable_protocols" or {});
+ bitflags_0_6_0_features."default".from_wayland_client_0_6_2__default = true;
+ lazy_static_0_0_0_features."default".from_wayland_client_0_6_2__default = true;
+ libc_0_2_21_features."default".from_wayland_client_0_6_2__default = true;
+ wayland_sys_0_6_0_features."client".from_wayland_client_0_6_2 = true;
+ wayland_sys_0_6_0_features."cursor".from_wayland_client_0_6_2__cursor = hasFeature (wayland_client_0_6_2_features."cursor" or {});
+ wayland_sys_0_6_0_features."dlopen".from_wayland_client_0_6_2__dlopen = hasFeature (wayland_client_0_6_2_features."dlopen" or {});
+ wayland_sys_0_6_0_features."egl".from_wayland_client_0_6_2__egl = hasFeature (wayland_client_0_6_2_features."egl" or {});
+ wayland_sys_0_6_0_features."default".from_wayland_client_0_6_2__default = true;
+ wayland_scanner_0_6_0 = wayland_scanner_0_6_0_ rec {
+ dependencies = [ xml_rs_0_3_6 ];
+ };
+ xml_rs_0_3_6_features."default".from_wayland_scanner_0_6_0__default = true;
+ wayland_sys_0_6_0 = wayland_sys_0_6_0_ rec {
+ dependencies = [ dlib_0_3_1 lazy_static_0_1_16 ]
+ ++ (if lib.lists.any (x: x == "lazy_static") features then [lazy_static_0_1_16] else []);
+ features = mkFeatures wayland_sys_0_6_0_features;
+ };
+ wayland_sys_0_6_0_features."".self = true;
+ wayland_sys_0_6_0_features."lazy_static".self_dlopen = hasFeature (wayland_sys_0_6_0_features."dlopen" or {});
+ wayland_sys_0_6_0_features."libc".self_server = hasFeature (wayland_sys_0_6_0_features."server" or {});
+ dlib_0_3_1_features."dlopen".from_wayland_sys_0_6_0__dlopen = hasFeature (wayland_sys_0_6_0_features."dlopen" or {});
+ dlib_0_3_1_features."default".from_wayland_sys_0_6_0__default = true;
+ lazy_static_0_1_16_features."default".from_wayland_sys_0_6_0__default = true;
+ libc_0_0_0_features."default".from_wayland_sys_0_6_0__default = true;
+ winapi_0_2_8 = winapi_0_2_8_ rec {};
+ winapi_build_0_1_1 = winapi_build_0_1_1_ rec {};
+ xml_rs_0_3_6 = xml_rs_0_3_6_ rec {
+ dependencies = [ bitflags_0_7_0 ];
+ };
+ bitflags_0_7_0_features."default".from_xml_rs_0_3_6__default = true;
+}
diff --git a/pkgs/applications/window-managers/way-cooler/wc-grab.nix b/pkgs/applications/window-managers/way-cooler/wc-grab.nix
new file mode 100644
index 0000000000000000000000000000000000000000..bc5d937206de602c5e386b9130a8cc59aaf48aa5
--- /dev/null
+++ b/pkgs/applications/window-managers/way-cooler/wc-grab.nix
@@ -0,0 +1,562 @@
+# Generated by carnix 0.5.0: carnix -o wc-grab.nix Cargo.lock
+{ lib, buildPlatform, buildRustCrate, fetchgit }:
+let kernel = buildPlatform.parsed.kernel.name;
+ abi = buildPlatform.parsed.abi.name;
+ hasFeature = feature:
+ lib.lists.any
+ (originName: feature.${originName})
+ (builtins.attrNames feature);
+
+ hasDefault = feature:
+ let defaultFeatures = builtins.attrNames (feature."default" or {}); in
+ (defaultFeatures == [])
+ || (lib.lists.any (originName: feature."default".${originName}) defaultFeatures);
+
+ mkFeatures = feat: lib.lists.foldl (features: featureName:
+ if featureName != "" && hasFeature feat.${featureName} then
+ [ featureName ] ++ features
+ else
+ features
+ ) (if hasDefault feat then [ "default" ] else []) (builtins.attrNames feat);
+ adler32_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "adler32";
+ version = "1.0.0";
+ authors = [ "Remi Rampin " ];
+ sha256 = "0pj35a7m4apn5xjg9n63gsdj6w8iw76zg4p9znrij43xnfqp084w";
+ inherit dependencies buildDependencies features;
+ };
+ ansi_term_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "ansi_term";
+ version = "0.9.0";
+ authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) " ];
+ sha256 = "1vcd8m2hglrdi4zmqnkkz5zy3c73ifgii245k7vj6qr5dzpn9hij";
+ inherit dependencies buildDependencies features;
+ };
+ atty_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "atty";
+ version = "0.2.2";
+ authors = [ "softprops " ];
+ sha256 = "05c6jvrxljp4s1aycgq2z3y56f7f5yvc56v25cqlmpc1qx65z7ba";
+ inherit dependencies buildDependencies features;
+ };
+ bitflags_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "bitflags";
+ version = "0.7.0";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "1hr72xg5slm0z4pxs2hiy4wcyx3jva70h58b7mid8l0a4c8f7gn5";
+ inherit dependencies buildDependencies features;
+ };
+ bitflags_0_8_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "bitflags";
+ version = "0.8.0";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "1h489m0wzhng5gvvc40jgdbaf0ac3rgkka31vwinhsjmfvrqcc4v";
+ inherit dependencies buildDependencies features;
+ };
+ byteorder_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "byteorder";
+ version = "1.0.0";
+ authors = [ "Andrew Gallant " ];
+ sha256 = "14pdnds4517vcpablc51vv76hvc3glnpkpbb7qdil591q7lyb0m1";
+ inherit dependencies buildDependencies features;
+ };
+ clap_2_22_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "clap";
+ version = "2.22.0";
+ authors = [ "Kevin K. " ];
+ sha256 = "0gdgyfh3ydpd2px4xh0i5qd6bhi2c5f43bqv9z4kla9vkmmfiavd";
+ inherit dependencies buildDependencies features;
+ };
+ color_quant_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "color_quant";
+ version = "1.0.0";
+ authors = [ "nwin " ];
+ sha256 = "0jwr40lr115zm2bydk1wja12gcxrmgsx0n1z1pipq00sab71maaj";
+ inherit dependencies buildDependencies features;
+ };
+ dbus_0_5_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "dbus";
+ version = "0.5.2";
+ authors = [ "David Henningsson " ];
+ sha256 = "1ga3p2myqxbz34n2bbw4gk1ipf76mjr8r2rvrvnalwggymzfkhj7";
+ build = "build.rs";
+ inherit dependencies buildDependencies features;
+ };
+ deflate_0_7_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "deflate";
+ version = "0.7.5";
+ authors = [ "oyvindln " ];
+ sha256 = "18bcmdkyshnzpkxx22b29gn55g6bk5ysy98ghjpjhxy3hky96rvy";
+ inherit dependencies buildDependencies features;
+ };
+ deque_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "deque";
+ version = "0.3.1";
+ authors = [ "Alex Crichton " "Samuel Fredrickson " "Linus Färnstrand " "Amanieu d'Antras " ];
+ sha256 = "04x8i5aagxmslk350i8qszyw7kmvrqc3d99g4qi1xnfmr61y7m68";
+ inherit dependencies buildDependencies features;
+ };
+ enum_primitive_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "enum_primitive";
+ version = "0.1.1";
+ authors = [ "Anders Kaseorg " ];
+ sha256 = "1a225rlsz7sz3nn14dar71kp2f9v08s3rwl6j55xp51mv01f695y";
+ inherit dependencies buildDependencies features;
+ };
+ error_chain_0_7_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "error-chain";
+ version = "0.7.2";
+ authors = [ "Brian Anderson " "Paul Colomiets " "Colin Kiegel " "Yamakaky " ];
+ sha256 = "0b1r4ggdgy1djfvz2s4l5kirmfsmxd286y6wx0p9ahv2phb7inyi";
+ inherit dependencies buildDependencies features;
+ };
+ gif_0_9_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "gif";
+ version = "0.9.1";
+ authors = [ "nwin " ];
+ sha256 = "16s7b0rqc6gg1fcbppakm3jy2q462w3qvykcmcmifmg7q7lwsg6r";
+ inherit dependencies buildDependencies features;
+ };
+ glob_0_2_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "glob";
+ version = "0.2.11";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "104389jjxs8r2f5cc9p0axhjmndgln60ih5x4f00ccgg9d3zarlf";
+ inherit dependencies buildDependencies features;
+ };
+ image_0_12_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "image";
+ version = "0.12.3";
+ authors = [ "ccgn" "bvssvni " "nwin" "TyOverby " ];
+ sha256 = "12xdzi29vr19gz3h93c1ihyvyv9xar9sp0inrjwwvlbjvn8nn0p9";
+ libPath = "./src/lib.rs";
+ inherit dependencies buildDependencies features;
+ };
+ inflate_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "inflate";
+ version = "0.1.1";
+ authors = [ "nwin " ];
+ sha256 = "112kh9hjcjjxdybl032mdhpwnr3qxw8j0ch6hwanwpcf3gz42g1h";
+ inherit dependencies buildDependencies features;
+ };
+ jpeg_decoder_0_1_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "jpeg-decoder";
+ version = "0.1.11";
+ authors = [ "Ulf Nilsson " ];
+ sha256 = "1xm39c1cff5gkczs164371hk2gpkjpkbw63k4f8mjnpwwpn9xk4n";
+ inherit dependencies buildDependencies features;
+ };
+ kernel32_sys_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "kernel32-sys";
+ version = "0.2.2";
+ authors = [ "Peter Atashian " ];
+ sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj";
+ libName = "kernel32";
+ build = "build.rs";
+ inherit dependencies buildDependencies features;
+ };
+ libc_0_2_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "libc";
+ version = "0.2.21";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "0glj3lxwc8358cfw9pb5dd4zr9iynzj6w2ly59nshrggsw021j75";
+ inherit dependencies buildDependencies features;
+ };
+ lzw_0_10_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "lzw";
+ version = "0.10.0";
+ authors = [ "nwin " ];
+ sha256 = "1cfsy2w26kbz9bjaqp9dh1wyyh47rpmhwvj4jpc1rmffbf438fvb";
+ inherit dependencies buildDependencies features;
+ };
+ metadeps_1_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "metadeps";
+ version = "1.1.1";
+ authors = [ "Josh Triplett " ];
+ sha256 = "1px8v94jn4ps63gqmvgsfcqxrwjhpa9z4xr0y1lh95wn2063fsar";
+ inherit dependencies buildDependencies features;
+ };
+ num_integer_0_1_33_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "num-integer";
+ version = "0.1.33";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "1rhy9lf4lhl7r8278n73mi9y55v9a71639as3v92bj2gk1x4k729";
+ inherit dependencies buildDependencies features;
+ };
+ num_iter_0_1_33_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "num-iter";
+ version = "0.1.33";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "1xjzf2p2vaqwknkr4s8ka5hn6cpr5rsshnydbpkn2pvapfzdrqd3";
+ inherit dependencies buildDependencies features;
+ };
+ num_rational_0_1_36_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "num-rational";
+ version = "0.1.36";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "0jibhs8xiap2wlv1xjwdvhyj4yrxwfisqbnfm53vjm5ldlijp87p";
+ inherit dependencies buildDependencies features;
+ };
+ num_traits_0_1_37_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "num-traits";
+ version = "0.1.37";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "0rwzfmdjq6iz6plva2gi7agvy1w9sjs7aqjh0p115w57xiix2224";
+ inherit dependencies buildDependencies features;
+ };
+ num_cpus_1_3_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "num_cpus";
+ version = "1.3.0";
+ authors = [ "Sean McArthur " ];
+ sha256 = "0i0zm6qh932k9b67qf7f1vsczkdim5kg9qv73m7y5hhw1i781rrb";
+ inherit dependencies buildDependencies features;
+ };
+ pkg_config_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "pkg-config";
+ version = "0.3.9";
+ authors = [ "Alex Crichton " ];
+ sha256 = "06k8fxgrsrxj8mjpjcq1n7mn2p1shpxif4zg9y5h09c7vy20s146";
+ inherit dependencies buildDependencies features;
+ };
+ png_0_6_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "png";
+ version = "0.6.2";
+ authors = [ "nwin " ];
+ sha256 = "03i78w5jbvk9y6babfrh7h0akvg81pcyyhniilv24z5v0vh5jvjs";
+ inherit dependencies buildDependencies features;
+ };
+ rand_0_3_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "rand";
+ version = "0.3.15";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "1fs30rc1xic40s1n7l3y7pxzfifpy03mgrvhy5ggp5p7zjfv3rr8";
+ inherit dependencies buildDependencies features;
+ };
+ rayon_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "rayon";
+ version = "0.6.0";
+ authors = [ "Niko Matsakis " ];
+ sha256 = "0y2693bari5j4h46mjzkyc9lkfbnq2d1p0ldyn6sb02jn63lpw97";
+ inherit dependencies buildDependencies features;
+ };
+ scoped_threadpool_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "scoped_threadpool";
+ version = "0.1.7";
+ authors = [ "Marvin Löbel " ];
+ sha256 = "0dg58f18i6v071640062n0vymr4h42cnj0xy8a7b80sc0mddykyk";
+ inherit dependencies buildDependencies features;
+ };
+ strsim_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "strsim";
+ version = "0.6.0";
+ authors = [ "Danny Guo " ];
+ sha256 = "1lz85l6y68hr62lv4baww29yy7g8pg20dlr0lbaswxmmcb0wl7gd";
+ inherit dependencies buildDependencies features;
+ };
+ term_size_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "term_size";
+ version = "0.2.3";
+ authors = [ "Kevin K. " "Benjamin Sago " ];
+ sha256 = "16b7gq2dmz7mws4vgai7whxy4xkg4yvlhm7spz0q6jyipqfq87ci";
+ inherit dependencies buildDependencies features;
+ };
+ toml_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "toml";
+ version = "0.2.1";
+ authors = [ "Alex Crichton " ];
+ sha256 = "0p4rkaqhmk4fp6iqpxfgp3p98hxhbs2wmla3fq531n875h922yqs";
+ inherit dependencies buildDependencies features;
+ };
+ unicode_segmentation_1_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "unicode-segmentation";
+ version = "1.1.0";
+ authors = [ "kwantam " ];
+ sha256 = "10hk7wy0217jwdbp27p36skwkig5lbhk482yfzij9m87h247rry0";
+ inherit dependencies buildDependencies features;
+ };
+ unicode_width_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "unicode-width";
+ version = "0.1.4";
+ authors = [ "kwantam " ];
+ sha256 = "1rp7a04icn9y5c0lm74nrd4py0rdl0af8bhdwq7g478n1xifpifl";
+ inherit dependencies buildDependencies features;
+ };
+ vec_map_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "vec_map";
+ version = "0.7.0";
+ authors = [ "Alex Crichton " "Jorge Aparicio " "Alexis Beingessner " "Brian Anderson <>" "tbu- <>" "Manish Goregaokar <>" "Aaron Turon " "Adolfo Ochagavía <>" "Niko Matsakis <>" "Steven Fackler <>" "Chase Southwood " "Eduard Burtescu <>" "Florian Wilkens <>" "Félix Raimundo <>" "Tibor Benke <>" "Markus Siemens " "Josh Branchaud " "Huon Wilson " "Corey Farwell " "Aaron Liblong <>" "Nick Cameron " "Patrick Walton " "Felix S Klock II <>" "Andrew Paseltiner " "Sean McArthur " "Vadim Petrochenkov <>" ];
+ sha256 = "0jawvi83b1nm101nam0w71kdyh7cy3fr0l9qj1hfcjvzvihfk2l1";
+ inherit dependencies buildDependencies features;
+ };
+ wc_grab_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "wc-grab";
+ version = "0.2.0";
+ authors = [ "Timidger " ];
+ src = ./.;
+ inherit dependencies buildDependencies features;
+ };
+ winapi_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "winapi";
+ version = "0.2.8";
+ authors = [ "Peter Atashian " ];
+ sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as";
+ inherit dependencies buildDependencies features;
+ };
+ winapi_build_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "winapi-build";
+ version = "0.1.1";
+ authors = [ "Peter Atashian " ];
+ sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga";
+ libName = "build";
+ inherit dependencies buildDependencies features;
+ };
+
+in
+rec {
+ adler32_1_0_0 = adler32_1_0_0_ rec {};
+ ansi_term_0_9_0 = ansi_term_0_9_0_ rec {};
+ atty_0_2_2 = atty_0_2_2_ rec {
+ dependencies = (if !(kernel == "windows") then [ libc_0_2_21 ] else [])
+ ++ (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ] else []);
+ };
+ libc_0_2_21_features."default".from_atty_0_2_2__default = true;
+ kernel32_sys_0_2_2_features."default".from_atty_0_2_2__default = true;
+ winapi_0_2_8_features."default".from_atty_0_2_2__default = true;
+ bitflags_0_7_0 = bitflags_0_7_0_ rec {};
+ bitflags_0_8_0 = bitflags_0_8_0_ rec {
+ features = mkFeatures bitflags_0_8_0_features;
+ };
+ bitflags_0_8_0_features."i128".self_unstable = hasFeature (bitflags_0_8_0_features."unstable" or {});
+ byteorder_1_0_0 = byteorder_1_0_0_ rec {
+ features = mkFeatures byteorder_1_0_0_features;
+ };
+ byteorder_1_0_0_features."std".self_default = hasDefault byteorder_1_0_0_features;
+ clap_2_22_0 = clap_2_22_0_ rec {
+ dependencies = [ ansi_term_0_9_0 atty_0_2_2 bitflags_0_8_0 strsim_0_6_0 term_size_0_2_3 unicode_segmentation_1_1_0 unicode_width_0_1_4 vec_map_0_7_0 ]
+ ++ (if lib.lists.any (x: x == "ansi_term") features then [ansi_term_0_9_0] else []) ++ (if lib.lists.any (x: x == "atty") features then [atty_0_2_2] else []) ++ (if lib.lists.any (x: x == "strsim") features then [strsim_0_6_0] else []) ++ (if lib.lists.any (x: x == "term_size") features then [term_size_0_2_3] else []);
+ features = mkFeatures clap_2_22_0_features;
+ };
+ clap_2_22_0_features."".self = true;
+ clap_2_22_0_features."ansi_term".self_color = hasFeature (clap_2_22_0_features."color" or {});
+ clap_2_22_0_features."atty".self_color = hasFeature (clap_2_22_0_features."color" or {});
+ clap_2_22_0_features."suggestions".self_default = hasDefault clap_2_22_0_features;
+ clap_2_22_0_features."color".self_default = hasDefault clap_2_22_0_features;
+ clap_2_22_0_features."wrap_help".self_default = hasDefault clap_2_22_0_features;
+ clap_2_22_0_features."clippy".self_lints = hasFeature (clap_2_22_0_features."lints" or {});
+ clap_2_22_0_features."strsim".self_suggestions = hasFeature (clap_2_22_0_features."suggestions" or {});
+ clap_2_22_0_features."term_size".self_wrap_help = hasFeature (clap_2_22_0_features."wrap_help" or {});
+ clap_2_22_0_features."yaml-rust".self_yaml = hasFeature (clap_2_22_0_features."yaml" or {});
+ ansi_term_0_9_0_features."default".from_clap_2_22_0__default = true;
+ atty_0_2_2_features."default".from_clap_2_22_0__default = true;
+ bitflags_0_8_0_features."default".from_clap_2_22_0__default = true;
+ clippy_0_0_0_features."default".from_clap_2_22_0__default = true;
+ strsim_0_6_0_features."default".from_clap_2_22_0__default = true;
+ term_size_0_2_3_features."default".from_clap_2_22_0__default = true;
+ unicode_segmentation_1_1_0_features."default".from_clap_2_22_0__default = true;
+ unicode_width_0_1_4_features."default".from_clap_2_22_0__default = true;
+ vec_map_0_7_0_features."default".from_clap_2_22_0__default = true;
+ yaml_rust_0_0_0_features."default".from_clap_2_22_0__default = true;
+ color_quant_1_0_0 = color_quant_1_0_0_ rec {};
+ dbus_0_5_2 = dbus_0_5_2_ rec {
+ dependencies = [ libc_0_2_21 ];
+ buildDependencies = [ metadeps_1_1_1 ];
+ features = mkFeatures dbus_0_5_2_features;
+ };
+ dbus_0_5_2_features."".self = true;
+ libc_0_2_21_features."default".from_dbus_0_5_2__default = true;
+ deflate_0_7_5 = deflate_0_7_5_ rec {
+ dependencies = [ adler32_1_0_0 byteorder_1_0_0 ];
+ };
+ adler32_1_0_0_features."default".from_deflate_0_7_5__default = true;
+ byteorder_1_0_0_features."default".from_deflate_0_7_5__default = true;
+ deque_0_3_1 = deque_0_3_1_ rec {
+ dependencies = [ rand_0_3_15 ];
+ };
+ rand_0_3_15_features."default".from_deque_0_3_1__default = true;
+ enum_primitive_0_1_1 = enum_primitive_0_1_1_ rec {
+ dependencies = [ num_traits_0_1_37 ];
+ };
+ num_traits_0_1_37_features."default".from_enum_primitive_0_1_1__default = false;
+ error_chain_0_7_2 = error_chain_0_7_2_ rec {
+ dependencies = [];
+ features = mkFeatures error_chain_0_7_2_features;
+ };
+ error_chain_0_7_2_features."backtrace".self_default = hasDefault error_chain_0_7_2_features;
+ error_chain_0_7_2_features."example_generated".self_default = hasDefault error_chain_0_7_2_features;
+ backtrace_0_0_0_features."default".from_error_chain_0_7_2__default = true;
+ gif_0_9_1 = gif_0_9_1_ rec {
+ dependencies = [ color_quant_1_0_0 lzw_0_10_0 ];
+ features = mkFeatures gif_0_9_1_features;
+ };
+ gif_0_9_1_features."libc".self_c_api = hasFeature (gif_0_9_1_features."c_api" or {});
+ gif_0_9_1_features."raii_no_panic".self_default = hasDefault gif_0_9_1_features;
+ color_quant_1_0_0_features."default".from_gif_0_9_1__default = true;
+ libc_0_0_0_features."default".from_gif_0_9_1__default = true;
+ lzw_0_10_0_features."default".from_gif_0_9_1__default = true;
+ glob_0_2_11 = glob_0_2_11_ rec {};
+ image_0_12_3 = image_0_12_3_ rec {
+ dependencies = [ byteorder_1_0_0 enum_primitive_0_1_1 gif_0_9_1 glob_0_2_11 jpeg_decoder_0_1_11 num_iter_0_1_33 num_rational_0_1_36 num_traits_0_1_37 png_0_6_2 scoped_threadpool_0_1_7 ]
+ ++ (if lib.lists.any (x: x == "gif") features then [gif_0_9_1] else []) ++ (if lib.lists.any (x: x == "jpeg-decoder") features then [jpeg_decoder_0_1_11] else []) ++ (if lib.lists.any (x: x == "png") features then [png_0_6_2] else []) ++ (if lib.lists.any (x: x == "scoped_threadpool") features then [scoped_threadpool_0_1_7] else []);
+ features = mkFeatures image_0_12_3_features;
+ };
+ image_0_12_3_features."".self = true;
+ image_0_12_3_features."gif_codec".self_default = hasDefault image_0_12_3_features;
+ image_0_12_3_features."jpeg".self_default = hasDefault image_0_12_3_features;
+ image_0_12_3_features."ico".self_default = hasDefault image_0_12_3_features;
+ image_0_12_3_features."png_codec".self_default = hasDefault image_0_12_3_features;
+ image_0_12_3_features."ppm".self_default = hasDefault image_0_12_3_features;
+ image_0_12_3_features."tga".self_default = hasDefault image_0_12_3_features;
+ image_0_12_3_features."tiff".self_default = hasDefault image_0_12_3_features;
+ image_0_12_3_features."webp".self_default = hasDefault image_0_12_3_features;
+ image_0_12_3_features."bmp".self_default = hasDefault image_0_12_3_features;
+ image_0_12_3_features."hdr".self_default = hasDefault image_0_12_3_features;
+ image_0_12_3_features."gif".self_gif_codec = hasFeature (image_0_12_3_features."gif_codec" or {});
+ image_0_12_3_features."scoped_threadpool".self_hdr = hasFeature (image_0_12_3_features."hdr" or {});
+ image_0_12_3_features."bmp".self_ico = hasFeature (image_0_12_3_features."ico" or {});
+ image_0_12_3_features."png_codec".self_ico = hasFeature (image_0_12_3_features."ico" or {});
+ image_0_12_3_features."jpeg-decoder".self_jpeg = hasFeature (image_0_12_3_features."jpeg" or {});
+ image_0_12_3_features."png".self_png_codec = hasFeature (image_0_12_3_features."png_codec" or {});
+ byteorder_1_0_0_features."default".from_image_0_12_3__default = true;
+ enum_primitive_0_1_1_features."default".from_image_0_12_3__default = true;
+ gif_0_9_1_features."default".from_image_0_12_3__default = true;
+ glob_0_2_11_features."default".from_image_0_12_3__default = true;
+ jpeg_decoder_0_1_11_features."default".from_image_0_12_3__default = true;
+ num_iter_0_1_33_features."default".from_image_0_12_3__default = true;
+ num_rational_0_1_36_features."default".from_image_0_12_3__default = false;
+ num_traits_0_1_37_features."default".from_image_0_12_3__default = true;
+ png_0_6_2_features."default".from_image_0_12_3__default = true;
+ scoped_threadpool_0_1_7_features."default".from_image_0_12_3__default = true;
+ inflate_0_1_1 = inflate_0_1_1_ rec {
+ features = mkFeatures inflate_0_1_1_features;
+ };
+ inflate_0_1_1_features."".self = true;
+ jpeg_decoder_0_1_11 = jpeg_decoder_0_1_11_ rec {
+ dependencies = [ byteorder_1_0_0 rayon_0_6_0 ]
+ ++ (if lib.lists.any (x: x == "rayon") features then [rayon_0_6_0] else []);
+ features = mkFeatures jpeg_decoder_0_1_11_features;
+ };
+ jpeg_decoder_0_1_11_features."".self = true;
+ jpeg_decoder_0_1_11_features."rayon".self_default = hasDefault jpeg_decoder_0_1_11_features;
+ byteorder_1_0_0_features."default".from_jpeg_decoder_0_1_11__default = true;
+ rayon_0_6_0_features."default".from_jpeg_decoder_0_1_11__default = true;
+ kernel32_sys_0_2_2 = kernel32_sys_0_2_2_ rec {
+ dependencies = [ winapi_0_2_8 ];
+ buildDependencies = [ winapi_build_0_1_1 ];
+ };
+ winapi_0_2_8_features."default".from_kernel32_sys_0_2_2__default = true;
+ libc_0_2_21 = libc_0_2_21_ rec {
+ features = mkFeatures libc_0_2_21_features;
+ };
+ libc_0_2_21_features."use_std".self_default = hasDefault libc_0_2_21_features;
+ lzw_0_10_0 = lzw_0_10_0_ rec {
+ features = mkFeatures lzw_0_10_0_features;
+ };
+ lzw_0_10_0_features."raii_no_panic".self_default = hasDefault lzw_0_10_0_features;
+ metadeps_1_1_1 = metadeps_1_1_1_ rec {
+ dependencies = [ error_chain_0_7_2 pkg_config_0_3_9 toml_0_2_1 ];
+ };
+ error_chain_0_7_2_features."default".from_metadeps_1_1_1__default = false;
+ pkg_config_0_3_9_features."default".from_metadeps_1_1_1__default = true;
+ toml_0_2_1_features."default".from_metadeps_1_1_1__default = false;
+ num_integer_0_1_33 = num_integer_0_1_33_ rec {
+ dependencies = [ num_traits_0_1_37 ];
+ };
+ num_traits_0_1_37_features."default".from_num_integer_0_1_33__default = true;
+ num_iter_0_1_33 = num_iter_0_1_33_ rec {
+ dependencies = [ num_integer_0_1_33 num_traits_0_1_37 ];
+ };
+ num_integer_0_1_33_features."default".from_num_iter_0_1_33__default = true;
+ num_traits_0_1_37_features."default".from_num_iter_0_1_33__default = true;
+ num_rational_0_1_36 = num_rational_0_1_36_ rec {
+ dependencies = [ num_integer_0_1_33 num_traits_0_1_37 ];
+ features = mkFeatures num_rational_0_1_36_features;
+ };
+ num_rational_0_1_36_features."num-bigint".self_bigint = hasFeature (num_rational_0_1_36_features."bigint" or {});
+ num_rational_0_1_36_features."bigint".self_default = hasDefault num_rational_0_1_36_features;
+ num_rational_0_1_36_features."rustc-serialize".self_default = hasDefault num_rational_0_1_36_features;
+ num_bigint_0_0_0_features."default".from_num_rational_0_1_36__default = true;
+ num_integer_0_1_33_features."default".from_num_rational_0_1_36__default = true;
+ num_traits_0_1_37_features."default".from_num_rational_0_1_36__default = true;
+ rustc_serialize_0_0_0_features."default".from_num_rational_0_1_36__default = true;
+ serde_0_0_0_features."default".from_num_rational_0_1_36__default = true;
+ num_traits_0_1_37 = num_traits_0_1_37_ rec {};
+ num_cpus_1_3_0 = num_cpus_1_3_0_ rec {
+ dependencies = [ libc_0_2_21 ];
+ };
+ libc_0_2_21_features."default".from_num_cpus_1_3_0__default = true;
+ pkg_config_0_3_9 = pkg_config_0_3_9_ rec {};
+ png_0_6_2 = png_0_6_2_ rec {
+ dependencies = [ bitflags_0_7_0 deflate_0_7_5 inflate_0_1_1 num_iter_0_1_33 ]
+ ++ (if lib.lists.any (x: x == "deflate") features then [deflate_0_7_5] else []);
+ features = mkFeatures png_0_6_2_features;
+ };
+ png_0_6_2_features."".self = true;
+ png_0_6_2_features."png-encoding".self_default = hasDefault png_0_6_2_features;
+ png_0_6_2_features."deflate".self_png-encoding = hasFeature (png_0_6_2_features."png-encoding" or {});
+ bitflags_0_7_0_features."default".from_png_0_6_2__default = true;
+ deflate_0_7_5_features."default".from_png_0_6_2__default = true;
+ inflate_0_1_1_features."default".from_png_0_6_2__default = true;
+ num_iter_0_1_33_features."default".from_png_0_6_2__default = true;
+ rand_0_3_15 = rand_0_3_15_ rec {
+ dependencies = [ libc_0_2_21 ];
+ };
+ libc_0_2_21_features."default".from_rand_0_3_15__default = true;
+ rayon_0_6_0 = rayon_0_6_0_ rec {
+ dependencies = [ deque_0_3_1 libc_0_2_21 num_cpus_1_3_0 rand_0_3_15 ];
+ features = mkFeatures rayon_0_6_0_features;
+ };
+ rayon_0_6_0_features."".self = true;
+ deque_0_3_1_features."default".from_rayon_0_6_0__default = true;
+ libc_0_2_21_features."default".from_rayon_0_6_0__default = true;
+ num_cpus_1_3_0_features."default".from_rayon_0_6_0__default = true;
+ rand_0_3_15_features."default".from_rayon_0_6_0__default = true;
+ scoped_threadpool_0_1_7 = scoped_threadpool_0_1_7_ rec {
+ features = mkFeatures scoped_threadpool_0_1_7_features;
+ };
+ scoped_threadpool_0_1_7_features."".self = true;
+ strsim_0_6_0 = strsim_0_6_0_ rec {};
+ term_size_0_2_3 = term_size_0_2_3_ rec {
+ dependencies = []
+ ++ (if !(kernel == "windows") then [ libc_0_2_21 ] else [])
+ ++ (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ] else []);
+ features = mkFeatures term_size_0_2_3_features;
+ };
+ term_size_0_2_3_features."clippy".self_lints = hasFeature (term_size_0_2_3_features."lints" or {});
+ term_size_0_2_3_features."nightly".self_lints = hasFeature (term_size_0_2_3_features."lints" or {});
+ term_size_0_2_3_features."lints".self_travis = hasFeature (term_size_0_2_3_features."travis" or {});
+ term_size_0_2_3_features."nightly".self_travis = hasFeature (term_size_0_2_3_features."travis" or {});
+ clippy_0_0_0_features."default".from_term_size_0_2_3__default = true;
+ libc_0_2_21_features."default".from_term_size_0_2_3__default = true;
+ kernel32_sys_0_2_2_features."default".from_term_size_0_2_3__default = true;
+ winapi_0_2_8_features."default".from_term_size_0_2_3__default = true;
+ toml_0_2_1 = toml_0_2_1_ rec {
+ dependencies = [];
+ };
+ toml_0_2_1_features."rustc-serialize".self_default = hasDefault toml_0_2_1_features;
+ rustc_serialize_0_0_0_features."default".from_toml_0_2_1__default = true;
+ serde_0_0_0_features."default".from_toml_0_2_1__default = true;
+ unicode_segmentation_1_1_0 = unicode_segmentation_1_1_0_ rec {
+ features = mkFeatures unicode_segmentation_1_1_0_features;
+ };
+ unicode_segmentation_1_1_0_features."".self = true;
+ unicode_width_0_1_4 = unicode_width_0_1_4_ rec {
+ features = mkFeatures unicode_width_0_1_4_features;
+ };
+ unicode_width_0_1_4_features."".self = true;
+ vec_map_0_7_0 = vec_map_0_7_0_ rec {
+ dependencies = [];
+ features = mkFeatures vec_map_0_7_0_features;
+ };
+ vec_map_0_7_0_features."serde".self_eders = hasFeature (vec_map_0_7_0_features."eders" or {});
+ vec_map_0_7_0_features."serde_derive".self_eders = hasFeature (vec_map_0_7_0_features."eders" or {});
+ serde_0_0_0_features."default".from_vec_map_0_7_0__default = true;
+ serde_derive_0_0_0_features."default".from_vec_map_0_7_0__default = true;
+ wc_grab_0_2_0 = wc_grab_0_2_0_ rec {
+ dependencies = [ clap_2_22_0 dbus_0_5_2 image_0_12_3 ];
+ };
+ clap_2_22_0_features."default".from_wc_grab_0_2_0__default = true;
+ dbus_0_5_2_features."default".from_wc_grab_0_2_0__default = true;
+ image_0_12_3_features."default".from_wc_grab_0_2_0__default = true;
+ winapi_0_2_8 = winapi_0_2_8_ rec {};
+ winapi_build_0_1_1 = winapi_build_0_1_1_ rec {};
+}
diff --git a/pkgs/applications/window-managers/way-cooler/wc-lock.nix b/pkgs/applications/window-managers/way-cooler/wc-lock.nix
new file mode 100644
index 0000000000000000000000000000000000000000..634288cfca8031daea30b33114fc1351d15d2f4c
--- /dev/null
+++ b/pkgs/applications/window-managers/way-cooler/wc-lock.nix
@@ -0,0 +1,625 @@
+# Generated by carnix 0.5.0: carnix -o wc-lock.nix Cargo.lock
+{ lib, buildPlatform, buildRustCrate, fetchgit }:
+let kernel = buildPlatform.parsed.kernel.name;
+ abi = buildPlatform.parsed.abi.name;
+ hasFeature = feature:
+ lib.lists.any
+ (originName: feature.${originName})
+ (builtins.attrNames feature);
+
+ hasDefault = feature:
+ let defaultFeatures = builtins.attrNames (feature."default" or {}); in
+ (defaultFeatures == [])
+ || (lib.lists.any (originName: feature."default".${originName}) defaultFeatures);
+
+ mkFeatures = feat: lib.lists.foldl (features: featureName:
+ if featureName != "" && hasFeature feat.${featureName} then
+ [ featureName ] ++ features
+ else
+ features
+ ) (if hasDefault feat then [ "default" ] else []) (builtins.attrNames feat);
+ ansi_term_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "ansi_term";
+ version = "0.9.0";
+ authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) " ];
+ sha256 = "1vcd8m2hglrdi4zmqnkkz5zy3c73ifgii245k7vj6qr5dzpn9hij";
+ inherit dependencies buildDependencies features;
+ };
+ atty_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "atty";
+ version = "0.2.2";
+ authors = [ "softprops " ];
+ sha256 = "05c6jvrxljp4s1aycgq2z3y56f7f5yvc56v25cqlmpc1qx65z7ba";
+ inherit dependencies buildDependencies features;
+ };
+ bitflags_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "bitflags";
+ version = "0.7.0";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "1hr72xg5slm0z4pxs2hiy4wcyx3jva70h58b7mid8l0a4c8f7gn5";
+ inherit dependencies buildDependencies features;
+ };
+ bitflags_0_8_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "bitflags";
+ version = "0.8.2";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "0whaj3969ysqxzk620sk1isvq6vh85516f2fplvqjrw3syz44sb2";
+ inherit dependencies buildDependencies features;
+ };
+ byteorder_0_5_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "byteorder";
+ version = "0.5.3";
+ authors = [ "Andrew Gallant " ];
+ sha256 = "0zsr6b0m0yl5c0yy92nq7srfpczd1dx1xqcx3rlm5fbl8si9clqx";
+ inherit dependencies buildDependencies features;
+ };
+ clap_2_24_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "clap";
+ version = "2.24.2";
+ authors = [ "Kevin K. " ];
+ sha256 = "0028bkzafprs6n7ing8lnf7iss2a2zq17qmgadipgdfgvww43rmv";
+ inherit dependencies buildDependencies features;
+ };
+ dlib_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "dlib";
+ version = "0.3.1";
+ authors = [ "Victor Berger " ];
+ sha256 = "11mhh6g9vszp2ay3r46x4capnnmvvhx5hcp74bapxjhiixqjfvkr";
+ inherit dependencies buildDependencies features;
+ };
+ dtoa_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "dtoa";
+ version = "0.4.1";
+ authors = [ "David Tolnay " ];
+ sha256 = "0mgg4r90yby68qg7y8csbclhsm53ac26vsyq615viq535plllhzw";
+ inherit dependencies buildDependencies features;
+ };
+ fs2_0_2_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "fs2";
+ version = "0.2.5";
+ authors = [ "Dan Burkert " ];
+ sha256 = "0j6l5r95jigbl0lgkm69c82dzq10jipjbm9qnni147hb45gyw790";
+ inherit dependencies buildDependencies features;
+ };
+ gcc_0_3_50_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "gcc";
+ version = "0.3.50";
+ authors = [ "Alex Crichton " ];
+ sha256 = "032izcbbyiakv9ck5j3s27p3ddx4468n7qpaxgwi5iswmimjaaj0";
+ inherit dependencies buildDependencies features;
+ };
+ itoa_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "itoa";
+ version = "0.3.1";
+ authors = [ "David Tolnay " ];
+ sha256 = "0jp1wvfw0qqbyz0whbycp7xr5nx1ds5plh4wsfyj503xmjf9ab4k";
+ inherit dependencies buildDependencies features;
+ };
+ kernel32_sys_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "kernel32-sys";
+ version = "0.2.2";
+ authors = [ "Peter Atashian " ];
+ sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj";
+ libName = "kernel32";
+ build = "build.rs";
+ inherit dependencies buildDependencies features;
+ };
+ lazy_static_0_1_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "lazy_static";
+ version = "0.1.16";
+ authors = [ "Marvin Löbel " ];
+ sha256 = "0lc5ixs5bmnc43lfri2ynh9393l7vs0z3sw2v5rkaady2ivnznpc";
+ inherit dependencies buildDependencies features;
+ };
+ lazy_static_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "lazy_static";
+ version = "0.2.8";
+ authors = [ "Marvin Löbel " ];
+ sha256 = "1xbpxx7cd5kl60g87g43q80jxyrsildhxfjc42jb1x4jncknpwbl";
+ inherit dependencies buildDependencies features;
+ };
+ libc_0_2_23_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "libc";
+ version = "0.2.23";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "1i29f6k26fmv81c5bjc6hw2j95sd01h9ad66qxdc755b24xfa9jm";
+ inherit dependencies buildDependencies features;
+ };
+ libloading_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "libloading";
+ version = "0.3.4";
+ authors = [ "Simonas Kazlauskas " ];
+ sha256 = "1f2vy32cr434n638nv8sdf05iwa53q9q5ahlcpw1l9ywh1bcbhf1";
+ build = "build.rs";
+ inherit dependencies buildDependencies features;
+ };
+ memmap_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "memmap";
+ version = "0.4.0";
+ authors = [ "Dan Burkert " ];
+ sha256 = "0q2gm5p8n9najc8kccbxxkannmnjh85rin4k8d4y1kg5ymdp6kll";
+ inherit dependencies buildDependencies features;
+ };
+ num_traits_0_1_37_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "num-traits";
+ version = "0.1.37";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "0rwzfmdjq6iz6plva2gi7agvy1w9sjs7aqjh0p115w57xiix2224";
+ inherit dependencies buildDependencies features;
+ };
+ phf_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "phf";
+ version = "0.7.21";
+ authors = [ "Steven Fackler " ];
+ sha256 = "11m2rzm2s8s35m0s97gjxxb181xz352kjlhr387xj5c8q3qp5afg";
+ libPath = "src/lib.rs";
+ inherit dependencies buildDependencies features;
+ };
+ phf_codegen_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "phf_codegen";
+ version = "0.7.21";
+ authors = [ "Steven Fackler " ];
+ sha256 = "0kgy8s2q4zr0iqcm21mgq4ppc45wy6z7b5wn98xyfsrcad6lwmmj";
+ inherit dependencies buildDependencies features;
+ };
+ phf_generator_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "phf_generator";
+ version = "0.7.21";
+ authors = [ "Steven Fackler " ];
+ sha256 = "1jxjfzc6d6d4l9nv0r2bb66if5brk9lnncmg4dpjjifn6zhhqd9g";
+ inherit dependencies buildDependencies features;
+ };
+ phf_shared_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "phf_shared";
+ version = "0.7.21";
+ authors = [ "Steven Fackler " ];
+ sha256 = "0lxpg3wgxfhzfalmf9ha9my1lsvfjy74ah9f6mfw88xlp545jlln";
+ libPath = "src/lib.rs";
+ inherit dependencies buildDependencies features;
+ };
+ rand_0_3_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "rand";
+ version = "0.3.15";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "1fs30rc1xic40s1n7l3y7pxzfifpy03mgrvhy5ggp5p7zjfv3rr8";
+ inherit dependencies buildDependencies features;
+ };
+ rustc_version_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "rustc_version";
+ version = "0.1.7";
+ authors = [ "Marvin Löbel " ];
+ sha256 = "0plm9pbyvcwfibd0kbhzil9xmr1bvqi8fgwlfw0x4vali8s6s99p";
+ inherit dependencies buildDependencies features;
+ };
+ semver_0_1_20_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "semver";
+ version = "0.1.20";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "05cdig0071hls2k8lxbqmyqpl0zjmc53i2d43mwzps033b8njh4n";
+ inherit dependencies buildDependencies features;
+ };
+ serde_0_9_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "serde";
+ version = "0.9.15";
+ authors = [ "Erick Tryzelaar " ];
+ sha256 = "0rlflkc57kvy69hnhj4arfsj7ic4hpihxsb00zg5lkdxfj5qjx9b";
+ inherit dependencies buildDependencies features;
+ };
+ serde_json_0_9_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "serde_json";
+ version = "0.9.10";
+ authors = [ "Erick Tryzelaar " ];
+ sha256 = "0g6bxlfnvf2miicnsizyrxm686rfval6gbss1i2qcna8msfwc005";
+ inherit dependencies buildDependencies features;
+ };
+ siphasher_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "siphasher";
+ version = "0.2.2";
+ authors = [ "Frank Denis " ];
+ sha256 = "0iyx7nlzfny9ly1634a6zcq0yvrinhxhypwas4p8ry3zqnn76qqr";
+ inherit dependencies buildDependencies features;
+ };
+ strsim_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "strsim";
+ version = "0.6.0";
+ authors = [ "Danny Guo " ];
+ sha256 = "1lz85l6y68hr62lv4baww29yy7g8pg20dlr0lbaswxmmcb0wl7gd";
+ inherit dependencies buildDependencies features;
+ };
+ target_build_utils_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "target_build_utils";
+ version = "0.3.1";
+ authors = [ "Simonas Kazlauskas " ];
+ sha256 = "1b450nyxlbgicp2p45mhxiv6yv0z7s4iw01lsaqh3v7b4bm53flj";
+ build = "build.rs";
+ inherit dependencies buildDependencies features;
+ };
+ tempfile_2_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "tempfile";
+ version = "2.1.5";
+ authors = [ "Steven Allen " ];
+ sha256 = "1yz8aaj78z9gsn4b71y0m6fa5bnxhqafcczhxvmwra56k943aqkw";
+ build = "build.rs";
+ inherit dependencies buildDependencies features;
+ };
+ term_size_0_3_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "term_size";
+ version = "0.3.0";
+ authors = [ "Kevin K. " "Benjamin Sago " ];
+ sha256 = "054d5avad49sy5nfaaaphai4kv4rmdh6q0npchnvdhpxp02lcfhs";
+ inherit dependencies buildDependencies features;
+ };
+ unicode_segmentation_1_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "unicode-segmentation";
+ version = "1.2.0";
+ authors = [ "kwantam